From 1ec3d4b598d4ba7ec80549312d7abf4ca714e7e8 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 28 Jan 2018 21:07:28 -0500 Subject: [PATCH] Fixes #4633 (#4651) --- code/__defines/_planes+layers.dm | 4 ++-- code/modules/mob/freelook/chunk.dm | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/__defines/_planes+layers.dm b/code/__defines/_planes+layers.dm index 3000776d86e..ad4fe2181d8 100644 --- a/code/__defines/_planes+layers.dm +++ b/code/__defines/_planes+layers.dm @@ -72,7 +72,6 @@ What is the naming convention for planes or layers? //#define FLY_LAYER 5 //For easy recordkeeping; this is a byond define #define LIGHTING_LAYER 11 //Layer that lighting used to be on (now it's on a plane) #define HUD_LAYER 20 //Above lighting, but below obfuscation. For in-game HUD effects (whereas SCREEN_LAYER is for abstract/OOC things like inventory slots) - #define OBFUSCATION_LAYER 21 //Where images covering the view for eyes are put #define SCREEN_LAYER 22 //Mob HUD/effects layer #define PLANE_LIGHTING 5 //Where the lighting (and darkness) lives @@ -96,7 +95,8 @@ What is the naming convention for planes or layers? #define PLANE_MESONS 30 //Stuff seen with mesons, like open ceilings. This is 30 for downstreams. //Fullscreen overlays under inventory -#define PLANE_FULLSCREEN 90 //Blindness, mesons, druggy, etc +#define PLANE_FULLSCREEN 90 //Blindness, mesons, druggy, etc + #define OBFUSCATION_LAYER 5 //Where images covering the view for eyes are put #define FULLSCREEN_LAYER 18 #define DAMAGE_LAYER 18.1 #define BLIND_LAYER 18.2 diff --git a/code/modules/mob/freelook/chunk.dm b/code/modules/mob/freelook/chunk.dm index 626a79e28fb..7c50bd3135a 100644 --- a/code/modules/mob/freelook/chunk.dm +++ b/code/modules/mob/freelook/chunk.dm @@ -101,7 +101,9 @@ var/turf/t = turf if(obscuredTurfs[t]) if(!t.obfuscations[obfuscation.type]) - t.obfuscations[obfuscation.type] = image(obfuscation.icon, t, obfuscation.icon_state, OBFUSCATION_LAYER) + var/image/ob_image = image(obfuscation.icon, t, obfuscation.icon_state, OBFUSCATION_LAYER) + ob_image.plane = PLANE_FULLSCREEN + t.obfuscations[obfuscation.type] = ob_image obscured += t.obfuscations[obfuscation.type] for(var/eye in seenby) @@ -140,7 +142,9 @@ for(var/turf in obscuredTurfs) var/turf/t = turf if(!t.obfuscations[obfuscation.type]) - t.obfuscations[obfuscation.type] = image(obfuscation.icon, t, obfuscation.icon_state, OBFUSCATION_LAYER) + var/image/ob_image = image(obfuscation.icon, t, obfuscation.icon_state, OBFUSCATION_LAYER) + ob_image.plane = PLANE_FULLSCREEN + t.obfuscations[obfuscation.type] = ob_image obscured += t.obfuscations[obfuscation.type] #undef UPDATE_BUFFER