git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
	Mon, 24 Apr 2023 02:31:07 +0000 (03:31 +0100)
committer	GitHub <noreply@github.com>
	Mon, 24 Apr 2023 02:31:07 +0000 (20:31 -0600)
commit	4d2a558977762193a54a72927881d65b857dcca0
tree	cdc019e8e32b098ada468904f539639f88c9e38f	tree \| snapshot
parent	4dd928d9f5b52472351e19400eca063eb99dfc2a	commit \| diff

[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

79 files changed:

Resources/Audio/Animals/kangaroo_grunt.ogg	[new file with mode: 0644]	blob
Resources/Audio/Animals/license.txt		diff \| blob \| history
Resources/Audio/Effects/Footsteps/attributions.yml		diff \| blob \| history
Resources/Audio/Effects/Footsteps/bounce.ogg	[new file with mode: 0644]	blob
Resources/Locale/en-US/accent/accents.ftl		diff \| blob \| history
Resources/Locale/en-US/prototypes/catalog/cargo/cargo-livestock.ftl		diff \| blob \| history
Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl		diff \| blob \| history
Resources/Prototypes/Accents/full_replacements.yml		diff \| blob \| history
Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml		diff \| blob \| history
Resources/Prototypes/Catalog/Fills/Crates/npc.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Belt/belts.yml		diff \| blob \| history
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml		diff \| blob \| history
Resources/Prototypes/Entities/Markers/Spawners/mobs.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/pets.yml		diff \| blob \| history
Resources/Prototypes/Entities/Mobs/NPCs/space.yml	[moved from Resources/Prototypes/Entities/Mobs/NPCs/bear.yml with 51% similarity]	diff \| blob \| history
Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml	[new file with mode: 0644]	blob
Resources/Prototypes/InventoryTemplates/kangaroo_inventory_template.yml	[new file with mode: 0644]	blob
Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml		diff \| blob \| history
Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml		diff \| blob \| history
Resources/Prototypes/SoundCollections/bike_horn.yml		diff \| blob \| history
Resources/Prototypes/SoundCollections/footsteps.yml		diff \| blob \| history
Resources/Prototypes/Voice/speech_emote_sounds.yml		diff \| blob \| history
Resources/Prototypes/tags.yml		diff \| blob \| history
Resources/Textures/Clothing/Belt/champion.rsi/equipped-BELT-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Clothing/Belt/champion.rsi/meta.json		diff \| blob \| history
Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/equipped-HAND-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingblue.rsi/meta.json		diff \| blob \| history
Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/equipped-HAND-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Clothing/Hands/Gloves/Boxing/boxinggreen.rsi/meta.json		diff \| blob \| history
Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/equipped-HAND-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingred.rsi/meta.json		diff \| blob \| history
Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/equipped-HAND-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Clothing/Hands/Gloves/Boxing/boxingyellow.rsi/meta.json		diff \| blob \| history
Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-hamster.png	[new file with mode: 0644]	blob
Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Clothing/Mask/breath.rsi/meta.json		diff \| blob \| history
Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-hamster.png	[new file with mode: 0644]	blob
Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Clothing/Mask/medical.rsi/meta.json		diff \| blob \| history
Resources/Textures/Mobs/Animals/hamster.rsi/hamster-0.png		diff \| blob \| history
Resources/Textures/Mobs/Animals/kangaroo.rsi/glow.png	[new file with mode: 0644]	blob
Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-boxing-dead.png	[deleted file]	blob \| history
Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-boxing.png	[deleted file]	blob \| history
Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-crit.png	[new file with mode: 0644]	blob
Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-dead.png		diff \| blob \| history
Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space-crit.png	[new file with mode: 0644]	blob
Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space-dead.png		diff \| blob \| history
Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo-space.png		diff \| blob \| history
Resources/Textures/Mobs/Animals/kangaroo.rsi/kangaroo.png		diff \| blob \| history
Resources/Textures/Mobs/Animals/kangaroo.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-hamster.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-hamster.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/emergency.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-hamster.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-hamster.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-hamster.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/generic.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-hamster.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-hamster.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/red.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-hamster.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/yellow.rsi/equipped-SUITSTORAGE-kangaroo.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Tanks/yellow.rsi/meta.json		diff \| blob \| history
Resources/Textures/Structures/Wallmounts/bell.rsi/bell.png	[new file with mode: 0644]	blob
Resources/Textures/Structures/Wallmounts/bell.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Structures/Wallmounts/metamap.rsi/meta.json		diff \| blob \| history

Форк Space Station 14 с переводами на русский

RSS Atom