[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

diff --git a/Resources/Audio/Animals/kangaroo_grunt.ogg b/Resources/Audio/Animals/kangaroo_grunt.ogg
new file mode 100644 (file)
index 0000000..e3cb4c3
Binary files /dev/null and b/Resources/Audio/Animals/kangaroo_grunt.ogg differ

diff --git a/Resources/Audio/Animals/license.txt b/Resources/Audio/Animals/license.txt
index 70a76ec2cf79e6d23fc428a10a4bf895536119f0..ea1ba5fbda4013f8ffa04374be9959bc3143fc80 100644 (file)
--- a/Resources/Audio/Animals/license.txt
+++ b/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.

diff --git a/Resources/Audio/Effects/Footsteps/attributions.yml b/Resources/Audio/Effects/Footsteps/attributions.yml
index 4126037a06e0675e90607cb24cbf00575c1da584..14419542ddbb937caf6537c7851bb294b37fd444 100644 (file)
--- a/Resources/Audio/Effects/Footsteps/attributions.yml
+++ b/Resources/Audio/Effects/Footsteps/attributions.yml
@@ -6,10 +6,16 @@
   license: "CC-BY-SA-3.0"
   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
   license: "CC-BY-SA-3.0"
   copyright: "Made and posted by GentleJester#8754 on the SS14 discord."
-  source: "https://discord.com/channels/310555209753690112/311537926376783886/1097222920813674527"
\ No newline at end of file
+  source: "https://discord.com/channels/310555209753690112/311537926376783886/1097222920813674527"

diff --git a/Resources/Audio/Effects/Footsteps/bounce.ogg b/Resources/Audio/Effects/Footsteps/bounce.ogg
new file mode 100644 (file)
index 0000000..62a681a
Binary files /dev/null and b/Resources/Audio/Effects/Footsteps/bounce.ogg differ

diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl
index 393311e56775b7f9c6894b8178f364cfc6e99f6a..244310437a5e64f6bd4334981046757687293a79 100644 (file)
--- a/Resources/Locale/en-US/accent/accents.ftl
+++ b/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!

diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-livestock.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-livestock.ftl
index a5a40001d127d7f1da3b42158e09d9d71bb2a9b9..f2c9362c0dba829cab33607bb32a25e90610dd9b 100644 (file)
--- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-livestock.ftl
+++ b/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 }

diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl
index 8c0555ed67365cd2b4efba6358e6673ff693aff6..2b8427fed99b853ca1b3746dd9835b9214490ff6 100644 (file)
--- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl
+++ b/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.
\ No newline at end of file

diff --git a/Resources/Prototypes/Accents/full_replacements.yml b/Resources/Prototypes/Accents/full_replacements.yml
index 45ce49d6537e054c24f0221ef477ea4a0689776c..659c2aab8970056c2770cec1bbb7723b60e5c67c 100644 (file)
--- a/Resources/Prototypes/Accents/full_replacements.yml
+++ b/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

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index 8af8d827276b8d93f79e0007d01102724455fbc1..cfb1c95db0597e0d150e0bbd69b78fe0d59d6946 100644 (file)
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/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

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
index 6587da5841af677f50d38e0e5ad93463980ef249..ee34d5d3b11e30ecf89e0ce79732f1d79bf39e6b 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml
+++ b/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

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 08735b9e511a9464c69e0dd27a083db730a07180..9c0d1058f8ad5e39aa69c39508376a0a3baa27dc 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/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

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index a9f9a8e2931e34355dbfb4320275170f41504eee..6c7f15577aef24cbd39d9f511c60db63edcd57bf 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/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

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
index d084a4065a2a750470b4b43c720e5fdde2adc2fc..8ba42ef982e345b8cbdac228bccb56a8e789009b 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
+++ b/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

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index e4347d429e5562c598d7a3e5dd898111ace6a672..c3ec6edb3e6adec9507a26967388a94cfbe5ba96 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/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

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index c3f46b3a6ec08222b5617f5c14e922cb0e8d217b..f04be369546b32a54a0e466cd7ac37f8ad74fca6 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/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
-    baseSprintSpeed: 6
+    baseWalkSpeed: 3.5
+    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
-  description: A large marsupial herbivore. It has powerful hind legs and... boxing gloves?
+  id: MobBoxingKangaroo
   components:
