From 95b2307b6161a89aecb20ab5fb8f3fcb9ea527e9 Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 22 Sep 2022 20:56:35 -0400 Subject: [PATCH] Lighting Underlay Stacking Fix --- code/game/turfs/simulated/floor_types.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index a2a6cdeea2..09a107f799 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -116,7 +116,11 @@ /turf/simulated/shuttle/proc/underlay_update() if(!takes_underlays) //Basically, if it's not forced, and we don't care, don't do it. +<<<<<<< HEAD return //CHOMP Edit removed 0. Sarcastically quoting the above comment ^ "Basically, if it's not stupposed to store a fucking value, don't store a fucking value." +======= + return +>>>>>>> a814870726... Merge pull request #13775 from VOREStation/overlay_stack_fix var/turf/under //May be a path or a turf var/mutable_appearance/us = new(src) //We'll use this for changes later