removed pill changes

This commit is contained in:
Kevin
2016-06-06 00:10:32 +02:00
parent bddd4aee3e
commit e584256330
3 changed files with 2 additions and 8 deletions
@@ -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)
@@ -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
. = ..()
@@ -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)"