From fff3f0ceaf12367d3ff408e3b1c741072472f49d Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 1 Aug 2021 11:26:43 -0400 Subject: [PATCH] Further tweaks for is_outdoors usage --- code/game/mecha/equipment/weapons/ballistic/mortar.dm | 2 +- code/game/turfs/simulated/floor_icon.dm | 2 +- code/game/turfs/simulated/lava.dm | 2 +- code/modules/metric/activity.dm | 2 +- code/modules/metric/count.dm | 2 +- .../mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/game/mecha/equipment/weapons/ballistic/mortar.dm b/code/game/mecha/equipment/weapons/ballistic/mortar.dm index c192d0fc9b8..df734af78cb 100644 --- a/code/game/mecha/equipment/weapons/ballistic/mortar.dm +++ b/code/game/mecha/equipment/weapons/ballistic/mortar.dm @@ -18,7 +18,7 @@ /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar/action_checks(atom/target) var/turf/MT = get_turf(chassis) var/turf/TT = get_turf(target) - if(!MT.outdoors || !TT.outdoors) + if(!MT.outdoors || !TT.is_outdoors()) to_chat(chassis.occupant, "\The [src]'s control system prevents you from firing due to a blocked firing arc.") return 0 return ..() \ No newline at end of file diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm index d975f81090d..420d8628b54 100644 --- a/code/game/turfs/simulated/floor_icon.dm +++ b/code/game/turfs/simulated/floor_icon.dm @@ -87,7 +87,7 @@ var/image/no_ceiling_image = null // Show 'ceilingless' overlay. var/turf/above = GetAbove(src) - if(above && isopenspace(above) && !istype(src, /turf/simulated/floor/outdoors)) // This won't apply to outdoor turfs since its assumed they don't have a ceiling anyways. + if(!is_outdoors() && above && isopenspace(above)) // This won't apply to outdoor turfs since its assumed they don't have a ceiling anyways. add_overlay(no_ceiling_image) // Update our 'them-to-us' edges, aka edges from external turfs we feel should spill onto us diff --git a/code/game/turfs/simulated/lava.dm b/code/game/turfs/simulated/lava.dm index 6a539ec7b66..e44ac49a662 100644 --- a/code/game/turfs/simulated/lava.dm +++ b/code/game/turfs/simulated/lava.dm @@ -21,7 +21,7 @@ // For maximum pedantry. /turf/simulated/floor/lava/Initialize() - if(!outdoors) + if(!is_outdoors()) name = "magma" update_icon() update_light() diff --git a/code/modules/metric/activity.dm b/code/modules/metric/activity.dm index c33c88adcaf..dd93b901793 100644 --- a/code/modules/metric/activity.dm +++ b/code/modules/metric/activity.dm @@ -86,7 +86,7 @@ var/num = 0 for(var/mob/living/L in player_list) var/turf/T = get_turf(L) - if(istype(T) && !istype(T, /turf/space) && T.outdoors) + if(istype(T) && !istype(T, /turf/space) && T.is_outdoors()) . += assess_player_activity(L) num++ if(num) diff --git a/code/modules/metric/count.dm b/code/modules/metric/count.dm index ba3678295fe..e0b1843d77b 100644 --- a/code/modules/metric/count.dm +++ b/code/modules/metric/count.dm @@ -6,7 +6,7 @@ var/num = 0 for(var/mob/living/L in player_list) var/turf/T = get_turf(L) - if(istype(T) && !istype(T, /turf/space) && T.outdoors) + if(istype(T) && !istype(T, /turf/space) && T.is_outdoors()) if(assess_player_activity(L) >= cutoff) num++ return num diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm index cc0b3785b6b..4efce708e82 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm @@ -136,7 +136,8 @@ if(stat != DEAD && cell) // TODO generalize solar occlusion to charge from the actual sun. - var/new_recharge_state = istype(loc, /turf/simulated/floor/outdoors) || /*, /turf/exterior) */ istype(loc, /turf/space) + var/turf/T = get_turf(src) + var/new_recharge_state = T?.is_outdoors() || isspace(T) if(new_recharge_state != last_recharge_state) last_recharge_state = new_recharge_state if(last_recharge_state)