From 707f38ea7fc359b8688f70f2653ce39c1c8ff232 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 24 Jun 2021 02:58:05 +0200 Subject: [PATCH] [MIRROR] Fixes bodybags, cargo crates, and directional lighting. (#6459) * Fixes bodybags, cargo crates, and directional lighting. (#59709) Fixes a couple bugs created by the neon carpets PR: * Bodybags can once again be closed. (Fixes #59704, Fixes #59747) * Cargo crates no longer report having delivered an emissive blocker * Directional lighting no longer masks the emissive plane. * Fixes bodybags, cargo crates, and directional lighting. Co-authored-by: TemporalOroboros --- code/game/objects/effects/misc.dm | 1 + code/game/objects/effects/overlays.dm | 2 ++ code/game/objects/structures/crates_lockers/closets.dm | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm index 162a5ac949b..e42a45182a6 100644 --- a/code/game/objects/effects/misc.dm +++ b/code/game/objects/effects/misc.dm @@ -74,6 +74,7 @@ light_range = MINIMUM_USEFUL_LIGHT_RANGE light_color = COLOR_WHITE mouse_opacity = MOUSE_OPACITY_TRANSPARENT + blocks_emissive = NONE /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 5aa9cec232a..0a38171dfa3 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -75,6 +75,7 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT alpha = 0 vis_flags = NONE + blocks_emissive = NONE /obj/effect/overlay/light_cone name = "" @@ -85,3 +86,4 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT vis_flags = NONE alpha = 110 + blocks_emissive = NONE diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 19d09cc4398..352fb753e1f 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -10,7 +10,7 @@ max_integrity = 200 integrity_failure = 0.25 armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 70, ACID = 60) - blocks_emissive = EMISSIVE_BLOCK_UNIQUE + blocks_emissive = EMISSIVE_BLOCK_GENERIC /// Controls whether a door overlay should be applied using the icon_door value as the icon state var/enable_door_overlay = TRUE