микрофикс

Выполнение парочки задач
Lost-Paradise-Project · Sep 4, 2024 · c21ca16 · c21ca16
1 parent e73fb5f
commit c21ca16
Show file tree

Hide file tree

Showing 26 changed files with 21 additions and 13 deletions.
diff --git a/...s/botany.rsi/equipped-MASK-rreptilian.png → ...as/botany.rsi/equipped-MASK-reptilian.png b/...s/botany.rsi/equipped-MASK-rreptilian.png → ...as/botany.rsi/equipped-MASK-reptilian.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json
@@ -21,6 +21,22 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-tajaran",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-shark",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-vulpkanin",
+      "directions": 4
     }
   ]
 }
diff --git a/...tures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING-monkey.png b/...tures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING-monkey.png
diff --git a/...es/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING-reptilian.png b/...es/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING-reptilian.png
diff --git a/...ces/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING.png b/...ces/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/inhand-right.png
diff --git a/...s/Jumpsuit/Magistrate-suite.rsi/meta.json → .../Uniforms/Jumpsuit/prisoner.rsi/meta.json b/...s/Jumpsuit/Magistrate-suite.rsi/meta.json → .../Uniforms/Jumpsuit/prisoner.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Pe4henika + Someone",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-INNERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/Resources/Textures/Nyanotrasen/Clothing/Head/ReverseEngineering/syndicate.rsi/meta.json b/Resources/Textures/Nyanotrasen/Clothing/Head/ReverseEngineering/syndicate.rsi/meta.json
@@ -13,10 +13,6 @@
     {
       "name": "icon-flash"
     },
-    {
-      "name": "combat-equipped-HELMET",
-      "directions": 4
-    },
     {
       "name": "off-equipped-HELMET",
       "directions": 4
@@ -48,14 +44,6 @@
     {
       "name": "on-equipped-HELMET-vulpkanin",
       "directions": 4
-    },
-    {
-      "name": "off-equipped-HELMET-reptilian",
-      "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-reptilian",
-      "directions": 4
     }
   ]
 }
diff --git a/...adise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-vulpkanin.png b/...adise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-unshaded-vulpkanin.png
diff --git a/.../_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-vulpkanin.png b/.../_LostParadise/Clothing/Head/Hardsuits/iic-head.rsi/equipped-head-vulpkanin.png
diff --git a/...es/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_black.png b/...es/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_black.png
diff --git a/...ces/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_cyan.png b/...ces/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_cyan.png
diff --git a/...es/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_green.png b/...es/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_green.png
diff --git a/...es/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_latex.png b/...es/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_latex.png
diff --git a/...s/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_orange.png b/...s/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_orange.png
diff --git a/...s/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_purple.png b/...s/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_purple.png
diff --git a/...rces/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_red.png b/...rces/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_red.png
diff --git a/...extures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_tealblack.png b/...extures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_tealblack.png
diff --git a/...es/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_white.png b/...es/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_white.png
diff --git a/...s/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_yellow.png b/...s/Textures/_LostParadise/Clothing/Uniforms/ERP/stripper.rsi/stripper_yellow.png
diff --git a/...dise/Clothing/Uniforms/Jumpsuit/Magistrate-suite.rsi/equipped-INNERCLOTHING.png b/...dise/Clothing/Uniforms/Jumpsuit/Magistrate-suite.rsi/equipped-INNERCLOTHING.png
diff --git a/...Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/Magistrate-suite.rsi/icon.png b/...Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/Magistrate-suite.rsi/icon.png
diff --git a/...s/_LostParadise/Clothing/Uniforms/Jumpsuit/Magistrate-suite.rsi/inhand-left.png b/...s/_LostParadise/Clothing/Uniforms/Jumpsuit/Magistrate-suite.rsi/inhand-left.png
diff --git a/.../_LostParadise/Clothing/Uniforms/Jumpsuit/Magistrate-suite.rsi/inhand-right.png b/.../_LostParadise/Clothing/Uniforms/Jumpsuit/Magistrate-suite.rsi/inhand-right.png