From abecd4e92ee8cafdbc96156b28726ef405caf198 Mon Sep 17 00:00:00 2001 From: AnturK Date: Fri, 23 Mar 2018 21:03:11 +0100 Subject: [PATCH] Fixes runtimes when random mineral spawn rolled cave. (#36624) * Fixes runtimes when random mineral spawn rolled cave. * Actually the issue was bit deeper. --- code/game/turfs/simulated/floor/plating/asteroid.dm | 3 +-- code/game/turfs/simulated/minerals.dm | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index 44fc9dc6432..8eb6e2cc4b8 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -159,10 +159,9 @@ if (!flora_spawn_list) flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2) + . = ..() if(!has_data) produce_tunnel_from_data() - else - ..() //do not continue after changeturfing or we will do a double initialize /turf/open/floor/plating/asteroid/airless/cave/proc/get_cave_data(set_length, exclude_dir = -1) // If set_length (arg1) isn't defined, get a random length; otherwise assign our length to the length arg. diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index b9d92021906..ee407926d86 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -146,7 +146,7 @@ . = ..() if (prob(mineralChance)) var/path = pickweight(mineralSpawnChanceList) - var/turf/T = ChangeTurf(path,FALSE,FALSE,TRUE) + var/turf/T = ChangeTurf(path,null,CHANGETURF_IGNORE_AIR) if(T && ismineralturf(T)) var/turf/closed/mineral/M = T