From: Link <131011403+LinkUyx@users.noreply.github.com>
Date: Wed, 18 Oct 2023 17:18:54 +0000 (+0300)
Subject: Added implanter sprite (#20758)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=badb601dd1867f497d8181e8add98e02f16e4f30;p=space-station-14.git

Added implanter sprite (#20758)

* add

* Update meta.json

* tweaaaak
---

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
index 77140aba3b..f8f5253b23 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -21,8 +21,8 @@
 - type: cargoProduct
   id: TrackingImplant
   icon:
-    sprite: Objects/Specific/Chemistry/syringe.rsi
-    state: syringe_base0
+    sprite: Objects/Specific/Medical/implanter.rsi
+    state: implanter0
   product: CrateTrackingImplants
   cost: 1000
   category: Armory
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index cc18f6676f..5ea658ffe5 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -121,8 +121,8 @@
 - type: cargoProduct
   id: FunSadTromboneImplants
   icon:
-    sprite: Objects/Specific/Chemistry/syringe.rsi
-    state: syringe_base0
+    sprite: Objects/Specific/Medical/implanter.rsi
+    state: implanter0
   product: CrateFunSadTromboneImplants
   cost: 1000
   category: Fun
@@ -131,8 +131,8 @@
 - type: cargoProduct
   id: FunLightImplants
   icon:
-    sprite: Objects/Specific/Chemistry/syringe.rsi
-    state: syringe_base0
+    sprite: Objects/Specific/Medical/implanter.rsi
+    state: implanter0
   product: CrateFunLightImplants
   cost: 1000
   category: Fun
@@ -171,8 +171,8 @@
 - type: cargoProduct
   id: FunBikeHornImplants
   icon:
-    sprite: Objects/Specific/Chemistry/syringe.rsi
-    state: syringe_base0
+    sprite: Objects/Specific/Medical/implanter.rsi
+    state: implanter0
   product: CrateFunBikeHornImplants
   cost: 1000
   category: Fun
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
index 42370eb7d9..16498a5a75 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
@@ -101,8 +101,8 @@
 - type: cargoProduct
   id: MedicalMindShieldImplants
   icon:
-    sprite: Objects/Specific/Chemistry/syringe.rsi
-    state: syringe_base0
+    sprite: Objects/Specific/Medical/implanter.rsi
+    state: implanter0
   product: CrateMindShieldImplants
   cost: 3000
   category: Medical
diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
index 8cb55e386e..41966ab93f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
@@ -21,17 +21,17 @@
           tags:
             - SubdermalImplant
     - type: Sprite
-      sprite: Objects/Specific/Chemistry/syringe.rsi
-      state: syringe_base0
+      sprite: Objects/Specific/Medical/implanter.rsi
+      state: implanter0
       layers:
-        - state: syringe2
+        - state: implanter0
+          map: [ "implantOnly" ]
+          visible: true
+        - state: implanter1
           map: [ "implantFull" ]
-          color: '#1cd94e'
           visible: false
-        - state: syringe_base0
-          map: [ "implantOnly" ]
     - type: Item
-      sprite: Objects/Specific/Chemistry/syringe.rsi
+      sprite: Objects/Specific/Medical/implanter.rsi
       heldPrefix: 0
     - type: Appearance
     - type: GenericVisualizer
@@ -43,7 +43,7 @@
         enum.ImplanterImplantOnlyVisuals.ImplantOnly:
           implantOnly:
             True: {state: broken}
-            False: {state: syringe_base0}
+            False: {state: implanter0}
 
 - type: entity
   id: Implanter
@@ -61,14 +61,13 @@
   abstract: true
   components:
     - type: Sprite
-      sprite: Objects/Specific/Chemistry/syringe.rsi
-      state: syringe_base0
+      sprite: Objects/Specific/Medical/implanter.rsi
+      state: implanter0
       layers:
-        - state: syringe2
+        - state: implanter1
           map: [ "implantFull" ]
-          color: '#1cd94e'
           visible: true
-        - state: syringe_base0
+        - state: implanter0
           map: [ "implantOnly" ]
     - type: Implanter
       currentMode: Inject
@@ -81,10 +80,10 @@
   abstract: true
   components:
     - type: Item
-      sprite: Objects/Specific/Medical/implanter.rsi
+      sprite: Objects/Specific/Medical/syndi_implanter.rsi
       size: 3
     - type: Sprite
-      sprite: Objects/Specific/Medical/implanter.rsi
+      sprite: Objects/Specific/Medical/syndi_implanter.rsi
       state: implanter1
       layers:
         - state: implanter0
diff --git a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/broken.png b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/broken.png
index 027ecee0f7..301d1928d7 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/broken.png and b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter0.png b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter0.png
index 57956f4c90..81290957ad 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter0.png and b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter0.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter1.png b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter1.png
index 1dd9ee53bd..6072b52272 100644
Binary files a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter1.png and b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter1.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/meta.json
index 38050ea310..efcfc1c348 100644
--- a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/PestoVerde322/tgstation/blob/37460afeeb24f84e591d538e40bb04e60aef9cf8/icons/obj/syringe.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, resprite by @linkblyat",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/broken.png b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/broken.png
new file mode 100644
index 0000000000..027ecee0f7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/broken.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter0.png b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter0.png
new file mode 100644
index 0000000000..57956f4c90
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter0.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter1.png b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter1.png
new file mode 100644
index 0000000000..1dd9ee53bd
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter1.png differ
diff --git a/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/meta.json
new file mode 100644
index 0000000000..38050ea310
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/PestoVerde322/tgstation/blob/37460afeeb24f84e591d538e40bb04e60aef9cf8/icons/obj/syringe.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "broken"
+    },
+    {
+      "name": "implanter0"
+    },
+    {
+      "name": "implanter1"
+    }
+  ]
+}