From e5d01311d62f738899d5b2d6bf7ff0cbb1178756 Mon Sep 17 00:00:00 2001 From: Dave Date: Sat, 23 Feb 2019 22:37:59 -0500 Subject: [PATCH] Review Concerns --- code/game/machinery/iv_drip.dm | 6 +++--- code/game/objects/items/weapons/storage/boxes.dm | 16 ++++++++-------- .../reagents/reagent_containers/iv_bag.dm | 7 +++---- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index a8bbbd18fb1..3c888bc501a 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -10,14 +10,14 @@ var/obj/item/reagent_containers/iv_bag/bag = null /obj/machinery/iv_drip/update_icon() - overlays.Cut() + cut_overlays() if(bag) - overlays += "hangingbag" + add_overlay("hangingbag") if(bag.reagents.total_volume) var/image/filling = image('icons/goonstation/objects/iv.dmi', src, "hangingbag-fluid") filling.icon += mix_color_from_reagents(bag.reagents.reagent_list) - overlays += filling + add_overlay(overlays) /obj/machinery/iv_drip/MouseDrop(mob/living/target) if(usr.incapacitated()) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 838e9fbedd9..5a5d1c5ba63 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -197,14 +197,14 @@ icon_state = "beaker" /obj/item/storage/box/iv_bags/New() - ..() - new /obj/item/reagent_containers/iv_bag( src ) - new /obj/item/reagent_containers/iv_bag( src ) - new /obj/item/reagent_containers/iv_bag( src ) - new /obj/item/reagent_containers/iv_bag( src ) - new /obj/item/reagent_containers/iv_bag( src ) - new /obj/item/reagent_containers/iv_bag( src ) - new /obj/item/reagent_containers/iv_bag( src ) + ..() + new /obj/item/reagent_containers/iv_bag( src ) + new /obj/item/reagent_containers/iv_bag( src ) + new /obj/item/reagent_containers/iv_bag( src ) + new /obj/item/reagent_containers/iv_bag( src ) + new /obj/item/reagent_containers/iv_bag( src ) + new /obj/item/reagent_containers/iv_bag( src ) + new /obj/item/reagent_containers/iv_bag( src ) /obj/item/storage/box/injectors name = "\improper DNA injectors" diff --git a/code/modules/reagents/reagent_containers/iv_bag.dm b/code/modules/reagents/reagent_containers/iv_bag.dm index 78f0438efba..8cea4b7658a 100644 --- a/code/modules/reagents/reagent_containers/iv_bag.dm +++ b/code/modules/reagents/reagent_containers/iv_bag.dm @@ -138,11 +138,10 @@ // PRE-FILLED IV BAGS BELOW -/obj/item/reagent_containers/iv_bag/salglu/New() +/obj/item/reagent_containers/iv_bag/salglu ..() - set_label("Saline-Glucose") - reagents = list_reagents = list("salglu_solution" = 200) - update_icon() + name = "\improper IV Bag (Saline Glucose)" + list_reagents = list("salglu_solution" = 200) /obj/item/reagent_containers/iv_bag/blood // Don't use this - just an abstract type to allow blood bags to have a common blood_type var for ease of creation. var/blood_type