From b3cce8cfa4df32ac088c7d22c4890717859ec0a7 Mon Sep 17 00:00:00 2001 From: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com> Date: Thu, 6 Apr 2023 23:26:49 +0100 Subject: [PATCH] Fixes the basketball and thunderdome baseturf issue. (#74461) ## About The Pull Request Simply modifies the should_place_on_top value on these maps templates so that they overwrite their baseturfs rather that creating an evergrowing stack. I've also done the same for Mafia and CTF which should also not be creating stacked baseturfs. Fixes #69711 Should fix #74443 too since its the same issue. ## Why It's Good For The Game Bugfix good. ## Changelog :cl: fix: Basketball and Thunderdome maps should not load with broken turfs are several resets of their maps. /:cl: --- code/modules/admin/verbs/secrets.dm | 1 + code/modules/basketball/basketball_map_loading.dm | 1 + code/modules/capture_the_flag/ctf_map_loading.dm | 1 + code/modules/mafia/map_pieces.dm | 1 + 4 files changed, 4 insertions(+) diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index dc9288af598..ce250cb04db 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -143,6 +143,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) qdel(obj) //Clear objects var/datum/map_template/thunderdome_template = SSmapping.map_templates[THUNDERDOME_TEMPLATE_FILE] + thunderdome_template.should_place_on_top = FALSE var/turf/thunderdome_corner = locate(thunderdome.x - 3, thunderdome.y - 1, 1) // have to do a little bit of coord manipulation to get it in the right spot thunderdome_template.load(thunderdome_corner) diff --git a/code/modules/basketball/basketball_map_loading.dm b/code/modules/basketball/basketball_map_loading.dm index 056b943a2d2..11f4af4bfff 100644 --- a/code/modules/basketball/basketball_map_loading.dm +++ b/code/modules/basketball/basketball_map_loading.dm @@ -36,6 +36,7 @@ area_flags = UNIQUE_AREA | NOTELEPORT | NO_DEATH_MESSAGE | BLOCK_SUICIDE /datum/map_template/basketball + should_place_on_top = FALSE var/description = "" /// The name of the basketball team var/team_name diff --git a/code/modules/capture_the_flag/ctf_map_loading.dm b/code/modules/capture_the_flag/ctf_map_loading.dm index 75261274e5f..726059b2943 100644 --- a/code/modules/capture_the_flag/ctf_map_loading.dm +++ b/code/modules/capture_the_flag/ctf_map_loading.dm @@ -63,6 +63,7 @@ GLOBAL_DATUM(ctf_spawner, /obj/effect/landmark/ctf) return TRUE /datum/map_template/ctf + should_place_on_top = FALSE var/description = "" /datum/map_template/ctf/classic diff --git a/code/modules/mafia/map_pieces.dm b/code/modules/mafia/map_pieces.dm index 8211dd34441..342f4a9045a 100644 --- a/code/modules/mafia/map_pieces.dm +++ b/code/modules/mafia/map_pieces.dm @@ -38,6 +38,7 @@ area_flags = BLOCK_SUICIDE | UNIQUE_AREA /datum/map_template/mafia + should_place_on_top = FALSE ///A brief background tidbit var/description = "" ///What costume will this map force players to start with?