Make Advanced Spray more tolerable to use (#34209)

* initial commit

* Fixed the eject order

* FINALLY got a new sprite, its ready to merge!

* I FORGOT THE ATTRIBUTIONS DAMMIT

* Remove extra whitespace

* Sprite update!

diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
index fcdecffc8f1518e756964e461aad44e52da0aed2..9ff6871b3c72aef3490343f60d68d3f648168de5 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: ClothingBackpack
   id: ClothingBackpackChameleon
   name: backpack
@@ -20,10 +20,10 @@
           type: ChameleonBoundUserInterface
 
 - type: entity
-  parent: Clothing
+  parent: [Clothing, ClothingSlotBase]
   id: ClothingBackpackWaterTank
   name: backpack water tank
-  description: Holds a large amount of fluids. Supplies to spray nozzles in your hands.
+  description: Holds a large amount of fluids. Supplies to spray nozzles in your hands, and has a slot on the side for said spray nozzles.
   components:
   - type: Tag
     tags:
@@ -37,6 +37,20 @@
   - type: Clothing
     slots: BACK
     sprite: Clothing/Back/Backpacks/waterbackpack.rsi
+  - type: ItemSlots
+    slots:
+      item:
+        priority: 2
+        whitelist:
+          tags:
+          - SprayNozzle
+  - type: ItemMapper
+    mapLayers:
+      icon-filled:
+        whitelist:
+          tags:
+            - SprayNozzle
+  - type: Appearance
   - type: SolutionAmmoProvider
     solutionId: tank
     proto: BulletWaterShot

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml
index f2e93a607ece056a8299d298a3f1b1070afac89f..616a799affe3d0baab9f8e2ca7f93052caf298c0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml
@@ -1,9 +1,12 @@
-- type: entity
+- type: entity
   id: WeaponSprayNozzle
   parent: BaseItem
   name: spray nozzle
   description: A high-powered spray nozzle used in conjunction with a backpack-mounted water tank.
   components:
+  - type: Tag
+    tags:
+    - SprayNozzle
   - type: Sprite
     sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi
     state: icon

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 805eb4d5239c265bde47572aef22df5bf38da31d..968805a7b69c41106cb5f56a6a7538cc34983301 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1195,6 +1195,9 @@
 - type: Tag
   id: Spray
 
+- type: Tag
+  id: SprayNozzle
+
 - type: Tag
   id: SpreaderIgnore
 

diff --git a/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/icon-filled.png b/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/icon-filled.png
new file mode 100644 (file)
index 0000000..913b1a2
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/icon-filled.png differ

diff --git a/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/icon.png
index 7a5eac53021b0522c4ca91026b36a4c278c9f39e..d6636224af71dbde9cf2915900f42465f6ea9695 100644 (file)
Binary files a/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/meta.json
index 54f53865dafdb74bf57f108f282de540b45cf647..09934f57b0e0ebb7209af0da845744ced8e39e88 100644 (file)
--- a/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/meta.json
+++ b/Resources/Textures/Clothing/Back/Backpacks/waterbackpack.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f7337f1aa9efdcc1403ca4771d638e0634074537",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f7337f1aa9efdcc1403ca4771d638e0634074537, icon-filled by PS3MOIRA",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon-filled"
+    },
     {
       "name": "equipped-BACKPACK",
       "directions": 4