From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Wed, 19 Jun 2024 02:04:03 +0000 (-0500)
Subject: Security Resprite (#29082)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4cf60f805e87775f6dc6151310fa61ccee4ff710;p=space-station-14.git

Security Resprite (#29082)

* security resprite

* hos cap fix

* i forgor

* further fixes

* my furniture is broken

* fedora update
---

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
index 91e45c8391..a67ed9397b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@@ -4,7 +4,8 @@
     ClothingUniformJumpsuitDetective: 2
     ClothingUniformJumpskirtDetective: 2
     ClothingShoesColorBrown: 2
-    ClothingOuterCoatDetectiveLoadout: 2
+    ClothingOuterCoatDetectiveLoadout: 1
+    ClothingOuterCoatDetectiveLoadoutGrey: 1
     ClothingHeadHatFedoraBrown: 2
     ClothingUniformJumpsuitDetectiveGrey: 2
     ClothingUniformJumpskirtDetectiveGrey: 2
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index ca3ba080b7..462b1cb889 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -317,8 +317,8 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatHoshat
-  name: head of security's hat
-  description: "There's a new sheriff in station."
+  name: head of security cap
+  description: The robust standard-issue cap of the Head of Security. For showing the officers who's in charge.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/hoshat.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index b5b969551c..fa937c1ccc 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -10,10 +10,10 @@
     sprite: Clothing/OuterClothing/Coats/bomber.rsi
 
 - type: entity
-  parent: [ClothingOuterStorageBase, AllowSuitStorageClothing]
+  parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ClothingOuterArmorBasic]
   id: ClothingOuterCoatDetective
   name: detective trenchcoat
-  description: A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Wearing it makes you feel for the plight of the Tibetans.
+  description: An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Coats/detective.rsi
@@ -23,13 +23,20 @@
     contents:
     - id: SmokingPipeFilledTobacco
     - id: FlippoEngravedLighter
-  - type: Armor #same as regular sec armor
-    modifiers:
-      coefficients:
-        Blunt: 0.70
-        Slash: 0.70
-        Piercing: 0.70
-        Heat: 0.80
+  - type: ExplosionResistance
+    damageCoefficient: 1 #its a coat. it doesnt do shit
+
+- type: entity
+  parent: [ClothingOuterCoatDetectiveLoadout]
+  id: ClothingOuterCoatDetectiveLoadoutGrey
+  name: noir trenchcoat
+  description: Ah, your trusty coat. There's a few tears here and there, giving it a more timely look. Or at least, that's what you told yourself when you found out gettin' it repaired would set you back 200 speos.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/detective_grey.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/detective_grey.rsi
+
 
 - type: entity
   parent: ClothingOuterCoatDetective
@@ -93,17 +100,6 @@
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
 
-- type: entity
-  parent: ClothingOuterStorageBase
-  id: ClothingOuterCoatInspector
-  name: inspector's coat
-  description: A strict inspector's coat for being intimidating during inspections.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
-
 - type: entity
   parent: ClothingOuterStorageToggleableBase
   id: ClothingOuterCoatJensen
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index ea7b4ea0aa..5ef711556b 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -184,6 +184,20 @@
     sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+      - state: overlay-inhand-left
+        sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
+      right:
+      - state: inhand-right
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+      - state: overlay-inhand-right
+        sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
 
 - type: entity
   parent: ClothingUniformSkirtBase
@@ -377,6 +391,21 @@
     sprite: Clothing/Uniforms/Jumpskirt/security.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/security.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+      - state: overlay-inhand-left
+        sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+      right:
+      - state: inhand-right
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+      - state: overlay-inhand-right
+        sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+
 
 - type: entity
   parent: ClothingUniformSkirtBase
@@ -388,6 +417,21 @@
     sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+      - state: overlay-inhand-left
+        sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+      right:
+      - state: inhand-right
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+      - state: overlay-inhand-right
+        sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+
 
 - type: entity
   parent: ClothingUniformSkirtBase
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index a713530515..a5e57a608d 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -340,6 +340,18 @@
     sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      - state: overlay-inhand-left
+      right:
+      - state: inhand-right
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      - state: overlay-inhand-right
 
 - type: entity
   parent: ClothingUniformBase
@@ -588,6 +600,18 @@
     sprite: Clothing/Uniforms/Jumpsuit/security.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      - state: overlay-inhand-left
+      right:
+      - state: inhand-right
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      - state: overlay-inhand-right
 
 - type: entity
   parent: ClothingUniformBase
@@ -621,6 +645,18 @@
     sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      - state: overlay-inhand-left
+      right:
+      - state: inhand-right
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      - state: overlay-inhand-right
 
 - type: entity
   parent: ClothingUniformBase
diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-hamster.png
deleted file mode 100644
index ca8f4f2411..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-hamster.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
index 36056a0e4e..3eadec710e 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
index da90e4a62e..a7d0e41adb 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png
index 28dc2d9d1d..8c51d5e5b2 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png
index ef3574b017..b1bf119a28 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
index ade65863af..6154f16edd 100644
--- a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy for SS14. icon state made by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,10 +14,6 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "equipped-HELMET-hamster",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png
index 20554f5f2a..64f9a1bd80 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png
index 634dbe744c..95153962ea 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png
index 88f5e5ef93..c6986385b6 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png
index 8c68945d83..15f8738478 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json
index a470e00944..cb460f5efa 100644
--- a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy for space station 14. icon state made by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
deleted file mode 100644
index 8b7692f0ff..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
index f980e7b3ec..d897247c6a 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
index e441011bcf..5c93734fe8 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
index d0213d0eab..78a51140c6 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
index 36d4c7032f..aa51e2962b 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
index 9a2a838962..214d5b0e9e 100644
--- a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99. Inhands made by Flareguy using equipped-HELMET state",
   "size": {
     "x": 32,
     "y": 32
@@ -14,10 +14,6 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "equipped-HELMET-hamster",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png
index 952b32f3a1..1f6b8adceb 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
index 3264d3cde6..af6fbcd77e 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
index a2892255be..55eaa9ed57 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
index 9640ec825f..cd3dc7f557 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
index abfed0635a..292dc9c993 100644
--- a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb. Vox state by Flareguy for SS14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
index 703d927ecf..47a6bfb145 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
index 4fd9f44ff2..fd0c4dd25d 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
index f8f7501afc..2ddfc4379f 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
index a8bbe3dfac..ff0b6b723b 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png
deleted file mode 100644
index e1ed2d59ae..0000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png
deleted file mode 100644
index 634828f1b3..0000000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
index a0653e5c65..20fb373db6 100644
--- a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for SS14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -18,14 +18,6 @@
       "name": "equipped-HELMET-vox",
       "directions": 4
     },
-    {
-      "name": "light-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "lighton-equipped-HELMET",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png
index 1ed974c206..e13fb42099 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png
index 030107f05e..770a9c020d 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png
index c334355ba8..27ce818b8e 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png
index 423f3fe52e..9316e65d1c 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json
index f505b4e75e..20fb373db6 100644
--- a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites & vox state by Flareguy",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png
index e228a8a33a..31bb5b7ada 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png
index 6c958708c8..194c17066d 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png
index e0ab815b50..2932481da1 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json
index a0bf954585..20fb373db6 100644
--- a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites by Flareguy, icon edited by Flareguy. Vox state taken from from Paradise at https://github.com/ParadiseSS13/Paradise/blob/b1658390731745adf5cc9fb039bb0f17ad3c11a7/icons/mob/clothing/species/vox/helmet.dmi ",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..2fc3e13a20
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
index 24481b1f74..4cd72c8e3c 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
index ed3481d3d2..661741d790 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
index 9f79738900..8274ada74a 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
index b1315700d1..5e5f6f9816 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
index 18a65e16d7..b2c9c73012 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404",
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy. Vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob//icons/mob/species/vox/suit.dmi and modified by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..c1c1244752
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..a7c91b5ca9
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/icon.png
new file mode 100644
index 0000000000..70672d2ca9
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-left.png
new file mode 100644
index 0000000000..a661e43f85
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-right.png
new file mode 100644
index 0000000000..3a6c76fe53
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/meta.json
new file mode 100644
index 0000000000..8e05b97e42
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Modified from detective coat found in https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 by Flareguy. vox state modified from detective state found in vgstation13 at https://github.com/vgstation-coders/vgstation13/blob//icons/mob/species/vox/suit.dmi. icon state by Flareguy. ",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png
index 31e6f31708..e89ec20485 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
index 987679cecb..1d911bfa1a 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
index 20ac8b6d18..d6f9dad556 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
index aa0228cf31..0aca0dd517 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
index 4d6c934790..b4012d09ea 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
index fa20ea7d59..afc5942298 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , edited by Alekshhh. Vox state made by Flareguy for SS14",
+  "copyright": "Taken from Paradise at commit bad1ec7aa2c86df5794dc6ba28be05ebd0228012",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 6790bf5e94..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png
deleted file mode 100644
index 61ad9f9517..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png
deleted file mode 100644
index 72db4712bb..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png
deleted file mode 100644
index e50751b374..0000000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json
deleted file mode 100644
index e482264df5..0000000000
--- a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png
index a56db4fd53..3b01d4176c 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
index b62a0318da..2426c2aa25 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
index b226550a5d..2a06209b62 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
index 51b08d9568..62d25c958b 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
index 464ee509bc..581ba4b951 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
index 232bec9c0a..cb3e0ab471 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and modified by Flareguy",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png
index 50e6d79c20..9e02aa280a 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png
index 2e86e34438..73c0691b96 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png
index e0de8c7ec9..043e2709dd 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png
index 457d2f0aa7..30dd5afe3f 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png
index 46c4bf259c..26ec896bf6 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
index 920eab5520..175876d3d7 100644
--- a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index b3d41dd754..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
index 0eff0ab3fa..54c35ef455 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
index 31ba54e8af..50d752aa66 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png
deleted file mode 100644
index f3b0529e93..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png
deleted file mode 100644
index d7cfdd2a25..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json
index bbcef071e2..2b78bcd698 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.",
   "size": {
     "x": 32,
     "y": 32
@@ -13,18 +13,6 @@
     {
       "name": "equipped-INNERCLOTHING",
       "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 9acfc278c0..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
index 8781d46b5f..bede369f67 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
index accf74dc8f..619ad40626 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png
deleted file mode 100644
index 5fc87a93df..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png
deleted file mode 100644
index 1cb708b7ad..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
index 45e0f9141c..2b78bcd698 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Original sec jumpsuit from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, jumpskirt sprite made by Flareguy for SS14. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.",
   "size": {
     "x": 32,
     "y": 32
@@ -13,18 +13,6 @@
     {
       "name": "equipped-INNERCLOTHING",
       "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 8b722ac058..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
index 56e7e3567a..d2380bdf73 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
index 77db2ff028..d44522dcca 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png
deleted file mode 100644
index 2ed552361f..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png
deleted file mode 100644
index dec63daa28..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
index bbcef071e2..2b78bcd698 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.",
   "size": {
     "x": 32,
     "y": 32
@@ -13,18 +13,6 @@
     {
       "name": "equipped-INNERCLOTHING",
       "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index fa049e89a5..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
index 80984c51c1..bf0b30d17a 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
index 9400796353..b0e364c825 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png
deleted file mode 100644
index f3b0529e93..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png
deleted file mode 100644
index d7cfdd2a25..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
index 3f72fb4460..8fe98eacbe 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.",
   "size": {
     "x": 32,
     "y": 32
@@ -15,15 +15,11 @@
       "directions": 4
     },
     {
-      "name": "equipped-INNERCLOTHING-monkey",
+      "name": "overlay-inhand-left",
       "directions": 4
     },
     {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
+      "name": "overlay-inhand-right",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png
new file mode 100644
index 0000000000..cedb1942e7
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png
new file mode 100644
index 0000000000..8a353cc390
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index f17cb0661b..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
index 2fb771d84c..bd0af34098 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
index a3186ba4c1..be5b2406d2 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png
deleted file mode 100644
index 5fc87a93df..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png
deleted file mode 100644
index 1cb708b7ad..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
index c11c48fe74..8fe98eacbe 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14. equipped-INNERCLOTHING edited by Dutch-VanDerLinde (github).",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.",
   "size": {
     "x": 32,
     "y": 32
@@ -15,15 +15,11 @@
       "directions": 4
     },
     {
-      "name": "equipped-INNERCLOTHING-monkey",
+      "name": "overlay-inhand-left",
       "directions": 4
     },
     {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
+      "name": "overlay-inhand-right",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png
new file mode 100644
index 0000000000..f6bb7be725
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png
new file mode 100644
index 0000000000..139eaee057
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644
index 562402ee89..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
index a912ead177..67ba63f7cd 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
index 331203e531..e7ae72ca07 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png
deleted file mode 100644
index 2ed552361f..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png
deleted file mode 100644
index dec63daa28..0000000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
index 3f72fb4460..8fe98eacbe 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.",
   "size": {
     "x": 32,
     "y": 32
@@ -15,15 +15,11 @@
       "directions": 4
     },
     {
-      "name": "equipped-INNERCLOTHING-monkey",
+      "name": "overlay-inhand-left",
       "directions": 4
     },
     {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
+      "name": "overlay-inhand-right",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png
new file mode 100644
index 0000000000..d3a01e1a6c
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png
new file mode 100644
index 0000000000..ffe5f93eba
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png differ
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 5f73d4d253..c345d8616d 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -348,3 +348,6 @@ DoorRemoteFirefight: null
 
 # 2024-06-03
 AirlockServiceCaptainLocked: AirlockCaptainLocked
+
+# 2024-06-15
+ClothingOuterCoatInspector: ClothingOuterCoatDetectiveLoadout
\ No newline at end of file