diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 59ab9d17bc..64a17abff2 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -86,6 +86,10 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/glasses.rsi - type: VisionCorrection + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingEyesBase @@ -113,6 +117,10 @@ - type: FlashImmunity - type: EyeProtection protectionTime: 5 + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingEyesBase @@ -127,6 +135,10 @@ - type: FlashImmunity - type: EyeProtection protectionTime: 5 + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingEyesBase diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml index 982aecd856..b39d7adadb 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml @@ -30,6 +30,10 @@ sprite: Clothing/Head/Bandanas/botany.rsi - type: Clothing sprite: Clothing/Head/Bandanas/botany.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBaseButcherable diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 111183bb3a..25550da663 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -19,6 +19,10 @@ sprite: Clothing/Head/Hats/beret.rsi - type: Clothing sprite: Clothing/Head/Hats/beret.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -30,6 +34,10 @@ sprite: Clothing/Head/Hats/beret_rnd.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_rnd.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -41,6 +49,10 @@ sprite: Clothing/Head/Hats/beret_engineering.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_engineering.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -52,6 +64,10 @@ sprite: Clothing/Head/Hats/beret_hos.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_hos.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -107,6 +123,10 @@ sprite: Clothing/Head/Hats/captain.rsi - type: Clothing sprite: Clothing/Head/Hats/captain.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -153,6 +173,10 @@ - type: ContainerContainer containers: storagebase: !type:Container + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -164,6 +188,10 @@ sprite: Clothing/Head/Hats/brownfedora.rsi - type: Clothing sprite: Clothing/Head/Hats/brownfedora.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -197,6 +225,10 @@ sprite: Clothing/Head/Hats/hopcap.rsi - type: Clothing sprite: Clothing/Head/Hats/hopcap.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -208,6 +240,10 @@ sprite: Clothing/Head/Hats/hoshat.rsi - type: Clothing sprite: Clothing/Head/Hats/hoshat.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -307,6 +343,10 @@ sprite: Clothing/Head/Hats/surgcap_blue.rsi - type: Clothing sprite: Clothing/Head/Hats/surgcap_blue.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -340,6 +380,10 @@ sprite: Clothing/Head/Hats/tophat.rsi - type: Clothing sprite: Clothing/Head/Hats/tophat.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -408,6 +452,10 @@ sprite: Clothing/Head/Hats/wizardhat.rsi - type: Clothing sprite: Clothing/Head/Hats/wizardhat.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -509,6 +557,10 @@ sprite: Clothing/Head/Hats/nursehat.rsi - type: Clothing sprite: Clothing/Head/Hats/nursehat.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -562,6 +614,10 @@ sprite: Clothing/Head/Hats/beret_cmo.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_cmo.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index ffc656889d..5b3d990b24 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -16,6 +16,10 @@ Slash: 0.8 Piercing: 0.9 Heat: 0.8 + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon #Old (Security) Helmet - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index e25d0ccba0..483884117e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -83,6 +83,10 @@ sprite: Clothing/Head/Hoods/chaplain.rsi - type: Clothing sprite: Clothing/Head/Hoods/chaplain.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase @@ -105,6 +109,10 @@ sprite: Clothing/Head/Hoods/nun.rsi - type: Clothing sprite: Clothing/Head/Hoods/nun.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 806fcf18d8..9e0218e460 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -118,6 +118,10 @@ sprite: Clothing/Head/Misc/shrine-maidens-wig.rsi - type: Clothing sprite: Clothing/Head/Misc/shrine-maidens-wig.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index 9260d33f3e..a4ce85c100 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -30,6 +30,10 @@ sprite: Clothing/Head/Soft/cargosoft.rsi - type: Clothing sprite: Clothing/Head/Soft/cargosoft.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBaseButcherable @@ -184,6 +188,10 @@ sprite: Clothing/Head/Soft/purplesoft.rsi - type: Clothing sprite: Clothing/Head/Soft/purplesoft.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingHeadBaseButcherable @@ -294,7 +302,11 @@ sprite: Clothing/Head/Soft/paramedicsoft.rsi - type: Clothing sprite: Clothing/Head/Soft/paramedicsoft.rsi - + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatParamedicsoftFlipped diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml index 94254e625f..582e1f0d50 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml @@ -25,6 +25,10 @@ sprite: Clothing/Head/Welding/welding.rsi - type: Clothing sprite: Clothing/Head/Welding/welding.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: WeldingMaskBase diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 5de841d89d..324016784d 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -11,6 +11,10 @@ - type: BreathMask - type: IngestionBlocker - type: IdentityBlocker + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingMaskGas @@ -167,6 +171,8 @@ - type: Tag tags: - ClownMask + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingMaskClownBase @@ -201,6 +207,10 @@ sprite: Clothing/Mask/mime.rsi - type: BreathMask - type: IdentityBlocker + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingMaskPullableBase @@ -220,17 +230,17 @@ name: muzzle description: To stop that awful noise. components: - - type: Sprite - sprite: Clothing/Mask/muzzle.rsi - - type: Clothing - sprite: Clothing/Mask/muzzle.rsi - - type: IngestionBlocker - - type: AddAccentClothing - accent: ReplacementAccent - replacement: mumble - - type: Construction - graph: Muzzle - node: muzzle + - type: Sprite + sprite: Clothing/Mask/muzzle.rsi + - type: Clothing + sprite: Clothing/Mask/muzzle.rsi + - type: IngestionBlocker + - type: AddAccentClothing + accent: ReplacementAccent + replacement: mumble + - type: Construction + graph: Muzzle + node: muzzle - type: entity parent: ClothingMaskPullableBase @@ -326,6 +336,10 @@ - type: Clothing sprite: Clothing/Mask/rat.rsi - type: BreathMask + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: IdentityBlocker - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml index c50ffa7092..f45c83b146 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml @@ -8,6 +8,10 @@ sprite: Clothing/Neck/Ties/redtie.rsi - type: Clothing sprite: Clothing/Neck/Ties/redtie.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon - type: entity parent: ClothingNeckBase @@ -30,3 +34,7 @@ sprite: Clothing/Neck/Ties/scitie.rsi - type: Clothing sprite: Clothing/Neck/Ties/scitie.rsi + - type: Tag + tags: + - HamsterWearable + - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index c04d8d1dc9..02c92903ca 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -24,6 +24,9 @@ sprite: Clothing/OuterClothing/Suits/eva_syndicate.rsi - type: Clothing sprite: Clothing/OuterClothing/Suits/eva_syndicate.rsi + - type: Tag + tags: + - SuitEVA #Emergency EVA - type: entity @@ -58,6 +61,9 @@ sprite: Clothing/OuterClothing/Suits/eva_prisoner.rsi - type: Clothing sprite: Clothing/OuterClothing/Suits/eva_prisoner.rsi + - type: Tag + tags: + - SuitEVA #NTSRA Voidsuit / Ancient Voidsuit - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index d1a947feb2..2e5b69f7cd 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2080,7 +2080,7 @@ baseSprintSpeed : 4 - type: Inventory speciesId: hamster - templateId: pet + templateId: hamster - type: InventorySlots - type: Strippable - type: UserInterface diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 7aeb5db4a2..65af3799ec 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -440,6 +440,12 @@ id: MobHamsterHamlet description: A grumpy, cute and fluffy hamster. components: + - type: Sprite + drawdepth: SmallMobs + sprite: Mobs/Pets/hamlet.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: hamlet - type: GhostRole makeSentient: true allowSpeech: true diff --git a/Resources/Prototypes/InventoryTemplates/hamster_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/hamster_inventory_template.yml new file mode 100644 index 0000000000..cb94e68485 --- /dev/null +++ b/Resources/Prototypes/InventoryTemplates/hamster_inventory_template.yml @@ -0,0 +1,52 @@ +- type: inventoryTemplate + id: hamster + slots: + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + whitelist: + tags: + - PetWearable + - HamsterWearable + - name: neck + slotTexture: neck + slotFlags: NECK + uiWindowPos: 0,1 + strippingWindowPos: 0,1 + displayName: Neck + whitelist: + tags: + - HamsterWearable + - name: eyes + slotTexture: glasses + slotFlags: EYES + stripTime: 3 + uiWindowPos: 0,0 + strippingWindowPos: 0,0 + displayName: Eyes + whitelist: + tags: + - HamsterWearable + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + slotGroup: SecondHotbar + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,5 + displayName: Suit Storage + whitelist: + components: + - GasTank + - name: head + slotTexture: head + slotFlags: HEAD + uiWindowPos: 1,0 + strippingWindowPos: 1,0 + displayName: Head + whitelist: + tags: + - HamsterWearable \ No newline at end of file diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 991ecbb5a6..8c712a7dcc 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -354,6 +354,9 @@ - type: Tag id: Hamster +- type: Tag + id: HamsterWearable + - type: Tag id: HamtrCentralControlModule diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES-hamster.png b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES-hamster.png new file mode 100644 index 0000000000..82246877e5 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json index 541bdfbedc..1d659eee14 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-EYES", "directions": 4 }, + { + "name": "equipped-EYES-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-hamster.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-hamster.png new file mode 100644 index 0000000000..f6a9fcecd7 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json index 541bdfbedc..1d659eee14 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-EYES", "directions": 4 }, + { + "name": "equipped-EYES-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES-hamster.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES-hamster.png new file mode 100644 index 0000000000..9fa934a778 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES-hamster.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json index 541bdfbedc..1d659eee14 100644 --- a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-EYES", "directions": 4 }, + { + "name": "equipped-EYES-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..3b89ea8bdf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json index 66dc616e52..22a0c38fde 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json @@ -17,6 +17,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "mask-equipped-HELMET", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..b12b3a19b6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret.rsi/meta.json index a470e00944..ade65863af 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..146c6ec4a0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/meta.json index a9602ce838..cfc7714de7 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..d94faf182d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/meta.json index a470e00944..ade65863af 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..4a4c9970c4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/meta.json index 7bd2e3e22a..091d438f17 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..c5e77b2f3c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json index 1b11033dcf..7d73315ad6 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..2016cf5cf2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json index a470e00944..ade65863af 100644 --- a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..7fe3a8683b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json index a470e00944..ade65863af 100644 --- a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..959ff68a85 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/meta.json index a470e00944..ade65863af 100644 --- a/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..d7f074427c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json index a470e00944..ade65863af 100644 --- a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..01f171cd93 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json index e0ee93d642..9a2a838962 100644 --- a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..c6b7efd308 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/meta.json index 4a7c120f3a..81966f0161 100644 --- a/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..9ef489a4a2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json index a470e00944..ade65863af 100644 --- a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/tophat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..79bec8ed60 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/tophat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/meta.json index a470e00944..ade65863af 100644 --- a/Resources/Textures/Clothing/Head/Hats/tophat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..bd22cf606c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json index a470e00944..ade65863af 100644 --- a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..bba686a7f0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json index e0ee93d642..9a2a838962 100644 --- a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..b98ee27d8d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/meta.json index a470e00944..ade65863af 100644 --- a/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/chaplain.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hoods/nun.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hoods/nun.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..c700f43b5a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/nun.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/nun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/nun.rsi/meta.json index a470e00944..ade65863af 100644 --- a/Resources/Textures/Clothing/Head/Hoods/nun.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/nun.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..4e728ec36c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/meta.json index 50ab60e45f..a9d526771b 100644 --- a/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/shrine-maidens-wig.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..4017c9bd0e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json index 86b28c561a..83a38bf11b 100644 --- a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..79b4d66da0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json index 8089773135..2b73b340e6 100644 --- a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..06508e0d0d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json index a470e00944..ade65863af 100644 --- a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Welding/welding.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000..3843d378d2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/welding.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json b/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json index 954d46b9e9..90730cb2d0 100644 --- a/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Welding/welding.rsi/meta.json @@ -21,6 +21,14 @@ "name": "up-equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "up-equipped-HELMET-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Welding/welding.rsi/up-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Welding/welding.rsi/up-equipped-HELMET-hamster.png new file mode 100644 index 0000000000..347651fe91 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Welding/welding.rsi/up-equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-hamster.png index 5fdc96e8c5..283c12e693 100644 Binary files a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-hamster.png and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-hamster.png new file mode 100644 index 0000000000..36d659b86e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json index 2e57ae2151..61285267df 100644 --- a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-hamster.png new file mode 100644 index 0000000000..200da502d6 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/meta.json b/Resources/Textures/Clothing/Mask/gas.rsi/meta.json index 2e57ae2151..61285267df 100644 --- a/Resources/Textures/Clothing/Mask/gas.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gas.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-hamster.png index 5fdc96e8c5..b6e27db120 100644 Binary files a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-hamster.png and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-hamster.png new file mode 100644 index 0000000000..ad6a03261b Binary files /dev/null and b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/meta.json b/Resources/Textures/Clothing/Mask/mime.rsi/meta.json index c98cf38d35..a6a6833671 100644 --- a/Resources/Textures/Clothing/Mask/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/mime.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "equipped-MASK", "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/rat.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/rat.rsi/equipped-MASK-hamster.png new file mode 100644 index 0000000000..f5b182434c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/rat.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/rat.rsi/meta.json b/Resources/Textures/Clothing/Mask/rat.rsi/meta.json index 518989cd13..611cb36f60 100644 --- a/Resources/Textures/Clothing/Mask/rat.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/rat.rsi/meta.json @@ -10,6 +10,10 @@ { "name": "icon" }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, { "name": "equipped-MASK", "directions": 4 diff --git a/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/equipped-NECK-hamster.png b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/equipped-NECK-hamster.png new file mode 100644 index 0000000000..37f55003ae Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/equipped-NECK-hamster.png differ diff --git a/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json index f6ae2ed6de..6c5b834406 100644 --- a/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Ties/redtie.rsi/meta.json @@ -11,6 +11,10 @@ "name": "equipped-NECK", "directions": 4 }, + { + "name": "equipped-NECK-hamster", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/equipped-NECK-hamster.png b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/equipped-NECK-hamster.png new file mode 100644 index 0000000000..48111199d0 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/equipped-NECK-hamster.png differ diff --git a/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/meta.json index f6ae2ed6de..6c5b834406 100644 --- a/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Ties/scitie.rsi/meta.json @@ -11,6 +11,10 @@ "name": "equipped-NECK", "directions": 4 }, + { + "name": "equipped-NECK-hamster", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-monkey.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-monkey.png new file mode 100644 index 0000000000..b817257a16 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json index b2c50fc4c6..86e27c9c1f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-monkey", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/dead-0.png b/Resources/Textures/Mobs/Animals/hamster.rsi/dead-0.png index 279401902f..02b4d6e998 100644 Binary files a/Resources/Textures/Mobs/Animals/hamster.rsi/dead-0.png and b/Resources/Textures/Mobs/Animals/hamster.rsi/dead-0.png differ diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-0.png b/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-0.png index 2c783a540c..449523446f 100644 Binary files a/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-0.png and b/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-0.png differ diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json b/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json index f7e96fb7d7..d09ebc8383 100644 --- a/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json +++ b/Resources/Textures/Mobs/Animals/hamster.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by brainfood# 7460", + "copyright": "Created by brainfood# 7460, hamster-0 resprite by RamZ (discord)", "size": { "x": 32, "y": 32 @@ -17,19 +17,31 @@ [ 0.2, 0.2, - 0.2 - ], - [ + 0.2, 0.2, 0.2, 0.2 ], [ + 0.2, + 0.2, + 0.2, 0.2, 0.2, 0.2 ], [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, 0.2, 0.2, 0.2 diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/splat-0.png b/Resources/Textures/Mobs/Animals/hamster.rsi/splat-0.png index 8fe91e2888..cfb56027be 100644 Binary files a/Resources/Textures/Mobs/Animals/hamster.rsi/splat-0.png and b/Resources/Textures/Mobs/Animals/hamster.rsi/splat-0.png differ diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/dead-0.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/dead-0.png new file mode 100644 index 0000000000..cea6149d7e Binary files /dev/null and b/Resources/Textures/Mobs/Pets/hamlet.rsi/dead-0.png differ diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/hamlet.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/hamlet.png new file mode 100644 index 0000000000..c008c71684 Binary files /dev/null and b/Resources/Textures/Mobs/Pets/hamlet.rsi/hamlet.png differ diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json b/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json new file mode 100644 index 0000000000..3b8ce2de6d --- /dev/null +++ b/Resources/Textures/Mobs/Pets/hamlet.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by brainfood# 7460, hamlet resprite by RamZ (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hamlet", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "dead-0" + }, + { + "name": "splat-0" + } + ] +} diff --git a/Resources/Textures/Mobs/Pets/hamlet.rsi/splat-0.png b/Resources/Textures/Mobs/Pets/hamlet.rsi/splat-0.png new file mode 100644 index 0000000000..f9ab920ac6 Binary files /dev/null and b/Resources/Textures/Mobs/Pets/hamlet.rsi/splat-0.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hamtr.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hamtr.png index bb80a6b65d..bb2b1ab21c 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hamtr.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hamtr.png differ diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-hamster.png index de3bba5ebe..7089e59478 100644 Binary files a/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-hamster.png and b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-hamster.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-hamster.png index 5263f4cb30..c39e774306 100644 Binary files a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-hamster.png and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-hamster.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-hamster.png index 1bd13c24d9..2a671d6b6b 100644 Binary files a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-hamster.png and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-hamster.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-hamster.png index 1bd13c24d9..95fbac61b9 100644 Binary files a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-hamster.png and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-hamster.png differ diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-hamster.png index 365002a0d8..de231850c2 100644 Binary files a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-hamster.png and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-hamster.png differ diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-hamster.png index 5263f4cb30..93994b77fd 100644 Binary files a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-hamster.png and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-hamster.png differ diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-hamster.png index fc306eb6ef..ecf4b4f3eb 100644 Binary files a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-hamster.png and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-hamster.png differ diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-hamster.png index 344b1ac7e2..b4cf9b527c 100644 Binary files a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-hamster.png and b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-hamster.png differ