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

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

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

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:

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: