Trooper Uniform and Hat (#31997)

* Adds entities, sprites, and loadout accessibility

* Fixing Uniform file issues

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 02275d5a2f2e632be48c0fb544746bb634fcd644..c2e921bcbf21d92dd05ea5905bda45ef2907ff22 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -58,6 +58,21 @@
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSecurityTrooper
+  name: trooper hat
+  description: A campaign hat for the Nanotrasen Troopers, comes with a case too, but you lost it.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/security_trooper_hat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/security_trooper_hat.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatCasa

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 8a265c58114416c3ee11c5745d4b88db8bf5857c..a3ffc5952a0f946b742d418360a4875addb61781 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -634,6 +634,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi
 
+- type: entity
+  parent: [ClothingUniformBase, BaseRestrictedContraband]
+  id: ClothingUniformSecurityTrooper
+  name: trooper uniform
+  description: A formal uniform issued to the Nanotrasen Troopers, usually it comes with a car.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/security_trooper.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/security_trooper.rsi
+
 - type: entity
   parent: [ClothingUniformBase, BaseRestrictedContraband]
   id: ClothingUniformJumpsuitWarden

diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
index e479d822dd26600827a34d5b20c354928cbf823c..6cc0dedf722dc03476a00831857b0a5de072008f 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -39,6 +39,11 @@
   equipment:
     head: ClothingHeadHatBeretSecurity
 
+- type: loadout
+  id: TrooperHat
+  equipment:
+    head: ClothingHeadHatSecurityTrooper
+
 # Jumpsuit
 - type: loadout
   id: SecurityJumpsuit
@@ -60,6 +65,11 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtSecGrey
 
+- type: loadout
+  id: TrooperUniform
+  equipment: 
+    jumpsuit: ClothingUniformSecurityTrooper
+
 - type: loadout
   id: SeniorOfficerJumpsuit
   effects:

diff --git a/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..e2415d4
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/icon.png
new file mode 100644 (file)
index 0000000..ed64010
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..1bb0b35
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..a0a36dc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/meta.json
new file mode 100644 (file)
index 0000000..187e5b7
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by DieselMohawk for use in ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644 (file)
index 0000000..fec358a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING-monkey.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..59fdc6a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/icon.png
new file mode 100644 (file)
index 0000000..6da7236
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..4899fb6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..7a4841f
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/meta.json
new file mode 100644 (file)
index 0000000..ffbdd2c
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by DieselMohawk for use in ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}