From ee1b7b3f6fc356c08e524aaef165e22f18a96b73 Mon Sep 17 00:00:00 2001
From: larentoun <31931237+larentoun@users.noreply.github.com>
Date: Wed, 19 Jul 2023 13:51:47 +0900
Subject: [PATCH] [FIX] Allows some decals spawn (#22529)

* decal exceptions

* fix

---------

Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
---
 .../code/game/objects/effects/decals/cleanable/humans.dm      | 2 ++
 .../code/game/objects/effects/decals/cleanable/misc.dm        | 2 ++
 .../master_files/code/game/objects/effects/decals/remains.dm  | 2 ++
 .../mapfluff/ruins/objects_and_mobs/necropolis_gate.dm        | 2 ++
 modular_skyrat/modules/mapping/code/turf_decals.dm            | 3 +++
 tgstation.dme                                                 | 4 ++++
 6 files changed, 15 insertions(+)
 create mode 100644 modular_skyrat/master_files/code/game/objects/effects/decals/cleanable/humans.dm
 create mode 100644 modular_skyrat/master_files/code/game/objects/effects/decals/cleanable/misc.dm
 create mode 100644 modular_skyrat/master_files/code/game/objects/effects/decals/remains.dm
 create mode 100644 modular_skyrat/master_files/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm

diff --git a/modular_skyrat/master_files/code/game/objects/effects/decals/cleanable/humans.dm b/modular_skyrat/master_files/code/game/objects/effects/decals/cleanable/humans.dm
new file mode 100644
index 00000000000..7a0ffaf421b
--- /dev/null
+++ b/modular_skyrat/master_files/code/game/objects/effects/decals/cleanable/humans.dm
@@ -0,0 +1,2 @@
+/obj/effect/decal/cleanable/blood/gibs/NeverShouldHaveComeHere(turf/here_turf)
+	return !islava(here_turf) && ..()
diff --git a/modular_skyrat/master_files/code/game/objects/effects/decals/cleanable/misc.dm b/modular_skyrat/master_files/code/game/objects/effects/decals/cleanable/misc.dm
new file mode 100644
index 00000000000..0300e46131f
--- /dev/null
+++ b/modular_skyrat/master_files/code/game/objects/effects/decals/cleanable/misc.dm
@@ -0,0 +1,2 @@
+/obj/effect/decal/cleanable/NeverShouldHaveComeHere(turf/here_turf)
+	return !(isclosedturf(here_turf) || isturf(here_turf, /turf/template_noop)) && ..()
diff --git a/modular_skyrat/master_files/code/game/objects/effects/decals/remains.dm b/modular_skyrat/master_files/code/game/objects/effects/decals/remains.dm
new file mode 100644
index 00000000000..3dc421d40be
--- /dev/null
+++ b/modular_skyrat/master_files/code/game/objects/effects/decals/remains.dm
@@ -0,0 +1,2 @@
+/obj/effect/decal/remains/NeverShouldHaveComeHere(turf/here_turf)
+	return !islava(here_turf) && ..()
diff --git a/modular_skyrat/master_files/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm b/modular_skyrat/master_files/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
new file mode 100644
index 00000000000..1f22d480d7d
--- /dev/null
+++ b/modular_skyrat/master_files/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
@@ -0,0 +1,2 @@
+/obj/effect/decal/necropolis_gate_decal/NeverShouldHaveComeHere(turf/here_turf)
+	return !islava(here_turf) && ..()
diff --git a/modular_skyrat/modules/mapping/code/turf_decals.dm b/modular_skyrat/modules/mapping/code/turf_decals.dm
index a574c5bc8bb..5dfa5f1f22f 100644
--- a/modular_skyrat/modules/mapping/code/turf_decals.dm
+++ b/modular_skyrat/modules/mapping/code/turf_decals.dm
@@ -5,6 +5,9 @@
 /obj/effect/decal/fakelattice/passthru	//Why the hell did TG make it dense anyways
 	density = FALSE
 
+/obj/effect/decal/fakelattice/passthru/NeverShouldHaveComeHere(turf/here_turf)
+	return !isclosedturf(here_turf) && ..()
+
 ///SYNDICATE EMBLEM///
 //Bottom
 /obj/effect/turf_decal/skyrat_decals/syndicate/bottom/left
diff --git a/tgstation.dme b/tgstation.dme
index 66f6d446235..e848f931488 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5545,6 +5545,9 @@
 #include "modular_skyrat\master_files\code\game\machinery\doors\firedoor.dm"
 #include "modular_skyrat\master_files\code\game\objects\items.dm"
 #include "modular_skyrat\master_files\code\game\objects\objs.dm"
+#include "modular_skyrat\master_files\code\game\objects\effects\decals\remains.dm"
+#include "modular_skyrat\master_files\code\game\objects\effects\decals\cleanable\humans.dm"
+#include "modular_skyrat\master_files\code\game\objects\effects\decals\cleanable\misc.dm"
 #include "modular_skyrat\master_files\code\game\objects\effects\decals\turfdecals\markings.dm"
 #include "modular_skyrat\master_files\code\game\objects\effects\decals\turfdecals\tilecoloring.dm"
 #include "modular_skyrat\master_files\code\game\objects\items\AI_modules.dm"
@@ -5684,6 +5687,7 @@
 #include "modular_skyrat\master_files\code\modules\logging\categories\log_category_debug.dm"
 #include "modular_skyrat\master_files\code\modules\logging\categories\log_category_game.dm"
 #include "modular_skyrat\master_files\code\modules\logging\categories\log_category_uplink.dm"
+#include "modular_skyrat\master_files\code\modules\mapfluff\ruins\objects_and_mobs\necropolis_gate.dm"
 #include "modular_skyrat\master_files\code\modules\mining\equipment\explorer_gear.dm"
 #include "modular_skyrat\master_files\code\modules\mob\dead\new_player\latejoin_menu.dm"
 #include "modular_skyrat\master_files\code\modules\mob\dead\new_player\preferences_setup.dm"