-  - type: CombatMode
-  - type: Sprite
-    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: Loadout
+    prototypes: [ BoxingKangarooGear ]
   - 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
 

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index e2e1a0a34cc519d3fb1218c250a1475db9d799f5..cc84f9d7bee0153425c568b5b12d73f4df199df5 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/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 ]

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
similarity index 51%
rename from Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
rename to Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 7af585c69a835372273fc259fc6a08de463914bc..2968b53ce0550d6dffe021f67411087c33b8a3c5 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/bear.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -1,7 +1,8 @@
 - type: entity
-  name: space bear
-  id: MobBearSpace
+  name: basic
+  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

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
new file mode 100644 (file)
index 0000000..e10baa2
--- /dev/null
+++ b/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

diff --git a/Resources/Prototypes/InventoryTemplates/kangaroo_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/kangaroo_inventory_template.yml
new file mode 100644 (file)
index 0000000..775c5ac
--- /dev/null
+++ b/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

diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index 71e001d640bab9f0856d71cbb15d726340171dcf..a6ed83bdf6f1b1f7a8d89919ffd3b0099469890c 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/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

diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
index abbfc39865e8e20042dece0b97c2a96229a81210..a2b7ff1d9585c80653c98bf342eaeabe8e096aab 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml
+++ b/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

diff --git a/Resources/Prototypes/SoundCollections/bike_horn.yml b/Resources/Prototypes/SoundCollections/bike_horn.yml
index e7e33ca725d133aba01995e46c774843bd024ee0..00c9eb585df84c8094bf8a1ac3311e934d0f034d 100644 (file)
--- a/Resources/Prototypes/SoundCollections/bike_horn.yml
+++ b/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

diff --git a/Resources/Prototypes/SoundCollections/footsteps.yml b/Resources/Prototypes/SoundCollections/footsteps.yml
index 79798e7b05f4c9eb5f041f08b62a2a48668ed19a..f3275eb66e0aa264133d7f1331fb1624382dae76 100644 (file)
--- a/Resources/Prototypes/SoundCollections/footsteps.yml
+++ b/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

diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index cb63c7b297e725db03113b361f0aa33da8c59916..67b3c23e0570168ee1b7851f649ec4f2f62c57d9 100644 (file)
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/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

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index f80c8482e86ac62dab2387a2df30294d907dcf2a..f549352e3d464af548cc4cb7992b0a6fe7e58b20 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -347,6 +347,10 @@
 - type: Tag
   id: Katana
 
+- type: Tag
+  id: Kangaroo
+
+
 - type: Tag
   id: KeyedInstrument
 

diff --git a/Resources/Textures/Clothing/Belt/champion.rsi/equipped-BELT-kangaroo.png b/Resources/Textures/Clothing/Belt/champion.rsi/equipped-BELT-kangaroo.png
new file mode 100644 (file)
index 0000000..e20c205
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/champion.rsi/equipped-BELT-kangaroo.png differ

diff --git a/Resources/Textures/Clothing/Belt/champion.rsi/meta.json b/Resources/Textures/Clothing/Belt/champion.rsi/meta.json
index a01a9c6cb9bd416d69748c299103a15ff9b2c53f..95d302cc2d6a5f7da0c39823ef6f974a19b80dca 100644 (file)
--- a/Resources/Textures/Clothing/Belt/champion.rsi/meta.json
+++ b/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

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/equipped-HAND-kangaroo.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/equipped-HAND-kangaroo.png
new file mode 100644 (file)
index 0000000..eba8266
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/equipped-HAND-kangaroo.png differ

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json
index 88e3ebd509d64a8b12d6635517ecdf0bdea931e8..0bb50af2c7b33220332d00f2761355dbec98fa0f 100644 (file)
--- a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json
+++ b/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

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/equipped-HAND-kangaroo.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/equipped-HAND-kangaroo.png
new file mode 100644 (file)
index 0000000..bee235e
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/equipped-HAND-kangaroo.png differ

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json
index 88e3ebd509d64a8b12d6635517ecdf0bdea931e8..0bb50af2c7b33220332d00f2761355dbec98fa0f 100644 (file)
--- a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json
+++ b/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

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/equipped-HAND-kangaroo.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/equipped-HAND-kangaroo.png
new file mode 100644 (file)
index 0000000..ac87575
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/equipped-HAND-kangaroo.png differ

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json
index 88e3ebd509d64a8b12d6635517ecdf0bdea931e8..0bb50af2c7b33220332d00f2761355dbec98fa0f 100644 (file)
--- a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json
+++ b/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

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/equipped-HAND-kangaroo.png b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/equipped-HAND-kangaroo.png
new file mode 100644 (file)
index 0000000..a799270
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/equipped-HAND-kangaroo.png differ

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json
index 88e3ebd509d64a8b12d6635517ecdf0bdea931e8..0bb50af2c7b33220332d00f2761355dbec98fa0f 100644 (file)
--- a/Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json
+++ b/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

diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-hamster.png
new file mode 100644 (file)
index 0000000..5fdc96e
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-hamster.png differ

diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-kangaroo.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-kangaroo.png
new file mode 100644 (file)
index 0000000..040380d
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-kangaroo.png differ

diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json
index ce59e8bdae88e8c9d7d9a93750c4f7af6a76be3b..01d110843049bf91f7a0e52583e3249f286dbd10 100644 (file)
--- a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json
+++ b/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
+    }
+  ]
+}

diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-hamster.png
new file mode 100644 (file)
index 0000000..5fdc96e
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-hamster.png differ

diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-kangaroo.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-kangaroo.png
new file mode 100644 (file)
index 0000000..040380d
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-kangaroo.png differ

diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json
index 538fca3fd426b4d24224b4d707ac1b79357865d8..ce7886d06c2da1d3ec5ddcb1845718a99f29b3d3 100644 (file)
--- a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json
+++ b/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

diff --git a/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-0.png b/Resources/Textures/Mobs/Animals/hamster.rsi/hamster-0.png
index 665d695451f80a261806e695d414a8905431fef5..2c783a540c900fb80fcd231cb57168417fcf3776 100644 (file)
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/kangaroo.rsi/glow.png b/Resources/Textures/Mobs/Animals/kangaroo.rsi/glow.png
new file mode 100644 (file)
index 0000000..a50d0f7
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/kangaroo.rsi/glow.png differ

diff --git a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-boxing-dead.png b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-boxing-dead.png
deleted file mode 100644 (file)
index 198af94..0000000
Binary files a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-boxing-dead.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-boxing.png b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-boxing.png
deleted file mode 100644 (file)
index 86aec9b..0000000
Binary files a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-boxing.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-crit.png b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-crit.png
new file mode 100644 (file)
index 0000000..21714ef
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-crit.png differ

diff --git a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-dead.png b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-dead.png
index e9300857090921de3313eee6538662a9490eb37c..74d7257b5cc0569451e150af7f449c9a9eb4ed1c 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-dead.png and b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-dead.png differ

diff --git a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space-crit.png b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space-crit.png
new file mode 100644 (file)
index 0000000..b235f4b
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space-crit.png differ

diff --git a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space-dead.png b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space-dead.png
index 3e77bdcef87c4fbe3c63e29ed74050eab385e359..55e4782ac296af9fa1a074f7af5aedba24c41812 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space-dead.png and b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space-dead.png differ

diff --git a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space.png b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space.png
index 061c83e78f376e282e304f373d1a58479b361715..773248294fa919acf06e81b92887f34b6248cbd0 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space.png and b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space.png differ

diff --git a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo.png b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo.png
index 27953ae5f47a296cb937e9b559218897a8d2ef4a..841487fd599211a9baf20eb6d1a8031c636bb61a 100644 (file)
Binary files a/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo.png and b/Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo.png differ

diff --git a/Resources/Textures/Mobs/Animals/kangaroo.rsi/meta.json b/Resources/Textures/Mobs/Animals/kangaroo.rsi/meta.json
index 9861158a37f5d43577e889269d7010b6ff60feb8..494d3300326fd0ede3cb3d0218567cf5206288a8 100644 (file)
--- a/Resources/Textures/Mobs/Animals/kangaroo.rsi/meta.json
+++ b/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",
-      "directions": 4
+      "name": "kangaroo-crit"
     },
     {
-      "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"
     }

diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-hamster.png
new file mode 100644 (file)
index 0000000..de3bba5
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-hamster.png differ

diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-kangaroo.png
new file mode 100644 (file)
index 0000000..20200e7
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-kangaroo.png differ

diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json
index 819d0b14d784427810c2f6c29fb3de5e0e7b984a..bd74448c03c18372a377d6fbeba0a72443cb234d 100644 (file)
--- a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json
+++ b/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,

diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-hamster.png
new file mode 100644 (file)
index 0000000..5263f4c
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-hamster.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-kangaroo.png
new file mode 100644 (file)
index 0000000..eb47f10
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-kangaroo.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json
index 72d63e7737e7636a3c61d3860d0b440cc68eeaef..9dd4186ecdd13f2d91060c0941261b20ed238d5c 100644 (file)
--- a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json
+++ b/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

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
new file mode 100644 (file)
index 0000000..1bd13c2
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-hamster.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-kangaroo.png
new file mode 100644 (file)
index 0000000..266b03c
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-kangaroo.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json
index 72d63e7737e7636a3c61d3860d0b440cc68eeaef..a1661aee78ccb9f0ec34cbe0e5d34f27995c3ca9 100644 (file)
--- a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json
+++ b/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,

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
new file mode 100644 (file)
index 0000000..1bd13c2
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-hamster.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-kangaroo.png
new file mode 100644 (file)
index 0000000..266b03c
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-kangaroo.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json
index 72d63e7737e7636a3c61d3860d0b440cc68eeaef..a1661aee78ccb9f0ec34cbe0e5d34f27995c3ca9 100644 (file)
--- a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json
+++ b/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,

diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-hamster.png
new file mode 100644 (file)
index 0000000..365002a
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-hamster.png differ

diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-kangaroo.png
new file mode 100644 (file)
index 0000000..d86ef07
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-kangaroo.png differ

diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json b/Resources/Textures/Objects/Tanks/generic.rsi/meta.json
index 819d0b14d784427810c2f6c29fb3de5e0e7b984a..bd74448c03c18372a377d6fbeba0a72443cb234d 100644 (file)
--- a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json
+++ b/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,

diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-hamster.png
new file mode 100644 (file)
index 0000000..5263f4c
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-hamster.png differ

diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-kangaroo.png
new file mode 100644 (file)
index 0000000..eb47f10
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-kangaroo.png differ

diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json b/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json
index 819d0b14d784427810c2f6c29fb3de5e0e7b984a..bd74448c03c18372a377d6fbeba0a72443cb234d 100644 (file)
--- a/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json
+++ b/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,

diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-hamster.png
new file mode 100644 (file)
index 0000000..fc306eb
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-hamster.png differ

diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-kangaroo.png
new file mode 100644 (file)
index 0000000..450ebf9
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-kangaroo.png differ

diff --git a/Resources/Textures/Objects/Tanks/red.rsi/meta.json b/Resources/Textures/Objects/Tanks/red.rsi/meta.json
index 819d0b14d784427810c2f6c29fb3de5e0e7b984a..bd74448c03c18372a377d6fbeba0a72443cb234d 100644 (file)
--- a/Resources/Textures/Objects/Tanks/red.rsi/meta.json
+++ b/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,

diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-hamster.png
new file mode 100644 (file)
index 0000000..344b1ac
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-hamster.png differ

diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-kangaroo.png
new file mode 100644 (file)
index 0000000..f44f77d
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-kangaroo.png differ

diff --git a/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json
index 819d0b14d784427810c2f6c29fb3de5e0e7b984a..59ffe2bb895b31a816e34541410d1ca1bf6491fc 100644 (file)
--- a/Resources/Textures/Objects/Tanks/yellow.rsi/meta.json
+++ b/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,

diff --git a/Resources/Textures/Structures/Wallmounts/bell.rsi/bell.png b/Resources/Textures/Structures/Wallmounts/bell.rsi/bell.png
new file mode 100644 (file)
index 0000000..466209d
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/bell.rsi/bell.png differ

diff --git a/Resources/Textures/Structures/Wallmounts/bell.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/bell.rsi/meta.json
new file mode 100644 (file)
index 0000000..6de3b4b
--- /dev/null
+++ b/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
+    }
+  ]
+}

diff --git a/Resources/Textures/Structures/Wallmounts/metamap.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/metamap.rsi/meta.json
index 995bf11545788c3edd81d6958b00e3fd88c206ae..b35b248f0da9397d2be9967ee9cecca204e6ba41 100644 (file)
--- a/Resources/Textures/Structures/Wallmounts/metamap.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/metamap.rsi/meta.json
@@ -9,4 +9,4 @@
     "states": [\r
         { "name": "metamap64x" }\r
     ]\r
-}
\ No newline at end of file
+}\r