diff --git a/code/game/mecha/equipment/weapons/ballistic/mortar.dm b/code/game/mecha/equipment/weapons/ballistic/mortar.dm index c192d0fc9b..6fdfa8190d 100644 --- a/code/game/mecha/equipment/weapons/ballistic/mortar.dm +++ b/code/game/mecha/equipment/weapons/ballistic/mortar.dm @@ -18,7 +18,13 @@ /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) +<<<<<<< HEAD if(!MT.outdoors || !TT.outdoors) +||||||| parent of 7bd2f9ada6... Merge pull request #11324 from VOREStation/Arokha/fewmoreoutdoors + if(!MT.outdoors || !TT.is_outdoors()) +======= + if(!MT.is_outdoors() || !TT.is_outdoors()) +>>>>>>> 7bd2f9ada6... Merge pull request #11324 from VOREStation/Arokha/fewmoreoutdoors 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/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index f61567d6de..61a7448300 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -1378,7 +1378,7 @@ spawn_nothing_percentage = 20 var/override_outdoors = FALSE // Do we override our chosen turf's outdoors? - var/turf_outdoors = TRUE // Will our turf be outdoors? + var/turf_outdoors = OUTDOORS_AREA // Will our turf be outdoors? /obj/random/turf/spawn_item() var/build_path = item_to_spawn() @@ -1400,7 +1400,7 @@ desc = "This is a random lava spawn." override_outdoors = TRUE - turf_outdoors = FALSE + turf_outdoors = OUTDOORS_NO /obj/random/turf/lava/item_to_spawn() return pick(prob(5);/turf/simulated/floor/lava, diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm index 8ca1659d1b..3e46ccfeef 100644 --- a/code/game/turfs/simulated/outdoors/outdoors.dm +++ b/code/game/turfs/simulated/outdoors/outdoors.dm @@ -63,7 +63,7 @@ var/list/turf_edge_cache = list() edge_blending_priority = 1 /turf/simulated/floor/outdoors/rocks/caves - outdoors = FALSE + outdoors = OUTDOORS_NO // This proc adds a 'layer' on top of the turf. /turf/simulated/floor/outdoors/proc/promote(var/new_turf_type) diff --git a/code/game/turfs/simulated/outdoors/outdoors_vr.dm b/code/game/turfs/simulated/outdoors/outdoors_vr.dm index a7233b4329..9e5f6961c9 100644 --- a/code/game/turfs/simulated/outdoors/outdoors_vr.dm +++ b/code/game/turfs/simulated/outdoors/outdoors_vr.dm @@ -1,7 +1,7 @@ /turf/simulated/floor/tiled/asteroid_steel/outdoors name = "weathered tiles" desc = "Old tiles left out in the elements." - outdoors = 1 + outdoors = OUTDOORS_YES edge_blending_priority = 1 /turf/simulated/floor/outdoors/newdirt diff --git a/code/game/turfs/simulated/water_vr.dm b/code/game/turfs/simulated/water_vr.dm index ea16037cf7..9063f6afc3 100644 --- a/code/game/turfs/simulated/water_vr.dm +++ b/code/game/turfs/simulated/water_vr.dm @@ -1,5 +1,5 @@ /turf/simulated/floor/water/indoors //because it's nice to be able to use these indoors without having a blizzard ignore walls and areas. - outdoors = FALSE + outdoors = OUTDOORS_NO /turf/simulated/floor/water/deep/indoors - outdoors = FALSE \ No newline at end of file + outdoors = OUTDOORS_NO \ No newline at end of file diff --git a/code/game/turfs/unsimulated/beach_vr.dm b/code/game/turfs/unsimulated/beach_vr.dm index be3130a72e..6fe6b07b2c 100644 --- a/code/game/turfs/unsimulated/beach_vr.dm +++ b/code/game/turfs/unsimulated/beach_vr.dm @@ -1,5 +1,5 @@ /turf/simulated/floor/beach/sand/outdoors - outdoors = TRUE + outdoors = OUTDOORS_YES /turf/simulated/floor/beach/sand/desert/outdoors - outdoors = TRUE \ No newline at end of file + outdoors = OUTDOORS_YES \ No newline at end of file diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm index d59a4d5315..3ab854a26f 100644 --- a/code/modules/lighting/lighting_turf.dm +++ b/code/modules/lighting/lighting_turf.dm @@ -96,7 +96,7 @@ ///Setter for the byond luminosity var /turf/proc/set_luminosity(new_luminosity, force) // SSplanets handles outdoor turfs - if(outdoors && !force) + if(is_outdoors() && !force) return luminosity = new_luminosity diff --git a/code/modules/planet/sun.dm b/code/modules/planet/sun.dm index 569b99ca01..b7f33688d3 100644 --- a/code/modules/planet/sun.dm +++ b/code/modules/planet/sun.dm @@ -117,15 +117,15 @@ // Test for corners for(var/direction in cornerdirs) var/turf/dirturf = get_step(T, direction) - if(dirturf && !dirturf.outdoors) + if(dirturf && !dirturf.is_outdoors()) var/turf/TL = get_step(T, turn(direction, -45)) var/turf/TR = get_step(T, turn(direction, 45)) // If outdoors at 45 degrees are the same, then this is a corner - if(TL && TR && TL.outdoors == TR.outdoors) + if(TL && TR && TL.is_outdoors() == TR.is_outdoors()) var/atom/movable/sun_visuals_overlap/OL // Outer corner - if(TL.outdoors) + if(TL.is_outdoors()) OL = spreads["o[direction]"] // Inner corner else @@ -139,11 +139,11 @@ // Take all orthagonals for(var/direction in cardinal) var/turf/dirturf = get_step(T, direction) - if(dirturf && !dirturf.outdoors) + if(dirturf && !dirturf.is_outdoors()) var/turf/TL = get_step(T, turn(direction, -45)) var/turf/TR = get_step(T, turn(direction, 45)) // End of a wall, the corner will handle it - if(TL && TR && TL.outdoors != TR.outdoors) + if(TL && TR && TL.is_outdoors() != TR.is_outdoors()) continue var/atom/movable/sun_visuals_overlap/OL = spreads["[direction]"] dirturf.vis_contents += OL diff --git a/maps/offmap_vr/om_ships/aro2.dm b/maps/offmap_vr/om_ships/aro2.dm index d31b8f2ca1..d42ef4d6bb 100644 --- a/maps/offmap_vr/om_ships/aro2.dm +++ b/maps/offmap_vr/om_ships/aro2.dm @@ -49,7 +49,7 @@ desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right." description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy." color = "#222222" - outdoors = FALSE + outdoors = OUTDOORS_NO reagent_type = "liquid_protean" // The 'ship' diff --git a/maps/offmap_vr/om_ships/aro3.dm b/maps/offmap_vr/om_ships/aro3.dm index 724e803854..c5c339fe37 100644 --- a/maps/offmap_vr/om_ships/aro3.dm +++ b/maps/offmap_vr/om_ships/aro3.dm @@ -72,7 +72,7 @@ desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right." description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy." color = "#222222" - outdoors = FALSE + outdoors = OUTDOORS_NO reagent_type = "liquid_protean" // The 'ship' diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index 0bf0ef290f..f975667161 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -4,7 +4,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/open) edge_blending_priority = 0.5 //Turfs which also have e_b_p and higher than this will plop decorative edges onto this turf /turf/simulated/open/virgo3b/Initialize(mapload) . = ..() - if(outdoors) + if(is_outdoors()) SSplanets.addTurf(src) VIRGO3B_TURF_CREATE(/turf/simulated/floor)