From 5ea84cd3f654adb4e4e43ce797038ae100fff555 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 4 Mar 2024 22:14:43 +0100 Subject: [PATCH] [MIRROR] [no gbp] Lazy Templates can be configured to Place on Top, deathmatch does this now (#26746) * [no gbp] Lazy Templates can be configured to Place on Top, deathmatch does this now (#81783) ## About The Pull Request this is very much a code thing im not sure what i would say this just adds an extra variable also should be no sideeffects this is handled by turf reservations also virtual domains (fixes #81779) ## Why It's Good For The Game ![2024-03-02 11_28_18-Window](https://github.com/tgstation/tgstation/assets/70376633/85d094d3-c877-418f-bec9-af2f16736352) this would formerly breach to space ## Changelog :cl: fix: fixes deathmatch baseturfs (you cant crowbar the floor to breach to space) /:cl: * [no gbp] Lazy Templates can be configured to Place on Top, deathmatch does this now --------- Co-authored-by: jimmyl <70376633+mc-oofert@users.noreply.github.com> --- code/datums/lazy_template.dm | 3 +++ code/modules/bitrunning/virtual_domain/virtual_domain.dm | 1 + code/modules/deathmatch/deathmatch_maps.dm | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/datums/lazy_template.dm b/code/datums/lazy_template.dm index 0a5e8e53314..3b19a17a179 100644 --- a/code/datums/lazy_template.dm +++ b/code/datums/lazy_template.dm @@ -13,6 +13,8 @@ var/map_dir = "_maps/templates/lazy_templates" /// The filename (without extension) of the map to load var/map_name + /// place_on_top: Whether to use /turf/proc/PlaceOnTop rather than /turf/proc/ChangeTurf + var/place_on_top = FALSE /datum/lazy_template/New() reservations = list() @@ -83,6 +85,7 @@ bottom_left.z, z_upper = z_idx, z_lower = z_idx, + place_on_top = place_on_top, ) for(var/turf/turf as anything in block(bottom_left, top_right)) loaded_turfs += turf diff --git a/code/modules/bitrunning/virtual_domain/virtual_domain.dm b/code/modules/bitrunning/virtual_domain/virtual_domain.dm index 838834f45a7..41e5da8973e 100644 --- a/code/modules/bitrunning/virtual_domain/virtual_domain.dm +++ b/code/modules/bitrunning/virtual_domain/virtual_domain.dm @@ -6,6 +6,7 @@ map_dir = "_maps/virtual_domains" map_name = "None" key = "Virtual Domain" + place_on_top = TRUE /// Cost of this map to load var/cost = BITRUNNER_COST_NONE diff --git a/code/modules/deathmatch/deathmatch_maps.dm b/code/modules/deathmatch/deathmatch_maps.dm index d437bffbb3c..71d7e8a8651 100644 --- a/code/modules/deathmatch/deathmatch_maps.dm +++ b/code/modules/deathmatch/deathmatch_maps.dm @@ -1,6 +1,8 @@ /datum/lazy_template/deathmatch //deathmatch maps that have any possibility of the walls being destroyed should use indestructible walls, because baseturf moment - var/name map_dir = "_maps/map_files/Deathmatch" + place_on_top = TRUE + /// Map UI Name + var/name /// Map Description var/desc = "" var/min_players = 2