From aa46434c51f2cb8ac70f54ad21ddddc541680c5d Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 17 Jun 2021 14:57:35 -0400 Subject: [PATCH] Changes from PR linked below https://github.com/tgstation/tgstation/pull/59709 --- code/game/objects/effects/misc.dm | 1 + code/game/objects/effects/overlays.dm | 3 +++ code/game/objects/structures/crates_lockers/__closets.dm | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm index e9f2438027e..aac5b6ffa0e 100644 --- a/code/game/objects/effects/misc.dm +++ b/code/game/objects/effects/misc.dm @@ -72,6 +72,7 @@ light_color = COLOR_WHITE mouse_opacity = MOUSE_OPACITY_TRANSPARENT light_on = TRUE + blocks_emissive = FALSE /obj/effect/dummy/lighting_obj/Initialize(mapload, _range, _power, _color, _duration) . = ..() diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 5ed1ccc66c1..3657e34604e 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -141,6 +141,7 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT alpha = 0 vis_flags = NONE + blocks_emissive = FALSE /obj/effect/overlay/light_cone name = "" @@ -151,3 +152,5 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT vis_flags = NONE alpha = 110 + blocks_emissive = FALSE + \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm index 4af69175fd8..f111d191968 100644 --- a/code/game/objects/structures/crates_lockers/__closets.dm +++ b/code/game/objects/structures/crates_lockers/__closets.dm @@ -7,7 +7,7 @@ density = 1 w_class = ITEMSIZE_HUGE layer = UNDER_JUNK_LAYER - blocks_emissive = EMISSIVE_BLOCK_UNIQUE + blocks_emissive = EMISSIVE_BLOCK_GENERIC var/opened = 0 var/sealed = 0