From a74e6842d937aca57a9705ab06cda91f14dea68a Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Sat, 23 Apr 2022 22:27:12 -0400 Subject: [PATCH] Medical Techfab + Bed Deconstruction Fix (#7637) --- .../Catalog/Research/technologies.yml | 5 ++ .../Entities/Structures/Machines/lathe.yml | 66 ++++++++++++++++-- .../Construction/Graphs/furniture/bed.yml | 6 ++ .../Prototypes/Recipes/Lathes/medical.yml | 34 +++++++++ .../icon.png | Bin .../inserting.png | Bin .../Structures/Machines/techfab.rsi/med.png | Bin 0 -> 666 bytes .../meta.json | 3 + .../panel.png | Bin .../unlit.png | Bin 10 files changed, 109 insertions(+), 5 deletions(-) rename Resources/Textures/Structures/Machines/{security_techfab.rsi => techfab.rsi}/icon.png (100%) rename Resources/Textures/Structures/Machines/{security_techfab.rsi => techfab.rsi}/inserting.png (100%) create mode 100644 Resources/Textures/Structures/Machines/techfab.rsi/med.png rename Resources/Textures/Structures/Machines/{security_techfab.rsi => techfab.rsi}/meta.json (93%) rename Resources/Textures/Structures/Machines/{security_techfab.rsi => techfab.rsi}/panel.png (100%) rename Resources/Textures/Structures/Machines/{security_techfab.rsi => techfab.rsi}/unlit.png (100%) diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 3191f71060..99e5ce4cd6 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -45,6 +45,11 @@ - HydroponicsToolScythe - HydroponicsToolHatchet - KitchenKnife + - HandheldHealthAnalyzer + - ClothingHandsGlovesLatex + - ClothingHandsGlovesNitrile + - ClothingMaskSterile + - DiseaseSwab - type: technology name: "advanced botany" diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 434ca76874..b88c4f00c6 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -70,7 +70,6 @@ - Spade - CableStack - HandheldGPSBasic - - HandheldHealthAnalyzer - type: ActivatableUI key: enum.LatheUiKey.Key - type: ActivatableUIRequiresPower @@ -212,7 +211,7 @@ - type: entity parent: Protolathe id: CircuitImprinter - name: Circuit Imprinter + name: circuit imprinter description: Prints circuit boards for machines. components: - type: Sprite @@ -256,12 +255,12 @@ - type: entity parent: Protolathe id: SecurityTechFab - name: Security TechFab + name: security techfab description: Prints equipment for use by security crew. components: - type: Sprite netsync: false - sprite: Structures/Machines/security_techfab.rsi + sprite: Structures/Machines/techfab.rsi layers: - state: icon map: ["enum.LatheVisualLayers.IsRunning"] @@ -308,6 +307,64 @@ - Signaller - SignalTrigger +- type: entity + parent: Protolathe + id: MedicalTechFab + name: medical techfab + description: Prints equipment for use by the medbay. + components: + - type: Sprite + netsync: false + sprite: Structures/Machines/techfab.rsi + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: med + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: inserting + map: ["enum.LatheVisualLayers.IsInserting"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: LatheVisuals + idleState: icon + runningState: icon + - type: ProtolatheDatabase + protolatherecipes: + - HandheldHealthAnalyzer + - ClothingHandsGlovesLatex + - ClothingHandsGlovesNitrile + - ClothingMaskSterile + - DiseaseSwab + - HandheldCrewMonitor + - Scalpel + - Retractor + - Cautery + - Drill + - Saw + - Hemostat + - Beaker + - LargeBeaker + - CryostasisBeaker + - Dropper + - Syringe + - PillCanister #Everything below this is shared with other lathes + - FlashlightLantern + - Bucket + - MopItem + - SprayBottle + - FireExtinguisher + - LightTube + - LightBulb + - SheetSteel + - SheetGlass1 + - SheetRGlass + - SheetPlastic + - CableStack + - CableMVStack + - CableHVStack + - type: entity parent: Autolathe id: UniformPrinter @@ -378,7 +435,6 @@ - ClothingOuterWinterHoS - ClothingOuterWinterQM - ClothingOuterWinterRD - - type: Sprite sprite: Structures/Machines/uniform_printer.rsi netsync: false diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml index c9be483aea..3a6150bb5b 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/bed.yml @@ -41,6 +41,9 @@ - !type:SpawnPrototype prototype: SheetSteel1 amount: 2 + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 steps: - tool: Screwing doAfter: 1 @@ -63,6 +66,9 @@ - !type:SpawnPrototype prototype: SheetPlasteel1 amount: 2 + - !type:SpawnPrototype + prototype: MaterialDurathread1 + amount: 2 steps: - tool: Screwing doAfter: 1 diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index 84e7761cde..c6dde8b824 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -73,3 +73,37 @@ materials: Glass: 500 Steel: 500 + +- type: latheRecipe + id: ClothingHandsGlovesLatex + icon: Clothing/Hands/Gloves/latex.rsi/icon.png + result: ClothingHandsGlovesLatex + completetime: 2 + materials: + Plastic: 300 + +- type: latheRecipe + id: ClothingHandsGlovesNitrile + icon: Clothing/Hands/Gloves/Color/blue.rsi/icon.png + result: ClothingHandsGlovesNitrile + completetime: 2 + materials: + Plastic: 100 + Durathread: 200 + +- type: latheRecipe + id: ClothingMaskSterile + icon: Clothing/Mask/sterile.rsi/icon.png + result: ClothingMaskSterile + completetime: 2 + materials: + Plastic: 300 + +- type: latheRecipe + id: DiseaseSwab + icon: Objects/Specific/Medical/mouth_swab.rsi/icon.png + result: DiseaseSwab + completetime: 1 + materials: + Cloth: 20 + Plastic: 20 diff --git a/Resources/Textures/Structures/Machines/security_techfab.rsi/icon.png b/Resources/Textures/Structures/Machines/techfab.rsi/icon.png similarity index 100% rename from Resources/Textures/Structures/Machines/security_techfab.rsi/icon.png rename to Resources/Textures/Structures/Machines/techfab.rsi/icon.png diff --git a/Resources/Textures/Structures/Machines/security_techfab.rsi/inserting.png b/Resources/Textures/Structures/Machines/techfab.rsi/inserting.png similarity index 100% rename from Resources/Textures/Structures/Machines/security_techfab.rsi/inserting.png rename to Resources/Textures/Structures/Machines/techfab.rsi/inserting.png diff --git a/Resources/Textures/Structures/Machines/techfab.rsi/med.png b/Resources/Textures/Structures/Machines/techfab.rsi/med.png new file mode 100644 index 0000000000000000000000000000000000000000..506b03568a64b240ca60f6d7ebf52a3c0f31abb0 GIT binary patch literal 666 zcmV;L0%iS)P)EX>4Tx04R}tkv&MmKpe$i(@I4ug6$yUkfAzRDJtS9RV;#q(pG5I!Q|2}Xws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;qmz@Oi4rtTK|Hf* z>74h8L#!kz#OK8023?T&k?XRT(DP#3AESVO7iiXP`}^3onpV2qvfZ#3Ax90TL-pAn`u^?e6X0GwuF<0N`D6)Bk!mX8-^I&`Cr=R9J;$U>F4>9WWBB(7kxke`;8` zvo{XKPNE%o@j86KqhQnl1MUE#a{;vqBC;JItSm_j`-yh|ub?mrpWJeRYzI6zbA=lAk?(+C z?|#z60fQ?Sn7DQR=j7w2s{=4XfQ6TxAvsKwfrXbHj+4VQQPjkHD$&jXFvAJaG;_eh z?e~bHsRdB-vWZ(K(WTv)UFB3M2S&jt7zLvM0L>UT%%gQ=(f|Me07*qoM6N<$g0Y)9 A