From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Mon, 14 Apr 2025 15:58:55 +0000 (+0200)
Subject: Add SolutionContainerVisuals to the hypospray (#30703)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=69f9d531f983f10330ec17afbbcbe16be42ce627;p=space-station-14.git

Add SolutionContainerVisuals to the hypospray (#30703)

* Hypovisuals

* Syndie hypo

* Include attribution
---

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 5837c503a9..cb1fef33a6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -6,7 +6,12 @@
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/hypospray.rsi
-    state: hypo
+    layers:
+      - state: hypo
+        map: ["enum.SolutionContainerLayers.Base"]
+      - state: hypo_fill1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
   - type: Item
     sprite: Objects/Specific/Medical/hypospray.rsi
   - type: SolutionContainerManager
@@ -28,6 +33,11 @@
     - HighRiskItem
   - type: StealTarget
     stealGroup: Hypospray
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: hypo_fill
+    solutionName: hypospray
 
 - type: entity
   name: gorlex hypospray
@@ -37,7 +47,12 @@
   components:
   - type: Sprite
     sprite: Objects/Specific/Medical/syndihypo.rsi
-    state: hypo
+    layers:
+      - state: hypo
+        map: ["enum.SolutionContainerLayers.Base"]
+      - state: hypo_fill1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
   - type: Item
     sprite: Objects/Specific/Medical/syndihypo.rsi
   - type: SolutionContainerManager
@@ -52,6 +67,11 @@
     onlyAffectsMobs: false
   - type: UseDelay
     delay: 0.5
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 4
+    fillBaseName: hypo_fill
+    solutionName: hypospray
 
 - type: entity
   name: borghypo
diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo.png
index cab29e5b0a..230833869f 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo.png and b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill1.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill1.png
new file mode 100644
index 0000000000..0e24434f92
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill1.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill2.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill2.png
new file mode 100644
index 0000000000..1e5858ded4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill2.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill3.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill3.png
new file mode 100644
index 0000000000..1235fb7344
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill3.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill4.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill4.png
new file mode 100644
index 0000000000..19c613e820
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill4.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill5.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill5.png
new file mode 100644
index 0000000000..34eed2337c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill5.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill6.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill6.png
new file mode 100644
index 0000000000..e09ce7c78a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo_fill6.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
index 0095919b63..904543f6e5 100644
--- a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, modified with fill sprites by SlamBamActionman (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -19,6 +19,24 @@
     {
       "name": "hypo"
     },
+    {
+      "name": "hypo_fill1"
+    },
+    {
+      "name": "hypo_fill2"
+    },
+    {
+      "name": "hypo_fill3"
+    },
+    {
+      "name": "hypo_fill4"
+    },
+    {
+      "name": "hypo_fill5"
+    },
+    {
+      "name": "hypo_fill6"
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo.png b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo.png
index 2e410898ef..679ffb3a07 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo.png and b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo_fill1.png b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo_fill1.png
new file mode 100644
index 0000000000..1961261a3a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo_fill1.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo_fill2.png b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo_fill2.png
new file mode 100644
index 0000000000..575e99f90b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo_fill2.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo_fill3.png b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo_fill3.png
new file mode 100644
index 0000000000..187eac6969
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo_fill3.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo_fill4.png b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo_fill4.png
new file mode 100644
index 0000000000..2e72a044a5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/hypo_fill4.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/meta.json
index 5d25ef74a6..ddf2ea210f 100644
--- a/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/syndihypo.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and modified by emisse for ss14",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and modified by emisse for ss14, further modified with fill sprites by SlamBamActionman (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,18 @@
     {
       "name": "hypo"
     },
+    {
+      "name": "hypo_fill1"
+    },
+    {
+      "name": "hypo_fill2"
+    },
+    {
+      "name": "hypo_fill3"
+    },
+    {
+      "name": "hypo_fill4"
+    },
     {
       "name": "inhand-left",
       "directions": 4
@@ -19,4 +31,4 @@
       "directions": 4
     }
   ]
-}
\ No newline at end of file
+}