and the computers too (+ PA)

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]

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:

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml

@@ -33,7 +33,7 @@
   name: protolathe machine board
   description: A machine printed circuit board for a protolathe.
   components:
-    - type: Sprite
+    - type: Sprite #imp
       state: science
     - type: MachineBoard
       prototype: Protolathe
@@ -51,7 +51,7 @@
   name: hyper convection protolathe machine board
   description: A machine printed circuit board for a hyper convection protolathe.
   components:
-    - type: Sprite
+    - type: Sprite #imp
       state: science
     - type: MachineBoard
       prototype: ProtolatheHyperConvection

Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

@@ -51,7 +51,7 @@
       prototype: ComputerPowerMonitoring
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseMedicalContraband ]
   id: MedicalRecordsComputerCircuitboard
   name: medical records computer board
   description: A computer printed circuit board for a medical records computer.
@@ -62,7 +62,7 @@
       prototype: ComputerMedicalRecords
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseSecurityContraband ]
   id: CriminalRecordsComputerCircuitboard
   name: criminal records computer board
   description: A computer printed circuit board for a criminal records computer.
@@ -73,7 +73,7 @@
       prototype: ComputerCriminalRecords
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseSecurityCommandContraband ]
   id: StationRecordsComputerCircuitboard
   name: station records computer board
   description: A computer printed circuit board for a station records computer.
@@ -84,7 +84,7 @@
       prototype: ComputerStationRecords
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseCargoContraband ]
   id: CargoRequestComputerCircuitboard
   name: cargo request computer board
   description: A computer printed circuit board for a cargo request computer.
@@ -100,7 +100,7 @@
         - DroneUsable
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseCargoContraband ]
   id: CargoSaleComputerCircuitboard
   name: cargo sale computer board
   description: A computer printed circuit board for a cargo sale computer.
@@ -112,7 +112,7 @@
 
 - type: entity
   id: CargoBountyComputerCircuitboard
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseCargoContraband ]
   name: cargo bounty computer board
   description: A computer printed circuit board for a cargo bounty computer.
   components:
@@ -126,7 +126,7 @@
     - DroneUsable
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseCargoContraband ]
   id: CargoShuttleComputerCircuitboard
   name: cargo shuttle computer board
   description: A computer printed circuit board for a cargo shuttle computer.
@@ -137,7 +137,7 @@
       prototype: ComputerCargoShuttle
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseCargoContraband ]
   id: SalvageExpeditionsComputerCircuitboard
   name: salvage expeditions computer board
   description: A computer printed circuit board for a salvage expeditions computer.
@@ -150,7 +150,7 @@
       stealGroup: SalvageExpeditionsComputerCircuitboard
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseCargoContraband ]
   id: CargoShuttleConsoleCircuitboard
   name: cargo shuttle console board
   description: A computer printed circuit board for a cargo shuttle console.
@@ -196,7 +196,7 @@
         - DroneUsable
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseCommandContraband ]
   id: ResearchComputerCircuitboard
   name: R&D computer board
   description: A computer printed circuit board for a R&D console.
@@ -218,7 +218,7 @@
       prototype: ComputerAnalysisConsole
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseScienceContraband ]
   id: TechDiskComputerCircuitboard
   name: tech disk terminal board
   description: A computer printed circuit board for a technology disk terminal.
@@ -294,7 +294,7 @@
     prototype: ComputerRadar
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseEngineeringContraband ]
   id: SolarControlComputerCircuitboard
   name: solar control computer board
   description: A computer printed circuit board for a solar control console.
@@ -323,7 +323,7 @@
       prototype: BlockGameArcade
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseEngineeringContraband ]
   id: ParticleAcceleratorComputerCircuitboard
   name: PA control box computer board
   description: A computer printed circuit board for a particle accelerator control box.
@@ -343,7 +343,7 @@
       prototype: ComputerShuttle
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, Tier2Contraband ]
   id: SyndicateShuttleConsoleCircuitboard
   name: syndicate shuttle console board
   description: A computer printed circuit board for a syndicate shuttle console.
@@ -374,7 +374,7 @@
       prototype: ComputerIFF
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, Tier2Contraband ]
   id: ComputerIFFSyndicateCircuitboard
   name: syndicate IFF console board
   description: Allows you to control the IFF and stealth characteristics of this vessel.
@@ -407,7 +407,7 @@
       prototype: ComputerSensorMonitoring
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseCommandContraband ]
   id: RoboticsConsoleCircuitboard
   name: robotics control console board
   description: A computer printed circuit board for a robotics control console.
@@ -418,7 +418,7 @@
       prototype: ComputerRoboticsControl
 
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseCommandContraband ]
   id: StationAiUploadCircuitboard
   name: AI upload console board
   description: A computer printed circuit board for a AI upload console.

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

@@ -171,7 +171,7 @@
     board: ShuttleConsoleCircuitboard
 
 - type: entity
-  parent: BaseComputerShuttle
+  parent: [ BaseComputerShuttle, Tier2Contraband ]
   id: ComputerShuttleSyndie
   name: syndicate shuttle console
   description: Used to pilot a syndicate shuttle.
@@ -203,7 +203,7 @@
     board: SyndicateShuttleConsoleCircuitboard
 
 - type: entity
-  parent: BaseComputerShuttle
+  parent: [ BaseComputerShuttle, BaseCargoContraband ]
   id: ComputerShuttleCargo
   name: cargo shuttle console
   description: Used to pilot the cargo shuttle.
