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

Resources/Locale/en-US/materials/materials.ftl

@@ -22,6 +22,7 @@ materials-uranium = uranium
 materials-bananium = bananium
 materials-meat = meat
 materials-web = silk
+materials-bones = bone
 
 # Material Reclaimer
 material-reclaimer-upgrade-process-rate = process rate

Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml

@@ -41,6 +41,8 @@
     ClothingUniformJumpsuitKimono: 1
     ClothingHeadHatCasa: 1
     ClothingHeadHatHairflower: 1
+    ClothingHeadHatGladiator: 1
+    ClothingUniformJumpsuitGladiator: 1
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingOuterDogi: 1

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -777,3 +777,14 @@
     - ClothMade
     - WhitelistChameleon
     - HamsterWearable
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatGladiator
+  name: Gladiator helmet
+  description: Protects the head from harsh ash winds and toy spears.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/gladiator.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/gladiator.rsi

Resources/Prototypes/Entities/Clothing/Head/helmets.yml

@@ -336,3 +336,18 @@
     sprite: Clothing/Head/Helmets/ert_janitor.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/ert_janitor.rsi
+
+#Bone Helmet
+- type: entity
+  parent: ClothingHeadHelmetBasic
+  id: ClothingHeadHelmetBone
+  name: bone helmet
+  description: Cool-looking helmet made of skull of your enemies.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/bone_helmet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/bone_helmet.rsi
+  - type: Construction
+    graph: BoneHelmet
+    node: helmet

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -255,3 +255,28 @@
   - type: ExplosionResistance
     damageCoefficient: 0.5
   - type: GroupExamine
+
+- type: entity
+  parent: ClothingOuterBaseLarge
+  id: ClothingOuterArmorBone
+  name: bone armor
+  description: Sits on you like a second skin.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/bone_armor.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Armor/bone_armor.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6
+        Slash: 0.8
+        Piercing: 0.4
+  - type: ClothingSpeedModifier
+    walkModifier: 0.8
+  - type: ExplosionResistance
+    damageCoefficient: 0.4
+  - type: GroupExamine
+  - type: Construction
+    graph: BoneArmor
+    node: armor

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -1312,3 +1312,14 @@
     sprite: Clothing/Uniforms/Jumpsuit/loungewear.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/loungewear.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitGladiator
+  name: gladiator uniform
+  description: Made for true gladiators (or Ash Walkers).
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi

Resources/Prototypes/Entities/Objects/Materials/materials.yml

@@ -534,3 +534,44 @@
     count: 1
   - type: Item
     size: 1
+
+- type: entity
+  parent: MaterialBase
+  id: MaterialBones
+  name: bones
+  suffix: Full
+  components:
+  - type: Stack
+    stackType: Bones
+    baseLayer: base
+    layerStates:
+    - bones
+    - bones_2
+    - bones_3
+  - type: Sprite
+    state: cotton_3
+    layers:
+    - state: cotton_3
+      map: ["base"]
+  - type: Appearance
+  - type: Item
+    size: 30
+  - type: Food
+  - type: BadFood
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: Vitamin
+          Quantity: 3
+
+- type: entity
+  parent: MaterialBones
+  id: MaterialBones1
+  suffix: 1
+  components:
+  - type: Stack
+    count: 1
+  - type: Item
+    size: 1

Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml

@@ -166,3 +166,14 @@
         Radiation: 9
   - type: Construction
     graph: SpearUranium
+
+- type: entity
+  name: bone spear
+  parent: Spear
+  id: SpearBone
+  description: A spear made of bones.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/bone_spear.rsi
+  - type: Construction
+    graph: SpearBone

Resources/Prototypes/Reagents/Materials/materials.yml

@@ -91,3 +91,11 @@
   icon: { sprite: Objects/Materials/silk.rsi, state: icon }
   color: "#eeeeee" #eeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
   price: 0 # Maybe better for it to be priceless, knowing how greedy cargo is.
