From 4af0b3da4810d743d867020489996b86a05b424b Mon Sep 17 00:00:00 2001 From: Heroman Date: Thu, 28 Nov 2019 04:54:09 +1000 Subject: [PATCH 1/3] Fixes snow in snowfield --- maps/tether/submaps/gateway/snow_outpost.dm | 4 +- maps/tether/submaps/gateway/snowfield.dmm | 51 ++++----------------- 2 files changed, 10 insertions(+), 45 deletions(-) diff --git a/maps/tether/submaps/gateway/snow_outpost.dm b/maps/tether/submaps/gateway/snow_outpost.dm index de9d70dfb1b..1ae588ff985 100644 --- a/maps/tether/submaps/gateway/snow_outpost.dm +++ b/maps/tether/submaps/gateway/snow_outpost.dm @@ -15,8 +15,8 @@ power_light = 0 power_equip = 0 power_environ = 0 - mobcountmax = 100 - floracountmax = 7000 + mobcountmax = 40 + floracountmax = 2000 valid_mobs = list(/mob/living/simple_mob/animal/sif/savik, /mob/living/simple_mob/animal/wolf, /mob/living/simple_mob/animal/sif/shantak, /mob/living/simple_mob/animal/sif/kururak, /mob/living/simple_mob/animal/sif/frostfly) valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, diff --git a/maps/tether/submaps/gateway/snowfield.dmm b/maps/tether/submaps/gateway/snowfield.dmm index aec5b0d0be0..89645bdee8a 100644 --- a/maps/tether/submaps/gateway/snowfield.dmm +++ b/maps/tether/submaps/gateway/snowfield.dmm @@ -3,56 +3,28 @@ /turf/unsimulated/wall/planetary/sif, /area/awaymission/snowfield/restricted) "ab" = ( -/turf/snow/snow2{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, +/turf/simulated/floor/outdoors/snow, /area/awaymission/snowfield/restricted) "ac" = ( /obj/effect/blocker, -/turf/snow/snow2{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, +/turf/simulated/floor/outdoors/snow, /area/awaymission/snowfield/restricted) "ad" = ( -/turf/snow/snow2{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, +/turf/simulated/floor/outdoors/snow, /area/awaymission/snowfield/outside) "ae" = ( -/turf/snow/snow2{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, +/turf/simulated/floor/outdoors/snow, /area/awaymission/snowfield) "af" = ( /obj/effect/landmark/gateway_scatter, -/turf/snow/snow2{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, +/turf/simulated/floor/outdoors/snow, /area/awaymission/snowfield) "ag" = ( /obj/machinery/light/small, -/turf/snow/snow2{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, +/turf/simulated/floor/outdoors/snow, /area/awaymission/snowfield/base) "ah" = ( -/turf/snow/snow2{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, +/turf/simulated/floor/outdoors/snow, /area/awaymission/snowfield/base) "ai" = ( /turf/simulated/wall/durasteel, @@ -1369,13 +1341,6 @@ /obj/effect/decal/remains/human, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/base) -"dT" = ( -/turf/snow/snow2{ - nitrogen = 93.7835; - oxygen = 20.7263; - temperature = 243.15 - }, -/area/shuttle/awaymission/oldengbase) "dU" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/decal/remains/human, @@ -13521,7 +13486,7 @@ ad ad ad ad -dT +ad ad ad ad From 84897c0a90d2237322c371da45665db4f72e02ac Mon Sep 17 00:00:00 2001 From: Heroman Date: Thu, 28 Nov 2019 06:49:14 +1000 Subject: [PATCH 2/3] Fixes wrong areas being adjusted --- maps/tether/submaps/gateway/snow_outpost.dm | 4 ++-- maps/tether/submaps/gateway/snowfield.dm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/maps/tether/submaps/gateway/snow_outpost.dm b/maps/tether/submaps/gateway/snow_outpost.dm index 1ae588ff985..de9d70dfb1b 100644 --- a/maps/tether/submaps/gateway/snow_outpost.dm +++ b/maps/tether/submaps/gateway/snow_outpost.dm @@ -15,8 +15,8 @@ power_light = 0 power_equip = 0 power_environ = 0 - mobcountmax = 40 - floracountmax = 2000 + mobcountmax = 100 + floracountmax = 7000 valid_mobs = list(/mob/living/simple_mob/animal/sif/savik, /mob/living/simple_mob/animal/wolf, /mob/living/simple_mob/animal/sif/shantak, /mob/living/simple_mob/animal/sif/kururak, /mob/living/simple_mob/animal/sif/frostfly) valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, diff --git a/maps/tether/submaps/gateway/snowfield.dm b/maps/tether/submaps/gateway/snowfield.dm index 8cfed032f56..80f3e07f74e 100644 --- a/maps/tether/submaps/gateway/snowfield.dm +++ b/maps/tether/submaps/gateway/snowfield.dm @@ -15,8 +15,8 @@ power_light = 0 power_equip = 0 power_environ = 0 - mobcountmax = 100 - floracountmax = 7000 + mobcountmax = 40 + floracountmax = 2000 valid_mobs = list(/mob/living/simple_mob/animal/sif/sakimm/polar, /mob/living/simple_mob/animal/sif/diyaab/polar, /mob/living/simple_mob/animal/sif/shantak/polar, /mob/living/simple_mob/animal/space/bear/polar, @@ -30,7 +30,7 @@ /area/awaymission/snowfield/restricted // No mob spawns! icon_state = "red" mobcountmax = 1 // Hacky fix. - floracountmax = 100 + floracountmax = 120 valid_mobs = list(/obj/structure/flora/tree/pine) // Hacky fix. valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/dead, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/green, From 258281e113fca83ae9de93237d9b52f2e6c54461 Mon Sep 17 00:00:00 2001 From: Heroman Date: Thu, 28 Nov 2019 06:54:30 +1000 Subject: [PATCH 3/3] Fixes temperature too --- maps/tether/submaps/gateway/snowfield.dmm | 42 +++++++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/maps/tether/submaps/gateway/snowfield.dmm b/maps/tether/submaps/gateway/snowfield.dmm index 89645bdee8a..5ce03b7e09f 100644 --- a/maps/tether/submaps/gateway/snowfield.dmm +++ b/maps/tether/submaps/gateway/snowfield.dmm @@ -3,28 +3,56 @@ /turf/unsimulated/wall/planetary/sif, /area/awaymission/snowfield/restricted) "ab" = ( -/turf/simulated/floor/outdoors/snow, +/turf/simulated/floor/outdoors/snow{ + nitrogen = 93.7835; + oxygen = 20.7263; + temperature = 243.15 + }, /area/awaymission/snowfield/restricted) "ac" = ( /obj/effect/blocker, -/turf/simulated/floor/outdoors/snow, +/turf/simulated/floor/outdoors/snow{ + nitrogen = 93.7835; + oxygen = 20.7263; + temperature = 243.15 + }, /area/awaymission/snowfield/restricted) "ad" = ( -/turf/simulated/floor/outdoors/snow, +/turf/simulated/floor/outdoors/snow{ + nitrogen = 93.7835; + oxygen = 20.7263; + temperature = 243.15 + }, /area/awaymission/snowfield/outside) "ae" = ( -/turf/simulated/floor/outdoors/snow, +/turf/simulated/floor/outdoors/snow{ + nitrogen = 93.7835; + oxygen = 20.7263; + temperature = 243.15 + }, /area/awaymission/snowfield) "af" = ( /obj/effect/landmark/gateway_scatter, -/turf/simulated/floor/outdoors/snow, +/turf/simulated/floor/outdoors/snow{ + nitrogen = 93.7835; + oxygen = 20.7263; + temperature = 243.15 + }, /area/awaymission/snowfield) "ag" = ( /obj/machinery/light/small, -/turf/simulated/floor/outdoors/snow, +/turf/simulated/floor/outdoors/snow{ + nitrogen = 93.7835; + oxygen = 20.7263; + temperature = 243.15 + }, /area/awaymission/snowfield/base) "ah" = ( -/turf/simulated/floor/outdoors/snow, +/turf/simulated/floor/outdoors/snow{ + nitrogen = 93.7835; + oxygen = 20.7263; + temperature = 243.15 + }, /area/awaymission/snowfield/base) "ai" = ( /turf/simulated/wall/durasteel,