]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
resprite every captain item (#22739)
authorEmisse <99158783+Emisse@users.noreply.github.com>
Tue, 19 Dec 2023 20:36:36 +0000 (13:36 -0700)
committerGitHub <noreply@github.com>
Tue, 19 Dec 2023 20:36:36 +0000 (15:36 -0500)
* captain giga resprite

* fixe a bit

* kill

* swag destroyed

* Revert "swag destroyed"

This reverts commit 30c8aafdf6ccc1ac290268f7645e040b709811b3.

64 files changed:
Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png
Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET.png [deleted file]
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon-flash.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-left.png [deleted file]
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-right.png [deleted file]
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png
Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png
Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png
Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png
Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png
Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png
Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-left.png
Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-right.png
Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png
Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png
Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png
Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png
Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png
Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png
Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json

index 85314a39f19caa927f245d742a3928a702ec100c..0cafe16e31138530e5faf9785052c9858949d7d2 100644 (file)
 
 #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.
index 1a93a18e1946897cea8038f5cb2494fbbacbdbf8..f572bb9f8cdfdfaeb1668deabd2acbdd5d10ad0c 100644 (file)
       coefficients:
         Blunt: 0.8
         Slash: 0.8
-        Piercing: 0.8
+        Piercing: 0.6
         Heat: 0.5
         Radiation: 0.5
         Caustic: 0.6
index 76c034d6344b510432e0905403e30a7240aa496f..0a03d276190e99527417ac63c184bed42fff1cb1 100644 (file)
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
index a2b60b055163a162b61e0446eb704c340a02e53c..d7dbdbe1526638ddf151f9e2f36df80be1e96b3a 100644 (file)
Binary files a/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png differ
index e06e2748e931f02fb4b300c4d272814452c6d443..1e397d6babc114167e547c2c8b7d4b63bcf93d5f 100644 (file)
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
index 0a50f7e64201f69b535af04326860253a46bdfd0..d7c09087dfe21e8c7a09dcaf256ce18380d789c3 100644 (file)
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 (file)
index 7f66343..0000000
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 (file)
index 0000000..05f8fa3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon-flash.png differ
index 7c7421bd3d918c9ee31ab31feccec73080be7f4b..cee0d6f0293e66c9e7d9c68a8d1ddfcf668c5954 100644 (file)
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 (file)
index 1aaf0e0..0000000
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 (file)
index 5179cfb..0000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-right.png and /dev/null differ
index a470e0094432b54e095fa221e474399e0a4651fc..ac71856cd7a41a9f0c1803cdfc378b3980fee83e 100644 (file)
@@ -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
       "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 (file)
index 0000000..7079528
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 (file)
index 0000000..5216ba5
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 (file)
index 0000000..2ffe013
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 (file)
index 0000000..6f4caec
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 (file)
index 0000000..6a5d075
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 (file)
index 0000000..25796fc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-right.png differ
index 7616a5d8e1c5b814685bd9b7c09b1f6f9041c630..831b7780eb8b4866252967f8b14e8c5857d8d30c 100644 (file)
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
index b2a2f4ef4bba8af8351ad5f9e06ae05aaf44cf01..bbc380f6adca08ee1a93472aa3cf31b9fda722d1 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png differ
index 9c0583a7c5c17afb15db633a247897ff56aace89..b21b92751c89e4f6514e6c1287b26e1f40147915 100644 (file)
@@ -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
+}
index 9cb857e9f4f510aa75548c6ba11c48f881b7191c..19048d7d1aa2ac3e64b38a19acaeccc2a872d4a7 100644 (file)
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
index 6cc73037aa6da8b259840f9cc3118812083225de..c025248263e1af27c7cd25576bf506535373a641 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png differ
index 8684787c2d215779cf75f04342676efb1aa38335..32a9300b28282e9462c956b1e1194c5a02e1cc13 100644 (file)
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
index 00813d1a1128e0409838aa6f66ae8a4e40c52217..b59da29a4b608b34f0cc36630ab19e376af3d16f 100644 (file)
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
index 2bfe92b12e1e6421bb0fc5466faca92b68544243..ae83b3a1d48feaed98262667aae45f8f50ebb18d 100644 (file)
@@ -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
+}
index d19f0936e8505ffdda57ab1314f2cd2db6251ae7..397d7e6eb16f5f51105dece074ebd242123e0591 100644 (file)
Binary files a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png differ
index ee566db54fad63babc53be419a97a8209a806ac2..98bf7228dc0d311a055f83331b29113ddb26fb00 100644 (file)
Binary files a/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png differ
index 2e57ae215108a26985ac834b23a0b9cf9a760a78..c463c0354dd74b6153982c0989b68f27c86fb4b6 100644 (file)
@@ -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
index 309230e3eec04207808aa71f9029d07587481afd..13b1c2efceaea8764b43b20a31857673a9905be8 100644 (file)
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
index 11fc99f20cc86f7d8cb95e6b5c7eab85c1e31830..49d27a0e96808d131c02e8c43292cbb173a57573 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png differ
index ea661b1f020f20a1a82a3074b7fb331751d88cbc..eda75fb97b1af5cce8927f3fc2b1862674673d73 100644 (file)
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
index c8780bcb7129a859c01a00c5d4d982f4feddef05..3b366bb979bc9f531d8820460eb6712230f4d330 100644 (file)
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
index 7de01f8732e04036bde7861c3cb4ba6ba91888ab..bed97894450c551082f922f3bee7509165604ea1 100644 (file)
@@ -1,7 +1,7 @@
 {\r
   "version": 1,\r
   "license": "CC-BY-SA-3.0",\r
-  "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)",\r
+  "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",\r
   "size": {\r
     "x": 32,\r
     "y": 32\r
index 89a24c93fe281a9f8f92db6a5914fc16f061a5c6..abbb7a255509c571354caa38e08556fa7fbf84b0 100644 (file)
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
index a02c9b842b5119f68cd91dcc2bc91090488a9706..1caea2582b300aedf8ffbc047e5e11c678d1ed55 100644 (file)
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
index 7b1cd0e4b85a07c98c02cdf9d788bbdd262e7b71..ba2375db82f65adb175c33e0bc07f0a9a2b92353 100644 (file)
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
index 61b0e7a9111af0a9a7cca4d293c369b192529c64..adb8622ebf2271f5e037bbee3cb8b6a1792c27ab 100644 (file)
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
index 81e4553e830be2de0cc79ef5f706475a5bf45d83..b979f8bfb8a3e77fa22c2e9d813360e20687b7d0 100644 (file)
@@ -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
index 02154c65cd67b2daa2bb9ef7c3695b77c4758847..7ac2fbde5e3843c433c0d7f5ae6542be01c3737f 100644 (file)
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
index 1bcc6adef92813d0b8ed8206b0a0e5e23783d7f9..77e0426ef488ad9e2d9eb08b8470f9245acb66fe 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png differ
index 1c5a054bbaee9f87c26740f5471b6c32ed69de38..0545ffa683b304872be8dc9f9431ab14ede68d89 100644 (file)
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
index 60c4c9631efd8d0ae84fe9ac6cfa01e1fd76206c..a0d0dd7125e66b1674aca3b1315b32ca493ab760 100644 (file)
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
index e482264df5f8b7f13d1a6a889a05f90ccba884a2..342d7844737643dd179b5a19fa27b996059094fa 100644 (file)
@@ -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
index 8651ad10e70f62b3618537cf8401a5ec244153ab..f6b6d7ab0407ae00539c135518b887f28007a22b 100644 (file)
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
index 50641b757b6320c59e0afcb6b4824008f72be5ff..8a65d6675e007bb6fc8fe05d6689c20ec34fab7c 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png differ
index 46bc66d25f4719c5230b403b6af574bb323aba61..b95ae73479c95343bd43b74885634f5db3a1e458 100644 (file)
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
index db345a7434ecee4811ffceb9d2ef923871feaa74..b43fd233e81b0959828b43939dfb7594e8994651 100644 (file)
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
index 75cbde9bb6a9d59782b89de3b4ed2104bc9bbe12..3c6f17107632288365ed66072d5c46950bd30a1b 100644 (file)
@@ -1,7 +1,7 @@
 {\r
   "version": 1,\r
   "license": "CC-BY-SA-3.0",\r
-  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, monkey derivative made by brainfood1183 (github) for ss14",\r
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, edited by emisse for ss14, monkey derivative made by brainfood1183 (github) for ss14",\r
   "size": {\r
     "x": 32,\r
     "y": 32\r
index 7966d2d81551699258b42268b5ab6defe0bbff33..dbdb51cef9b2aa10a212deb0b49a684d2c22648e 100644 (file)
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
index 4029e6b99a490683e9db930b0bc9f37ce9509c0c..67fd943b4c2f173a9935c8e9c346fb0922076c66 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png differ
index 450206873098f5aee6c5539c98b2c71acf7f58e0..9641f214a530834bd07aa5a59215107d4aa158ac 100644 (file)
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
index f6bcc2b1437b85450be3d0d2201783d68de80a06..0b3d00874786b654746a5d8415651b300885a9ca 100644 (file)
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
index 0b57c04149ca6645ba29beb5f820e5a80f94acca..6eb08f0f320f52c640a8e7bbc4a5e81a87228124 100644 (file)
@@ -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
index 8fe19d25f0e56b7f3c12605c62d02c4beb4ebe92..fbd1b6aea5b77baa254f74c6e7584cf883bd6cbe 100644 (file)
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
index b6ecfcb58c1ba87210b109117a322e8f49fc1488..127e4ded44a95cf034729b8e4aee4cf3374342fc 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png differ
index c591079d53f56aede4d71978cbe5fca0261641d0..f0dad45c99a6e99e61f0de94742bf60be9ae0212 100644 (file)
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
index e8d24fd26766a916b336952358ab203e34a10032..1d8ab34a2084e29c2ed96c3351862603cf0e7eee 100644 (file)
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
index e771fed56c01d4862ff34dc324a3f13b1d72e3f1..3eb2f765534e5d8ed01671a8d359b009b99196f7 100644 (file)
@@ -1,7 +1,7 @@
 {\r
   "version": 1,\r
   "license": "CC-BY-SA-3.0",\r
-  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, monkey made by brainfood1183 (github) for ss14",\r
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7,edited by Emisse for ss14, monkey made by brainfood1183 (github) for ss14",\r
   "size": {\r
     "x": 32,\r
     "y": 32\r
index 86c999c88289a6031ef2d7e72e08c840953b647c..5ad7eb1c1befe80a552813a45b0d2d0139f138ce 100644 (file)
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
index eecc668d4b4d34dada16235c1a9c5ae773e19aba..0d6dc2631b9a323f7423202250800f56ca7a0db1 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png differ
index 450206873098f5aee6c5539c98b2c71acf7f58e0..1bccf1eb46c4cceea676ae9cede0e43100974667 100644 (file)
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
index f6bcc2b1437b85450be3d0d2201783d68de80a06..e0b994af897300479a558832a12a90a634b81e20 100644 (file)
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
index b2404c68cd056e65abfe9f970db2e24c9dbd149b..6eb08f0f320f52c640a8e7bbc4a5e81a87228124 100644 (file)
@@ -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
+}