From 240fd8391a7ec7658fcc4e193a233e0a8a3adc10 Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Mon, 3 Oct 2022 23:14:45 -0500 Subject: [PATCH] Removes unused mapgenerator landmarks (#70260) * Removes mapgenerator landmarks * It's unused why is it missing breaking CI * :( * Fixes the error create and destroy was blowing up its enclosure, exposing basic space to air, which causes runtimes because basic space has literally nothing Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> --- _maps/templates/unit_tests.dmm | 2 +- .../awaymissions/mission_code/Cabin.dm | 7 ------- .../procedural_mapping/mapGeneratorObj.dm | 19 ------------------- tgstation.dme | 1 - 4 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 code/modules/procedural_mapping/mapGeneratorObj.dm diff --git a/_maps/templates/unit_tests.dmm b/_maps/templates/unit_tests.dmm index 120fc7c409f..a3bb3f87471 100644 --- a/_maps/templates/unit_tests.dmm +++ b/_maps/templates/unit_tests.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/closed/wall, +/turf/closed/indestructible, /area/misc/testroom) "m" = ( /turf/open/floor/iron, diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm index a8fd2cdbbdf..02e251849b9 100644 --- a/code/modules/awaymissions/mission_code/Cabin.dm +++ b/code/modules/awaymissions/mission_code/Cabin.dm @@ -163,10 +163,3 @@ /datum/map_generator_module/snow/rand_ice_rocks spawnableAtoms = list(/obj/structure/flora/rock/icy/style_random = 5, /obj/structure/flora/rock/pile/icy/style_random = 5) - -/obj/effect/landmark/map_generator/snowy - mapGeneratorType = /datum/map_generator/snowy - endTurfX = 159 - endTurfY = 157 - startTurfX = 37 - startTurfY = 35 diff --git a/code/modules/procedural_mapping/mapGeneratorObj.dm b/code/modules/procedural_mapping/mapGeneratorObj.dm deleted file mode 100644 index a12a96da66f..00000000000 --- a/code/modules/procedural_mapping/mapGeneratorObj.dm +++ /dev/null @@ -1,19 +0,0 @@ -/obj/effect/landmark/map_generator - var/startTurfX = 0 - var/startTurfY = 0 - var/startTurfZ = -1 - var/endTurfX = 0 - var/endTurfY = 0 - var/endTurfZ = -1 - var/mapGeneratorType = /datum/map_generator/nature - var/datum/map_generator/mapGenerator - -/obj/effect/landmark/map_generator/New() - ..() - if(startTurfZ < 0) - startTurfZ = z - if(endTurfZ < 0) - endTurfZ = z - mapGenerator = new mapGeneratorType() - mapGenerator.defineRegion(locate(startTurfX,startTurfY,startTurfZ), locate(endTurfX,endTurfY,endTurfZ)) - mapGenerator.generate() diff --git a/tgstation.dme b/tgstation.dme index e811602557e..1aa5e25946a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4015,7 +4015,6 @@ #include "code\modules\power\turbine\turbine_parts.dm" #include "code\modules\procedural_mapping\mapGenerator.dm" #include "code\modules\procedural_mapping\mapGeneratorModule.dm" -#include "code\modules\procedural_mapping\mapGeneratorObj.dm" #include "code\modules\procedural_mapping\mapGeneratorModules\helpers.dm" #include "code\modules\procedural_mapping\mapGeneratorModules\nature.dm" #include "code\modules\procedural_mapping\mapGenerators\asteroid.dm"