Scurrets - can wear pet bags, mail bags and spears (#38774)

* Scurrets - can wear pet bags, mail bags and spears

* a

* Resolve PR comments

diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
index b80e7709d59c3f9f82fca410050282d34d33ea9c..54b8f677b8ee0678fc60468d2fc9f6d615e68047 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
@@ -96,6 +96,7 @@
     - WhitelistChameleon
     - CorgiWearable
     - PetOnly
+    - ScurretWearable
   - type: Construction
     graph: ClothingBagPet
     node: bagPet

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/mail_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/mail_bag.yml
index 9f7ad36eb664c623a80dcfd928fe659708980831..bf41e70be11dfd6ee387d0bbc1629c87c700011d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/mail_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/mail_bag.yml
@@ -12,6 +12,7 @@
     quickEquip: false
     slots:
     - belt
+    - back
   - type: Item
     size: Ginormous
   - type: Storage
@@ -28,3 +29,7 @@
       - Document
       - Paper
   - type: Dumpable
+  - type: Tag
+    tags:
+    - ScurretWearable
+    - CorgiWearable

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
index 2dfb1b363ffde97764032956833f6edbad01012b..01e31bc4672bcb5d08f4155813dea431cee25ca1 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -12,6 +12,7 @@
   - type: Tag
     tags:
     - Spear
+    - ScurretWearable
   - type: Fixtures
     fixtures:
       fix1:
@@ -217,7 +218,7 @@
 
 - type: entity
   name: sharkminnow tooth spear
-  parent: Spear 
+  parent: Spear
   id: SpearSharkMinnow
   description: A spear with a sharkminnow tooth as a tip.
   components:
@@ -233,4 +234,4 @@
       types:
         Piercing: 25 #throw dmg enough to two-shot carp
   - type: Construction
-    graph: SpearSharkMinnow
\ No newline at end of file
+    graph: SpearSharkMinnow

diff --git a/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml
index 28b95eb3d347b17487759a0d1e179f53a95c8ea0..89f0af0302376fb609055025aad3b4f5e6f2f9ba 100644 (file)
--- a/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml
@@ -59,6 +59,18 @@
     dependsOnComponents:
     - type: AllowSuitStorage
     displayName: Suit Storage
+  - name: back
+    slotTexture: back
+    fullTextureName: template_small
+    slotFlags: BACK
+    slotGroup: SecondHotbar
+    stripTime: 6
+    uiWindowPos: 3,2
+    strippingWindowPos: 0,5
+    displayName: Back
+    whitelist:
+      tags:
+      - ScurretWearable
   - name: outerClothing
     slotTexture: suit
     slotFlags: OUTERCLOTHING

diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/equipped-BACKPACK.png
new file mode 100644 (file)
index 0000000..cb922af
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/equipped-BACKPACK.png differ

diff --git a/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/meta.json b/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/meta.json
index 9e95fc65da463b83d0d91a405df78577a7655707..9aa1e7b1c7ce060c0c9b4f9332b6b0a62a59f556 100644 (file)
--- a/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/meta.json
@@ -1,26 +1,30 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Sprites by Velken, based on the Chem Bag sprites from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by Velken, based on the Chem Bag sprites from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi. equipped-BACKPACK modified from equipped-BELT by FairlySadPanda (GitHub).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }