From bf0b6ed4c22b43e2737554f693f0387af3e13070 Mon Sep 17 00:00:00 2001 From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com> Date: Mon, 14 Feb 2022 22:58:57 +0000 Subject: [PATCH] Camera static effect now displays properly on space turfs. (#13168) --- code/__defines/_layers.dm | 1 + code/modules/mob/abstract/freelook/chunk.dm | 1 + html/changelogs/space_turf_obfuscation.yml | 6 ++++++ 3 files changed, 8 insertions(+) create mode 100644 html/changelogs/space_turf_obfuscation.yml diff --git a/code/__defines/_layers.dm b/code/__defines/_layers.dm index e5a4670dc33..1a966fa0160 100644 --- a/code/__defines/_layers.dm +++ b/code/__defines/_layers.dm @@ -2,6 +2,7 @@ #define PLANE_SPACE_PARALLAX (PLANE_SPACE_BACKGROUND + 1) // -97 #define PLANE_SPACE_DUST (PLANE_SPACE_PARALLAX + 1) // -96 #define PLANE_ABOVE_PARALLAX (PLANE_SPACE_BACKGROUND + 3) // -95 +#define PLANE_DEFAULT 0 #define LOWER_ON_TURF_LAYER (TURF_LAYER + 0.05) // under the below #define ON_TURF_LAYER (TURF_LAYER + 0.1) // sitting on the turf - should be preferred over direct use of TURF_LAYER diff --git a/code/modules/mob/abstract/freelook/chunk.dm b/code/modules/mob/abstract/freelook/chunk.dm index 011e7cbdda7..3821895a8e1 100644 --- a/code/modules/mob/abstract/freelook/chunk.dm +++ b/code/modules/mob/abstract/freelook/chunk.dm @@ -24,6 +24,7 @@ if(!obfuscation) obfuscation = image(icon, T, icon_state) obfuscation.layer = OBFUSCATION_LAYER + obfuscation.plane = PLANE_DEFAULT if(!obfuscation_underlay) // Creating a new icon of a fairly common icon state, adding some random color to prevent address searching, and hoping being static kills memory locality var/turf/floor = /turf/simulated/floor/tiled diff --git a/html/changelogs/space_turf_obfuscation.yml b/html/changelogs/space_turf_obfuscation.yml new file mode 100644 index 00000000000..e150a554752 --- /dev/null +++ b/html/changelogs/space_turf_obfuscation.yml @@ -0,0 +1,6 @@ +author: mikomyazaki + +delete-after: True + +changes: + - bugfix: "Space turfs will now properly display the camera static image when they are not visible from a camera, to an AI or camera view." \ No newline at end of file