From 94477bd66ca4153b866d0340b3261016373a397c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Baldomir?= Date: Thu, 5 Mar 2015 21:47:26 +0100 Subject: [PATCH] Minor fixes on the overlays. Made holosigns functional again. --- code/game/machinery/holosign.dm | 2 +- .../mob/living/carbon/human/update_icons.dm | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm index e341a8fc7f4..b00ab9d75b1 100644 --- a/code/game/machinery/holosign.dm +++ b/code/game/machinery/holosign.dm @@ -48,7 +48,7 @@ active = !active icon_state = "light[active]" - for(var/obj/machinery/holosign/M in machines) + for(var/obj/machinery/holosign/M in world) if (M.id == src.id) spawn( 0 ) M.toggle() diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 69faad2d8d5..15ad0b6bfd8 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -109,11 +109,11 @@ Please contact me on #coderbus IRC. ~Carn x #define DAMAGE_LAYER 2 #define SURGERY_LEVEL 3 //bs12 specific. #define UNIFORM_LAYER 4 -#define TAIL_LAYER 5 //bs12 specific. this hack is probably gonna come back to haunt me -#define ID_LAYER 6 -#define SHOES_LAYER 7 -#define GLOVES_LAYER 8 -#define SUIT_LAYER 9 +#define ID_LAYER 5 +#define SHOES_LAYER 6 +#define GLOVES_LAYER 7 +#define SUIT_LAYER 8 +#define TAIL_LAYER 9 //bs12 specific. this hack is probably gonna come back to haunt me #define GLASSES_LAYER 10 #define BELT_LAYER 11 //Possible make this an overlay of somethign required to wear a belt? #define SUIT_STORE_LAYER 12 @@ -920,7 +920,7 @@ proc/get_damage_icon_part(damage_state, body_part) /mob/living/carbon/human/update_fire(var/update_icons=1) overlays_standing[FIRE_LAYER] = null if(on_fire) - overlays_standing[FIRE_LAYER] = image("icon"='icons/mob/OnFire.dmi', "icon_state"="Standing", "layer"=-FIRE_LAYER) + overlays_standing[FIRE_LAYER] = image("icon"='icons/mob/OnFire.dmi', "icon_state"="Standing", "layer"=FIRE_LAYER) if(update_icons) update_icons() @@ -974,12 +974,12 @@ proc/get_damage_icon_part(damage_state, body_part) #undef DAMAGE_LAYER #undef SURGERY_LEVEL #undef UNIFORM_LAYER -#undef TAIL_LAYER #undef ID_LAYER #undef SHOES_LAYER #undef GLOVES_LAYER #undef EARS_LAYER #undef SUIT_LAYER +#undef TAIL_LAYER #undef GLASSES_LAYER #undef FACEMASK_LAYER #undef BELT_LAYER