Merge pull request #8211 from Poojawa/hypo-belts

Medical belt overlays + hypo storage
2019-04-05 20:13:55 -04:00
parent 4718f66f87 d8312ec5ae
commit 70ace01312
8 changed files with 23 additions and 3 deletions
@@ -170,4 +170,7 @@

 /obj/item/stack/medical/ointment/suicide_act(mob/living/user)
 	user.visible_message("<span class='suicide'>[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?</span>")
-	return TOXLOSS
+	return TOXLOSS
+
+/obj/item/stack/medical/get_belt_overlay()
+	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "pouch")
@@ -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)
@@ -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")
@@ -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")
@@ -39,4 +39,7 @@
 	name = "burn patch"
 	desc = "Helps with burn injuries."
 	list_reagents = list("silver_sulfadiazine" = 20)
-	icon_state = "bandaid_burn"
+	icon_state = "bandaid_burn"
+
+/obj/item/reagent_containers/pill/patch/get_belt_overlay()
+	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "pouch")
@@ -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")
@@ -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")