Merge pull request #1168 from iaada/imp/contra-protolathe

Machines and Computers become contraband
impstation · Jan 2, 2025 · 8f09106 · 8f09106
2 parents 6c098b1 + 04b5da9
commit 8f09106
Show file tree

Hide file tree

Showing 16 changed files with 95 additions and 90 deletions.
diff --git a/Resources/Locale/en-US/contraband/contraband-severity.ftl b/Resources/Locale/en-US/contraband/contraband-severity.ftl
@@ -5,5 +5,5 @@ contraband-examine-text-Major = [color=red]This item is considered major contrab
 contraband-examine-text-GrandTheft = [color=red]This item is a highly valuable target for Syndicate agents![/color]
 contraband-examine-text-Syndicate = [color=crimson]This item is highly illegal Syndicate contraband![/color]
 
-contraband-examine-text-avoid-carrying-around = [color=red][italic]You probably want to avoid visibly carrying this around without a good reason.[/italic][/color]
-contraband-examine-text-in-the-clear = [color=green][italic]You should be in the clear to visibly carry this around.[/italic][/color]
+contraband-examine-text-avoid-carrying-around = [color=red][italic]You probably want to avoid having this in your possession without a good reason.[/italic][/color]
+contraband-examine-text-in-the-clear = [color=green][italic]You should be in the clear to have possession of this.[/italic][/color]
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: MachineParticleAcceleratorEndCapCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseEngineeringContraband ]
   name: PA end cap board
   description: A machine board for a particle accelerator end cap.
   components:
@@ -14,7 +14,7 @@
 
 - type: entity
   id: MachineParticleAcceleratorFuelChamberCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseEngineeringContraband ]
   name: PA fuel chamber board
   description: A machine board for a particle accelerator fuel chamber.
   components:
@@ -32,7 +32,7 @@
 
 - type: entity
   id: MachineParticleAcceleratorPowerBoxCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseEngineeringContraband ]
   name: PA power box board
   description: A machine board for a particle accelerator power box.
   components:
@@ -48,7 +48,7 @@
 
 - type: entity
   id: MachineParticleAcceleratorEmitterStarboardCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseEngineeringContraband ]
   name: PA starboard emitter board
   description: A machine board for a particle accelerator left emitter.
   components:
@@ -62,7 +62,7 @@
 
 - type: entity
   id: MachineParticleAcceleratorEmitterForeCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseEngineeringContraband ]
   name: PA fore emitter board
   description: A machine board for a particle accelerator center emitter.
   components:
@@ -76,7 +76,7 @@
 
 - type: entity
   id: MachineParticleAcceleratorEmitterPortCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseEngineeringContraband ]
   name: PA port emitter board
   description: A machine board for a particle accelerator right emitter.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -29,10 +29,12 @@
 
 - type: entity
   id: ProtolatheMachineCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseScienceContraband ]
   name: protolathe machine board
   description: A machine printed circuit board for a protolathe.
   components:
+    - type: Sprite #imp
+      state: science
     - type: MachineBoard
       prototype: Protolathe
       stackRequirements:
@@ -44,22 +46,24 @@
           defaultPrototype: Beaker
 
 - type: entity
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseScienceContraband ]
   id: ProtolatheHyperConvectionMachineCircuitboard
   name: hyper convection protolathe machine board
   description: A machine printed circuit board for a hyper convection protolathe.
   components:
-  - type: MachineBoard
-    prototype: ProtolatheHyperConvection
-    stackRequirements:
-      MatterBin: 2
-    tagRequirements:
-      GlassBeaker:
-        amount: 2
-        defaultPrototype: Beaker
-      Igniter:
-        amount: 1
-        defaultPrototype: Igniter
+    - type: Sprite #imp
+      state: science
+    - type: MachineBoard
+      prototype: ProtolatheHyperConvection
+      stackRequirements:
+        MatterBin: 2
+      tagRequirements:
+        GlassBeaker:
+          amount: 2
+          defaultPrototype: Beaker
+        Igniter:
+          amount: 1
+          defaultPrototype: Igniter
 
 - type: entity
   id: BiofabricatorMachineCircuitboard
@@ -75,7 +79,7 @@
 
 - type: entity
   id: SecurityTechFabCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseSecurityContraband ]
   name: security techfab machine board
   description: A machine printed circuit board for a security techfab.
   components:
@@ -93,7 +97,7 @@
 
 - type: entity
   id: AmmoTechFabCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseSecurityContraband ]
   name: ammo techfab circuit board
   description: A machine printed circuit board for an ammo techfab.
   components:
@@ -107,7 +111,7 @@
 
 - type: entity
   id: MedicalTechFabCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseMedicalContraband ]
   name: medical techfab machine board
   description: A machine printed circuit board for a medical techfab.
   components:
@@ -127,7 +131,7 @@
 
 - type: entity
   id: CircuitImprinterMachineCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseScienceContraband ]
   name: circuit imprinter machine board
   components:
   - type: Sprite
@@ -143,7 +147,7 @@
         defaultPrototype: Beaker
 
 - type: entity
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseScienceContraband ]
   id: CircuitImprinterHyperConvectionMachineCircuitboard
   name: hyper convection circuit imprinter machine board
   description: A machine printed circuit board for a hyper convection circuit imprinter.
@@ -164,7 +168,7 @@
 
 - type: entity
   id: ExosuitFabricatorMachineCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseScienceContraband ]
   name: exosuit fabricator machine board
   components:
   - type: Sprite
@@ -182,7 +186,7 @@
 # yes i know this prototype name is long i'm just following conventions
 - type: entity
   id: ResearchAndDevelopmentServerMachineCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseCommandContraband ]
   name: R&D server machine board
   description: A machine printed circuit board for the R&D server.
   components:
@@ -276,7 +280,7 @@
 
 - type: entity
   id: ArtifactCrusherMachineCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseScienceContraband ]
   name: artifact crusher machine board
   description: A machine printed circuit board for an artifact crusher.
   components:
@@ -305,7 +309,7 @@
         PlasmaGlass: 10
 
 - type: entity
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseScienceContraband ]
   id: AnomalyVesselExperimentalCircuitboard
   name: experimental anomaly vessel machine board
   description: A machine printed circuit board for an experimental anomaly vessel.
@@ -337,7 +341,7 @@
         Cable: 5
 
 - type: entity
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseScienceContraband ]
   id: APECircuitboard
   name: A.P.E. machine board
   description: A machine printed circuit board for an A.P.E.
@@ -1045,7 +1049,7 @@
 
 - type: entity
   id: SyndicateMicrowaveMachineCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, Tier1Contraband ]
   name: donk co. microwave machine board
   components:
     - type: Sprite
@@ -1180,7 +1184,7 @@
 
 - type: entity
   id: CargoTelepadMachineCircuitboard
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseCargoContraband ]
   name: cargo telepad machine board
   description: A machine printed circuit board for a cargo telepad.
   components:
@@ -1222,7 +1226,7 @@
         Cable: 2
 
 - type: entity
-  parent: BaseMachineCircuitboard
+  parent: [ BaseMachineCircuitboard, BaseCargoContraband ]
   id: SalvageMagnetMachineCircuitboard
   name: salvage magnet machine board
   description: A machine printed circuit board for a salvage magnet.