From be8a45024b99043379a8d4495a5b82445313cc4d Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Thu, 25 Feb 2021 10:46:21 +0000 Subject: [PATCH] New first aid kits (#3396) --- .../Fills/Backpacks/Starter Gear/backpack.yml | 1 + .../Backpacks/Starter Gear/duffelbag.yml | 1 + .../Fills/Backpacks/Starter Gear/satchel.yml | 1 + .../Prototypes/Catalog/Fills/firstaidkits.yml | 35 ++++ .../Entities/Objects/Specific/medical.yml | 169 ++++++++++++++---- .../firstaidkits.rsi/advkit-inhand-left.png | Bin 0 -> 268 bytes .../firstaidkits.rsi/advkit-inhand-right.png | Bin 0 -> 277 bytes .../Medical/firstaidkits.rsi/advkit.png | Bin 0 -> 308 bytes .../firstaidkits.rsi/blackkit-inhand-left.png | Bin 0 -> 332 bytes .../blackkit-inhand-right.png | Bin 0 -> 333 bytes .../Medical/firstaidkits.rsi/blackkit.png | Bin 0 -> 274 bytes .../firstaidkits.rsi/brutekit-inhand-left.png | Bin 0 -> 373 bytes .../brutekit-inhand-right.png | Bin 0 -> 367 bytes .../Medical/firstaidkits.rsi/brutekit.png | Bin 0 -> 366 bytes .../firstaidkits.rsi/burnkit-inhand-left.png | Bin 0 -> 342 bytes .../firstaidkits.rsi/burnkit-inhand-right.png | Bin 0 -> 347 bytes .../Medical/firstaidkits.rsi/burnkit.png | Bin 0 -> 475 bytes .../firstaidkits.rsi/firstaid-inhand-left.png | Bin 0 -> 375 bytes .../firstaid-inhand-right.png | Bin 0 -> 364 bytes .../Medical/firstaidkits.rsi/firstaid.png | Bin 0 -> 370 bytes .../Medical/firstaidkits.rsi/meta.json | 110 ++++++++++++ .../firstaidkits.rsi/o2kit-inhand-left.png | Bin 0 -> 292 bytes .../firstaidkits.rsi/o2kit-inhand-right.png | Bin 0 -> 297 bytes .../Medical/firstaidkits.rsi/o2kit.png | Bin 0 -> 478 bytes .../purplekit-inhand-left.png | Bin 0 -> 287 bytes .../purplekit-inhand-right.png | Bin 0 -> 300 bytes .../Medical/firstaidkits.rsi/purplekit.png | Bin 0 -> 253 bytes .../firstaidkits.rsi/radkit-inhand-left.png | Bin 0 -> 370 bytes .../firstaidkits.rsi/radkit-inhand-right.png | Bin 0 -> 367 bytes .../Medical/firstaidkits.rsi/radkit.png | Bin 0 -> 484 bytes .../firstaidkits.rsi/toxinkit-inhand-left.png | Bin 0 -> 402 bytes .../toxinkit-inhand-right.png | Bin 0 -> 388 bytes .../Medical/firstaidkits.rsi/toxinkit.png | Bin 0 -> 533 bytes .../Specific/Medical/medical.rsi/medkit_r.png | Bin 713 -> 0 bytes .../Specific/Medical/medical.rsi/meta.json | 3 - 35 files changed, 284 insertions(+), 36 deletions(-) create mode 100644 Resources/Prototypes/Catalog/Fills/firstaidkits.yml create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png delete mode 100644 Resources/Textures/Objects/Specific/Medical/medical.rsi/medkit_r.png diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/backpack.yml index 3d0687f3ad..9f4eaf069d 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/backpack.yml @@ -34,6 +34,7 @@ - type: StorageFill contents: - name: BoxSurvival + - name: Medkit - type: entity abstract: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml index baea083bfb..30c8b76e5f 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml @@ -34,6 +34,7 @@ - type: StorageFill contents: - name: BoxSurvival + - name: Medkit - type: entity abstract: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/satchel.yml index 48eb3a9f0b..8a16e02fa8 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/satchel.yml @@ -34,6 +34,7 @@ - type: StorageFill contents: - name: BoxSurvival + - name: Medkit - type: entity abstract: true diff --git a/Resources/Prototypes/Catalog/Fills/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/firstaidkits.yml new file mode 100644 index 0000000000..f9ad04e600 --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/firstaidkits.yml @@ -0,0 +1,35 @@ +#Entities found at entities/objects/specific/medical +- type: entity + id: MedkitFilled + suffix: Filled + parent: Medkit + components: + - type: StorageFill + contents: + - name: Brutepack + amount: 3 + - name: Ointment + amount: 3 + # todo 1 Health Analyzer once it exists. Remove brutepack and ointment for suture, gauze, mesh and medipen? + # see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents + +- type: entity + id: MedkitBurnFilled + suffix: Filled + parent: MedkitBurn + components: + - type: StorageFill + contents: + - name: Ointment + amount: 5 + +- type: entity + id: MedkitBruteFilled + suffix: Filled + parent: MedkitBrute + components: + - type: StorageFill + contents: + - name: Brutepack + amount: 5 +#todo TO DO - add first aid kits for rad, toxin, o2, advanced and combat. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/medical.yml b/Resources/Prototypes/Entities/Objects/Specific/medical.yml index bba2da445c..400e66e546 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/medical.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/medical.yml @@ -1,30 +1,3 @@ -- type: entity - name: emergency medical kit - description: An emergency medical kit for those serious boo-boos. - parent: BaseItem - id: Medkit - components: - - type: Sprite - sprite: Objects/Specific/Medical/medical.rsi - state: medkit_r - - type: Storage - capacity: 60 - - type: Item - size: 9999 - -- type: entity - id: MedkitFilled - suffix: Filled - parent: Medkit - components: - - type: StorageFill - contents: - - name: Brutepack - amount: 3 - - name: Ointment - amount: 3 - # todo 1 Health Analyzer once it exists - - type: entity name: medical stack id: MedicalStack @@ -36,7 +9,7 @@ - type: entity name: ointment - description: Used to treat those nasty burns. + description: "Used to treat those nasty burns." parent: MedicalStack id: Ointment components: @@ -53,7 +26,7 @@ - type: entity name: bruise pack - description: A therapeutic gel pack and bandages designed to treat blunt-force trauma. + description: "A therapeutic gel pack and bandages designed to treat blunt-force trauma." parent: MedicalStack id: Brutepack components: @@ -70,17 +43,147 @@ - type: entity name: roll of gauze - description: Some sterile gauze to wrap around bloody stumps. + description: "Some sterile gauze to wrap around bloody stumps." parent: MedicalStack id: Gauze components: - type: Sprite sprite: Objects/Specific/Medical/medical.rsi state: gauze -# - type: Healing -# heal: -# Blunt: 10 + - type: Healing + heal: + Blunt: 10 - type: Stack stackType: Gauze max: 5 count: 5 + stacktype: enum.StackType.Gauze +#first aid kit entities. See catalog/fills/firstaidkits for contents +- type: entity + name: first aid kit + description: It's an emergency medical kit for those serious boo-boos. + parent: BaseItem + id: Medkit + components: + - type: Sprite + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: firstaid + - type: Storage + capacity: 50 + - type: Item + size: 5 + sprite: Objects/Specific/Medical/firstaidkits.rsi + HeldPrefix: firstaid + + +- type: entity + name: burn treatment kit + description: "A specialized medical kit for when the toxins lab *spontaneously* burns down." + parent: BaseItem + id: MedkitBurn + components: + - type: Sprite + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: burnkit + - type: Storage + capacity: 50 + - type: Item + size: 5 + sprite: Objects/Specific/Medical/firstaidkits.rsi + HeldPrefix: burnkit + +- type: entity + name: toxin treatment kit + description: "Used to treat toxic blood content." + parent: BaseItem + id: MedkitToxin + components: + - type: Sprite + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: toxinkit + - type: Storage + capacity: 50 + - type: Item + size: 5 + sprite: Objects/Specific/Medical/firstaidkits.rsi + HeldPrefix: toxinkit + +- type: entity + name: oxygen deprivation treatment kit + description: "A box full of oxygen goodies." + parent: BaseItem + id: MedkitO2 + components: + - type: Sprite + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: o2kit + - type: Storage + capacity: 50 + - type: Item + size: 5 + sprite: Objects/Specific/Medical/firstaidkits.rsi + HeldPrefix: o2kit + +- type: entity + name: brute trauma treatment kit + description: "A first aid kit for when you get toolboxed." + parent: BaseItem + id: MedkitBrute + components: + - type: Sprite + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: brutekit + - type: Storage + capacity: 50 + - type: Item + size: 5 + sprite: Objects/Specific/Medical/firstaidkits.rsi + HeldPrefix: brutekit + +- type: entity + name: advanced first aid kit + description: "An advanced kit to help deal with advanced wounds." + parent: BaseItem + id: MedkitAdvanced + components: + - type: Sprite + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: advkit + - type: Storage + capacity: 50 + - type: Item + size: 5 + sprite: Objects/Specific/Medical/firstaidkits.rsi + HeldPrefix: advkit + +- type: entity + name: radiation treatment kit + description: "If you took your Rad-X you wouldn't need this." + parent: BaseItem + id: MedkitRadiation + components: + - type: Sprite + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: radkit + - type: Storage + capacity: 50 + - type: Item + size: 5 + sprite: Objects/Specific/Medical/firstaidkits.rsi + HeldPrefix: radkit + +- type: entity + name: combat medical kit + description: "For the big weapons among us." + parent: BaseItem + id: MedkitCombat + components: + - type: Sprite + sprite: Objects/Specific/Medical/firstaidkits.rsi + state: blackkit + - type: Storage + capacity: 50 + - type: Item + size: 5 + sprite: Objects/Specific/Medical/firstaidkits.rsi + HeldPrefix: blackkit diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..61870c8756b9ca6cec050a8fabd4ec5369137f46 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`CEaj?(fW3pCs%`k0L$4N!=L|~V+9-y&vsP2W-8V&>{-4tQ>jION%MF!&!4z!&ZmyP zIO}l6_71Ok44ofy`glX(f`CkD zKQts{_VnqsH8qu$l@A|0c>n&rSKI3F$vc2*jx#W@q$ThI6?2ya`2{loRYO5-S?yJz zaJQ$6V@O2n+i8w`tqMFY-rTNx|2OV8TgM~0>e>1^(>KgI$-N=dl|!*5M&o(qExjzI zS*9XWvv+TMw)X0hgbVk=-tWuvJh&kD-t>3VM0jqk&tLFS%a@Do?W(k8Fa7siRcjIW z6#HSC!Tf&}-Zz5hb9|Uqutb<~-o=SYjQ50;{(k2DFik*H?7>cXO|hD(^6M>`=bfF} R0(2DvgQu&X%Q~loCIA>AcCP>c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png new file mode 100644 index 0000000000000000000000000000000000000000..83e91597166a7d1c28ad0225d7c65255c0700f0f GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|ECYN(Tn`*L zP+VC2;QFm;)25}RrG5JJY2LhfD^{%7zjJp?Ow87;ThHIP^XC0W^Y$Z((?0)aU^vde z@Lx;}sJ-^d?N*>6!X-g|!3_T~fSvsvU7&QAr;B5VMeo~*7x|nNIULqEgmag!`~UyO zg0k&GQ@78vnk{`wFtGpeahBBS?5T+gi=K3P@O0+d9g=Ja@?v?|lEHK4=QMqlO-&&U z-I=XFdPUvV6#P$7dZD$y^626V@_UOlw_Xd{aXLqJ%hZMk44ofy`glX(f`gar76xc>kD zKQts{_VnqsH8qu$l@A|0c>n&rSKI3F$ve*9xC2y$2ZV%#n71EMoc7t()z#S0$lBUk zNKjBsRqgQ<`C~wBG9^KN!3;nPaDkQOYXgDm>O5T>Ln2z=P7CBZpupqYI`?4Y<=^*< zdCb_39_70kFZaUzNYHEdpe_L?4z6`aMXKb#f79UL(oeW{)?un=V_39?fN0nEUDw}* z{M_FBRg$6a2e+f36NjSRhdjlV3mkl2*xXnq=9*)WI_XSDu-Vx~4q6&Ik44ofy`glX(f`gar76xc>kD zKQts{_VnqsH8qu$l@A|0c>n&rSKI3F$ve*9xC2y$2ZV%#n71EMoc7t()z#S0$lBUk zNKjBsRqgQ<`C~wBG9^KN!3;nPaDkQOYXgDm>OEZ?Ln2z=PCLkVK!L;gFQ?j-|Nqas zZk{Z4VdmUx(_ggS60n&vg+sBWKm;OPLbBs6`Z<>^UOq$Pd#1zT-G@yGywp13x`|) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png new file mode 100644 index 0000000000000000000000000000000000000000..cfa19a007aa4422a0dae7c3ed1c6fc8237fc7909 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvtpJ}8*8>L*NJ&UKI5-Fi3aY89 zMMg%}*48R2C|Fxt8yFZE8ydN~x|+8iQJnTU|LNS*KwXR_L4Lsu4$p3+0Xfq=T^vI+ zCMG8+h#PQmE#l(P)Z|nsY?YnL(ke3dq0^Z~on22`yH*}5VCR`NEOo?Sl*c-dzs^eNBjhi)?!nDuL zu`Ny#y%R7kRQue$z12xqg;W?fbg6no9Y~WiWS0Ei467t`_`nqw%|FkLp zXP!BA>eT!9@4ebqhfm&7TT?T6;+~B_MT{jue!&b5&u*jvIR#ZA5hX6E#mPmP1tppJ zc?=8{bArPPib}tK2`>2f^@*0ZuGYCT=Yuzd8eBAf@JQ#pkLF2+qMqIz7REuwmyNv? z<~*8oWKxJiu%_;2juYp6F8XR|>3W7fdgQ~%)lgDgxJ*>_*|Me^Z84{~*461Hd}d6` zk=?xH(4i$jyW2cn978-hlM^IZ7bjd`VpMQRUBKkV%H|rvCY4a;Tk4j&fN|M}Zweu7 zyPA3=Jy-Bd@-6T!bxK`e9pvdLIn|KM?VyGNk3^tl&x=n!-4nWb728~2EaiyqU=%v9 z!qdvlB)XK#!zMIDkE3LpV)u%LMV&^9IxLYctW&v}yu41VGje*$r^CRYwN3KOG>c;w QfG%S2boFyt=akR{0Q;SasQ>@~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b9ffd46359f2872987578fceb9ff6da29a050e94 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iW*Z=?jhlYgw_piQg9PvMG z%Kw>XPMtdS{{4Hew$u;r2P$SP3GxeOaCmkj4ag~|3W+FjNi9w;$}A|! z%+F(BsF)KRR!~&>{Y!Ac$FEPcymhtCojD)8A=Kca@qEamT(V3he!MZr%10$ot5%n`G4lL+!l~X+PX4b17S4O89ntNfYe7SpOTrZKo+u4hmc`SU zW-)D1YPxC4=*t+z#$I$$bb*+lgWgFsFttlL@HCUc^h5(jh7H#xB+d3)eFwUQ!PC{x JWt~$(69AE_kRbp7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png new file mode 100644 index 0000000000000000000000000000000000000000..7456850c08f24214473d4e75273b81a143301674 GIT binary patch literal 366 zcmV-!0g?WRP)fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM z;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+si?FhRf&r;C9|j)$T#HTOe;#vO@*+P z6k44ofy`glX(f`xCZ!yxB}_W zkdUKmSeNv(ygtkJ{~p7sQ>V^sVtN1my;s}n@X0$iE%vCbsoAv1_AMd9>yOuSf z)oR-^_Z2g(b>!u}y}f&Tdovz8WdjWoFA4GsX84a4Z0Ih&4^%S8)5S3)qV?^xgF?*; zJT9Rv7MH`;xcvVgJiE-sGR^n>@3aRS9MlRPmdYx&2zb=k44ofy`glX(f`xCZ!yxc>kD zKQtud=o;1~{VcD~vi-luaO%{lGn-i6zkl!5wmN+Bj!la^YHMmXE%unuYW3_|*2nwl zw{PFxw#Sud`K%@djwbm_<$q`UZO++z-N55H zE0@kqO^GFfVR4Len;fN1H}BlRS}WB!zvcl;td#xsBJN)$$IRck+f3mDYCYF|Pw374 z_ZAbLpEnfY8JPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0dPq~K~z{rV;BVk z4H%&`NuZ~I=|7YS2PG5!k!2Ri0A%^6Gkh2ro1=&U1YNzXhYN1-vnM|o(qeeP>=}!{ zf@u)Qh~);;vzB~ekdom5vq2!LXQ0J1#HPnE&Pfra6R&=jaB#Bw!N7C1(B z3`iYFJxCw2<8cAJE(94MC;1P|p0PcIA;WVGn2ir0t9$gEiC`$;4FM3aFjZ&JQ)gpv za&iLGgfL7UNFOnPUV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DJ`=I$j(er;^IsJGC}&dIMa#}b5lWVLoQ_nS3ei9$pD-c8)PG; z?{WYD0F+5YK~zYI?UXSN!XOlep*GBoC%{m5L!+}X=>@QGfrj)3#2fV5O4{N5Z*kP& zeJtMx1ej1t5dN0#Gf)t1)oByA3!{yBLSZzi1Qf<$S!Wc!A(bZzzar*V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DJ`=I$j(er;^IsJGC}&dIMa#}b5lWVLoQ_nS3ei9$pD-c8)PG; z?{WYD0EtONK~zYI?Uc(6fFKY=`4wOZ8tlMMR6Ls)Vh6Nf+wMgO!^Sg*9Zvh0z@DB` z5=nm<==@>r)x_NE@xv~}ohcM-jU?NY(iwe$k_R1=9c8KL?X!n zMKrzuMQDFQ0Tkf^7C;d+LID&(BNl2!*yaUL1dX_4?E)HAPk8}&ofx{a-q1Aw0000< KMNUMnLSTZ3*OcM_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png new file mode 100644 index 0000000000000000000000000000000000000000..3fe117f2ac6a20ac04a09aa996b49e769b5d7ad4 GIT binary patch literal 370 zcmV-&0ge8NP)- zsSviZf~%hk*kk~k%^P7b+7Vv>004eTL_t(2kz-&W7cdG6q6!EpDG4BPjSZDtoD_`> zV0`AFM3wRq#iU@kK*x*@AehmNP?4kr1V}1EApjv@3;M1&07*qoM6N<$g4lwXT>t<8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json new file mode 100644 index 0000000000..2a15bf86cd --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json @@ -0,0 +1,110 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "Taken from https://github.com/tgstation/tgstation/tree/727eb0a445bccbdc2d472e158e96b87fc0e997a1. Rad, toxin, o2, fire and adv by peptide", + "copyright": "CC-BY-SA-3.0", + "states": [ + { + "name": "firstaid" + }, + { + "name": "firstaid-inhand-right", + "directions": 4 + }, + { + "name": "firstaid-inhand-left", + "directions": 4 + }, + { + "name": "brutekit" + }, + { + "name": "brutekit-inhand-right", + "directions": 4 + }, + { + "name": "brutekit-inhand-left", + "directions": 4 + }, + { + "name": "burnkit" + }, + { + "name": "burnkit-inhand-right", + "directions": 4 + }, + { + "name": "burnkit-inhand-left", + "directions": 4 + }, + { + "name": "o2kit" + }, + { + "name": "o2kit-inhand-right", + "directions": 4 + }, + { + "name": "o2kit-inhand-left", + "directions": 4 + }, + { + "name": "radkit" + }, + { + "name": "radkit-inhand-right", + "directions": 4 + }, + { + "name": "radkit-inhand-left", + "directions": 4 + }, + { + "name": "toxinkit" + }, + { + "name": "toxinkit-inhand-right", + "directions": 4 + }, + { + "name": "toxinkit-inhand-left", + "directions": 4 + }, + { + "name": "purplekit" + }, + { + "name": "purplekit-inhand-right", + "directions": 4 + }, + { + "name": "purplekit-inhand-left", + "directions": 4 + }, + { + "name": "blackkit" + }, + { + "name": "blackkit-inhand-right", + "directions": 4 + }, + { + "name": "blackkit-inhand-left", + "directions": 4 + }, + { + "name": "advkit" + }, + { + "name": "advkit-inhand-right", + "directions": 4 + }, + { + "name": "advkit-inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1d05275009e7bbbedbbdf432f595dc827063ae6a GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`s0a9jxB_Vg z<1-9t|Ba3RGtB(IapOh?VpJ)b7Pz`AeJMxw>pmB=EmiCBdKi;jfOPDkR9keD0weD7!TlwnpZQa?@EzTiV b{!JBKU&wqZ_@nb?kPkgw{an^LB{Ts5p6GQC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a2ec7761481f72796c936068bd88e4b215196982 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`s08?gxc>kD zKQttSA?-hd@qgpA{~I@MWSIHi*!chZ_wT*hR)zopr0Bn?l(EtDd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png new file mode 100644 index 0000000000000000000000000000000000000000..59919b8585570407e25bcea726eb57e6a6516cb3 GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=FdEAk5hR^kXVWgQtsQNQ8T`1S>PI#6lC#12%;Z>otV={Lb~O zpVpaV+Nfi`si6Inz=J!Tb5ksv7PMVBlv!}!?$?2{44eO)dABn`ip3{p@?#_3;P@|^NE83t_{;?}j;37xThbvDTx}0>xCm6RTryOs%(s-r$i=wrh_<`3> z6Bz4vnjXwq$6hSCPt&2Mi(g@N^1rIN2^tT083hWqo2Lm(znW4|RK#?-#lT0_L*B3< zfuo^mQp|?*+d@r>4i^{$)NVFt@d=1bWcuvM`2M~P^JNihhMPqb7KXme3y@RGn7xzx z=thOFBI-^843aH5I~TTbNi1fbVB@2^u|b1ffqBBw=lORSlXLnML?^sq$YNe)!5|_O z+PX79E)!@jgX{5cZ*MQOxx{diui>bzj&1|PiSMh!)-rAOWKC&h&=EWYO3f>dj; zH+(YVX#Qkr#!xJQ_d^)9wc~Bv=Kk44ofy`glX(f`=mz+NxE?rg zAc3!Ej^e!n)tSNERhz6n&6_u`ig#`ba4!cXnlLlny4n!ewz-1K$hk8DTPMQ$Q76I@^G@`yj#`hKsK-k*lwwSC;1es}YVhn%^) z_JNX;(x=0J+~;w%o?Wh4u=MbsR}PvJxLCa!Lo@=omN+#ADTs1SVOklmKqNq;#*!he Xnnl%nLDgNLgBUzr{an^LB{Ts5t!8k44ofy`glX(f`=mz+NxE?rg zAc3!Ej^e!n)tSNERhz6n&6_u`ig#Eaj?(fW4UM!psU9_PzT5;dRxxBuSvLT$wy8SOfu$!pbb zEfrI25hz;tci-~2%hVQyItTCEw)=O%d)I@D*6urhcdJIkmfSPReA--Mx!mcI1^L-? zR@Jpc?_NDK^QX}NEMX^(O8pAeC+qFwIPaHuvs9?g$y7R^tr(;OBrdrygf~5{ZwPl< j647w~ugAs*Yik&?53wk?Dltz5x{krq)z4*}Q$iB}Lq~zZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png new file mode 100644 index 0000000000000000000000000000000000000000..778a319a016f8423e1502c4f292d11a403c7a218 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5u*8>L*B=GgjQM^~6Iy0EN zYLnHcdGqE~@osIG-yahb(=4^){Ea(r-hVW2KcYD8^YQc2nLv$d;MH;I!n9ASZ-P@~F z@c!=Z+do1RW;CX8w^?6^J;m^q%cg-%m4V^X5s!)mU1@KCE@AL=^>bP0l+XkKapqqR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit-inhand-left.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bbf7ebadf49f36443b51350fcd18c1133494b6a4 GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0Ei460(w;xq*%0u9EPn zQ>Wg)e=izXrWo7wfSaMVrp9kUOBYZPV@Z%-FoVOh8)-mJUR6j$iA!p6a#3bMNoIZ? z14G4};IM+C((hk_3qF2*qUEitb?(gh;0>V$7mXi0(mC&=d6J>1r+0^iaggz4V=sj{ zk0u?N6rvEUsk@ou#5tdfx?Vnkj~@9j7CBb!w7A?QR2=M>jX|?*M4mB-tmMK#LWI9jDMldjZJ}7=q!S%^;po17Z MUHx3vIVCg!0D_W&L;wH) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a81963b22d4f22c02200c4d3eb0e33444cf58f5e GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iW*Z=?jhlYf#aK~d@VFTn*Lzdq6O*3~+9=6vvmP=kxc4<6~9_t8AbP}I}A!@@Yo__DE= z!kkBwj!X(s2-eiy%yHtJ&qZA?pTI|td>D%yt9Dvk?h+~vcFb|sOJxnW7vJ!bLB>Gl z#P9#fOMo^vdAc};cyuNwNU$zW_`v9V!uSb?KDCR6#(sFg;jaK)A8WOAq3I`M#PPsDoMDcWK#ITyMp3zb~ zrE!PBgw-c6)o(>i3G2hRjw@m&`OXkB;+)$3&O=o-HAL@l0uw_}tC-cRlKwqF*D!dx L`njxgN@xNA2Puic literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png new file mode 100644 index 0000000000000000000000000000000000000000..0bab485fa95130e3bb5da80276b4918d0b0b1109 GIT binary patch literal 484 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0eMM8K~z{rV;BVk z4H%&`Nnj#3_kSo84)VW#CCe<5HGwP-WoCx*5McG+zhpUrpoWEPY;fOxU}a^1Sw8E} zA21C9X)G*Y8srFp-@n0Z5QzWvi=g>TP#P-$Sso`X&EU$x!SHv+45%o?a!;V8FpTUN zkUEfhkUnI`;{upri39?fnHydKeGS4J7#SH{o<0S$W!c#oegbJ22Ju1SqCgs?PV(_% zhI>Fqefj>KVZ-0QjZovT0=yvr0%bB zvgL*vDqxJx2Fb(J5(|iO05X7Ch7NFv69ObVfZBj$2b{lg2aZ9$M&^?P$PR%oub-pP zR8Q afdK#vi@nEyt66{m0000na*S0Ei45)wRH$vK}nd5g}* zjT@sTaRoMUzkmPUt8I1o!ED7=pW^j0RBMrzYs0xWFaY-#sF3Kz@ z$;{7VV5pcA99B?N`u$6A!N;#pw7hk-&Yd|Qydl)!qVa=AI_G^fPcjts^zN`Q4l=%M z?4>a0(WE1jLKK2EbvJXIIOlUw_vHE$XM!I+@?qp^C@C&nCaU^uS<{WSm{VNq>huym zGiF?qJ#6BZ4s!njPZ!4!kIv)-3D(647nm3oTv8V>xv{djhOkK`gmDJ88C*FuWus=o z_ZbiSPC0}N>@<=&lh7R_*>;`9tY0!OLUcvTip543WFzC^coL^96-^E{;Bq^taezr8 z(6Z;nC!g69x_K4bd|xc($ezR~bY4TWm78gg3}f=IQvf tsbRJ7rkSoQVgx+A-OHw0YLzE2GCYx%pVl%hjTPut22WQ%mvv4FO#peXmZ1Ou literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit-inhand-right.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7fea97fdbc1c032404469dd3d606afcab4e0abcc GIT binary patch literal 388 zcmV-~0ek+5P)F6XVDJF}AjBuksKB6zMIIr{tP-M( zMFF!~7*v=&V@5g_1qfl5$dw`36hy8JhbqXJk%HF*cC|2dYzpAQ%q1?x*c@42j!k$J zjDk@B2WUkEMtQ-gjZ#D~YAc{AKr14cRRYiypcN57E}8Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0jfzvK~z{r?UheU z0znwYUw2FMP!t&v2^n;-OCWR#BaqHU-J%asr*1{j7bw3&bnFX6hmfv97Y#aWWTGS_ zb=acFdd8V)HFI{yAP@V4mv?4%W}e6SC;9w00iHcEbu?b*Mak`EMQbk4gCHKB4e{DH zcK%h%gmOT9CnkTb9kEG>Kb}6b3`SN5S%!&lHO$JOa9}CtH+XIf#1mU{M2jD^J-y3Y z8{+1KA;W2g_513NaZdBUVe;IT$kOoMeWgV8C!)9WI+f!^Rt`-DDLB+G19h~UA(QpH z8?~r(T_&SuQ1zm=&!=lk#}xqcD+w~A0ZOG(EUQBF!#Fo|+#|UKn&b|zl;=QcfETs- z69YK?UJX9HrnA-a}MOL5(8@N58r5Ni$H zRnS@ih~)}5GK47|Tp7UKM&O=9@Zsg1e`$a^+QmEId<#_c_Dcx5`9DyJ`}p|y^Z-Pk XPG7gZ1nR{Y00000NkvXXu0mjf^>g7E literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/medkit_r.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/medkit_r.png deleted file mode 100644 index 6eb5a3eebea2ef04f4678fe60297012d13b65ecb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 713 zcmV;)0yh1LP)#FA>Y8jIsF=2Ehv@n%nF-CGVR&}{w~s?{nC!-#ZjS(YPmxV|WTJIo*n%StRE z_*KoFU$cRd20YbuOwTOf!TqU70p~A_Lf7@pwLY%fuHUc-Nq`vq2Y?oU4GuJjoXui> zb{doApnxx5o15d(__)Jsg#3~}m56|VaBv^nLxsCo9F44iv2(Z5zRH6l{Qi?FKqMmP zn47(b+pkT4o|GWJV;V4Fch+l3Ty4Z}j?_>#Az_>Mw7q$B-zNiYuysWuN&!^<7asYS zXM4T{RTxy94oU%w9M}P1pI|%m7lD5QSO>7gWf1`ZYuxSres7)=$hp|F?ayd&brMnq zzH`7}?t&*A_~@0MI=G%Pcm}|6xXC@X-9#e=5P41@eB!_r4fvceSg~n2@ABSG+fpOH z^u{I!dIWx88@`EXG*Z5nPyk`BzM7aTRUqHA&=4F{&J5sW(?To4>4%{K=j~_iPAKAbP2bS7yZ0RU|58#{73kMi*%LYagZo{ZbA>`MG^b?fYzzE6Wz#azl zGj}J1FQzC&Wlq8A(q0LPkp7Y#%`%5_N~n!#2j^*Fdbi;Ip>u4eQgOyo1 diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json index 52db031b86..261567b87d 100644 --- a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json @@ -14,9 +14,6 @@ { "name": "gauze" }, - { - "name": "medkit_r" - }, { "name": "morphine" },