From 4ce3f055b53a9771fc9aaf4849e8176334f1e02a Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 4 May 2018 22:18:03 -0400 Subject: [PATCH] Fix underdark mob spawn areas again again again --- code/modules/mining/mine_turfs.dm | 2 +- maps/tether/submaps/underdark_pois/hard_mob.dmm | 8 ++++++-- maps/tether/submaps/underdark_pois/normal_mob.dmm | 8 ++++++-- maps/tether/tether_turfs.dm | 4 ++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index b59909376f7..ef068381c89 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -563,7 +563,7 @@ var/list/mining_overlay_cache = list() new /obj/item/stack/material/uranium(src, rand(5,25)) /turf/simulated/mineral/proc/make_ore(var/rare_ore) - if(mineral) + if(mineral || ignore_mapgen) //VOREStation Edit - Makes sense, doesn't it? return var/mineral_name diff --git a/maps/tether/submaps/underdark_pois/hard_mob.dmm b/maps/tether/submaps/underdark_pois/hard_mob.dmm index 0ff94f7d863..51fb0f82423 100644 --- a/maps/tether/submaps/underdark_pois/hard_mob.dmm +++ b/maps/tether/submaps/underdark_pois/hard_mob.dmm @@ -1,13 +1,17 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/simulated/mineral/floor/virgo3b, +/turf/simulated/mineral/floor/virgo3b{ + ignore_mapgen = 1 + }, /area/mine/explored/underdark) "b" = ( /turf/simulated/mineral/virgo3b/rich, /area/mine/explored/underdark) "c" = ( /obj/tether_away_spawner/underdark_hard, -/turf/simulated/mineral/floor/virgo3b, +/turf/simulated/mineral/floor/virgo3b{ + ignore_mapgen = 1 + }, /area/mine/explored/underdark) (1,1,1) = {" diff --git a/maps/tether/submaps/underdark_pois/normal_mob.dmm b/maps/tether/submaps/underdark_pois/normal_mob.dmm index f29ab634e2b..b7336708045 100644 --- a/maps/tether/submaps/underdark_pois/normal_mob.dmm +++ b/maps/tether/submaps/underdark_pois/normal_mob.dmm @@ -1,13 +1,17 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/simulated/mineral/floor/virgo3b, +/turf/simulated/mineral/floor/virgo3b{ + ignore_mapgen = 1 + }, /area/mine/explored/underdark) "b" = ( /turf/simulated/mineral/virgo3b/rich, /area/mine/explored/underdark) "c" = ( /obj/tether_away_spawner/underdark_normal, -/turf/simulated/mineral/floor/virgo3b, +/turf/simulated/mineral/floor/virgo3b{ + ignore_mapgen = 1 + }, /area/mine/explored/underdark) (1,1,1) = {" diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index 49e644bc83f..a7056540250 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -56,7 +56,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral) VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) //This proc is responsible for ore generation on surface turfs /turf/simulated/mineral/virgo3b/make_ore(var/rare_ore) - if(mineral) + if(mineral || ignore_mapgen) return var/mineral_name if(rare_ore) @@ -84,7 +84,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) update_icon() /turf/simulated/mineral/virgo3b/rich/make_ore(var/rare_ore) - if(mineral) + if(mineral || ignore_mapgen) return var/mineral_name if(rare_ore)