@@ -266,7 +266,7 @@
     board: ComputerIFFCircuitboard
 
 - type: entity
-  parent: ComputerIFF
+  parent: [ ComputerIFF, Tier2Contraband ]
   id: ComputerIFFSyndicate
   name: IFF computer
   suffix: Syndicate
@@ -330,7 +330,7 @@
         type: WiresBoundUserInterface
 
 - type: entity
-  parent: BaseComputerAiAccess
+  parent: [ BaseComputerAiAccess, BaseMedicalContraband ]
   id: ComputerMedicalRecords
   name: medical records computer
   description: This can be used to check medical records.
@@ -355,7 +355,7 @@
     board: MedicalRecordsComputerCircuitboard
 
 - type: entity
-  parent: BaseComputerAiAccess
+  parent: [ BaseComputerAiAccess, BaseSecurityContraband ]
   id: ComputerCriminalRecords
   name: criminal records computer
   description: This can be used to check criminal records. Only security can modify them.
@@ -394,7 +394,7 @@
     - CriminalRecords
 
 - type: entity
-  parent: BaseComputerAiAccess
+  parent: [ BaseComputerAiAccess, BaseSecurityCommandContraband ]
   id: ComputerStationRecords
   name: station records computer
   description: This can be used to check station records.
@@ -458,7 +458,7 @@
     range: 1200
 
 - type: entity
-  parent: BaseComputerAiAccess
+  parent: [ BaseComputerAiAccess, BaseCommandContraband ]
   id: ComputerResearchAndDevelopment
   name: R&D computer
   description: A computer used to interface with R&D tools.
@@ -556,7 +556,7 @@
     - Xenoarchaeology
 
 - type: entity
-  parent: BaseComputerAiAccess
+  parent: [ BaseComputerAiAccess, BaseGrandTheftContraband ]
   id: ComputerId
   name: ID card computer
   description: Terminal for programming Nanotrasen employee ID cards to access parts of the station.
@@ -709,7 +709,7 @@
     color: "#f71713"
 
 - type: entity
-  parent: BaseComputerAiAccess
+  parent: [ BaseComputerAiAccess, BaseEngineeringContraband ]
   id: ComputerSolarControl
   name: solar control computer
   description: A controller for solar panel arrays.
@@ -781,7 +781,7 @@
 
 - type: entity
   id: ComputerCargoShuttle
-  parent: BaseComputerAiAccess
+  parent: [ BaseComputerAiAccess, BaseCargoContraband ]
   name: cargo shuttle computer
   description: Used to order the shuttle.
   components:
@@ -820,7 +820,7 @@
 
 - type: entity
   id: ComputerCargoOrders
-  parent: BaseComputerAiAccess
+  parent: [ BaseComputerAiAccess, BaseCargoContraband ]
   name: cargo request computer
   description: Used to order supplies and approve requests.
   components:
@@ -872,7 +872,7 @@
 
 - type: entity
   id: ComputerCargoBounty
-  parent: BaseComputerAiAccess
+  parent: [ BaseComputerAiAccess, BaseCargoContraband ]
   name: cargo bounty computer
   description: Used to manage currently active bounties.
   components:
@@ -965,7 +965,7 @@
 
 - type: entity
   id: ComputerSalvageExpedition
-  parent: BaseComputerAiAccess
+  parent: [ BaseComputerAiAccess, BaseCargoContraband ]
   name: salvage expeditions computer
   description: Used to accept salvage missions, if you're tough enough.
   components:
@@ -1098,7 +1098,7 @@
 
 - type: entity
   id: ComputerPalletConsole
-  parent: BaseComputerAiAccess
+  parent: [ BaseComputerAiAccess, BaseCargoContraband ]
   name: cargo sale computer
   description: Used to sell goods loaded onto cargo pallets.
   components:
@@ -1220,7 +1220,7 @@
     - type: AtmosDevice
 
 - type: entity
-  parent: BaseComputerAiAccess
+  parent: [ BaseComputerAiAccess, BaseCommandContraband ]
   id: ComputerRoboticsControl
   name: robotics control console
   description: Used to remotely monitor, disable and destroy the station's cyborgs.
@@ -1264,7 +1264,7 @@
 
 - type: entity
   id: StationAiUploadComputer
-  parent: BaseComputer
+  parent: [ BaseComputer, BaseCommandContraband ]
   name: AI upload console
   description: Used to update the laws of the station AI.
   components:

Resources/Prototypes/Entities/Structures/Machines/Computers/techdiskterminal.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseComputer
+  parent: [ BaseComputer, BaseScienceContraband ]
   id: ComputerTechnologyDiskTerminal
   name: tech disk terminal
   description: A terminal used to print out technology disks.

Resources/Prototypes/Entities/Structures/Power/Generation/PA/base_particleaccelerator.yml

@@ -1,5 +1,6 @@
 - type: entity
   id: ParticleAcceleratorBase
+  parent: BaseEngineeringContraband #imp
   abstract: true
   placement:
     mode: SnapgridCenter

Resources/Prototypes/_DeltaV/Entities/Objects/Devices/CircuitBoards/computer.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseComputerCircuitboard
+  parent: [ BaseComputerCircuitboard, BaseCargoContraband ]
   id: ShipyardComputerCircuitboard
   name: shipyard computer board
   description: A computer printed circuit board for a shipyard computer.