Merge pull request #1016 from SixValentine/CMO_Hardsuit_Touchup

Cmo hardsuit touchup
impstation · Dec 14, 2024 · 868f11d · 868f11d
2 parents 9150648 + a9ea16b
commit 868f11d
Show file tree

Hide file tree

Showing 15 changed files with 67 additions and 4 deletions.
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -285,9 +285,9 @@
   description: Lightweight medical hardsuit helmet that doesn't restrict your head movements.
   components:
   - type: Sprite
-    sprite: Clothing/Head/Hardsuits/medical.rsi
+    sprite: _Impstation/Clothing/Head/Helmets/impcmohelmet.rsi
   - type: Clothing
-    sprite: Clothing/Head/Hardsuits/medical.rsi
+    sprite: _Impstation/Clothing/Head/Helmets/impcmohelmet.rsi
   - type: PointLight
     color: "#adf1ff"
   - type: PressureProtection

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -349,9 +349,9 @@
   description: A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/Hardsuits/medical.rsi
+    sprite: _Impstation/Clothing/OuterClothing/Hardsuits/impcmo.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/Hardsuits/medical.rsi
+    sprite: _Impstation/Clothing/OuterClothing/Hardsuits/impcmo.rsi
   - type: PressureProtection
     highPressureMultiplier: 0.3
     lowPressureMultiplier: 1000

diff --git a/...rces/Textures/_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/icon-flash.png b/...rces/Textures/_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/icon-flash.png
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/icon.png
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14. Recolor for Imp by Six Valentine",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "off-equipped-HELMET-vox",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET-vox",
+      "directions": 4
+    }
+  ]
+}
diff --git a/.../_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/off-equipped-HELMET-vox.png b/.../_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/off-equipped-HELMET-vox.png
diff --git a/...ures/_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/off-equipped-HELMET.png b/...ures/_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/off-equipped-HELMET.png
diff --git a/...s/_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/on-equipped-HELMET-vox.png b/...s/_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/on-equipped-HELMET-vox.png
diff --git a/...tures/_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/on-equipped-HELMET.png b/...tures/_Impstation/Clothing/Head/Helmets/impcmohelmet.rsi/on-equipped-HELMET.png
diff --git a/...tion/Clothing/OuterClothing/Hardsuits/impcmo.rsi/equipped-OUTERCLOTHING-vox.png b/...tion/Clothing/OuterClothing/Hardsuits/impcmo.rsi/equipped-OUTERCLOTHING-vox.png
diff --git a/...pstation/Clothing/OuterClothing/Hardsuits/impcmo.rsi/equipped-OUTERCLOTHING.png b/...pstation/Clothing/OuterClothing/Hardsuits/impcmo.rsi/equipped-OUTERCLOTHING.png
diff --git a/...urces/Textures/_Impstation/Clothing/OuterClothing/Hardsuits/impcmo.rsi/icon.png b/...urces/Textures/_Impstation/Clothing/OuterClothing/Hardsuits/impcmo.rsi/icon.png
diff --git a/...extures/_Impstation/Clothing/OuterClothing/Hardsuits/impcmo.rsi/inhand-left.png b/...extures/_Impstation/Clothing/OuterClothing/Hardsuits/impcmo.rsi/inhand-left.png
diff --git a/...xtures/_Impstation/Clothing/OuterClothing/Hardsuits/impcmo.rsi/inhand-right.png b/...xtures/_Impstation/Clothing/OuterClothing/Hardsuits/impcmo.rsi/inhand-right.png
diff --git a/Resources/Textures/_Impstation/Clothing/OuterClothing/Hardsuits/impcmo.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/OuterClothing/Hardsuits/impcmo.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14. Blue IMP Recolor by SixValentine",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}