+
+- type: material
+  id: Bones
+  name: materials-bones
+  unit: materials-unit-piece
+  icon: { sprite: Objects/Materials/materials.rsi, state: bones }
+  color: "#896f5e"
+  price: 0

Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml

@@ -0,0 +1,27 @@
+- type: constructionGraph
+  id: BoneArmor
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: armor
+      steps:
+      - material: Bones
+        amount: 6
+        doAfter: 2
+  - node: armor
+    entity: ClothingOuterArmorBone
+
+- type: constructionGraph
+  id: BoneHelmet
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: helmet
+      steps:
+      - material: Bones
+        amount: 4
+        doAfter: 1
+  - node: helmet
+    entity: ClothingHeadHelmetBone

Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml

@@ -89,3 +89,20 @@
               doAfter: 1
     - node: spear
       entity: SpearUranium
+
+- type: constructionGraph
+  id: SpearBone
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: spear
+          steps:
+            - material: Bones
+              amount: 4
+              doAfter: 2
+            - material: WebSilk
+              amount: 1
+              doAfter: 1
+    - node: spear
+      entity: SpearBone

Resources/Prototypes/Recipes/Construction/clothing.yml

@@ -8,3 +8,25 @@
   description: A modified hardsuit fit for a clown.
   icon: { sprite: Clothing/OuterClothing/Hardsuits/clown.rsi, state: icon }
   objectType: Item
+
+- type: construction
+  name: bone armor
+  id: BoneArmor
+  graph: BoneArmor
+  startNode: start
+  targetNode: armor
+  category: construction-category-clothing
+  description: Armor made of bones.
+  icon: { sprite: Clothing/OuterClothing/Armor/bone_armor.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: bone helmet
+  id: BoneHelmet
+  graph: BoneHelmet
+  startNode: start
+  targetNode: helmet
+  category: construction-category-clothing
+  description: Helmet made of bones.
+  icon: { sprite: Clothing/Head/Helmets/bone_helmet.rsi, state: icon }
+  objectType: Item

Resources/Prototypes/Recipes/Construction/weapons.yml

@@ -140,3 +140,14 @@
   description: A shoddily constructed bow made out of wood and cloth. It's not much, but it's gotten the job done for millennia.
   icon: { sprite: Objects/Weapons/Guns/Bow/bow.rsi, state: unwielded }
   objectType: Item
+
+- type: construction
+  name: bone spear
+  id: SpearBone
+  graph: SpearBone
+  startNode: start
+  targetNode: spear
+  category: construction-category-weapons
+  description: Bones and silk combined together.
+  icon: { sprite: Objects/Weapons/Melee/bone_spear.rsi, state: spear }
+  objectType: Item

Resources/Prototypes/Stacks/Materials/materials.yml

@@ -77,3 +77,11 @@
   spawn: MaterialWebSilk1
   maxCount: 50
   itemSize: 1
+
+- type: stack
+  id: Bones
+  name: bones
+  icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bones}
+  spawn: MaterialBones1
+  maxCount: 30
+  itemSize: 1

Resources/Textures/Clothing/Head/Hats/gladiator.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "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-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "direction": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Head/Helmets/bone_helmet.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "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-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "direction": 4
+    }
+  ]
+}

Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "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-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/gladiator.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/46166/commits/b4b1dde442978f9d85d534437a32e5f2fbc3e89e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Materials/materials.rsi/meta.json

@@ -141,6 +141,15 @@
     {
       "name": "wood-inhand-right",
       "directions": 4
+    },
+    {
+      "name": "bones"
+    },
+    {
+      "name": "bones_2"
+    },
+    {
+      "name": "bones_3"
     }
   ]
 }

Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/meta.json

@@ -0,0 +1,34 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "spear"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+        "name": "wielded-inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-right",
+        "directions": 4
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    }
+  ]
+}