From dc4b549b90ae7550b206e608571e718b1bdfc09c Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Wed, 29 Dec 2021 01:21:17 -0500 Subject: [PATCH] Pill Canister Tweaks (#5928) --- Resources/Prototypes/Catalog/Research/technologies.yml | 1 + Resources/Prototypes/Entities/Clothing/Belt/belts.yml | 2 ++ .../Prototypes/Entities/Objects/Specific/chemistry.yml | 3 +++ .../Prototypes/Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/Recipes/Lathes/chemistry.yml | 8 ++++++++ Resources/Prototypes/tags.yml | 3 +++ 6 files changed, 18 insertions(+) diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 31968062d9..f7999fe89e 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -96,6 +96,7 @@ - CryostasisBeaker - Dropper - Syringe + - PillCanister - type: technology name: "medical machinery" diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 97b029e727..c8ac59b0a6 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -237,6 +237,7 @@ - Ointment - CigPack - Pill + - PillCanister components: - Hypospray - SurgeryTool @@ -255,6 +256,7 @@ whitelist: tags: - Pill + - PillCanister bottle_spray: whitelist: tags: diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index b97db0c1ea..6c51a9f8db 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -257,6 +257,9 @@ state: pill_canister - type: Item sprite: Objects/Specific/Chemistry/pills_canister.rsi + - type: Tag + tags: + - PillCanister - type: Storage capacity: 12 quickInsert: true diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index bb40207eec..df0e9e169f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -160,6 +160,7 @@ - CryostasisBeaker - Dropper - Syringe + - PillCanister - Flash - Handcuffs - Stunbaton diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml index 372669674d..f1a02c461c 100644 --- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml @@ -48,3 +48,11 @@ completetime: 500 materials: Glass: 200 + +- type: latheRecipe + id: PillCanister + icon: Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png + result: PillCanister + completetime: 500 + materials: + Plastic: 100 diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index f7eaa44692..715c2fd401 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -180,6 +180,9 @@ - type: Tag id: Pill +- type: Tag + id: PillCanister + - type: Tag id: Pipe