From fd418d7d5ea04817ea4b1faf7765c82b396dadc9 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 1 Aug 2021 11:26:50 -0400 Subject: [PATCH] VR fixes --- code/modules/lighting/lighting_fake_sun_vr.dm | 2 +- code/modules/planet/virgo3b_vr.dm | 12 ++++++------ code/modules/planet/virgo4_vr.dm | 12 ++++++------ maps/southern_cross/events/wildlife_encounter.dm | 4 +++- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/code/modules/lighting/lighting_fake_sun_vr.dm b/code/modules/lighting/lighting_fake_sun_vr.dm index 8f1d68a6f7..41fb677fb6 100644 --- a/code/modules/lighting/lighting_fake_sun_vr.dm +++ b/code/modules/lighting/lighting_fake_sun_vr.dm @@ -100,7 +100,7 @@ var/list/all_turfs = block(locate(1, 1, min), locate(world.maxx, world.maxy, max)) var/list/turfs_to_use = list() for(var/turf/T as anything in all_turfs) - if(T.outdoors) + if(T.is_outdoors()) turfs_to_use += T if(!turfs_to_use.len) diff --git a/code/modules/planet/virgo3b_vr.dm b/code/modules/planet/virgo3b_vr.dm index d2faf2315d..822faa2d7e 100644 --- a/code/modules/planet/virgo3b_vr.dm +++ b/code/modules/planet/virgo3b_vr.dm @@ -276,7 +276,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain @@ -327,7 +327,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain @@ -383,7 +383,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail @@ -474,7 +474,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to burn them with ash. L.inflict_heat_damage(rand(1, 3)) @@ -511,7 +511,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null if(L.z in holder.our_planet.expected_z_levels) irradiate_nearby_turf(L) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to irradiate them with fallout. L.rad_act(rand(direct_rad_low, direct_rad_high)) @@ -525,6 +525,6 @@ var/datum/planet/virgo3b/planet_virgo3b = null var/turf/T = pick(turfs) // We get one try per tick. if(!istype(T)) return - if(T.outdoors) + if(T.is_outdoors()) SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high)) diff --git a/code/modules/planet/virgo4_vr.dm b/code/modules/planet/virgo4_vr.dm index 18f4298aa1..74cd6c33b4 100644 --- a/code/modules/planet/virgo4_vr.dm +++ b/code/modules/planet/virgo4_vr.dm @@ -255,7 +255,7 @@ var/datum/planet/virgo4/planet_virgo4 = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain @@ -301,7 +301,7 @@ var/datum/planet/virgo4/planet_virgo4 = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain @@ -354,7 +354,7 @@ var/datum/planet/virgo4/planet_virgo4 = null for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail @@ -447,7 +447,7 @@ var/datum/planet/virgo4/planet_virgo4 = null for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to burn them with ash. L.inflict_heat_damage(rand(1, 3)) @@ -484,7 +484,7 @@ var/datum/planet/virgo4/planet_virgo4 = null if(L.z in holder.our_planet.expected_z_levels) irradiate_nearby_turf(L) var/turf/T = get_turf(L) - if(!T.outdoors) + if(!T.is_outdoors()) continue // They're indoors, so no need to irradiate them with fallout. L.rad_act(rand(direct_rad_low, direct_rad_high)) @@ -498,7 +498,7 @@ var/datum/planet/virgo4/planet_virgo4 = null var/turf/T = pick(turfs) // We get one try per tick. if(!istype(T)) return - if(T.outdoors) + if(T.is_outdoors()) SSradiation.radiate(T, rand(fallout_rad_low, fallout_rad_high)) /turf/unsimulated/wall/planetary/normal/virgo4 diff --git a/maps/southern_cross/events/wildlife_encounter.dm b/maps/southern_cross/events/wildlife_encounter.dm index 0a045f9f17..57fde54ef1 100644 --- a/maps/southern_cross/events/wildlife_encounter.dm +++ b/maps/southern_cross/events/wildlife_encounter.dm @@ -24,7 +24,9 @@ // continue // Not on the right z-level. if(L.stat) continue // Don't want dead people. - if(istype(get_turf(L), /turf/simulated/floor/outdoors) && istype(get_area(L),/area/surface/outside/wilderness)) + var/turf/T = get_turf(L) + var/area/A = get_area(L) + if(T?.is_outdoors() && istype(A, /area/tether/outpost/exploration_plains)) // VOREStation Edit potential_victims += L if(potential_victims.len)