Scarf Resprite (#35446)

* guh???

* Merge branch 'master' of https://github.com/SeamLesss/space-station-14

* all of em

* better scarfs

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/brown.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/brown.rsi/icon.png
index d50ecc9dd50f85e70a4ec2385e8c2b3e2055294b..12a177f1761ff47aa91f62d1c7ca400c4c46c150 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/brown.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Scarfs/brown.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/brown.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/brown.rsi/meta.json
index 276ae36807088342546de8637cce28e4c78f9580..30a175e77f5a55c63c3941b8dc235d4aec011440 100644 (file)
--- a/Resources/Textures/Clothing/Neck/Scarfs/brown.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Scarfs/brown.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by MrGreen06#0618 (discord)",
+  "copyright": "Sprited by MrGreen06#0618 (discord), resprited by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/equipped-NECK.png
index 63f1748aa1c71f2271af39beaf7459fd6a711d87..d64a3d4d5a5a771adee5c83ff3be4d76aeab336e 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/equipped-NECK.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/icon.png
index e080f9b915dc1058388ed36b15faa464f90efec0..a856052a970ed041cbf1825721a15d1991fed67c 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-left.png
index 7824960e493d251aaeb612f0a063691099e8a502..98edf09fab932b4383af4fb872128de10e0c1f3f 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-left.png and b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-right.png
index adb8668dc61741c07cf1c99e85373ddae80fe896..386e9983355b1152b6820c2cb200e9194d0d0c6e 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-right.png and b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/meta.json
index 276ae36807088342546de8637cce28e4c78f9580..30a175e77f5a55c63c3941b8dc235d4aec011440 100644 (file)
--- a/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Scarfs/centcom.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by MrGreen06#0618 (discord)",
+  "copyright": "Sprited by MrGreen06#0618 (discord), resprited by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/equipped-NECK.png
index 22dfcd4f0f5ddd10bf1535f1229a1062405d1119..fe49082b6b90ee981f99fed0b247f7b1d606692b 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/equipped-NECK.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/icon.png
index 45069cdd79bb66fb9555c64e110de0bb3677e020..273a69bf6c1ed2b84599030122a0a535b16bb9e7 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/inhand-left.png
index b0eb7231ff1d75c89f083c3ff1bbefcd345d7443..35cd59aa49f727d82c52a3b1f32b25b6e60132f6 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/inhand-left.png and b/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/inhand-right.png
index 49021629745531cbf9148c7b2f1b660fd6f9f83b..13f73766ba4141206c02631b2afbfba94a89a8cb 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/inhand-right.png and b/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/meta.json
index 276ae36807088342546de8637cce28e4c78f9580..30a175e77f5a55c63c3941b8dc235d4aec011440 100644 (file)
--- a/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Scarfs/lightblue.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by MrGreen06#0618 (discord)",
+  "copyright": "Sprited by MrGreen06#0618 (discord), resprited by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/orange.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/orange.rsi/icon.png
index 4570a868962d7ce92fc47a5b80d01bd19350de0a..dad0b4b33715ad04bd4ff53b9245c2429ed9b1f4 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/orange.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Scarfs/orange.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/orange.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/orange.rsi/meta.json
index 276ae36807088342546de8637cce28e4c78f9580..30a175e77f5a55c63c3941b8dc235d4aec011440 100644 (file)
--- a/Resources/Textures/Clothing/Neck/Scarfs/orange.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Scarfs/orange.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by MrGreen06#0618 (discord)",
+  "copyright": "Sprited by MrGreen06#0618 (discord), resprited by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/purple.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/purple.rsi/icon.png
index 92d9c6711344fa8e4ffd07bf3c601dfb2d3cfe97..561aa88df8f038264603ba159583becdcf2e21e7 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/purple.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Scarfs/purple.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/purple.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/purple.rsi/meta.json
index 276ae36807088342546de8637cce28e4c78f9580..30a175e77f5a55c63c3941b8dc235d4aec011440 100644 (file)
--- a/Resources/Textures/Clothing/Neck/Scarfs/purple.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Scarfs/purple.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by MrGreen06#0618 (discord)",
+  "copyright": "Sprited by MrGreen06#0618 (discord), resprited by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/syndiegreen.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/syndiegreen.rsi/icon.png
index b1bf4d39e5ab5460554ed90871773fdbe5b23148..a32113a9e1f3e397798d22890cd2828c879a5a52 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/syndiegreen.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Scarfs/syndiegreen.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/syndiegreen.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/syndiegreen.rsi/meta.json
index 276ae36807088342546de8637cce28e4c78f9580..30a175e77f5a55c63c3941b8dc235d4aec011440 100644 (file)
--- a/Resources/Textures/Clothing/Neck/Scarfs/syndiegreen.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Scarfs/syndiegreen.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by MrGreen06#0618 (discord)",
+  "copyright": "Sprited by MrGreen06#0618 (discord), resprited by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/syndiered.rsi/icon.png b/Resources/Textures/Clothing/Neck/Scarfs/syndiered.rsi/icon.png
index 67f3d270922fd6dc0275624c7e9f22149d76bf19..483a518b159f4356cf076728461c0d6a6d48e58f 100644 (file)
Binary files a/Resources/Textures/Clothing/Neck/Scarfs/syndiered.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Scarfs/syndiered.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Neck/Scarfs/syndiered.rsi/meta.json b/Resources/Textures/Clothing/Neck/Scarfs/syndiered.rsi/meta.json
index 276ae36807088342546de8637cce28e4c78f9580..30a175e77f5a55c63c3941b8dc235d4aec011440 100644 (file)
--- a/Resources/Textures/Clothing/Neck/Scarfs/syndiered.rsi/meta.json
+++ b/Resources/Textures/Clothing/Neck/Scarfs/syndiered.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by MrGreen06#0618 (discord)",
+  "copyright": "Sprited by MrGreen06#0618 (discord), resprited by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32