[entities] Kangaroos, boxer improvements, boxing bell and hamlet updates. (#15546)

* kangaroo

* fixes

* fuix

* fixes and rotational sprites for bell

* why wont u work, stupid rsi thingy

* attempt to fix

* now hsould work

* fix bell

* fix the bell

* bell make noise on hitting it

* add faction simple hostile to space kangaroo

* added boxing kangaroo spawner comes with gloves and agressive

Resources/Audio/Animals/license.txt

@@ -49,3 +49,5 @@ The following sounds were used from youtube:
     lizard_happy.ogg: audio created by youtube user "Nagaty Studio" (https://youtu.be/I7CX0AS8RNI) licensed under CC by 3.0.
 
     bear.ogg: audio is recorded by "Nagaty Studio" (https://www.youtube.com/watch?v=pz6eZbESlU8) licensed under CC by 3.0. The original audio was reverbed.
+
+    kangaroo_grunt.ogg: audio is recorded/created by Pfranzen "FreeSound.org" (https://freesound.org/people/pfranzen/sounds/322744/) licensed under CC BY 4.0. The original audio was trimmed and renamed.

Resources/Audio/Effects/Footsteps/attributions.yml

@@ -7,6 +7,12 @@
   copyright: "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13-RP"
   source: "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/tree/b7392a25f826d038d35309cf36875f2066c3eb05/sound/effects/footstep"
 
+- files:
+  - bounce.ogg
+  license: "CC-BY-SA-4.0"
+  copyright: "Made by JustInvoke freesound.org"
+  source: "https://freesound.org/people/JustInvoke/sounds/446100/"
+ 
 - files:
   - jesterstep1.ogg
   - jesterstep2.ogg

Resources/Locale/en-US/accent/accents.ftl

@@ -67,3 +67,9 @@ accent-words-pig-1 = Oink.
 accent-words-pig-2 = Oink?
 accent-words-pig-3 = Oink!
 accent-words-pig-4 = Oink oink!
+
+# Kangaroo
+accent-words-kangaroo-1 = Grr!
+accent-words-kangaroo-2 = Hisss!
+accent-words-kangaroo-3 = Shreak!
+accent-words-kangaroo-4 = Chuu!

Resources/Locale/en-US/prototypes/catalog/cargo/cargo-livestock.ftl

@@ -45,3 +45,6 @@ ent-LivestockSnake = { ent-CrateNPCSnake }
 
 ent-LivestockSnake = { ent-CrateNPCLizard }
     .desc = { ent-CrateNPCLizard.desc }
+
+ent-LivestockSnake = { ent-CrateNPCKangaroo }
+    .desc = { ent-CrateNPCKangaroo.desc }

Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl

@@ -48,3 +48,6 @@ ent-CrateNPCSnake = Snake crate
 
 ent-CrateNPCLizard = Lizard crate
     .desc = A crate containing a lizard.
+
+ent-CrateNPCKangaroo = Kangaroo crate
+    .desc = A crate containing a kangaroo.

Resources/Prototypes/Accents/full_replacements.yml

@@ -91,3 +91,11 @@
   - accent-words-pig-2
   - accent-words-pig-3
   - accent-words-pig-4
+
+- type: accent
+  id: kangaroo
+  fullReplacements:
+  - accent-words-kangaroo-1
+  - accent-words-kangaroo-2
+  - accent-words-kangaroo-3
+  - accent-words-kangaroo-4

Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml

@@ -177,3 +177,13 @@
   cost: 1000
   category: Livestock
   group: market
+
+- type: cargoProduct
+  id: LivestockKangaroo
+  icon:
+    sprite: Mobs/Animals/kangaroo.rsi
+    state: kangaroo
+  product: CrateNPCKangaroo
+  cost: 2800
+  category: Livestock
+  group: market

Resources/Prototypes/Catalog/Fills/Crates/npc.yml

@@ -164,3 +164,11 @@
     - type: StorageFill
       contents:
         - id: MobLizard
+
+- type: entity
+  id: CrateNPCKangaroo
+  parent: CrateLivestock
+  components:
+  - type: StorageFill
+    contents:
+      - id: MobKangaroo

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -425,6 +425,9 @@
   - type: Clothing
     sprite: Clothing/Belt/champion.rsi
     quickEquip: true
+  - type: Tag
+    tags:
+    - Kangaroo
 
 - type: entity
   parent: ClothingBeltStorageBase

Resources/Prototypes/Entities/Clothing/Hands/gloves.yml

@@ -24,6 +24,9 @@
     fiberMaterial: fibers-leather
     fiberColor: fibers-red
   - type: FingerprintMask
+  - type: Tag
+    tags:
+    - Kangaroo
 
 - type: entity
   parent: ClothingHandsGlovesBoxingRed

Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml

@@ -170,3 +170,16 @@
     chance: 0.75
     offset: 0.2
 
+- type: entity
+  name: Salvage Space Kangaroo Spawner
+  id: SpawnMobKangarooSalvage
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: kangaroo-space
+      sprite: Mobs/Animals/kangaroo.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobKangarooSpaceSalvage

Resources/Prototypes/Entities/Markers/Spawners/mobs.yml

@@ -302,3 +302,45 @@
   - type: ConditionalSpawner
     prototypes:
       - MobSpiderShiva
+
+- type: entity
+  name: Willow Spawner
+  id: SpawnMobKangarooWillow
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: kangaroo
+      sprite: Mobs/Animals/kangaroo.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobKangarooWillow
+
+- type: entity
+  name: Space Kangaroo Spawner
+  id: SpawnMobKangaroo
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: kangaroo-space
+      sprite: Mobs/Animals/kangaroo.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobKangarooSpace
+
+- type: entity
+  name: Boxing Kangaroo Spawner
+  id: SpawnMobBoxingKangaroo
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - state: kangaroo
+      sprite: Mobs/Animals/kangaroo.rsi
+  - type: ConditionalSpawner
+    prototypes:
+    - MobBoxingKangaroo

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -602,8 +602,8 @@
   description: A large marsupial herbivore. It has powerful hind legs, with nails that resemble long claws.
   components:
   - type: MovementSpeedModifier
-    baseWalkSpeed: 4
+    baseWalkSpeed: 3.5
-    baseSprintSpeed: 6
+    baseSprintSpeed: 4.5
   - type: Sprite
     drawdepth: Mobs
     layers:
@@ -622,48 +622,67 @@
       - MobLayer
   - type: Physics
   - type: Appearance
+  - type: Inventory
+    speciesId: kangaroo
+    templateId: kangaroo
+  - type: ReplacementAccent
+    accent: kangaroo
+  - type: InventorySlots
+  - type: Strippable
+  - type: Butcherable
+    spawned:
+    - id: FoodMeat
+  - type: UserInterface
+    interfaces:
+    - key: enum.StrippingUiKey.Key
+      type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
         Base: kangaroo
       # SKIPPY NO!
       Critical:
-        Base: kangaroo-dead
+        Base: kangaroo-crit
       Dead:
         Base: kangaroo-dead
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - FootstepSound
+  - type: GhostRole
+    prob: 0.25
+    name: kangaroo
+    description: |
+      You're a kangaroo! Do whatever kangaroos do.
+  - type: GhostTakeoverAvailable
+  - type: Vocal
+    sounds:
+      Unsexed: Kangaroo
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepBounce
   - type: Puller
+    needsHands: false
+  - type: StaminaDamageOnHit
+    damage: 8 #Stam damage values seem a bit higher than regular damage because of the decay, etc
+    # This needs to be moved to boxinggloves
+    #knockdownSound: /Audio/Weapons/boxingbell.ogg
+  - type: MeleeWeapon
+    attackRate: 1.5
+    damage:
+      types:
+        Blunt: 0.4
+    soundHit:
+      collection: BoxingHit
+    animation: WeaponArcFist
 
 - type: entity
   name: boxing kangaroo
   parent: MobKangaroo
-  id: MobKangarooBoxer
+  id: MobBoxingKangaroo
-  description: A large marsupial herbivore. It has powerful hind legs and... boxing gloves?
   components:
-  - type: CombatMode
+  - type: Loadout
-  - type: Sprite
+    prototypes: [ BoxingKangarooGear ]
-    drawdepth: Mobs
-    layers:
-      - map: ["enum.DamageStateVisualLayers.Base"]
-        state: kangaroo-boxing
-        sprite: Mobs/Animals/kangaroo.rsi
-  - type: Appearance
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: kangaroo-boxing
-      Critical:
-        Base: kangaroo-boxing-dead
-      Dead:
-        Base: kangaroo-boxing-dead
-  - type: MeleeWeapon
-    hidden: true
-    angle: 0
-    animation: WeaponArcClaw
-    damage:
-      types:
-        Blunt: 10
-  - type: InputMover
-  - type: MobMover
   - type: HTN
     rootTask: SimpleHostileCompound
   - type: Faction
@@ -1970,6 +1989,15 @@
     baseWalkSpeed : 4
     baseSprintSpeed : 4
   - type: Appearance
+  - type: Inventory
+    speciesId: hamster
+    templateId: pet
+  - type: InventorySlots
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+    - key: enum.StrippingUiKey.Key
+      type: StrippableBoundUserInterface
   - type: DamageStateVisuals
     states:
       Alive:
@@ -2031,6 +2059,7 @@
   - type: Bloodstream
     bloodMaxVolume: 60
   - type: CanEscapeInventory
+    BaseResistTime: 3
   - type: MobPrice
     price: 60
 

Resources/Prototypes/Entities/Mobs/NPCs/pets.yml

@@ -543,3 +543,29 @@
   - type: Tag
     tags:
     - CannotSuicide
+
+- type: entity
+  name: Willow
+  parent: MobKangaroo
+  id: MobKangarooWillow
+  description: Willow the boxing kangaroo.
+  components:
+  - type: InteractionPopup
+    successChance: 1
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: female
+  - type: Tag
+    tags:
+    - CannotSuicide
+    - DoorBumpOpener
+    - FootstepSound
+  - type: GhostRole
+    prob: 0.25
+    name: Willow the kangaroo
+    description: |
+      You're a kangaroo named willow! willow likes to box.
+  - type: GhostTakeoverAvailable
+  - type: Loadout
+    prototypes: [ BoxingKangarooGear ]

Resources/Prototypes/Entities/Mobs/NPCs/space.yml

@@ -1,7 +1,8 @@
 - type: entity
-  name: space bear
+  name: basic
-  id: MobBearSpace
+  id: MobSpaceBasic
   parent: SimpleSpaceMobBase
+  abstract: true
   description: It looks friendly. Why don't you give it a hug?
   components:
   - type: HTN
@@ -36,22 +37,6 @@
       150: Dead
   - type: Stamina
     excess: 150
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: bear
-        BaseUnshaded: glow
-      Critical:
-        Base: bear_dead
-      Dead:
-        Base: bear_dead
-  - type: Butcherable
-    spawned:
-    - id: FoodMeatBear
-      amount: 3
-    - id: MaterialHideBear
-      amount: 1
-      prob: 0.3
   - type: Bloodstream
     bloodMaxVolume: 300
     bloodReagent: Cryoxadone
@@ -75,6 +60,44 @@
     - FootstepSound
   - type: Puller
     needsHands: false
+  - type: PointLight
+    radius: 1.2
+    energy: 2
+    color: "#4faffb"
+  - type: GhostTakeoverAvailable
+
+- type: entity
+  name: space bear
+  id: MobBearSpace
+  parent: MobSpaceBasic
+  description: It looks friendly. Why don't you give it a hug?
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    netsync: false
+    sprite: Mobs/Animals/bear.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: bear
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: glow
+      shader: unshaded
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: bear
+        BaseUnshaded: glow
+      Critical:
+        Base: bear_dead
+      Dead:
+        Base: bear_dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatBear
+      amount: 3
+    - id: MaterialHideBear
+      amount: 1
+      prob: 0.3
   - type: ReplacementAccent
     accent: genericAggressive
   - type: Vocal
@@ -86,16 +109,11 @@
     interactFailureString: petting-failure-bear
     interactSuccessSound:
       path: /Audio/Animals/sloth_squeak.ogg
-  - type: PointLight
-    radius: 1.2
-    energy: 2
-    color: "#4faffb"
   - type: GhostRole
     prob: 0.25
     name: space bear
     description: |
       You're a bear! Do bear things.
-  - type: GhostTakeoverAvailable
 
 - type: entity
   id: MobBearSpaceSalvage
@@ -107,5 +125,82 @@
     name: space bear on salvage wreck
     description: |
       Defend the loot inside the salvage wreck!
-  - type: GhostTakeoverAvailable
+  - type: SalvageMobRestrictions
+
+- type: entity
+  name: space kangaroo
+  id: MobKangarooSpace
+  parent: MobSpaceBasic
+  description: It looks friendly. Why don't you give it a hug?
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    netsync: false
+    sprite: Mobs/Animals/kangaroo.rsi
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: kangaroo-space
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: glow
+      shader: unshaded
+  - type: MeleeWeapon
+    hidden: true
+    soundHit:
+        path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+    angle: 0
+    animation: WeaponArcClaw
+    damage:
+      types:
+        Blunt: 9
+        Slash: 2
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 3.5
+    baseSprintSpeed: 4.5
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: kangaroo-space
+        BaseUnshaded: glow
+      Critical:
+        Base: kangaroo-space-crit
+      Dead:
+        Base: kangaroo-space-dead
+  - type: Stamina
+    excess: 180
+  - type: Inventory
+    speciesId: kangaroo
+    templateId: spacekangaroo
+  - type: Vocal
+    sounds:
+      Unsexed: Kangaroo
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepBounce
+  - type: ReplacementAccent
+    accent: kangaroo
+  - type: InventorySlots
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+    - key: enum.StrippingUiKey.Key
+      type: StrippableBoundUserInterface
+    radius: 1.2
+    energy: 2
+    color: "#4faffb"
+  - type: GhostRole
+    prob: 0.25
+    name: space kangaroo
+    description: |
+      You're a kangaroo! Do kangaroo things.
+
+- type: entity
+  id: MobKangarooSpaceSalvage
+  parent: MobKangarooSpace
+  suffix: "Salvage Ruleset"
+  components:
+  - type: GhostRole
+    prob: 0.25
+    name: space kangaroo on salvage wreck
+    description: |
+      Defend the loot inside the salvage wreck!
   - type: SalvageMobRestrictions

Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml

@@ -0,0 +1,47 @@
+- type: entity
+  id: BoxingBell
+  name: boxing bell
+  description: Ding ding!
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wallmount
+  components:
+  - type: Transform
+    anchored: true
+  - type: WallMount
+  - type: Sprite
+    sprite: Structures/Wallmounts/bell.rsi
+    layers:
+    - state: bell
+  - type: InteractionPopup
+    successChance: 1
+    interactSuccessSound:   
+      path: /Audio/Weapons/boxingbell.ogg
+  - type: Clickable
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        path:
+          "/Audio/Weapons/boxingbell.ogg"
+  - type: Appearance
+  - type: Rotatable
+  - type: CollisionWake
+    enabled: false
+  - type: Physics
+    canCollide: false
+    bodyType: Dynamic
+  - type: Fixtures
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/metalbreak.ogg

Resources/Prototypes/InventoryTemplates/kangaroo_inventory_template.yml

@@ -0,0 +1,79 @@
+- type: inventoryTemplate
+  id: kangaroo
+  slots:
+  - name: mask
+    slotTexture: mask
+    slotFlags: MASK
+    uiWindowPos: 1,1
+    strippingWindowPos: 1,1
+    displayName: Mask
+    whitelist:
+      tags:
+        - PetWearable
+
+  - name: suitstorage
+    slotTexture: suit_storage
+    slotFlags: SUITSTORAGE
+    slotGroup: SecondHotbar
+    stripTime: 3
+    uiWindowPos: 2,0
+    strippingWindowPos: 2,5
+    displayName: Suit Storage
+    whitelist:
+      components:
+        - GasTank
+
+  - name: gloves
+    slotTexture: gloves
+    slotFlags: GLOVES
+    uiWindowPos: 2,2
+    strippingWindowPos: 2,2
+    displayName: Gloves
+    whitelist:
+      tags:
+        - Kangaroo
+
+  - name: belt
+    slotTexture: belt
+    slotFlags: BELT
+    slotGroup: SecondHotbar
+    stripTime: 6
+    uiWindowPos: 3,1
+    strippingWindowPos: 1,5
+    displayName: Belt
+    whitelist:
+      tags:
+        - Kangaroo
+
+  - name: pocket1
+    slotTexture: pocket
+    slotFlags: POCKET
+    slotGroup: MainHotbar
+    stripTime: 3
+    uiWindowPos: 2,3
+    strippingWindowPos: 1,4
+    displayName: Pouch
+    stripHidden: true
+
+- type: inventoryTemplate
+  id: spacekangaroo
+  slots:
+  - name: pocket1
+    slotTexture: pocket
+    slotFlags: POCKET
+    slotGroup: MainHotbar
+    stripTime: 3
+    uiWindowPos: 2,3
+    strippingWindowPos: 1,4
+    displayName: Pouch
+    stripHidden: true
+
+  - name: gloves
+    slotTexture: gloves
+    slotFlags: GLOVES
+    uiWindowPos: 2,2
+    strippingWindowPos: 2,2
+    displayName: Gloves
+    whitelist:
+      tags:
+        - Kangaroo

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -178,3 +178,8 @@
   innerclothingskirt: ClothingUniformJumpsuitColorBrown
   satchel: ClothingBackpackDuffelCBURN
   duffelbag: ClothingBackpackDuffelCBURN
+
+- type: startingGear
+  id: BoxingKangarooGear
+  equipment:
+    gloves: ClothingHandsGlovesBoxingBlue

Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml

@@ -8,6 +8,7 @@
   supervisors: job-supervisors-hop
   access:
   - Service
+  - Maintenance
 
 - type: startingGear
   id: BoxerGear
@@ -17,6 +18,8 @@
     id: BoxerPDA
     ears: ClothingHeadsetService
     gloves: ClothingHandsGlovesBoxingRed
+    shoes: ClothingShoesColorRed
+    belt: ClothingBeltChampion
   innerclothingskirt: UniformShortsRedWithTop
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/SoundCollections/bike_horn.yml

@@ -13,3 +13,7 @@
   files:
   - /Audio/Items/desk_bell_ring.ogg
 
+- type: soundCollection
+  id: BoxingBell
+  files:
+  - /Audio/Weapons/boxingbell.ogg

Resources/Prototypes/SoundCollections/footsteps.yml

@@ -142,3 +142,8 @@
   - /Audio/Effects/Footsteps/woodbarefoot3.ogg
   - /Audio/Effects/Footsteps/woodbarefoot4.ogg
   - /Audio/Effects/Footsteps/woodbarefoot5.ogg
+
+- type: soundCollection
+  id: FootstepBounce
+  files:
+  - /Audio/Effects/Footsteps/bounce.ogg

Resources/Prototypes/Voice/speech_emote_sounds.yml

@@ -152,3 +152,10 @@
     path: /Audio/Animals/cerberus.ogg
     params:
       variation: 0.125
+
+- type: emoteSounds
+  id: Kangaroo
+  sound:
+    path: /Audio/Animals/kangaroo_grunt.ogg
+    params:
+      variation: 0.125

Resources/Prototypes/tags.yml

@@ -347,6 +347,10 @@
 - type: Tag
   id: Katana
 
+- type: Tag
+  id: Kangaroo
+
+
 - type: Tag
   id: KeyedInstrument
 

Resources/Textures/Clothing/Belt/champion.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-BELT",
       "directions": 4
     },
+    {
+      "name": "equipped-BELT-kangaroo",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-kangaroo",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-kangaroo",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-kangaroo",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json

@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-kangaroo",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Mask/breath.rsi/meta.json

@@ -1 +1,70 @@
-{"version":1,"license":"CC-BY-SA-3.0","copyright":"Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e","size":{"x":32,"y":32},"states":[{"name":"icon"},{"name":"equipped-MASK","directions":4},{"name":"inhand-left","directions":4},{"name":"inhand-right","directions":4},{"name":"equipped-MASK-dog","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-puppy","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-fox","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-cat","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-sloth","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-possum","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-vox","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-MASK-pig","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"up-equipped-MASK","directions":4}]}
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "up-equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-dog",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-puppy",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-fox",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-cat",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-sloth",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-possum",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-vox",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-pig",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-hamster",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-kangaroo",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Mask/medical.rsi/meta.json

@@ -34,6 +34,16 @@
       "name": "equipped-MASK-sloth",
       "directions": 4
     },
+    {
+      "name": "equipped-MASK-hamster",
+      "directions": 4,
+      "delays": [[1.0], [1.0], [1.0], [1.0]]
+    },
+    {
+      "name": "equipped-MASK-kangaroo",
+      "directions": 4,
+      "delays": [[1.0], [1.0], [1.0], [1.0]]
+    },
     {
       "name": "equipped-MASK-possum",
       "directions": 4

Resources/Textures/Mobs/Animals/kangaroo.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/austation/austation/tree/30f0ba9c2dab3ec8e55ab6fae03bde1566a154ca",
+  "copyright": "Taken from https://github.com/austation/austation/tree/30f0ba9c2dab3ec8e55ab6fae03bde1566a154ca, space kangaroo made by and kangaroo modified by brainfood1183 (github)",
   "states": [
     {
       "name": "kangaroo",
@@ -15,16 +15,45 @@
       "name": "kangaroo-dead"
     },
     {
-      "name": "kangaroo-boxing",
+      "name": "kangaroo-crit"
-      "directions": 4
     },
     {
-      "name": "kangaroo-boxing-dead"
+      "name": "kangaroo-space-crit"
     },
     {
       "name": "kangaroo-space",
       "directions": 4
     },
+    {
+      "name": "glow",
+      "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
+        ]
+      ]
+    },
     {
       "name": "kangaroo-space-dead"
     }

Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json

@@ -39,6 +39,16 @@
       "directions": 4,
       "delays": [[1],[1],[1],[1]]
     },
+    {
+      "name": "equipped-SUITSTORAGE-hamster",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-kangaroo",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
     {
       "name": "equipped-SUITSTORAGE-possum",
       "directions": 4,

Resources/Textures/Objects/Tanks/emergency.rsi/meta.json

@@ -19,6 +19,11 @@
       "directions": 4,
       "delays": [[1],[1],[1],[1]]
     },
+    {
+      "name": "equipped-SUITSTORAGE-kangaroo",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
     {
       "name": "equipped-SUITSTORAGE-puppy",
       "directions": 4,
@@ -49,6 +54,11 @@
       "directions": 4,
       "delays": [[1],[1],[1],[1]]
     },
+    {
+      "name": "equipped-SUITSTORAGE-hamster",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json

@@ -39,6 +39,16 @@
       "directions": 4,
       "delays": [[1],[1],[1],[1]]
     },
+    {
+      "name": "equipped-SUITSTORAGE-hamster",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-kangaroo",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
     {
       "name": "equipped-SUITSTORAGE-possum",
       "directions": 4,

Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json

@@ -39,6 +39,16 @@
       "directions": 4,
       "delays": [[1],[1],[1],[1]]
     },
+    {
+      "name": "equipped-SUITSTORAGE-hamster",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-kangaroo",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
     {
       "name": "equipped-SUITSTORAGE-possum",
       "directions": 4,

Resources/Textures/Objects/Tanks/generic.rsi/meta.json

@@ -39,6 +39,16 @@
       "directions": 4,
       "delays": [[1],[1],[1],[1]]
     },
+    {
+      "name": "equipped-SUITSTORAGE-hamster",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-kangaroo",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
     {
       "name": "equipped-SUITSTORAGE-possum",
       "directions": 4,

Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json

@@ -39,6 +39,16 @@
       "directions": 4,
       "delays": [[1],[1],[1],[1]]
     },
+    {
+      "name": "equipped-SUITSTORAGE-hamster",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-kangaroo",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
     {
       "name": "equipped-SUITSTORAGE-possum",
       "directions": 4,

Resources/Textures/Objects/Tanks/red.rsi/meta.json

@@ -39,6 +39,16 @@
       "directions": 4,
       "delays": [[1],[1],[1],[1]]
     },
+    {
+      "name": "equipped-SUITSTORAGE-hamster",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-kangaroo",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
     {
       "name": "equipped-SUITSTORAGE-possum",
       "directions": 4,

Resources/Textures/Objects/Tanks/yellow.rsi/meta.json

@@ -34,6 +34,16 @@
       "directions": 4,
       "delays": [[1],[1],[1],[1]]
     },
+    {
+      "name": "equipped-SUITSTORAGE-hamster",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
+    {
+      "name": "equipped-SUITSTORAGE-kangaroo",
+      "directions": 4,
+      "delays": [[1],[1],[1],[1]]
+    },
     {
       "name": "equipped-SUITSTORAGE-sloth",
       "directions": 4,

Resources/Textures/Structures/Wallmounts/bell.rsi/meta.json

@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by brainfood1183 (github) for ss14",
+  "states": [
+    {
+      "name": "bell",
+      "directions": 4
+    }
+  ]
+}