From 499c4dd0d72c256b34503941733c4820abc06984 Mon Sep 17 00:00:00 2001 From: panurgomatic Date: Tue, 28 Dec 2010 09:20:55 +0000 Subject: [PATCH] - Fixed pill\bottle icon randomization for pills\bottles which should not have it. If you want random icons - leave icon_state null. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@718 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/Chemistry-Tools.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index fb3d3f3e2dc..9dca7593842 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -960,7 +960,8 @@ var/datum/reagents/R = new/datum/reagents(50) reagents = R R.my_atom = src - icon_state = "pill[rand(1,20)]" + if(!icon_state) + icon_state = "pill[rand(1,20)]" attackby(obj/item/weapon/W as obj, mob/user as mob) return @@ -1138,7 +1139,7 @@ name = "bottle" desc = "A small bottle." icon = 'chemical.dmi' - icon_state = "bottle16" + icon_state = null item_state = "atoxinbottle" amount_per_transfer_from_this = 10 flags = FPRINT | TABLEPASS | OPENCONTAINER @@ -1147,7 +1148,8 @@ var/datum/reagents/R = new/datum/reagents(30) reagents = R R.my_atom = src - icon_state = "bottle[rand(1,20)]" + if(!icon_state) + icon_state = "bottle[rand(1,20)]" /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline name = "inaprovaline bottle" @@ -2697,4 +2699,4 @@ icon_state = "jar" name = "empty jar" desc = "A jar. You're not sure what it's supposed to hold." - return \ No newline at end of file + return