From 4261cbdb8fb67cd6aa7218f584192c94fab75580 Mon Sep 17 00:00:00 2001
From: CrimsonShrike <29737699+CrimsonShrike@users.noreply.github.com>
Date: Sun, 15 Oct 2023 18:50:07 +0300
Subject: [PATCH] [MIRROR] Makes no client colour consistently work with
 planemasters

---
 code/__defines/__renderer.dm                     | 2 ++
 code/__defines/_renderer.dm                      | 4 +---
 code/game/objects/effects/misc.dm                | 3 ++-
 code/game/objects/effects/particles/particles.dm | 1 +
 code/modules/mechs/equipment/utility.dm          | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/code/__defines/__renderer.dm b/code/__defines/__renderer.dm
index 725af36d372cc..58f9737e378de 100644
--- a/code/__defines/__renderer.dm
+++ b/code/__defines/__renderer.dm
@@ -195,6 +195,8 @@
 
 #define DEFAULT_APPEARANCE_FLAGS (PIXEL_SCALE)
 
+#define DEFAULT_RENDERER_APPEARANCE_FLAGS (PLANE_MASTER | NO_CLIENT_COLOR)
+
 /atom/appearance_flags = DEFAULT_APPEARANCE_FLAGS
 /atom/movable/appearance_flags = DEFAULT_APPEARANCE_FLAGS | TILE_BOUND // Most AMs are not visibly bigger than a tile.
 /image/appearance_flags = DEFAULT_APPEARANCE_FLAGS
diff --git a/code/__defines/_renderer.dm b/code/__defines/_renderer.dm
index 37b9173b66737..1e2f3aec47c51 100644
--- a/code/__defines/_renderer.dm
+++ b/code/__defines/_renderer.dm
@@ -10,7 +10,7 @@
 /// The base /renderer definition and defaults.
 /atom/movable/renderer
 	abstract_type = /atom/movable/renderer
-	appearance_flags = PLANE_MASTER
+	appearance_flags = DEFAULT_RENDERER_APPEARANCE_FLAGS
 	screen_loc = "CENTER"
 	plane = LOWEST_PLANE
 	blend_mode = BLEND_OVERLAY
@@ -132,7 +132,6 @@ INITIALIZE_IMMEDIATE(/atom/movable/renderer)
 	name = "Letterbox"
 	group = RENDER_GROUP_SCENE
 	plane = BLACKNESS_PLANE
-	appearance_flags = PLANE_MASTER | NO_CLIENT_COLOR
 	blend_mode = BLEND_MULTIPLY
 	mouse_opacity = MOUSE_OPACITY_UNCLICKABLE
 
@@ -188,7 +187,6 @@ GLOBAL_LIST_EMPTY(zmimic_renderers)
 	name = "Lighting"
 	group = RENDER_GROUP_SCENE
 	plane = LIGHTING_PLANE
-	appearance_flags = PLANE_MASTER | NO_CLIENT_COLOR
 	relay_blend_mode = BLEND_MULTIPLY
 	mouse_opacity = MOUSE_OPACITY_UNCLICKABLE
 
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index 0b1e19844d868..ae9a4dfc7fbf1 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -126,13 +126,14 @@
 /obj/heat
 	icon = 'icons/effects/fire.dmi'
 	icon_state = "3"
+	appearance_flags = PIXEL_SCALE | NO_CLIENT_COLOR
 	render_target = HEAT_EFFECT_TARGET
 	mouse_opacity = MOUSE_OPACITY_UNCLICKABLE
 
 /// Example of a warp filter
 /obj/effect/warp
 	plane = WARP_EFFECT_PLANE
-	appearance_flags = PIXEL_SCALE
+	appearance_flags = PIXEL_SCALE | NO_CLIENT_COLOR
 	icon = 'icons/effects/352x352.dmi'
 	icon_state = "singularity_s11"
 	pixel_x = -176
diff --git a/code/game/objects/effects/particles/particles.dm b/code/game/objects/effects/particles/particles.dm
index c404f7c9455e9..988b885fa6bf6 100644
--- a/code/game/objects/effects/particles/particles.dm
+++ b/code/game/objects/effects/particles/particles.dm
@@ -323,6 +323,7 @@
 /obj/particle_emitter/heat
 	particle_type = "heat"
 	render_target = HEAT_EFFECT_TARGET
+	appearance_flags = PIXEL_SCALE | NO_CLIENT_COLOR
 
 
 /obj/particle_emitter/heat/Initialize()
diff --git a/code/modules/mechs/equipment/utility.dm b/code/modules/mechs/equipment/utility.dm
index b72274938abff..96e19c8c8255a 100644
--- a/code/modules/mechs/equipment/utility.dm
+++ b/code/modules/mechs/equipment/utility.dm
@@ -336,11 +336,12 @@
 
 /obj/ebeam/warp
 	plane = WARP_EFFECT_PLANE
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS | TILE_BOUND | NO_CLIENT_COLOR
 	z_flags = ZMM_IGNORE
 
 /obj/effect/warp/small
 	plane = WARP_EFFECT_PLANE
-	appearance_flags = PIXEL_SCALE
+	appearance_flags = PIXEL_SCALE | NO_CLIENT_COLOR
 	icon = 'icons/effects/96x96.dmi'
 	icon_state = "singularity_s3"
 	pixel_x = -32