]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Ash Walker`s spear and uniform (#20292)
authorTunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>
Sun, 24 Sep 2023 19:57:10 +0000 (22:57 +0300)
committerGitHub <noreply@github.com>
Sun, 24 Sep 2023 19:57:10 +0000 (15:57 -0400)
commitee540228320c69d1a5f6cbed16df0c0965c96648
tree2b54afb9c2dd3e866b48dbd18283818d2f191fd8
parent74901b0cb1f6aac10040309575695e29e1b2caf6
Ash Walker`s spear and uniform (#20292)

* bones, gladiators, milk, spear and tears

* :trollface: my copy/paste python script did the funny

* forgor

* fixed

* mat.yml fixed

* bones

* bone armor

* gladiator uniform now in clothesmate like ss13

* bone armor craft

* pieces

* i was dumb in the past, now im dumb too

* that was dumb...

* fixing stuff

* i hate git

* Revert "i hate git"

This reverts commit 17ef4e5a07a3ebad7d4f487f15721d1df16d757f.

* Revert "fixing stuff"

This reverts commit 4fc5d6b2dc1fc6ebb3945bdf5663b8e432ca7aa3.

* this will work?

* i fucking merged it
43 files changed:
Resources/Locale/en-US/materials/materials.ftl
Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
Resources/Prototypes/Entities/Clothing/Head/hats.yml
Resources/Prototypes/Entities/Clothing/Head/helmets.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Resources/Prototypes/Entities/Objects/Materials/materials.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
Resources/Prototypes/Reagents/Materials/materials.yml
Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
Resources/Prototypes/Recipes/Construction/clothing.yml
Resources/Prototypes/Recipes/Construction/weapons.yml
Resources/Prototypes/Stacks/Materials/materials.yml
Resources/Textures/Clothing/Head/Hats/gladiator.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/gladiator.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/gladiator.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/gladiator.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/gladiator.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/bones.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/bones_2.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/bones_3.png [new file with mode: 0644]
Resources/Textures/Objects/Materials/materials.rsi/meta.json
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-BACKPACK.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/spear.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right.png [new file with mode: 0644]