Basic equipment for all jobs (#573)

2020-01-29 12:14:35 -06:00
parent b167107c8b
commit 73a9b2af89
99 changed files with 293 additions and 48 deletions
--- a/Resources/Prototypes/Entities/items/clothing/OuterClothing.yml
+++ b/Resources/Prototypes/Entities/items/clothing/OuterClothing.yml
@@ -1843,3 +1843,18 @@
    sprite: Clothing/OuterClothing/xenos.rsi
  - type: Clothing
    sprite: Clothing/OuterClothing/xenos.rsi
+
+- type: entity
+  parent: OuterclothingBase
+  id: OuterclothingHoSTrenchcoat
+  name: Head of Security Trenchcoat
+  description: ''
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
+    state: hos_trenchcoat
+  - type: Icon
+    sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
+    state: hos_trenchcoat
+  - type: Clothing
+    sprite: Clothing/OuterClothing/hos_trenchcoat.rsi
--- a/Resources/Prototypes/Entities/items/clothing/hats.yml
+++ b/Resources/Prototypes/Entities/items/clothing/hats.yml
@@ -298,6 +298,21 @@
    type: Clothing
  parent: HatBase

+- type: entity
+  id: HatBeretHoS
+  name: Beret HoS
+  description: ''
+  components:
+  - sprite: Clothing/Head/beret_hos.rsi
+    type: Sprite
+    state: beret_hos
+  - sprite: Clothing/Head/beret_hos.rsi
+    type: Icon
+    state: beret_hos
+  - sprite: Clothing/Head/beret_hos.rsi
+    type: Clothing
+  parent: HatBase
+
 - type: entity
  id: HatBeretNavyHos
  name: Beret Navy HoS
--- a/Resources/Prototypes/Entities/items/clothing/uniforms.yml
+++ b/Resources/Prototypes/Entities/items/clothing/uniforms.yml
@@ -14,15 +14,15 @@
  description: The jumpsuit for the poor sop with a mop
  components:
  - type: Sprite
-    sprite: Clothing/uniform_janitor.rsi
+    sprite: Clothing/Uniforms/uniform_janitor.rsi
    state: janitor

  - type: Icon
-    sprite: Clothing/uniform_janitor.rsi
+    sprite: Clothing/Uniforms/uniform_janitor.rsi
    state: janitor

  - type: Clothing
-    sprite: Clothing/uniform_janitor.rsi
+    sprite: Clothing/Uniforms/uniform_janitor.rsi

 - type: entity
  parent: UniformBase
@@ -31,15 +31,15 @@
  description: Greytide. Worldwide.
  components:
  - type: Sprite
-    sprite: Clothing/uniform_grey.rsi
+    sprite: Clothing/Uniforms/uniform_grey.rsi
    state: grey

  - type: Icon
-    sprite: Clothing/uniform_grey.rsi
+    sprite: Clothing/Uniforms/uniform_grey.rsi
    state: grey

  - type: Clothing
-    sprite: Clothing/uniform_grey.rsi
+    sprite: Clothing/Uniforms/uniform_grey.rsi


 - type: entity
@@ -48,15 +48,15 @@
  name: Engineering Jumpsuit
  components:
  - type: Sprite
-    sprite: Clothing/uniform_engineering.rsi
+    sprite: Clothing/Uniforms/uniform_engineering.rsi
    state: engine

  - type: Icon
-    sprite: Clothing/uniform_engineering.rsi
+    sprite: Clothing/Uniforms/uniform_engineering.rsi
    state: engine

  - type: Clothing
-    sprite: Clothing/uniform_engineering.rsi
+    sprite: Clothing/Uniforms/uniform_engineering.rsi


 - type: entity
@@ -65,15 +65,15 @@
  name: Assistant Jumpsuit
  components:
  - type: Sprite
-    sprite: Clothing/uniform_assistant.rsi
+    sprite: Clothing/Uniforms/uniform_assistant.rsi
    state: assistant

  - type: Icon
-    sprite: Clothing/uniform_assistant.rsi
+    sprite: Clothing/Uniforms/uniform_assistant.rsi
    state: assistant

  - type: Clothing
-    sprite: Clothing/uniform_assistant.rsi
+    sprite: Clothing/Uniforms/uniform_assistant.rsi

 - type: entity
  parent: UniformBase
@@ -82,15 +82,15 @@
  description: HONK!
  components:
  - type: Sprite
-    sprite: Clothing/uniform_clown.rsi
+    sprite: Clothing/Uniforms/uniform_clown.rsi
    state: icon

  - type: Icon
-    sprite: Clothing/uniform_clown.rsi
+    sprite: Clothing/Uniforms/uniform_clown.rsi
    state: icon

  - type: Clothing
-    sprite: Clothing/uniform_clown.rsi
+    sprite: Clothing/Uniforms/uniform_clown.rsi
    femaleMask: UniformTop

 - type: entity
@@ -100,15 +100,32 @@
  description: A jumpsuit made of strong material, providing robust protection.
  components:
  - type: Sprite
-    sprite: Clothing/uniform_sec.rsi
+    sprite: Clothing/Uniforms/uniform_sec.rsi
    state: icon

  - type: Icon
-    sprite: Clothing/uniform_sec.rsi
+    sprite: Clothing/Uniforms/uniform_sec.rsi
    state: icon

  - type: Clothing
-    sprite: Clothing/uniform_sec.rsi
+    sprite: Clothing/Uniforms/uniform_sec.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformCargoTech
+  name: Cargo Technician Jumpsuit
+  description: Shooooorts! They're comfy and easy to wear!
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_cargotech.rsi
+    state: cargotech
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_cargotech.rsi
+    state: cargotech
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_cargotech.rsi

 - type: entity
  parent: UniformBase
@@ -117,15 +134,15 @@
  description: Can't cook without this.
  components:
  - type: Sprite
-    sprite: Clothing/chef_uniform.rsi
+    sprite: Clothing/Uniforms/uniform_chef.rsi
    state: chef

  - type: Icon
-    sprite: Clothing/chef_uniform.rsi
+    sprite: Clothing/Uniforms/uniform_chef.rsi
    state: chef

  - type: Clothing
-    sprite: Clothing/chef_uniform.rsi
+    sprite: Clothing/Uniforms/uniform_chef.rsi

 - type: entity
  parent: UniformBase
@@ -134,12 +151,131 @@
  description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain".
  components:
  - type: Sprite
-    sprite: Clothing/captain_uniform.rsi
+    sprite: Clothing/Uniforms/uniform_captain.rsi
    state: captain

  - type: Icon
-    sprite: Clothing/captain_uniform.rsi
+    sprite: Clothing/Uniforms/uniform_captain.rsi
    state: captain

  - type: Clothing
-    sprite: Clothing/captain_uniform.rsi
+    sprite: Clothing/Uniforms/uniform_captain.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformHoP
+  name: Head of Personnel Jumpsuit
+  description: It's a jumpsuit worn by someone who works in the position of Head of Personnel.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_hop.rsi
+    state: hop
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_hop.rsi
+    state: hop
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_hop.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformChiefEngineer
+  name: Chief Engineer Jumpsuit
+  description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_ce.rsi
+    state: ce
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_ce.rsi
+    state: ce
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_ce.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformCMO
+  name: Chief Medical Officer Jumpsuit
+  description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_cmo.rsi
+    state: cmo
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_cmo.rsi
+    state: cmo
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_cmo.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformMedicalDoctor
+  name: Medical Doctor Jumpsuit
+  description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_md.rsi
+    state: md
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_md.rsi
+    state: md
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_md.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformScientist
+  name: Scientist Jumpsuit
+  description: It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_scientist.rsi
+    state: scientist
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_scientist.rsi
+    state: scientist
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_scientist.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformResearchDirector
+  name: Research Director Vest Suit
+  description: It's a suit worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_rd.rsi
+    state: rd
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_rd.rsi
+    state: rd
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_rd.rsi
+
+- type: entity
+  parent: UniformBase
+  id: UniformHoS
+  name: Head of Security Jumpsuit
+  description: A security jumpsuit decorated for those few with the dedication to achieve the position of Head of Security.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/uniform_hos.rsi
+    state: hos
+
+  - type: Icon
+    sprite: Clothing/Uniforms/uniform_hos.rsi
+    state: hos
+
+  - type: Clothing
+    sprite: Clothing/Uniforms/uniform_hos.rsi
--- a/Resources/Prototypes/Entities/mobs/human.yml
+++ b/Resources/Prototypes/Entities/mobs/human.yml
@@ -41,14 +41,6 @@
      color: "#e8b59b"
      sprite: Mob/human.rsi
      state: human_l_arm
-    - map: ["enum.HumanoidVisualLayers.LHand"]
-      color: "#e8b59b"
-      sprite: Mob/human.rsi
-      state: human_l_hand
-    - map: ["enum.HumanoidVisualLayers.RHand"]
-      color: "#e8b59b"
-      sprite: Mob/human.rsi
-      state: human_r_hand
    - map: ["enum.HumanoidVisualLayers.RLeg"]
      color: "#e8b59b"
      sprite: Mob/human.rsi
@@ -70,6 +62,15 @@
    - map: ["enum.Slots.INNERCLOTHING"]
      shader: stencilDraw

+    - map: ["enum.HumanoidVisualLayers.LHand"]
+      color: "#e8b59b"
+      sprite: Mob/human.rsi
+      state: human_l_hand
+    - map: ["enum.HumanoidVisualLayers.RHand"]
+      color: "#e8b59b"
+      sprite: Mob/human.rsi
+      state: human_r_hand
+
    - map: ["enum.Slots.IDCARD"]
    - map: ["enum.Slots.GLOVES"]
    - map: ["enum.Slots.SHOES"]
@@ -168,14 +169,6 @@
        color: "#e8b59b"
        sprite: Mob/human.rsi
        state: human_l_arm
-      - map: ["enum.HumanoidVisualLayers.LHand"]
-        color: "#e8b59b"
-        sprite: Mob/human.rsi
-        state: human_l_hand
-      - map: ["enum.HumanoidVisualLayers.RHand"]
-        color: "#e8b59b"
-        sprite: Mob/human.rsi
-        state: human_r_hand
      - map: ["enum.HumanoidVisualLayers.RLeg"]
        color: "#e8b59b"
        sprite: Mob/human.rsi
@@ -195,6 +188,15 @@
      - map: ["enum.Slots.INNERCLOTHING"]
        shader: stencilDraw

+      - map: ["enum.HumanoidVisualLayers.LHand"]
+        color: "#e8b59b"
+        sprite: Mob/human.rsi
+        state: human_l_hand
+      - map: ["enum.HumanoidVisualLayers.RHand"]
+        color: "#e8b59b"
+        sprite: Mob/human.rsi
+        state: human_r_hand
+
      - map: ["enum.Slots.IDCARD"]
      - map: ["enum.Slots.GLOVES"]
      - map: ["enum.Slots.SHOES"]