From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Tue, 19 Dec 2023 20:36:36 +0000 (-0700)
Subject: resprite every captain item (#22739)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f05262b6ada77a9ec9f75c483f626676e5d9b49e;p=space-station-14.git

resprite every captain item (#22739)

* captain giga resprite

* fixe a bit

* kill

* swag destroyed

* Revert "swag destroyed"

This reverts commit 30c8aafdf6ccc1ac290268f7645e040b709811b3.
---

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 85314a39f1..0cafe16e31 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -209,7 +209,7 @@
 
 #Captain's Hardsuit
 - type: entity
-  parent: ClothingHeadHardsuitBase
+  parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitCap
   name: captain's hardsuit helmet
   description: Special hardsuit helmet, made for the captain of the station.
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 1a93a18e19..f572bb9f8c 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -264,7 +264,7 @@
       coefficients:
         Blunt: 0.8
         Slash: 0.8
-        Piercing: 0.8
+        Piercing: 0.6
         Heat: 0.5
         Radiation: 0.5
         Caustic: 0.6
diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
index 76c034d634..0a03d27619 100644
Binary files a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
index a2b60b0551..d7dbdbe152 100644
Binary files a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png
index e06e2748e9..1e397d6bab 100644
Binary files a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png
index 0a50f7e642..d7c09087df 100644
Binary files a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET.png
deleted file mode 100644
index 7f66343e42..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon-flash.png
new file mode 100644
index 0000000000..05f8fa3cb3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon-flash.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png
index 7c7421bd3d..cee0d6f029 100644
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-left.png
deleted file mode 100644
index 1aaf0e08f1..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-right.png
deleted file mode 100644
index 5179cfb413..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
index a470e00944..ac71856cd7 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/capspace.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, modified by Emisse for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -11,15 +11,30 @@
       "name": "icon"
     },
     {
-      "name": "equipped-HELMET",
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "inhand-left",
+      "name": "on-inhand-left",
       "directions": 4
     },
     {
-      "name": "inhand-right",
+      "name": "on-inhand-right",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png
new file mode 100644
index 0000000000..7079528ae6
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-left.png
new file mode 100644
index 0000000000..5216ba5dd9
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-right.png
new file mode 100644
index 0000000000..2ffe013c12
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png
new file mode 100644
index 0000000000..6f4caecb98
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-left.png
new file mode 100644
index 0000000000..6a5d075d80
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-right.png
new file mode 100644
index 0000000000..25796fc014
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
index 7616a5d8e1..831b7780eb 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
index b2a2f4ef4b..bbc380f6ad 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
index 9c0583a7c5..b21b92751c 100644
--- a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7 , edited by Skarletto (github)",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7 , edited by Skarletto (github), edited by Emisse for ss14",
   "size": {
     "x": 32,
     "y": 32
@@ -19,4 +19,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
index 9cb857e9f4..19048d7d1a 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
index 6cc73037aa..c025248263 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png
index 8684787c2d..32a9300b28 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png
index 00813d1a11..b59da29a4b 100644
Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
index 2bfe92b12e..ae83b3a1d4 100644
--- a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github)",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14",
   "size": {
     "x": 32,
     "y": 32
@@ -27,4 +27,4 @@
       "name": "icon"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png
index d19f0936e8..397d7e6eb1 100644
Binary files a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png differ
diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png
index ee566db54f..98bf7228dc 100644
Binary files a/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
index 2e57ae2151..c463c0354d 100644
--- a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/gascaptain.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, edited by Emisse for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png
index 309230e3ee..13b1c2efce 100644
Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png
index 11fc99f20c..49d27a0e96 100644
Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-left.png
index ea661b1f02..eda75fb97b 100644
Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-left.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-right.png
index c8780bcb71..3b366bb979 100644
Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-right.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
index 7de01f8732..bed9789445 100644
--- a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/pull/62603 which was taken from bee station. Bee station does not have a history on the cloaks on their github, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875 , colors edited by Skarletto (github)",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/pull/62603 which was taken from bee station. Bee station does not have a history on the cloaks on their github, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875 , colors edited by Skarletto (github), edited by Emisse for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
index 89a24c93fe..abbb7a2555 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
index a02c9b842b..1caea2582b 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png
index 7b1cd0e4b8..ba2375db82 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png
index 61b0e7a911..adb8622ebf 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
index 81e4553e83..b979f8bfb8 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github)",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png
index 02154c65cd..7ac2fbde5e 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png
index 1bcc6adef9..77e0426ef4 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png
index 1c5a054bba..0545ffa683 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png
index 60c4c9631e..a0d0dd7125 100644
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
index e482264df5..342d784473 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.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": "Made by Emisse for SS14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png
index 8651ad10e7..f6b6d7ab04 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png
index 50641b757b..8a65d6675e 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png
index 46bc66d25f..b95ae73479 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png
index db345a7434..b43fd233e8 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
index 75cbde9bb6..3c6f171076 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, edited by emisse for ss14, monkey derivative made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
index 7966d2d815..dbdb51cef9 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
index 4029e6b99a..67fd943b4c 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png
index 4502068730..9641f214a5 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png
index f6bcc2b143..0b3d008747 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
index 0b57c04149..6eb08f0f32 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github)",
+  "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png
index 8fe19d25f0..fbd1b6aea5 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png
index b6ecfcb58c..127e4ded44 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png
index c591079d53..f0dad45c99 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png
index e8d24fd267..1d8ab34a20 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
index e771fed56c..3eb2f76553 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7,edited by Emisse for ss14, monkey made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
index 86c999c882..5ad7eb1c1b 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
index eecc668d4b..0d6dc2631b 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png
index 4502068730..1bccf1eb46 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png
index f6bcc2b143..e0b994af89 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
index b2404c68cd..6eb08f0f32 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github)",
+  "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14",
   "size": {
     "x": 32,
     "y": 32
@@ -27,4 +27,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}