From badb601dd1867f497d8181e8add98e02f16e4f30 Mon Sep 17 00:00:00 2001 From: Link <131011403+LinkUyx@users.noreply.github.com> Date: Wed, 18 Oct 2023 20:18:54 +0300 Subject: [PATCH] Added implanter sprite (#20758) * add * Update meta.json * tweaaaak --- .../Prototypes/Catalog/Cargo/cargo_armory.yml | 4 +-- .../Prototypes/Catalog/Cargo/cargo_fun.yml | 12 ++++---- .../Catalog/Cargo/cargo_medical.yml | 4 +-- .../Entities/Objects/Misc/implanters.yml | 29 +++++++++--------- .../Specific/Medical/implanter.rsi/broken.png | Bin 257 -> 483 bytes .../Medical/implanter.rsi/implanter0.png | Bin 229 -> 539 bytes .../Medical/implanter.rsi/implanter1.png | Bin 124 -> 127 bytes .../Specific/Medical/implanter.rsi/meta.json | 2 +- .../Medical/syndi_implanter.rsi/broken.png | Bin 0 -> 257 bytes .../syndi_implanter.rsi/implanter0.png | Bin 0 -> 229 bytes .../syndi_implanter.rsi/implanter1.png | Bin 0 -> 124 bytes .../Medical/syndi_implanter.rsi/meta.json | 20 ++++++++++++ 12 files changed, 45 insertions(+), 26 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/broken.png create mode 100644 Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter0.png create mode 100644 Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/implanter1.png create mode 100644 Resources/Textures/Objects/Specific/Medical/syndi_implanter.rsi/meta.json 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 027ecee0f7dd50e3a991da3cace39bca29e5c4dc..301d1928d74fa23b37d89fcb738977092ed066e7 100644 GIT binary patch delta 457 zcmV;)0XF`D0^8cgW?g5ejX<=koyo)a6y~pBPsc zTrHVQA`*#khkxi8fH6kV=ppI4PPJN%7-KZ;pCiBDPXrI_Vt#3j7-Jm~i^YiG;r8pv zfhIeP=CPH4z%*p_8mNMF!WQ|0N18H7= z`vIEd^La^mE7A!7O$&BiqO2C|CJO`tfq=_5pFhqe5@fBu00000NkvXXu0mjfzsAzK delta 229 zcmaFN+{iRRrJl3EBeIx*f$s4Sea(SUI8it`xSPs2st89-JJg=!Pm8Qk-jko;zxq{*_?yI{>N=YV@0pP&? zon*7wFm^f}K6;N-?>)w541xe5gox^N>1)i+-dFkjQEIh!)M~G>?E+Ftq?7Hb^N6f`FMjx5!Q2j9wBlbK?q)h99e6I|A3A z?qG6vviaCw(DMzbv-6)>vI}Bq@pdTO{;|#%{|$#mk8Xvr)%u3-e@!&Dw$^59>T*mx zbp>N%2SwE_V*&$vhY@^&!f8<~I-!ZyipTfXMi>DeF1URnRkxgIC`!ygmwLS}%+;p4 rx0yRmF?Ig{Rj0TmL5)VE(M0(R!fURm#&O6300000NkvXXu0mjfT;TI( delta 189 zcmV;u07Czp1myvcFn<7_NklhEZ!h^hFri~ z$=*Qr3fovN2v%v9RHU#&}lOR?j5 diff --git a/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter1.png b/Resources/Textures/Objects/Specific/Medical/implanter.rsi/implanter1.png index 1dd9ee53bd1de40a364ff2a21d5a4bb385aba1ae..6072b5227211fe976fe89807467103a75c973196 100644 GIT binary patch delta 83 zcmb=apJ3=`>FMGa64CnhjG`cef(XmSr7UeNOA0vIe+Pi n9p|=1I<#$H{N=)Q70+FK6<^qyI1J=D8Gyjk)z4*}Q$iB}E!-Z| delta 80 zcmb=gnPBK`=IP=X64CnhOrRixfPllnAnM8ko<6r;+Pgg&ebxsLQ09ZgFqyPW_ 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 0000000000000000000000000000000000000000..027ecee0f7dd50e3a991da3cace39bca29e5c4dc GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7e|v z#WAE}&f80dT!#!q*dB-%aLY!C2OC7*nX^l5`6FH%7rh6Dd%Dag_+2vXzRT6*t#)#X z<*g>k)+W~}|Kpk7^ZvZ|`0R_*j6kCxK!R1HOGzU6M%8wH?|R8B&gUE7&siKCyZI!; zXA@OLmlI)=CcU$|a?V%y_v}qeazk5P=S`k6X-d$Nt##Z|tUK)0w_Mw_W;g4*+CN{W uo;1I(et-S#$BkRR%=~jrkO^eLAJqqp>LI$Bn%}1ggZQ4VelF{r5}E)&!C;pF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..57956f4c907f44dedc29aa8ae67fc841985d94cf GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}^F3W0Ln2z= zUNGchG8ACFpns!Pw=6g1;F67-XKCx)Q>bW*IS_sFp2Ih;+Yx#kVVToHRwi$C)aAKx z-XH3`o8*k^} c;_`*X>7LG_s>-9jK&LWzy85}Sb4q9e0Q=cl7ytkO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1dd9ee53bd1de40a364ff2a21d5a4bb385aba1ae GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}W}YsNArY-_ z&jboG2naYFT;3v=MXJtr->KQ-sVb&HS$=Pfh;sd!esWBUD< Vl}YsXHx8f)44$rjF6*2UngBi!DDwaS literal 0 HcmV?d00001 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" + } + ] +} -- 2.51.2