From a95ddcbdd0b537d6ba538a8b7bc673ec7b0d6355 Mon Sep 17 00:00:00 2001 From: BubblegumBlue <63939723+BubblegumBlue@users.noreply.github.com> Date: Fri, 14 Jan 2022 00:21:41 +1000 Subject: [PATCH] Shuttle console construction (#6010) Co-authored-by: Starm4ncer <63939723+Starm4ncer@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../Catalog/Research/technologies.yml | 15 +++++++++++++++ .../Devices/Circuitboards/computer.yml | 18 +++++++++++++++++- .../Machines/Computers/computers.yml | 2 ++ .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/Recipes/Lathes/electronics.yml | 9 +++++++++ .../computers.rsi/avionics-systems.png | Bin 0 -> 1103 bytes .../Machines/computers.rsi/meta.json | 3 +++ 7 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/avionics-systems.png diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index a819df3d42..670f747716 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -244,6 +244,21 @@ - SheetRGlass - SheetGlass1 +# Avionics Circuitry Technology Tree + +- type: technology + name: "avionics systems" + id: AvionicsSystems + description: The latest in fly-by-LV-wire technology + icon: + sprite: Structures/Machines/computers.rsi + state: avionics-systems + requiredPoints: 10000 + requiredTechnologies: + - IndustrialEngineering + unlockedRecipes: + - ShuttleConsoleCircuitboard + # Electromagnetic Theory Technology Tree - type: technology diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index 21cc3bd53a..be773721da 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -1,4 +1,4 @@ -# TODO: Add descriptions (10) +# TODO: Add descriptions (10) - type: entity parent: BaseItem @@ -99,3 +99,19 @@ components: - type: ComputerBoard prototype: ParticleAcceleratorControlBoxUnfinished + +- type: entity + parent: BaseComputerCircuitboard + id: ShuttleConsoleCircuitboard + name: Shuttle Console Board + components: + - type: ComputerBoard + prototype: ComputerShuttle + +- type: entity + parent: BaseComputerCircuitboard + id: SyndicateShuttleConsoleCircuitboard + name: syndicate shuttle console board + components: + - type: ComputerBoard + prototype: ComputerShuttleSyndie diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 3b98beb836..bd35c3ab85 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -39,6 +39,8 @@ - type: ComputerVisualizer key: generic_key screen: shuttle + - type: Computer + board: ShuttleConsoleCircuitboard - type: entity parent: ComputerShuttleBase diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 5dfaeffeec..9aac30f988 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -188,6 +188,7 @@ - ProtolatheMachineCircuitboard - KitchenReagentGrinderMachineCircuitboard - CrewMonitoringComputerCircuitboard + - ShuttleConsoleCircuitboard - Bucket - MopItem - SprayBottle diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index 0910a914c3..64f6f3202b 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -150,3 +150,12 @@ materials: Steel: 100 Plastic: 100 + +- type: latheRecipe + id: ShuttleConsoleCircuitboard + icon: Objects/Misc/module.rsi/id_mod.png + result: ShuttleConsoleCircuitboard + completetime: 1000 + materials: + Steel: 100 + Plastic: 100 diff --git a/Resources/Textures/Structures/Machines/computers.rsi/avionics-systems.png b/Resources/Textures/Structures/Machines/computers.rsi/avionics-systems.png new file mode 100644 index 0000000000000000000000000000000000000000..fc7ae05513d8295df9804954cb512d07119def60 GIT binary patch literal 1103 zcmV-V1hD&wP)yhl9B z%5stTggDOWfW)^#S3G_bT=Mu!FwbWf0Ke!dl{#4IU{>Y^af~=>=vCG_kGM%#HCJ+! z$7xN#MiyzLAVEPDo6zAPLD{64b@wHkzGYO%!{~3J22PF=%H)lcTBWWkWsP)|J{>hN z_y6;>wV7$JdpHI3zq;<{BoN#O8g$3S z0;wR@0Wi~^d+0DoNl9TCE;VBw!&5dHxVXZrKVbF)*K`Jj-7^U~99aPqA=P{L?qvuM z4`+bUc6N3Qd+aPQw9Q{W6)yHbC=JX$E7ecPcm{$FxO54UC|9mr$&i)?F&G_ye2xx~ z9fZ#nSknNqhQh)^ICs{pSzxxyp%V;GahMA7weSywL+`uJVsK(e#_0yU4v^e&g#lab zgkkx`xeSi^KszonFbIRJVwnfz0|h`y11RR`j5`dlIslYqz^Rr1VCz}T@aW8O24#LV zyedIzKxT4bQHA0FO>IMPLG<>@CNQQp5Cs|tvg7_8V6Z>|yk3@7Q25W!&(8p=lCNJq zPi?!w=7B8Vws8T&$B!Qw9zS>hwi_M-Fw198X{L$gAVZJr-@=fZQww&)W2h}yvmpyJ zGlQs@I0Ln5Y(B$T4#+Dgg4I)-Mt1}}4ZxaYpeO+OoEG5E-@ouEfHlcbLIBhrfB`{a z5ipb5G_oBii4epAHOHFT5oJ0pLIJ(WH{i{36bAr(>`+$Mzkm6niL~%MLu6b&LswIw zBhc^zFbl92#RkT9G;shnLoq@CSR(GHrR~5H5G4dK96(FUk<5li0iEm{wFY+x007U? V)Z?Sm3Sj^M002ovPDHLkV1i0H<%s|Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json index 7f179ffbcf..9cad48e34d 100644 --- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json @@ -2125,6 +2125,9 @@ 1 ] ] + }, + { + "name": "avionics-systems" } ] }