From 2fe93e3e255c5e7f50b641742e8099cfabe91b7d Mon Sep 17 00:00:00 2001 From: "baloh.matevz@gmail.com" Date: Sat, 26 May 2012 02:14:17 +0000 Subject: [PATCH] - Replaced some hardcoded hallucination strings for screen placement to instead use #defines from hud.dm. Please don't use hardcoded constants when there are variables or defines available... git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3672 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/flufftext/Hallucination.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index ca64ddaa8bc..ec6f4c7afc4 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -37,14 +37,14 @@ mob/living/carbon/proc/handle_hallucinations() //src << "Traitor Items" if(!halitem) halitem = new - var/list/slots_free = list("1,1","3,1") - if(l_hand) slots_free -= "1,1" - if(r_hand) slots_free -= "3,1" + var/list/slots_free = list(ui_lhand,ui_rhand) + if(l_hand) slots_free -= ui_lhand + if(r_hand) slots_free -= ui_rhand if(istype(src,/mob/living/carbon/human)) var/mob/living/carbon/human/H = src - if(!H.belt) slots_free += "3,0" - if(!H.l_store) slots_free += "4,0" - if(!H.r_store) slots_free += "5,0" + if(!H.belt) slots_free += ui_belt + if(!H.l_store) slots_free += ui_storage1 + if(!H.r_store) slots_free += ui_storage2 if(slots_free.len) halitem.screen_loc = pick(slots_free) halitem.layer = 50