From e58425633083b8ef1e7c8bfe6a6dc032de7a3452 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 6 Jun 2016 00:10:32 +0200 Subject: [PATCH] removed pill changes --- code/modules/reagents/chemistry/machinery/chem_master.dm | 7 ------- code/modules/reagents/chemistry/reagents.dm | 1 - code/modules/reagents/reagent_containers/pill.dm | 2 ++ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 12572644e3c..ccdcc770c74 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -224,13 +224,6 @@ P.name = trim("[name] pill") P.pixel_x = rand(-7, 7) //random position P.pixel_y = rand(-7, 7) - - P.overlays.Cut() - if(reagents.total_volume) - var/image/filling = image('icons/obj/reagentfillings.dmi', src, "pill") - filling.color = mix_color_from_reagents(reagents.reagent_list) - P.overlays += filling - P.icon_state = "pill0" reagents.trans_to(P,vol_each) else var/name = stripped_input(usr, "Name:", "Name your pack!", reagents.get_master_reagent_name(), MAX_NAME_LEN) diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index 77768fc6e9f..52d9ad7142f 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -25,7 +25,6 @@ var/addiction_threshold = 0 var/addiction_stage = 0 var/overdosed = 0 // You fucked up and this is now triggering its overdose effects, purge that shit quick. - var/pill_icon_state = "pill" /datum/reagent/Destroy() // This should only be called by the holder, so it's already handled clearing its references . = ..() diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 1f6d7090d0c..b0d77981bc8 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -13,6 +13,8 @@ /obj/item/weapon/reagent_containers/pill/New() ..() + if(!icon_state) + icon_state = "pill[rand(1,20)]" if(reagents.total_volume && roundstart) name += " ([reagents.total_volume]u)"