]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Changes to CE's suits (#29850)
authorKingFroozy <140668342+KingFroozy@users.noreply.github.com>
Sat, 12 Oct 2024 19:13:39 +0000 (22:13 +0300)
committerGitHub <noreply@github.com>
Sat, 12 Oct 2024 19:13:39 +0000 (21:13 +0200)
* Changes to ce sprites

* Adjustments

* More changes i guess

* Love life, get skirt

* Bitlessdark

* fkingforcepush

* upd №?

26 files changed:
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING-monkey.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json

index c0258cf1991f43d325854e0e06d6dca1623cfb8f..a7646e15118c5c8fb3e8615531a50ef12808604b 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING-monkey.png differ
index 3263c54ec990480236510a1af6ec139408f1826b..63a2b78ddf014da8ff38a5ca51d3b75faafc666b 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png differ
index 5f662e0280b006fd31c98974ed299178a5d598ac..5b18b310eef5ffdcf59fa4bef2ea20bd85e404fb 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png differ
index 94d9ed8605bf2aa4691d9cf1e3e85953e0f256cc..be8f306df13f65542480c4a50846e01f88438b64 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png differ
index 560879a0f2689c359c4d0661dbf467c5443fc894..d45365583136c38bd08e8e57c4cd3e7eea55d557 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png differ
index bbcef071e2ea56b2f34b9bce56935fd3387f4ffe..41d39d9bf4f533225bd9bc40c5bbd0807a9fcc82 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/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+  "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), modified by KingFroozy (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
index 4cb7704e2c9829b4c612650061a9a316ae23a37b..54312098fb533fcc0eb21b5e8f220cdd12dc43cb 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ
index 93477d07f5c8bd38a44106f4aa8b498ae40d9eda..b7877ab176cd3c76bd5181facb891392b119a8dd 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png differ
index 06c845ef84ed0d130797900f280ca9a66cb639b2..59f190fb9922ea9fc319aefff74609d99ed4e816 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png differ
index bdbd3ea4881c788b1a25939186b3f1912b50b05a..ff454fb5dba7a9c56e5a95238cf4eb1ffed6ee72 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png differ
index 7822bf686cf10880ba23aa9243e05d467ef82db0..bb33c2d6c11154a07a299d2e1988a4581e8f5995 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png differ
index 425a857f0255ff701f3e8aa9e0fd7997663674a0..d0a3b5db803cceaf5fac44378ed87471a36486cf 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by KingFroozy (github) for space station 14",
+  "copyright": "Modified from https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi by KingFroozy (github) for space station 14",
   "size": {
     "x": 32,
     "y": 32
index e0881f66bbaf697fe2b024a0c6c30e9863e1a017..b5cda54ed20ff5e1c7c2b824b1e4031a9a4a52aa 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png differ
index e9165f29cc2ac8c9c65f7918040793474789664d..e935d8977de2a17710a83f08ba2308102d133cf1 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png differ
index e2c37a0c2caeaf3decff065cc5a43044cba0dcc2..e8703104a667165b71a481eb2386ff91c73a0a4c 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png differ
index 94d9ed8605bf2aa4691d9cf1e3e85953e0f256cc..be8f306df13f65542480c4a50846e01f88438b64 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png differ
index 560879a0f2689c359c4d0661dbf467c5443fc894..d45365583136c38bd08e8e57c4cd3e7eea55d557 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png differ
index 1d012747b8f31705754aa31bccc29b949eef9947..425e6eaae249ac96c4b856d13bb90e227eb4ec77 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/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
+  "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), modified by KingFroozy (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
     {
       "name": "icon"
     },
-    {
-      "name": "s"
-    },
     {
       "name": "equipped-INNERCLOTHING",
       "directions": 4
     },
-    {
-      "name": "s-equipped-INNERCLOTHING",
-      "directions": 4
-    },
     {
       "name": "equipped-INNERCLOTHING-monkey",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png
deleted file mode 100644 (file)
index 213562c..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s-equipped-INNERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png
deleted file mode 100644 (file)
index 7282eb2..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/s.png and /dev/null differ
index 7c9e3cfc92321c1be1d748b4ad2dcfcb2d1c3f35..05cbff092dde7667ccf986865727490be6d452f2 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ
index 171598455fcd58f9fcd3e47a8df801a2e520d50b..876758ad1c3604243077522d56babf9ba31b6398 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png differ
index 50def373e334a1255ca5620593df9c9819e85245..6db1c12d989df45f120151104bb2ec666ae1a3c1 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png differ
index bdbd3ea4881c788b1a25939186b3f1912b50b05a..ff454fb5dba7a9c56e5a95238cf4eb1ffed6ee72 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png differ
index 7822bf686cf10880ba23aa9243e05d467ef82db0..bb33c2d6c11154a07a299d2e1988a4581e8f5995 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png differ
index f61c82ce0e6ad4815ddc30822abcb17a800f7b55..b70dde70e4a9200f4f0afdebbbb6d62c4d9d8320 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by KingFroozy (github) for space station 14",
+  "copyright": "Modified from https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi by KingFroozy (github) for space station 14",
   "size": {
     "x": 32,
     "y": 32