From 3d9dab1d52b0211a7415d922d096b6801988e1e2 Mon Sep 17 00:00:00 2001 From: Velken <8467292+Velken@users.noreply.github.com> Date: Sun, 13 Jul 2025 13:11:00 -0300 Subject: [PATCH] Hats (and glasses) for pets - Part 1 - Ian and McGriff (#38634) * new branch new me * cursed displacement * 2 pixels of death * forgot a line * fixed some edge cases on corgis with the displacement * fix conflict * fix indentations * a bit more displacement fixes --- .../Entities/Clothing/Eyes/glasses.yml | 12 +- .../Prototypes/Entities/Clothing/Eyes/hud.yml | 16 +- .../Entities/Clothing/Eyes/specific.yml | 2 +- .../Entities/Clothing/Head/hats.yml | 191 ++++++++++- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 13 +- .../Prototypes/Entities/Mobs/NPCs/pets.yml | 43 ++- .../pet_inventory_template.yml | 46 ++- .../smartcorgi_inventory_template.yml | 2 +- .../Mobs/Pets/corgi.rsi/belt_displacement.png | Bin 83 -> 0 bytes .../Textures/Mobs/Pets/corgi.rsi/meta.json | 313 +++++++++--------- .../corgi_belt_displacement.png | Bin 0 -> 376 bytes .../corgi_head_displacement.png | Bin 0 -> 495 bytes .../lisa_head_displacement.png | Bin 0 -> 605 bytes .../mcgriff_eyes_displacement.png | Bin 0 -> 595 bytes .../mcgriff_head_displacement.png | Bin 0 -> 441 bytes .../Mobs/Pets/displacements.rsi/meta.json | 34 ++ 16 files changed, 483 insertions(+), 189 deletions(-) delete mode 100644 Resources/Textures/Mobs/Pets/corgi.rsi/belt_displacement.png create mode 100644 Resources/Textures/Mobs/Pets/displacements.rsi/corgi_belt_displacement.png create mode 100644 Resources/Textures/Mobs/Pets/displacements.rsi/corgi_head_displacement.png create mode 100644 Resources/Textures/Mobs/Pets/displacements.rsi/lisa_head_displacement.png create mode 100644 Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_eyes_displacement.png create mode 100644 Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_head_displacement.png create mode 100644 Resources/Textures/Mobs/Pets/displacements.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 52187227ac..30c14cab04 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -67,7 +67,7 @@ coverage: EYES - type: Tag tags: - - CorgiWearable + - PetWearable - WhitelistChameleon - type: entity @@ -144,7 +144,7 @@ - type: Tag tags: - HamsterWearable - - CorgiWearable + - PetWearable - WhitelistChameleon - type: IdentityBlocker coverage: EYES @@ -161,7 +161,7 @@ - type: Tag tags: - Sunglasses - - CorgiWearable + - PetWearable - HamsterWearable - WhitelistChameleon @@ -184,7 +184,7 @@ - type: Tag tags: - HamsterWearable - - CorgiWearable + - PetWearable - WhitelistChameleon - type: GuideHelp guides: @@ -209,7 +209,7 @@ - type: Tag tags: - HamsterWearable - - CorgiWearable + - PetWearable - WhitelistChameleon - type: IdentityBlocker coverage: EYES @@ -265,7 +265,7 @@ coverage: EYES - type: Tag tags: - - CorgiWearable + - PetWearable - WhitelistChameleon - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index c7562277b7..b35109ce17 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -44,7 +44,7 @@ - type: Tag tags: - HudMedical - - CorgiWearable + - PetWearable - WhitelistChameleon - type: entity @@ -60,7 +60,7 @@ - type: Tag tags: - HudSecurity - - CorgiWearable + - PetWearable - WhitelistChameleon - type: entity @@ -76,7 +76,7 @@ - type: ShowJobIcons - type: Tag tags: - - CorgiWearable + - PetWearable - WhitelistChameleon - type: entity @@ -95,7 +95,7 @@ - type: SolutionScanner - type: Tag tags: - - CorgiWearable + - PetWearable - WhitelistChameleon - type: entity @@ -221,7 +221,7 @@ - type: ShowSyndicateIcons - type: Tag tags: - - CorgiWearable + - PetWearable - WhitelistChameleon - type: entity @@ -238,7 +238,7 @@ - type: ShowHealthBars - type: Tag tags: - - CorgiWearable + - PetWearable - WhitelistChameleon - type: entity @@ -258,7 +258,7 @@ sprite: Clothing/Eyes/Hud/medpatch.rsi - type: Tag tags: - - CorgiWearable + - PetWearable - WhitelistChameleon - HudMedical @@ -279,7 +279,7 @@ sprite: Clothing/Eyes/Hud/secpatch.rsi - type: Tag tags: - - CorgiWearable + - PetWearable - WhitelistChameleon - HudSecurity diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml index d1b2d636b4..936856fdf7 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/specific.yml @@ -7,7 +7,7 @@ components: - type: Tag tags: # intentionally no WhitelistChameleon tag - - CorgiWearable + - PetWearable - type: Sprite sprite: Clothing/Eyes/Glasses/sunglasses.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index ec7801802b..c2b1c5abbd 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -21,6 +21,8 @@ sprite: Clothing/Head/Hats/beret.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable @@ -40,6 +42,8 @@ accent: FrenchAccent - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - WhitelistChameleon @@ -58,6 +62,8 @@ tags: - ClothMade - Recyclable + - PetWearable + - CorgiWearable - HamsterWearable - WhitelistChameleon @@ -86,6 +92,10 @@ sprite: Clothing/Head/Hats/casa.rsi - type: Clothing sprite: Clothing/Head/Hats/casa.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -99,6 +109,8 @@ sprite: Clothing/Head/Hats/beret_rnd.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable @@ -116,6 +128,8 @@ sprite: Clothing/Head/Hats/beret_engineering.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable @@ -133,6 +147,8 @@ sprite: Clothing/Head/Hats/beret_qm.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable @@ -150,6 +166,8 @@ sprite: Clothing/Head/Hats/beret_hos.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable @@ -165,6 +183,10 @@ sprite: Clothing/Head/Hats/beret_warden.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_warden.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -176,6 +198,10 @@ sprite: Clothing/Head/Hats/beret_physician.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_physician.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -187,6 +213,10 @@ sprite: Clothing/Head/Hats/beret_brigmedic.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_brigmedic.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: [ ClothingHeadBase ] @@ -198,6 +228,10 @@ sprite: Clothing/Head/Hats/beret_merc.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_merc.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -214,6 +248,8 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -225,6 +261,10 @@ sprite: Clothing/Head/Hats/bowler_hat.rsi - type: Clothing sprite: Clothing/Head/Hats/bowler_hat.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: [ClothingHeadBase, BaseCommandContraband] @@ -238,6 +278,8 @@ sprite: Clothing/Head/Hats/captain.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable @@ -268,6 +310,10 @@ sprite: Clothing/Head/Hats/centcom.rsi - type: Clothing sprite: Clothing/Head/Hats/centcom.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -295,6 +341,8 @@ - ChefPilot - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable @@ -312,6 +360,8 @@ sprite: Clothing/Head/Hats/brownfedora.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable @@ -327,6 +377,10 @@ sprite: Clothing/Head/Hats/greyfedora.rsi - type: Clothing sprite: Clothing/Head/Hats/greyfedora.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -338,6 +392,10 @@ sprite: Clothing/Head/Hats/fez.rsi - type: Clothing sprite: Clothing/Head/Hats/fez.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: [ClothingHeadBase, BaseCommandContraband] @@ -351,6 +409,8 @@ sprite: Clothing/Head/Hats/hopcap.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable @@ -368,6 +428,8 @@ sprite: Clothing/Head/Hats/hoshat.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable @@ -385,6 +447,10 @@ sprite: Clothing/Head/Hats/outlawhat.rsi - type: StaticPrice price: 500 + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -396,6 +462,10 @@ sprite: Clothing/Head/Hats/witchhat.rsi - type: Clothing sprite: Clothing/Head/Hats/witchhat.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -407,6 +477,10 @@ sprite: Clothing/Head/Hats/paper.rsi - type: Clothing sprite: Clothing/Head/Hats/paper.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -418,6 +492,10 @@ sprite: Clothing/Head/Hats/pirate.rsi - type: Clothing sprite: Clothing/Head/Hats/pirate.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -452,6 +530,7 @@ sprite: Clothing/Head/Hats/redwizard.rsi - type: Tag tags: + - PetWearable - CorgiWearable - ClothMade - WhitelistChameleon @@ -484,8 +563,10 @@ - state: icon-nobeard map: [ "foldedLayer" ] visible: true - - + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -499,6 +580,10 @@ sprite: Clothing/Head/Hats/sombrero.rsi - type: AddAccentClothing accent: SpanishAccent + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -554,7 +639,6 @@ HeadTop : HEAD HeadSide : HEAD - - type: entity parent: ClothingHeadBase id: ClothingHeadHatTophat @@ -567,6 +651,8 @@ sprite: Clothing/Head/Hats/tophat.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable @@ -647,6 +733,7 @@ sprite: Clothing/Head/Hats/violetwizard.rsi - type: Tag tags: + - PetWearable - CorgiWearable - ClothMade - WhitelistChameleon @@ -663,6 +750,10 @@ sprite: Clothing/Head/Hats/warden.rsi - type: StealTarget stealGroup: ClothingHeadHatWarden + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -677,6 +768,8 @@ sprite: Clothing/Head/Hats/witch.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - WhitelistChameleon - ClothMade - Recyclable @@ -719,11 +812,12 @@ sprite: Clothing/Head/Hats/wizardhat.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable - WhitelistChameleon - - CorgiWearable - type: entity parent: ClothingHeadBase @@ -932,6 +1026,8 @@ sprite: Clothing/Head/Hats/beret_cmo.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - HamsterWearable @@ -1055,6 +1151,9 @@ containers: storagebase: !type:Container - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -1070,6 +1169,8 @@ sprite: Clothing/Head/Hats/capcap.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - WhitelistChameleon @@ -1093,6 +1194,8 @@ sprite: Clothing/Head/Hats/comcap.rsi - type: Tag tags: + - PetWearable + - CorgiWearable - ClothMade - Recyclable - WhitelistChameleon @@ -1126,8 +1229,10 @@ sprite: Clothing/Head/Hats/party_red.rsi - type: Tag tags: - - WhitelistChameleon - - HamsterWearable + - PetWearable + - CorgiWearable + - WhitelistChameleon + - HamsterWearable - type: entity parent: ClothingHeadHatPartyRed @@ -1138,6 +1243,12 @@ sprite: Clothing/Head/Hats/party_yellow.rsi - type: Clothing sprite: Clothing/Head/Hats/party_yellow.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable + - WhitelistChameleon + - HamsterWearable - type: entity parent: ClothingHeadHatPartyRed @@ -1148,6 +1259,12 @@ sprite: Clothing/Head/Hats/party_green.rsi - type: Clothing sprite: Clothing/Head/Hats/party_green.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable + - WhitelistChameleon + - HamsterWearable - type: entity parent: ClothingHeadHatPartyRed @@ -1158,6 +1275,12 @@ sprite: Clothing/Head/Hats/party_blue.rsi - type: Clothing sprite: Clothing/Head/Hats/party_blue.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable + - WhitelistChameleon + - HamsterWearable - type: entity parent: ClothingHeadHatPartyRed @@ -1169,6 +1292,12 @@ sprite: Clothing/Head/Hats/party_water_cup.rsi - type: Clothing sprite: Clothing/Head/Hats/party_water_cup.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable + - WhitelistChameleon + - HamsterWearable - type: entity parent: ClothingHeadBase @@ -1211,6 +1340,12 @@ - type: AddAccentClothing accent: ReplacementAccent replacement: cowboy + - type: Tag + tags: + - PetWearable + - CorgiWearable + - WhitelistChameleon + - HamsterWearable - type: entity parent: ClothingHeadHatCowboyBrown @@ -1221,6 +1356,12 @@ sprite: Clothing/Head/Hats/cowboyhatblack.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatblack.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable + - WhitelistChameleon + - HamsterWearable - type: entity parent: ClothingHeadHatCowboyBrown @@ -1231,6 +1372,12 @@ sprite: Clothing/Head/Hats/cowboyhatgrey.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatgrey.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable + - WhitelistChameleon + - HamsterWearable - type: entity parent: ClothingHeadHatCowboyBrown @@ -1241,6 +1388,12 @@ sprite: Clothing/Head/Hats/cowboyhatred.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatred.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable + - WhitelistChameleon + - HamsterWearable - type: entity parent: ClothingHeadHatCowboyBrown @@ -1251,6 +1404,12 @@ sprite: Clothing/Head/Hats/cowboyhatwhite.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatwhite.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable + - WhitelistChameleon + - HamsterWearable - type: entity parent: ClothingHeadHatCowboyBrown @@ -1261,6 +1420,12 @@ sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable + - WhitelistChameleon + - HamsterWearable - type: entity parent: ClothingHeadBase @@ -1277,6 +1442,8 @@ node: strawhat - type: Tag tags: + - PetWearable + - CorgiWearable - HamsterWearable - type: Flammable fireSpread: true @@ -1316,6 +1483,10 @@ sprite: Clothing/Head/Hats/beret_medic.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_medic.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -1327,6 +1498,10 @@ sprite: Clothing/Head/Hats/solidheadband.rsi - type: Clothing sprite: Clothing/Head/Hats/solidheadband.rsi + - type: Tag + tags: + - PetWearable + - CorgiWearable - type: entity parent: ClothingHeadBase @@ -1360,3 +1535,7 @@ path: /Audio/Items/flashlight_on.ogg soundDeactivate: path: /Audio/Items/flashlight_off.ogg + - type: Tag + tags: + - PetWearable + - CorgiWearable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 2b837b768e..d46c5657c1 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -3796,13 +3796,18 @@ belt: sizeMaps: 32: - sprite: Mobs/Pets/corgi.rsi - state: belt_displacement + sprite: Mobs/Pets/displacements.rsi + state: corgi_belt_displacement ears: sizeMaps: 32: - sprite: Mobs/Pets/corgi.rsi - state: belt_displacement + sprite: Mobs/Pets/displacements.rsi + state: corgi_belt_displacement + head: + sizeMaps: + 32: + sprite: Mobs/Pets/displacements.rsi + state: corgi_head_displacement - type: Hands # HANDS! - type: Puller - type: Cuffable # bad dog! diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 86be44dd05..12a15bf8b5 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -13,6 +13,20 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: ian + - type: Inventory + speciesId: dog + templateId: petAdvanced + displacements: + head: + sizeMaps: + 32: + sprite: Mobs/Pets/displacements.rsi + state: corgi_head_displacement + eyes: + sizeMaps: + 32: + sprite: Mobs/Pets/displacements.rsi + state: corgi_eyes_displacement - type: DamageStateVisuals states: Alive: @@ -84,6 +98,20 @@ attributes: proper: true gender: female + - type: Inventory + speciesId: dog + templateId: petAdvanced + displacements: + head: + sizeMaps: + 32: + sprite: Mobs/Pets/displacements.rsi + state: lisa_head_displacement + eyes: + sizeMaps: + 32: + sprite: Mobs/Pets/displacements.rsi + state: corgi_eyes_displacement - type: entity name: real mouse @@ -280,6 +308,8 @@ layers: - map: ["enum.DamageStateVisualLayers.Base"] state: mcgriff + - map: [ "head" ] + - map: [ "eyes" ] - type: Physics - type: Fixtures fixtures: @@ -294,7 +324,18 @@ - MobLayer - type: Inventory speciesId: puppy - templateId: pet + templateId: petAdvanced + displacements: + head: + sizeMaps: + 32: + sprite: Mobs/Pets/displacements.rsi + state: mcgriff_head_displacement + eyes: + sizeMaps: + 32: + sprite: Mobs/Pets/displacements.rsi + state: mcgriff_eyes_displacement - type: DamageStateVisuals states: Alive: diff --git a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml index e6c2984221..b800995038 100644 --- a/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/pet_inventory_template.yml @@ -9,8 +9,7 @@ displayName: Mask whitelist: tags: - - PetWearable - + - PetWearable - name: suitstorage slotTexture: suit_storage slotFlags: SUITSTORAGE @@ -20,6 +19,45 @@ displayName: Suit Storage whitelist: components: - - GasTank - + - GasTank +- type: inventoryTemplate + id: petAdvanced + slots: + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 0,2 + strippingWindowPos: 1,1 + displayName: Mask + whitelist: + tags: + - PetWearable + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + stripTime: 3 + uiWindowPos: 0,1 + strippingWindowPos: 2,5 + displayName: Suit Storage + whitelist: + components: + - GasTank + - name: head + slotTexture: head + slotFlags: HEAD + uiWindowPos: 1,3 + strippingWindowPos: 1,0 + displayName: Head + whitelist: + tags: + - PetWearable + - name: eyes + slotTexture: glasses + slotFlags: EYES + uiWindowPos: 1,2 + strippingWindowPos: 1,2 + displayName: Head + whitelist: + tags: + - PetWearable diff --git a/Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml index a775b6373b..0f4650141d 100644 --- a/Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml +++ b/Resources/Prototypes/InventoryTemplates/smartcorgi_inventory_template.yml @@ -64,7 +64,7 @@ displayName: Eyes whitelist: tags: - - CorgiWearable + - PetWearable - name: head slotTexture: head slotFlags: HEAD diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/belt_displacement.png b/Resources/Textures/Mobs/Pets/corgi.rsi/belt_displacement.png deleted file mode 100644 index 6e3cb09bcf701bc53ecc7886c19b82d386469aa6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzDNh&2kcv5P4>B?Wc})uc*XMaS bfSB*u1QZw;C7n&)0XYnwu6{1-oD!MnAmtPE0&tPG4mmKP99L)jqLXfQH^#hHO@Lq;YB0U#X( z#F_0ZVDT&<8w3_lW?*;$R0N~ZEM)*nO<-qW0je}GGB#jb05KJ0BkKZ)NmGDq5MTnD z%LG;#WN86pL3J4#7=UDV$y+%8?9uB4GSxj@978JN-X3J+1@aCp`0k&}XRZKbB7+Ap XybcZwjNHY3vLInkS3j3^P6*~f)XXJ5hcO-X(i=}MX3w{iJ5sNdVa1U3Z{C7 zdKS`|uT}unY)g&sO!M^AV&DLBSQ(@kSs56CEH5CIhO$Af(O_f-i!%Y)hKx)M0zf(n zh%?(+z~WgzHVE7-V`O;2jG)mhWdKS|U}sjH>LQ-Ev`U;>)U z1XdYjX#r$Gbr~8MfMlQ6X0|2;PTdD&&hvC}45^5Fd&`jTkb}U{3ysVL_eC_iEG$g) zHpe<8?>}~X?U&b;XAbQ&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&q6x$)e4}RZK)BSX`Y^13>-iXD}xjxD+42tvp@3Xlx~Oh9v) zz$$|*Er2YjE<*zYknEW}u^O-77c#(L;qi2F45^5FJM$seAq5H7SpEyY-?{f(?6)mb zjXBuH*2eXC9&@2f#;@2??QJbwx5eVJ$`bE8m#z`od~E;8Z2}Eolt%_t9PnDTjTZbQPbt ze!sFVdQ&MBb@05<8brvLx| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_eyes_displacement.png b/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_eyes_displacement.png new file mode 100644 index 0000000000000000000000000000000000000000..93e43d5194ea438323103ef53b02a051ef5dc708 GIT binary patch literal 595 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwHWV?`6fv|E0r?EP8$WP@)RhGJ1^@s5pTR+EAC&ooa@ zEd~xChm}E!k(GfF$npYWX($`yY7Itaus9QtZOF*PAONJJfHZ7!{W|Er&`o@IyCcn%kc&^zT@2{v+Mjn<~8aO#R+pcHpC{JJ@9S80(({+^Bc|^ z?R^{6D}+8=vC!Xe$;2Y+C`)p{!PVg({@UI7&Yu>f^~=6O?lH*6p00i_>zopr0G7YB AVgLXD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_head_displacement.png b/Resources/Textures/Mobs/Pets/displacements.rsi/mcgriff_head_displacement.png new file mode 100644 index 0000000000000000000000000000000000000000..771f343f0431baeedb83afa471a94e0b2316a2ed GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`211o(uwHWV{d7c;aL1NjV-PVDFgsVfQc3;zHAKZAqT$}d1ZXMsl~P@Zo; z2s2u+2CD!CB}!Z)N`mv#O3D+9QW*jgGxJLH{9Hp6O!W-)ETl7EtpKXomKx!i=IN=$ zzyaj2GDtD9GB5&JUO+4jWrJL;!N?32X9BVf8JQRafOHfPXSTC|#j}8H5Li~m$nXN_ zIT(#*DFaYy0y_f>P^E#9u>s=(h^ZhOSr{&803`d! zvvlHlhpCT&Ob1UF$B+p3w^uguGAQscJ0AG`zDH-N@8l&8FV=sb9+#!$a6k^|Ikuxa vrwJ+~$g`F?S#?SXDI~CP+=y7PMskAQTW4v*