Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Machines and Computers become contraband #1168

Merged
merged 6 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/contraband/contraband-severity.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -127,7 +131,7 @@

- type: entity
id: CircuitImprinterMachineCircuitboard
parent: BaseMachineCircuitboard
parent: [ BaseMachineCircuitboard, BaseScienceContraband ]
name: circuit imprinter machine board
components:
- type: Sprite
Expand All @@ -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.
Expand All @@ -164,7 +168,7 @@

- type: entity
id: ExosuitFabricatorMachineCircuitboard
parent: BaseMachineCircuitboard
parent: [ BaseMachineCircuitboard, BaseScienceContraband ]
name: exosuit fabricator machine board
components:
- type: Sprite
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -1045,7 +1049,7 @@

- type: entity
id: SyndicateMicrowaveMachineCircuitboard
parent: BaseMachineCircuitboard
parent: [ BaseMachineCircuitboard, Tier1Contraband ]
name: donk co. microwave machine board
components:
- type: Sprite
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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.
Expand Down
Loading
Loading