From: Guilherme Ornel <86210200+joshepvodka@users.noreply.github.com>
Date: Thu, 21 Dec 2023 05:30:58 +0000 (-0300)
Subject: Updated (most) medipen sprites (#22789)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3db343f160fd128e363d0e3a2ec68ea032be8026;p=space-station-14.git

Updated (most) medipen sprites (#22789)

* changed sprites

* desaturated a bit
---

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 4d111c01a0..b9a6b08052 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -97,7 +97,7 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi
     layers:
-    - state: medipen
+    - state: firstaid
       map: ["enum.SolutionContainerLayers.Fill"]
   - type: Item
     sprite: Objects/Specific/Medical/medipen.rsi
@@ -115,7 +115,7 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 1
     changeColor: false
-    emptySpriteName: medipen_empty
+    emptySpriteName: firstaid_empty
   - type: Tag
     tags:
     - Trash
@@ -134,6 +134,15 @@
   id: EmergencyMedipen
   description: A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge. Beware, as it's easy to overdose on epinephrine and tranexamic acid.
   components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: medipen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: medipen_empty
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -157,6 +166,10 @@
     layers:
     - state: penacid
       map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: penacid_empty
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -180,6 +193,10 @@
     layers:
     - state: bicpen
       map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: bicpen_empty
   - type: Hypospray
     solutionName: pen
     transferAmount: 20
@@ -206,6 +223,10 @@
     layers:
     - state: dermpen
       map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: dermpen_empty
   - type: Hypospray
     solutionName: pen
     transferAmount: 20
@@ -232,6 +253,10 @@
     layers:
     - state: arithpen
       map: ["enum.SolutionContainerLayers.Fill"]
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: arithpen_empty
   - type: Hypospray
     solutionName: pen
     transferAmount: 20
@@ -289,8 +314,6 @@
     layers:
     - state: stimpen
       map: ["enum.SolutionContainerLayers.Fill"]
-  - type: Item
-    sprite: Objects/Specific/Medical/medipen.rsi
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -298,6 +321,10 @@
         reagents:
         - ReagentId: Stimulants
           Quantity: 30
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: stimpen_empty
   - type: Hypospray
     solutionName: pen
     transferAmount: 30
@@ -315,11 +342,8 @@
   - type: Sprite
     sprite: Objects/Specific/Medical/medipen.rsi
     layers:
-    - state: stimpen
+    - state: microstimpen
       map: ["enum.SolutionContainerLayers.Fill"]
-  - type: Item
-    sprite: Objects/Specific/Medical/medipen.rsi
-    size: Tiny
   - type: SolutionContainerManager
     solutions:
       pen:
@@ -327,6 +351,10 @@
         reagents:
         - ReagentId: Stimulants
           Quantity: 15
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: microstimpen_empty
   - type: StaticPrice
     price: 100
   - type: Tag
@@ -343,8 +371,10 @@
     layers:
     - state: morphen
       map: ["enum.SolutionContainerLayers.Fill"]
-  - type: Item
-    sprite: Objects/Specific/Medical/medipen.rsi
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    changeColor: false
+    emptySpriteName: morphen_empty
   - type: SolutionContainerManager
     solutions:
       pen:
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen.png
index 53a96484b4..3f04e24d57 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen_empty.png
index f6f5cfb522..09d2c35298 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen_empty.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/arithpen_empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen.png
index 599026eee8..40cb1c0034 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen_empty.png
index f959d0449a..f7cec51d03 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen_empty.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/bicpen_empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen.png
index 9eb79b6d92..48348e66b0 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen_empty.png
index eca6df5b78..3702b9ba42 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen_empty.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dermpen_empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/firstaid.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/firstaid.png
index bc232bc112..f021690c35 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/firstaid.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/firstaid.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/firstaid_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/firstaid_empty.png
index db0ed1b59c..c33d3049ca 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/firstaid_empty.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/firstaid_empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/hypovolemic.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/hypovolemic.png
index 0034a28756..a1f3cc4777 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/hypovolemic.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/hypovolemic.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/hypovolemic_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/hypovolemic_empty.png
index db0ed1b59c..80ef6e25df 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/hypovolemic_empty.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/hypovolemic_empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen.png
index e04a689f71..9b518aac52 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen_empty.png
index db0ed1b59c..fd12e821a1 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen_empty.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/medipen_empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json
index 3bf15e0a2e..8e9f54f1d0 100644
--- a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "tgstation at 986af32e22a88dae14fd147d812a5a4d27c1bc30 | stimpen sprites made by PuroSlavKing (Github) for Space Station 14",
+  "copyright": "tgstation at 986af32e22a88dae14fd147d812a5a4d27c1bc30 | stimpen sprites made by PuroSlavKing (Github) for Space Station 14. Nearly all resprited by joshepvodka",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,9 @@
     {
       "name": "medipen"
     },
+    {
+      "name": "medipen_empty"
+    },
     {
       "name": "firstaid"
     },
@@ -22,15 +25,18 @@
     {
       "name": "hypovolemic_empty"
     },
-    {
-      "name": "medipen_empty"
-    },
     {
       "name": "stimpen"
     },
     {
       "name": "stimpen_empty"
     },
+    {
+      "name": "microstimpen"
+    },
+    {
+      "name": "microstimpen_empty"
+    },
     {
       "name": "morphen"
     },
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/microstimpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/microstimpen.png
new file mode 100644
index 0000000000..85c89b8ce9
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/microstimpen.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/microstimpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/microstimpen_empty.png
new file mode 100644
index 0000000000..637d608fba
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/microstimpen_empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/morphen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/morphen.png
index da4bcb91b7..3d75ba58ce 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/morphen.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/morphen.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/morphen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/morphen_empty.png
index c0e4facda8..d96b7c5e24 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/morphen_empty.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/morphen_empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/penacid.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/penacid.png
index 5c34da6fe2..6c207646ea 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/penacid.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/penacid.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/penacid_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/penacid_empty.png
index cfb26f09f6..aa98daeb5a 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/penacid_empty.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/penacid_empty.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/stimpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/stimpen.png
index 3a06234bdd..990a1124c1 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/stimpen.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/stimpen.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/stimpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/stimpen_empty.png
index 616377ebb5..695b5ac4e0 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/stimpen_empty.png and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/stimpen_empty.png differ