From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Tue, 20 Aug 2024 04:20:12 +0000 (-0500)
Subject: Mothroaches can now wear hamster-wearable clothes + pet inventory tweaks (#28956)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4e3e8ad03cfe14ea9e053587fc3f19ea0e6620d4;p=space-station-14.git

Mothroaches can now wear hamster-wearable clothes + pet inventory tweaks (#28956)

* moth displacement + inventory tweaks

* Fix off by 1 on the head sprites

* Move files to main mothroach folder

* Fix mask up a bit

* Fix side mask sprites

* Change format because it changed forever ago
---

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index f44cb61f73..667b83ec3f 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -221,7 +221,7 @@
 - type: cargoProduct
   id: LivestockMothroach
   icon:
-    sprite: Mobs/Animals/mothroach.rsi
+    sprite: Mobs/Animals/mothroach/mothroach.rsi
     state: mothroach
   product: CrateNPCMothroach
   cost: 5000
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index a403486338..7d3acddcfe 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -444,7 +444,7 @@
     insertingState: inserting_mothroach
   - type: MothAccent
   - type: Sprite
-    sprite: Mobs/Animals/mothroach.rsi
+    sprite: Mobs/Animals/mothroach/mothroach.rsi
     layers:
     - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: mothroach
@@ -459,7 +459,7 @@
     size: Normal
   - type: Clothing
     quickEquip: false
-    sprite: Mobs/Animals/mothroach.rsi
+    sprite: Mobs/Animals/mothroach/mothroach.rsi
     equippedPrefix: 0
     slots:
     - HEAD
@@ -538,6 +538,41 @@
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Mouse_burning
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+      enum.StrippingUiKey.Key:
+        type: StrippableBoundUserInterface
+  - type: InventorySlots
+  - type: Inventory
+    speciesId: hamster
+    templateId: hamster
+    displacements:
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/mothroach/displacement.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/mothroach/displacement.rsi
+            state: mask
+      suitstorage:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/mothroach/displacement.rsi
+            state: suitstorage
+      eyes:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/mothroach/displacement.rsi
+            state: eyes
+      neck:
+        sizeMaps:
+          32:
+            sprite: Mobs/Animals/mothroach/displacement.rsi
+            state: neck
 
 
 # Note that the mallard duck is actually a male drake mallard, with the brown duck being the female variant of the same species, however ss14 lacks sex specific textures
diff --git a/Resources/Prototypes/InventoryTemplates/hamster_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/hamster_inventory_template.yml
index 3170417d9d..f48ae94e69 100644
--- a/Resources/Prototypes/InventoryTemplates/hamster_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/hamster_inventory_template.yml
@@ -15,7 +15,7 @@
     slotTexture: neck
     slotFlags: NECK
     uiWindowPos: 0,1
-    strippingWindowPos: 1,0
+    strippingWindowPos: 0,1
     displayName: Neck
     whitelist:
       tags:
@@ -24,7 +24,7 @@
     slotTexture: glasses
     slotFlags: EYES
     stripTime: 3
-    uiWindowPos: 0,1
+    uiWindowPos: 0,2
     strippingWindowPos: 0,0
     displayName: Eyes
     whitelist:
@@ -33,9 +33,8 @@
   - name: suitstorage
     slotTexture: suit_storage
     slotFlags: SUITSTORAGE
-    slotGroup: SecondHotbar
     stripTime: 3
-    uiWindowPos: 2,0
+    uiWindowPos: 1,0
     strippingWindowPos: 2,5
     displayName: Suit Storage
     whitelist:
diff --git a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml
index 1297b65d8d..e6c2984221 100644
--- a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml
@@ -4,7 +4,7 @@
   - name: mask
     slotTexture: mask
     slotFlags: MASK
-    uiWindowPos: 1,0
+    uiWindowPos: 0,2
     strippingWindowPos: 1,1
     displayName: Mask
     whitelist:
@@ -14,9 +14,8 @@
   - name: suitstorage
     slotTexture: suit_storage
     slotFlags: SUITSTORAGE
-    slotGroup: SecondHotbar
     stripTime: 3
-    uiWindowPos: 2,0
+    uiWindowPos: 0,1
     strippingWindowPos: 2,5
     displayName: Suit Storage
     whitelist:
diff --git a/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/eyes.png b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/eyes.png
new file mode 100644
index 0000000000..2cb7e553b6
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/eyes.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/head.png b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/head.png
new file mode 100644
index 0000000000..d77878fdcc
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/head.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/mask.png b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/mask.png
new file mode 100644
index 0000000000..5eb6ea0163
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/mask.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/meta.json
new file mode 100644
index 0000000000..30fcee2998
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Vermidia",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "load": {
+        "srgb": false
+    },
+    "states": [
+        {
+            "name": "head",
+            "directions": 4
+        },
+        {
+            "name": "mask",
+            "directions": 4
+        },
+        {
+            "name": "suitstorage",
+            "directions": 4
+        },
+        {
+            "name": "eyes",
+            "directions": 4
+        },
+        {
+            "name": "neck",
+            "directions": 4
+        }
+    ]
+}
+
diff --git a/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/neck.png b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/neck.png
new file mode 100644
index 0000000000..c503f75e1d
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/neck.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/suitstorage.png b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/suitstorage.png
new file mode 100644
index 0000000000..b37a81363f
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/displacement.rsi/suitstorage.png differ
diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/0-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/0-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mothroach.rsi/0-equipped-HELMET.png
rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/0-equipped-HELMET.png
diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/icon.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mothroach.rsi/icon.png
rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/icon.png
diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mothroach.rsi/inhand-left.png
rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/inhand-left.png
diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mothroach.rsi/inhand-right.png
rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/inhand-right.png
diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mothroach.rsi/meta.json
rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/meta.json
diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach-moving.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach-moving.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach-moving.png
rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach-moving.png
diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach.png
rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach.png
diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach_dead.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_dead.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach_dead.png
rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_dead.png
diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach_lazy.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_lazy.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach_lazy.png
rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_lazy.png
diff --git a/Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach_sleep.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_sleep.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mothroach.rsi/mothroach_sleep.png
rename to Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_sleep.png