From 79ecd8dde61f14c7e114898bc503d1eaffdf82cf Mon Sep 17 00:00:00 2001 From: Zerrien Date: Wed, 10 Feb 2016 01:21:39 -0800 Subject: [PATCH] Changes the name of bandaid to bandaid_generic, per the code changes --- .../reagents/reagent_containers/patch.dm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index 41fd6f5c3ea..94402015cf4 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -2,8 +2,8 @@ name = "chemical patch" desc = "A chemical patch for touch based applications." icon = 'icons/obj/chemical.dmi' - icon_state = "bandaid" - item_state = "bandaid" + icon_state = "bandaid_generic" + item_state = "bandaid_generic" possible_transfer_amounts = list() volume = 50 apply_type = PATCH @@ -11,13 +11,14 @@ /obj/item/weapon/reagent_containers/pill/patch/New() ..() + // thanks inheritance if(name == "brute patch") - icon_state = "bandaid_brute" // thanks inheritance + icon_state = "bandaid_brute" else if (name == "burn patch") - icon_state = "bandaid_burn" // thanks inheritance + icon_state = "bandaid_burn" else - icon_state = "bandaid" // thanks inheritance - + icon_state = "bandaid_generic" + /obj/item/weapon/reagent_containers/pill/patch/afterattack(obj/target, mob/user , proximity) return // thanks inheritance again @@ -30,13 +31,8 @@ name = "brute patch" desc = "Helps with brute injuries." list_reagents = list("styptic_powder" = 50) - icon_state = "bandaid_brute" - item_state = "bandaid_brute" /obj/item/weapon/reagent_containers/pill/patch/silver_sulf name = "burn patch" desc = "Helps with burn injuries." list_reagents = list("silver_sulfadiazine" = 50) - icon_state = "bandaid_burn" - item_state = "bandaid_burn" -