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 4d111c01a0824047d278d46b401768a697d02b72..b9a6b08052500db7314e096deb2d07fdbaf84c5b 100644 (file)
--- 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 53a96484b4a152b8c46fb36f8c800bb99c1c4188..3f04e24d57d22fd29f48228ec38e785e6be67a4e 100644 (file)
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 f6f5cfb52216f0aff5d6958c3c71e22e038207b0..09d2c352981f83f12e82dc69230656b68468bb8e 100644 (file)
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 599026eee88e4bd2d1ae8d3fd50c2f877216b201..40cb1c00341e5bc47d96255d0ee96f937abf7ba4 100644 (file)
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 f959d0449ad7f9c3d7260538743142761576d0bc..f7cec51d03ec7cd569dab6499838c9251b449f3d 100644 (file)
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 9eb79b6d924f050a9cac841680fbc91b69b0e267..48348e66b0fe9324332ee69dc531219868d0161a 100644 (file)
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 eca6df5b78dc8214e4f61ca9c3cefd3212bb0e3d..3702b9ba429a8507811afb375ad3959d7a719815 100644 (file)
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 bc232bc112a3b761e556727a3af1d777e0209342..f021690c3588feac5ebe7144d0179e56815a8788 100644 (file)
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 db0ed1b59ccff00dee6cdecf66f471002b8287c0..c33d3049cad266e184d1fd255e5c59ed84d5606e 100644 (file)
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 0034a287562e2db1eb799595baabe5a18c3eefeb..a1f3cc477718fdadf253ed8206f86f6186182704 100644 (file)
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 db0ed1b59ccff00dee6cdecf66f471002b8287c0..80ef6e25df39b5fbd195b61c71b2387063975395 100644 (file)
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 e04a689f715edcd7ee446a077965a4b5f742a89b..9b518aac525879e49498e018a3d6c53a9af50840 100644 (file)
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 db0ed1b59ccff00dee6cdecf66f471002b8287c0..fd12e821a1d49f5fb3eaeb3c83c233656797018d 100644 (file)
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 3bf15e0a2eb1a41c9be4b7905088d4be63394560..8e9f54f1d0689b42b307f4ac996bf763ae1f4086 100644 (file)
--- 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 (file)
index 0000000..85c89b8
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 (file)
index 0000000..637d608
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 da4bcb91b75e0e6f7035eb6b0550582310aed83b..3d75ba58cec4e48dd7375565be74b38c884714a5 100644 (file)
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 c0e4facda8b1fd3841766af1fd874d34233a0c5e..d96b7c5e24730d72ac85e797a7ca9b344c3d7c13 100644 (file)
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 5c34da6fe2991f765369cce76b9b61a3a605d3ee..6c207646ea73796e8a28be397abd862ca2c1d79a 100644 (file)
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 cfb26f09f6f62d23944daa3620f8ae41d7de919d..aa98daeb5a4dedaa1e6d85d16a09231138505a94 100644 (file)
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 3a06234bdd6dac8a6a5704617139f5dbbf096b9d..990a1124c1da4334f69bb875f4108060c48bd7bc 100644 (file)
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 616377ebb5d6674231efd68b2571ac947e2a5689..695b5ac4e0702422508a4994b4cc2cb138beff83 100644 (file)
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