From 6d58efc6b9e64330c5f138caa67774b95aa19e45 Mon Sep 17 00:00:00 2001 From: Archie Date: Fri, 30 Apr 2021 00:32:10 -0300 Subject: [PATCH] Fixes null gases and air runtimes that plague layenia --- code/game/turfs/open.dm | 7 +++++++ code/game/turfs/simulated/floor/plating/asteroid.dm | 6 ++---- code/game/turfs/simulated/minerals.dm | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 33e327b1..0ad48b4c 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -242,6 +242,13 @@ //testing("Active turf found. Return value of compare(): [is_active]") excited = TRUE SSair.active_turfs |= src + //Issues with air runtiming and you don't know where? Uncomment the following code. + /* + if(air == null) + log_game("Bad air from [src] at [src.loc]") + if(enemy_air == null) + log_game("Bad air from [enemy_tile] at [enemy_tile.loc]") + */ /turf/open/proc/GetHeatCapacity() . = air.heat_capacity() diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index e9f09422..afcc60c5 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -388,17 +388,15 @@ //light_color = LIGHT_COLOR_WHITE /turf/open/floor/plating/asteroid/layenia/Initialize() + . = ..() if(prob(50)) icon_state = "layenia[rand(0,4)]" + set_layenia_light(src) /turf/open/floor/plating/asteroid/layenia/garden initial_gas_mix = OPENTURF_DEFAULT_ATMOS planetary_atmos = TRUE -/turf/open/floor/plating/asteroid/layenia/Initialize() - . = ..() - set_layenia_light(src) - /proc/set_layenia_light(turf/open/floor/B) switch(B.icon_state) if("layenia3", "layenia4") diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 7e3d9358..e1c3fe45 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -527,9 +527,9 @@ /turf/closed/mineral/layenia name = "Crimson rock" icon = 'icons/turf/mining.dmi' + smooth_icon = 'icons/turf/layeniarocks.dmi' icon_state = "layenia" smooth = SMOOTH_MORE|SMOOTH_BORDER - smooth_icon = 'icons/turf/layeniarocks.dmi' canSmoothWith = null baseturfs = /turf/open/floor/plating/asteroid/layenia initial_gas_mix = FROZEN_ATMOS