Add the chemistry bag as the default belt for the chemist (#13965)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
index c8ed50cbba1513c725b8e2e78225bcdcb0173bee..d028c55cabc12b17e9cdd0d4eb8805eb67347dd4 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
@@ -8,6 +8,8 @@
     ClothingBackpackChemistry: 2
     ClothingBackpackSatchelChemistry: 2
     ClothingBackpackDuffelChemistry: 2
+    ChemBag: 2
+    ClothingBeltMedical: 2
     ClothingHandsGlovesLatex: 2
     ClothingHeadsetMedical: 2
     ClothingOuterWinterChem: 2

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
new file mode 100644 (file)
index 0000000..ad17f17
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
@@ -0,0 +1,28 @@
+- type: entity
+  name: chemistry bag
+  id: ChemBag
+  parent: BaseStorageItem
+  description: A bag for storing chemistry products, such as pills, pill canisters, bottles, and syringes.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Objects/Specific/Chemistry/chem_bag.rsi
+    state: icon
+  - type: Clothing
+    sprite: Objects/Specific/Chemistry/chem_bag.rsi
+    quickEquip: false
+    slots:
+    - belt
+  - type: Item
+    size: 46
+  - type: Storage
+    capacity: 45
+    quickInsert: true
+    areaInsert: true
+    whitelist:
+      tags:
+        - PillCanister
+        - Pill
+        - Bottle
+        - Syringe
+  - type: Dumpable

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 68ea5f643544a3e6b0f65ccc1507e09b3beb8c56..3737054ffdc1d4aa1b6372747b5215678d718852 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -251,6 +251,9 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 4
     fillBaseName: syringe
+  - type: Tag
+    tags:
+    - Syringe
 
 - type: entity
   parent: BaseSyringe
@@ -258,6 +261,7 @@
   components:
   - type: Tag
     tags:
+    - Syringe
     - Trash
 
 - type: entity

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index 390dc010a69aa94020eb9f3c17a459c9dad3b010..23faec9a596c824dff6452f0f1447f6fb4e2c19f 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -24,7 +24,7 @@
     outerClothing: ClothingOuterCoatLabChem
     id: ChemistryPDA
     ears: ClothingHeadsetMedical
-    belt: ClothingBeltMedical
+    belt: ChemBag
     pocket1: HandLabeler
     # the purple glasses?
   innerclothingskirt: ClothingUniformJumpskirtChemistry

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index dbb2562846b2de93ad93a3639ad8c567a81e18ff..f8dbea80e586dfe5e4606d58af7745f0d39e10ef 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -567,6 +567,9 @@
 - type: Tag
   id: SyndicateSegwayKeys
 
+- type: Tag
+  id: Syringe
+
 - type: Tag
   id: Taser
 

diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/equipped-BELT.png b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/equipped-BELT.png
new file mode 100644 (file)
index 0000000..d7e7069
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/equipped-BELT.png differ

diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/icon.png b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/icon.png
new file mode 100644 (file)
index 0000000..29fc1fb
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
new file mode 100644 (file)
index 0000000..32e4647
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}