From d8312ec5ae360e3b714b091f983a923d3da9caea Mon Sep 17 00:00:00 2001 From: Poojawa Date: Thu, 4 Apr 2019 18:38:34 -0500 Subject: [PATCH] Medical belt overlays + hypo storage --- code/game/objects/items/stacks/medical.dm | 5 ++++- code/game/objects/items/storage/belt.dm | 5 ++++- .../reagents/reagent_containers/dropper.dm | 3 +++ .../reagents/reagent_containers/glass.dm | 3 +++ .../reagents/reagent_containers/patch.dm | 5 ++++- .../reagents/reagent_containers/pill.dm | 2 ++ .../reagents/reagent_containers/syringes.dm | 3 +++ icons/obj/clothing/belt_overlays.dmi | Bin 1541 -> 4292 bytes 8 files changed, 23 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index f3363e135e..4bb3359c2f 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -170,4 +170,7 @@ /obj/item/stack/medical/ointment/suicide_act(mob/living/user) user.visible_message("[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?") - return TOXLOSS \ No newline at end of file + return TOXLOSS + +/obj/item/stack/medical/get_belt_overlay() + return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "pouch") diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 8b932cf615..57c77e5983 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -115,6 +115,7 @@ desc = "Can hold various medical equipment." icon_state = "medicalbelt" item_state = "medical" + content_overlays = TRUE /obj/item/storage/belt/medical/ComponentInitialize() . = ..() @@ -136,6 +137,7 @@ /obj/item/flashlight/pen, /obj/item/extinguisher/mini, /obj/item/reagent_containers/hypospray, + /obj/item/hypospray/mkii, /obj/item/sensor_device, /obj/item/radio, /obj/item/clothing/gloves/, @@ -172,6 +174,7 @@ /obj/item/storage/belt/medical/surgery_belt_adv name = "surgical supply belt" desc = "A specialized belt designed for holding surgical equipment. It seems to have specific pockets for each and every surgical tool you can think of." + content_overlays = FALSE /obj/item/storage/belt/medical/surgery_belt_adv/PopulateContents() new /obj/item/hemostat/adv(src) @@ -357,7 +360,7 @@ /obj/item/reagent_containers/food/snacks, /obj/item/reagent_containers/food/drinks )) - + var/amount = 5 var/rig_snacks while(contents.len <= amount) diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 5907c9e534..1c75c76458 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -97,3 +97,6 @@ var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "dropper") filling.color = mix_color_from_reagents(reagents.reagent_list) add_overlay(filling) + +/obj/item/reagent_containers/dropper/get_belt_overlay() + return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "pouch") diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 1912e9fe9d..05f30a7092 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -330,3 +330,6 @@ /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty list_reagents = list() + +/obj/item/reagent_containers/glass/get_belt_overlay() + return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle") diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index 12439c6b2f..02852f2218 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -39,4 +39,7 @@ name = "burn patch" desc = "Helps with burn injuries." list_reagents = list("silver_sulfadiazine" = 20) - icon_state = "bandaid_burn" \ No newline at end of file + icon_state = "bandaid_burn" + +/obj/item/reagent_containers/pill/patch/get_belt_overlay() + return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "pouch") diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index b5d00d2ba4..1702e1f816 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -214,3 +214,5 @@ if(prob(20)) desc = pick(descs) +/obj/item/reagent_containers/pill/get_belt_overlay() + return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "pouch") diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 92e7e9f789..b2b7ab88a7 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -259,3 +259,6 @@ desc = "A diamond-tipped syringe that pierces armor when launched at high velocity. It can hold up to 10 units." volume = 10 proj_piercing = 1 + +/obj/item/reagent_containers/syringe/get_belt_overlay() + return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "pouch") diff --git a/icons/obj/clothing/belt_overlays.dmi b/icons/obj/clothing/belt_overlays.dmi index 5946966d24d68db05e1884899e975d95098fee7e..d7bf32d7b1aeb12984c9a58bc4da9ccc656de883 100644 GIT binary patch literal 4292 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 literal 1541 zcmV+g2KxDlP)005u}0{{R3yb+fl0003mP)t-sz`(#C zA0I|WMkOUB0000$KtPO)j50DZTU%S>eF?6ciKy00VArZpD5S>zg0R2?oiF1``nx zn*adf3k92J0OFnnCL$ss4gf1ACOsSke*ge~RRAk1D;yjgM@L6(HxF7`T7OX$aBy(3 zizO~DE>%=iW@ctQ90Y3s0GR*)x&;M190oib1(IeOaBpuoAP+Yp5<49S9v&Vy7XYE5 zC-Cq%iHSf`Qc{3`08~^|$jB!qCMG{WKXg9;``jxbAt9BOl|DW`_Rk3AjRf%U@XO1~ zsHmvI001`t0E~@|-{0RuLqn95l)t~fbaZq@MMbQvtSl@n78MnXQOf=R0004WQchC< zK<3zH0003VdQ@0+L}hbha%pgMX>V=-0C=30l)-MoFbsyz?Nd~6MbpZVcG_hEO&s7A zA~!WnwlqPGOT^nRgEA&fDCsSZzAyUYSeaMvn~&|jTJN^y3CU|`tG8I~DJOg7~&JG5=YQT20vS>B=xL23OfuP56tsMKK`|;}4qJCY}ciHn`8(?Q2 z$^S_KlJyBE2-Zn7CM`(9&{8~`rm#XGw37rod}YM{BQylwCk;6;$F~!N={Ps`92?_8 zHl7)TTxcNO#E}yQs7p8GMrU1bWb^U{LMv4!CVFhOg!DL#cwU5lFs#|R^s&EW?%Umk zoX*9GGe%s7FOzMY;UxMA!Heq@<*`RPKLY2~X1~6CRo{uOYUrrlR9pZ616oN$K~#90 z?V5R0(?A%9w#kDeu!i zpEmoKLTIw*7!*iVn?o%fV+ zVPAn>A{*a7Ko)uzE?zR9!dwo_kcA%{7^FVpUA}y!y92LY8#3R6E|wSt4qv~~!A;^| z2Kz_oJyq&Z z{*ZAUKrXTNwo5!aJxh9j#y7Z%4zTu*!L^YOfIkXY0D*)*oxmXwNcbn<+Q^rHZ?QPE zVC|oRYa?F<{wP3!K;Yej#?QJ>5ClOGgtI}#u{ZhafxP}RdIYZb17=}m2?Q{`A5=ST zN;RPJ90ZoKp1~Kc1G#$;1|}}C+5hOd4y-25pf{#Wj#x4b^o;&h)b$?Z&!F?bq&?Ur zGnjmnc!3H|V-LPWfy)V|YXV;-sle!vioL`zF!6gZC>aKlBXGSRR+HAaR5m$9(*vwf zBXGSRE{Ctj3+hP{tDpWE8rY0+#pV+)XPAOG_%S&00}^SQ0S zQACf9d<^>sJntS9ka=M5l6*dgZc)Q8nFF=Y@`4M{L(JwOm*!m@ZSJsq9I1W}M&L1l zd~5)CR3Lw%0Q^+x{HIL1eJP{I-lqbPcTVHW*S&94An?xl{-aSS5&_6N=jX5AfBrJO rbGklI=>T#Ck#|l5{7r(q&{O;aN7k->8URyD00000NkvXXu0mjfQ!lGi