From e7bc138ed5e9d72cffeca82d982b0a1e198b117e Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Sun, 27 Feb 2022 13:46:26 +0000 Subject: [PATCH] Board descriptions for computers and machines (#6290) Co-authored-by: metalgearsloth --- .../Catalog/Research/technologies.yml | 2 +- .../Machine/particle_accelerator.yml | 22 +++--- .../Circuitboards/Machine/production.yml | 38 ++++++---- .../Devices/Circuitboards/computer.yml | 68 +++++++++++++++--- .../Objects/Devices/Electronics/apc.yml | 2 +- .../Devices/Electronics/atmos_alarms.yml | 4 +- .../Objects/Devices/Electronics/door.yml | 1 + .../Objects/Devices/Electronics/firelock.yml | 2 +- .../Objects/Devices/Electronics/solar.yml | 2 +- .../Machines/Computers/computers.yml | 24 +++++++ .../Entities/Structures/Machines/lathe.yml | 2 +- .../Prototypes/Recipes/Lathes/electronics.yml | 4 +- .../Machines/computers.rsi/meta.json | 12 ++-- .../Machines/computers.rsi/security.png | Bin 719 -> 816 bytes 14 files changed, 136 insertions(+), 47 deletions(-) diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 2e7b4fa925..37f1db2bfa 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -96,7 +96,7 @@ - CryostasisBeaker - Dropper - Syringe - - KitchenReagentGrinderMachineCircuitboard + - ReagentGrinderMachineCircuitboard - PillCanister - type: technology diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml index 92a6c84a03..ea22ad5199 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml @@ -1,9 +1,8 @@ -# TODO: Add descriptions (3) - -- type: entity +- type: entity id: MachineParticleAcceleratorEndCapCircuitboard parent: BaseMachineCircuitboard - name: PA End Cap + name: PA end cap board + description: A machine board for a particle accelerator end cap components: - type: MachineBoard prototype: ParticleAcceleratorEndCapUnfinished @@ -14,7 +13,8 @@ - type: entity id: MachineParticleAcceleratorFuelChamberCircuitboard parent: BaseMachineCircuitboard - name: PA Fuel Chamber + name: PA fuel chamber board + description: A machine board for a particle accelerator fuel chamber components: - type: MachineBoard prototype: ParticleAcceleratorFuelChamberUnfinished @@ -30,7 +30,8 @@ - type: entity id: MachineParticleAcceleratorPowerBoxCircuitboard parent: BaseMachineCircuitboard - name: PA Power Box + name: PA power box board + description: A machine board for a particle accelerator power box components: - type: MachineBoard prototype: ParticleAcceleratorPowerBoxUnfinished @@ -43,7 +44,8 @@ - type: entity id: MachineParticleAcceleratorEmitterLeftCircuitboard parent: BaseMachineCircuitboard - name: PA Emitter Left + name: PA emitter left board + description: A machine board for a particle accelerator left emitter components: - type: MachineBoard prototype: ParticleAcceleratorEmitterLeftUnfinished @@ -54,7 +56,8 @@ - type: entity id: MachineParticleAcceleratorEmitterCenterCircuitboard parent: BaseMachineCircuitboard - name: PA Emitter Center + name: PA emitter center board + description: A machine board for a particle accelerator center emitter components: - type: MachineBoard prototype: ParticleAcceleratorEmitterCenterUnfinished @@ -65,7 +68,8 @@ - type: entity id: MachineParticleAcceleratorEmitterRightCircuitboard parent: BaseMachineCircuitboard - name: PA Emitter Right + name: PA emitter right board + description: A machine board for a particle accelerator right emitter components: - type: MachineBoard prototype: ParticleAcceleratorEmitterRightUnfinished diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 9a51e7f4df..dc5d9e1f19 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -1,9 +1,8 @@ -# TODO: Add descriptions (3) - -- type: entity +- type: entity id: AutolatheMachineCircuitboard parent: BaseMachineCircuitboard - name: Autolathe (Machine Board) + name: autolathe machine board + description: A machine printed circuit board for an autolathe components: - type: MachineBoard prototype: Autolathe @@ -16,7 +15,8 @@ - type: entity id: ProtolatheMachineCircuitboard parent: BaseMachineCircuitboard - name: Protolathe (Machine Board) + name: protolathe machine board + description: A machine printed circuit board for a protolathe components: - type: MachineBoard prototype: Protolathe @@ -83,7 +83,8 @@ - type: entity id: CloningPodMachineCircuitboard parent: BaseMachineCircuitboard - name: Cloning Pod (Machine Board) + name: cloning pod machine board + description: A machine printed circuit board for a cloning pod components: - type: MachineBoard prototype: CloningPod @@ -97,7 +98,8 @@ - type: entity id: MedicalScannerMachineCircuitboard parent: BaseMachineCircuitboard - name: Medical Scanner (Machine Board) + name: medical scanner machine board + description: A machine printed circuit board for a medical scanner components: - type: MachineBoard prototype: MedicalScanner @@ -112,7 +114,8 @@ - type: entity id: ChemMasterMachineCircuitboard parent: BaseMachineCircuitboard - name: Chem Master (Machine Board) + name: ChemMaster 4000 machine board + description: A machine printed circuit board for a ChemMaster 4000 components: - type: MachineBoard prototype: chem_master @@ -129,7 +132,8 @@ - type: entity id: ChemDispenserMachineCircuitboard parent: BaseMachineCircuitboard - name: Chem Dispenser (Machine Board) + name: chem dispenser machine board + description: A machine printed circuit board for a chem dispenser components: - type: MachineBoard prototype: chem_dispenser @@ -143,7 +147,8 @@ - type: entity id: HydroponicsTrayMachineCircuitboard parent: BaseMachineCircuitboard - name: Hydroponics Tray (Machine Board) + name: hydroponics tray machine board + description: A machine printed circuit board for a hydroponics tray components: - type: MachineBoard prototype: hydroponicsTray @@ -164,20 +169,22 @@ - type: entity id: SMESMachineCircuitboard parent: BaseMachineCircuitboard - name: SMES (Machine Board) + name: SMES machine board + description: A machine printed circuit board for a SMES components: - type: Sprite sprite: Objects/Misc/module.rsi state: power_mod - type: MachineBoard - prototype: BaseSmes + prototype: BaseSMES requirements: Capacitor: 10 - type: entity id: SubstationMachineCircuitboard parent: BaseMachineCircuitboard - name: Substation (Machine Board) + name: substation machine board + description: A machine printed circuit board for a substation components: - type: MachineBoard prototype: BaseSubstation @@ -224,9 +231,10 @@ - type: entity - id: KitchenReagentGrinderMachineCircuitboard #unsure why the reagent grinder has 'kitchen' in the id name when multiple departments use it but that's for another time + id: ReagentGrinderMachineCircuitboard parent: BaseMachineCircuitboard - name: Reagent Grinder (Machine Board) + name: reagent grinder machine board + description: A machine printed circuit board for a reagent grinder components: - type: MachineBoard prototype: KitchenReagentGrinder diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index c10f53c7ca..6c6e51fc1a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -1,20 +1,55 @@ -# TODO: Add descriptions (10) - - type: entity parent: BaseItem id: BaseComputerCircuitboard - name: circuit board + name: computer board abstract: true components: - type: ComputerBoard - type: Sprite sprite: Objects/Misc/module.rsi - state: id_mod + state: cpuboard + +- type: entity + parent: BaseComputerCircuitboard + id: AlertsComputerCircuitboard + name: alerts computer board + description: A computer printed circuit board for an alerts computer + components: + - type: ComputerBoard + prototype: ComputerAlert + +- type: entity + parent: BaseComputerCircuitboard + id: PowerComputerCircuitboard + name: power monitoring computer board + description: A computer printed circuit board for a power monitoring computer + components: + - type: ComputerBoard + prototype: ComputerPowerMonitoring + +- type: entity + parent: BaseComputerCircuitboard + id: MedicalRecordsComputerCircuitboard + name: medical records computer board + description: A computer printed circuit board for a medical records computer + components: + - type: ComputerBoard + prototype: ComputerMedicalRecords + +- type: entity + parent: BaseComputerCircuitboard + id: CriminalRecordsComputerCircuitboard + name: criminal records computer board + description: A computer printed circuit board for a criminal records computer + components: + - type: ComputerBoard + prototype: ComputerCriminalRecords - type: entity parent: BaseComputerCircuitboard id: SupplyComputerCircuitboard - name: supply board + name: supply ordering computer board + description: A computer printed circuit board for a supply ordering console components: - type: ComputerBoard prototype: ComputerSupplyOrdering @@ -22,7 +57,8 @@ - type: entity parent: BaseComputerCircuitboard id: SupplyRequestComputerCircuitboard - name: supply request board + name: supply request computer board + description: A computer printed circuit board for a supply request console components: - type: ComputerBoard prototype: ComputerSupplyRequest @@ -31,6 +67,7 @@ parent: BaseComputerCircuitboard id: ResearchComputerCircuitboard name: R&D computer board + description: A computer printed circuit board for a R&D console components: - type: ComputerBoard prototype: ComputerResearchAndDevelopment @@ -38,7 +75,8 @@ - type: entity parent: BaseComputerCircuitboard id: CrewMonitoringComputerCircuitboard - name: crew monitoring console board + name: crew monitoring computer board + description: A computer printed circuit board for a crew monitoring console components: - type: ComputerBoard prototype: ComputerCrewMonitoring @@ -46,7 +84,8 @@ - type: entity parent: BaseComputerCircuitboard id: IDComputerCircuitboard - name: ID card terminal board + name: ID card computer board + description: A computer printed circuit board for an ID card console components: - type: ComputerBoard prototype: ComputerId @@ -55,6 +94,7 @@ parent: BaseComputerCircuitboard id: BodyScannerComputerCircuitboard name: body scanner computer board + description: A computer printed circuit board for a body scanner console components: - type: ComputerBoard prototype: computerBodyScanner @@ -63,6 +103,7 @@ parent: BaseComputerCircuitboard id: CommsComputerCircuitboard name: communications computer board + description: A computer printed circuit board for a communications console components: - type: ComputerBoard prototype: ComputerComms @@ -79,6 +120,7 @@ parent: BaseComputerCircuitboard id: SolarControlComputerCircuitboard name: solar control computer board + description: A computer printed circuit board for a solar control console components: - type: ComputerBoard prototype: ComputerSolarControl @@ -87,6 +129,7 @@ parent: BaseComputerCircuitboard id: SpaceVillainArcadeComputerCircuitboard name: space villain arcade board + description: A computer printed circuit board for a space villain arcade cabinet components: - type: ComputerBoard prototype: SpaceVillainArcade @@ -95,6 +138,7 @@ parent: BaseComputerCircuitboard id: BlockGameArcadeComputerCircuitboard name: block game arcade board + description: A computer printed circuit board for a block game arcade cabinet components: - type: ComputerBoard prototype: BlockGameArcade @@ -102,8 +146,8 @@ - type: entity parent: BaseComputerCircuitboard id: ParticleAcceleratorComputerCircuitboard - name: PA control box - suffix: Circuit Board + name: PA control box computer board + description: A computer printed circuit board for a particle accelerator control box components: - type: ComputerBoard prototype: ParticleAcceleratorControlBoxUnfinished @@ -111,7 +155,8 @@ - type: entity parent: BaseComputerCircuitboard id: ShuttleConsoleCircuitboard - name: Shuttle Console Board + name: shuttle console board + description: A computer printed circuit board for a shuttle console components: - type: ComputerBoard prototype: ComputerShuttle @@ -120,6 +165,7 @@ parent: BaseComputerCircuitboard id: SyndicateShuttleConsoleCircuitboard name: syndicate shuttle console board + description: A computer printed circuit board for a syndicate shuttle console components: - type: ComputerBoard prototype: ComputerShuttleSyndie diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml index eafd579fd3..52d7de82f8 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml @@ -2,7 +2,7 @@ id: APCElectronics parent: BaseItem name: APC electronics - description: Circuit used in APC construction. + description: An electronics board used in APC construction. components: - type: Sprite sprite: Objects/Misc/module.rsi diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml index bf1d2c72b2..7aca4aa1e0 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml @@ -2,6 +2,7 @@ id: AirAlarmElectronics parent: BaseItem name: air alarm electronics + description: An electronics board used in air alarms components: - type: Tag tags: @@ -14,10 +15,11 @@ id: FireAlarmElectronics parent: BaseItem name: fire alarm electronics + description: An electronics board used in fire alarms components: - type: Tag tags: - FireAlarmElectronics - type: Sprite sprite: Objects/Misc/module.rsi - state: door_electronics + state: airalarm_electronics \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml index dc0867488b..57286f4936 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml @@ -2,6 +2,7 @@ id: DoorElectronics parent: BaseItem name: door electronics + description: An electronics board used in doors and airlocks components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml index 88e2a2ad77..60d4961041 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml @@ -2,7 +2,7 @@ id: FirelockElectronics parent: BaseItem name: firelock electronics - description: Advanced circuit board used to detect differences in pressure, temperature and gas concentrations between the two sides of the door. + description: An electronics board used to detect differences in pressure, temperature and gas concentrations between the two sides of the door. components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml index 792c69e4ed..2f52529967 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/solar.yml @@ -2,7 +2,7 @@ parent: BaseItem id: SolarTrackerElectronics name: solar tracker electronics - description: Advanced circuit board used to detect differences in pressure, temperature and gas concentrations between the two sides of the door. + description: An electronics board used in solar tracker devices components: - type: Sprite sprite: Objects/Misc/module.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index a0ee96f3d3..a628388309 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -9,6 +9,8 @@ - type: ComputerVisualizer key: atmos_key screen: "alert-2" + - type: Computer + board: AlertsComputerCircuitboard - type: entity parent: ComputerBase @@ -71,6 +73,8 @@ radius: 1.5 energy: 1.6 color: "#c9c042" + - type: Computer + board: PowerComputerCircuitboard - type: entity parent: ComputerBase @@ -87,6 +91,26 @@ radius: 1.5 energy: 1.6 color: "#1f8c28" + - type: Computer + board: MedicalRecordsComputerCircuitboard + +- type: entity + parent: ComputerBase + id: ComputerCriminalRecords + name: criminal records computer + description: This can be used to check criminal records. + components: + - type: Appearance + visuals: + - type: ComputerVisualizer + key: security_key + screen: security + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#1f8c28" + - type: Computer + board: CriminalRecordsComputerCircuitboard - type: entity parent: ComputerBase diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8fe43b7940..9e5a6298b5 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -228,7 +228,7 @@ - SolarControlComputerCircuitboard - AutolatheMachineCircuitboard - ProtolatheMachineCircuitboard - - KitchenReagentGrinderMachineCircuitboard + - ReagentGrinderMachineCircuitboard - CrewMonitoringComputerCircuitboard - ShuttleConsoleCircuitboard - CircuitImprinterMachineCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index e1acd7b760..ac3ea4fead 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -155,9 +155,9 @@ Glass: 900 - type: latheRecipe - id: KitchenReagentGrinderMachineCircuitboard + id: ReagentGrinderMachineCircuitboard icon: Objects/Misc/module.rsi/id_mod.png - result: KitchenReagentGrinderMachineCircuitboard + result: ReagentGrinderMachineCircuitboard completetime: 1000 materials: Steel: 100 diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json index 9cad48e34d..ab239ee231 100644 --- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json @@ -1718,16 +1718,20 @@ "directions": 4, "delays": [ [ - 1 + 0.2, + 0.2 ], [ - 1 + 0.2, + 0.2 ], [ - 1 + 0.2, + 0.2 ], [ - 1 + 0.2, + 0.2 ] ] }, diff --git a/Resources/Textures/Structures/Machines/computers.rsi/security.png b/Resources/Textures/Structures/Machines/computers.rsi/security.png index d60450aaba64d5d07a0c0a59f3c42ad1dc1e39c1..a1c56e448ab2c292d7687079f2c068242878757a 100644 GIT binary patch literal 816 zcmV-01JC@4P)Px%>PbXFRCt{2-7#<4Ko|z#H&usYLAsk+Xa-lR6h)D`r4nnGW?{%rpd0-i8JeyA z1>G}st(0yN3~ZJ{r)0!PS@7l#tq~=*Q{Nr_eB^y3Bx538hwsiN(RTn45fKp)(Q|W9 zv{M_CEsqkfL3(DeOp?O9w&gde_<#n;RM&4%`T*cZNnYFX8}zd3!MDqI>+KtTjrp_( z0609kE8O0+{WCVC^P5mP13th1f;f&5MG-!I|L7ECGXuo(8}y>;!8neQrYYh$1^~>b zz4a}>zqua(R#%y~gR{vGP30*F0F+Ye?d_?Y-{0KdIrBTn>gM~<Zo*?w{xME##4( zvpNMGp4>fJowB_ziXteb5Ji#mL6$l1_c3}k#>H^Bvy5HmS1wU<>W^Q30{~1W6F^%Z zUnxB^z#IS1+jM>_SIGRgjg>5&p91~&()q10K&Cz*6Z=b8I=>CHF`_Skbbc#HzW~zt zL_|bHL_|bHL_|cpCjGx~>3msx(x)%Qtut;1pYIt|z6aI?(8m1p(T+`%&iBQt0NR)= zSuA`XORfCXssBzp3Dz?p@5$eX{!B^M1=xq){5G&Ifb__d&iBQ621t?4_r-aEhV)33 z&UfWp0O^q^o$qQdmMDeH%PC0DjE`dpGT+sc-yu^bKli2&Kq}A|FP-m;(+rUQYAES^ uG1C3;()r?~e|hPAA|fIpA|fK9K>Y@^)uup?{yrf90000X+uz;s;p3`t&NarE z-r<~Uq|RE~IOm!y%i7~ynVFkg-T=b8V#eJ@HTs5C!;R!B7>7q9}@@D2k#eilQjW zROEldd%!uDek_t5O5X7R$z097{&h^}bzR?734c>}QEfyy0BAEf$(?X1*+)A7NUsEu zd??v5g^M`gTo&gV5D}R9Y$|LlvmGD_NdUn--nHl^Laen>8LQb2u-3Mz>C_CfK%p%1 zRgp~-#+W9{vZPDmaNAByK#Yn3o9!M%gvDYJ)68Uu2*wx?QS|h?NDw5VlT7k8VP@~{ zkvT*=;1WyG94@u;%yxh*L9!p`5=+t)Qm;H-BmhY;Ox3Tow%vgi`$iZw1-cs!QY*kW zhMN)lMK%@LqnN6{QKTHuJ$!~MilQirqA1D>=Qr@Hsf7}_Y*qjO002ovPDHLkV1hx% BQuP1;