From b48b3429c166d901ab0d5d5cade9e8bcc641c62d Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 30 Sep 2023 20:27:20 -0400 Subject: [PATCH] this is what dying feels like --- _maps/safehouses/den.dmm | 9 +- _maps/safehouses/ice.dmm | 3 - _maps/safehouses/lavaland_boss.dmm | 4 - _maps/safehouses/wood.dmm | 14 +- _maps/virtual_domains/beach_bar.dmm | 153 +++++------------- _maps/virtual_domains/gondola_asteroid.dmm | 2 +- code/__DEFINES/multiz.dm | 8 +- code/__DEFINES/role_preferences.dm | 12 +- code/controllers/subsystem/mapping.dm | 1 - code/game/machinery/camera/camera.dm | 1 - code/game/turfs/open/chasm.dm | 2 +- code/modules/bitrunning/antagonists/outfit.dm | 4 - code/modules/lighting/lighting_source.dm | 8 +- .../antagonists/clock_cult/reebe_modules.dm | 2 +- .../code/modules/liquids/liquid_groups.dm | 2 +- .../outdoors/code/sunlight/sunlight_object.dm | 6 +- 16 files changed, 59 insertions(+), 172 deletions(-) diff --git a/_maps/safehouses/den.dmm b/_maps/safehouses/den.dmm index 235d786d6e9d..8fcbf95f552f 100644 --- a/_maps/safehouses/den.dmm +++ b/_maps/safehouses/den.dmm @@ -32,12 +32,6 @@ }, /turf/open/floor/plating, /area/virtual_domain/safehouse) -"l" = ( -/obj/structure/railing/corner/end{ - dir = 4 - }, -/turf/open/floor/pod/dark, -/area/virtual_domain/safehouse) "p" = ( /turf/open/floor/pod, /area/virtual_domain/safehouse) @@ -50,7 +44,6 @@ "u" = ( /obj/structure/railing, /obj/effect/turf_decal/siding/dark, -/obj/structure/sign/poster/contraband/hacking_guide/directional/east, /obj/effect/landmark/bitrunning/cache_goal_turf, /obj/effect/turf_decal/loading_area{ dir = 4 @@ -201,7 +194,7 @@ i (5,1,1) = {" C M -l +M e I i diff --git a/_maps/safehouses/ice.dmm b/_maps/safehouses/ice.dmm index a8293f9502aa..34b8affaaafa 100644 --- a/_maps/safehouses/ice.dmm +++ b/_maps/safehouses/ice.dmm @@ -98,9 +98,6 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 4 }, -/obj/structure/railing/corner/end{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/snowed, /area/virtual_domain/safehouse) diff --git a/_maps/safehouses/lavaland_boss.dmm b/_maps/safehouses/lavaland_boss.dmm index 7482846e61f7..c40463dcd775 100644 --- a/_maps/safehouses/lavaland_boss.dmm +++ b/_maps/safehouses/lavaland_boss.dmm @@ -99,11 +99,7 @@ }, /obj/structure/closet, /obj/item/gun/ballistic/rocketlauncher/unrestricted, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, /obj/item/energy_katana, -/obj/item/ammo_box/magazine/m7mm, /turf/open/floor/iron/dark/smooth_edge{ dir = 8 }, diff --git a/_maps/safehouses/wood.dmm b/_maps/safehouses/wood.dmm index 0bb6b273fcea..441730c67cd4 100644 --- a/_maps/safehouses/wood.dmm +++ b/_maps/safehouses/wood.dmm @@ -9,10 +9,6 @@ "o" = ( /turf/open/floor/carpet/green, /area/virtual_domain/safehouse) -"p" = ( -/obj/item/kirbyplants/random/fullysynthetic, -/turf/open/indestructible/hotelwood, -/area/virtual_domain/safehouse) "s" = ( /obj/machinery/light/small/directional/east, /obj/effect/landmark/bitrunning/cache_goal_turf, @@ -27,12 +23,6 @@ /obj/item/newspaper, /turf/open/indestructible/hotelwood, /area/virtual_domain/safehouse) -"x" = ( -/obj/structure/railing/corner/end{ - dir = 4 - }, -/turf/open/floor/carpet/green, -/area/virtual_domain/safehouse) "z" = ( /obj/structure/sign/poster/random/directional/east, /turf/open/indestructible/hotelwood, @@ -80,7 +70,7 @@ i "} (3,1,1) = {" G -p +a o o T @@ -97,7 +87,7 @@ G (5,1,1) = {" G a -x +o o T G diff --git a/_maps/virtual_domains/beach_bar.dmm b/_maps/virtual_domains/beach_bar.dmm index 9c4289ec6ccd..643ca68a3b78 100644 --- a/_maps/virtual_domains/beach_bar.dmm +++ b/_maps/virtual_domains/beach_bar.dmm @@ -2,7 +2,6 @@ "ab" = ( /obj/machinery/vending/cigarette/beach, /obj/effect/turf_decal/sand, -/obj/structure/sign/poster/contraband/have_a_puff/directional/west, /turf/open/floor/iron, /area/virtual_domain/powered) "af" = ( @@ -87,8 +86,9 @@ /area/virtual_domain/powered) "cz" = ( /obj/effect/turf_decal/sand, -/obj/machinery/jukebox, /obj/item/coin/gold, +/obj/structure/railing, +/obj/machinery/media/jukebox, /turf/open/floor/sepia, /area/virtual_domain/powered) "cG" = ( @@ -142,9 +142,7 @@ /turf/open/floor/wood, /area/virtual_domain/powered) "dj" = ( -/turf/open/misc/beach/coast{ - dir = 1 - }, +/turf/open/misc/beach/sand/coastline_b, /area/virtual_domain/powered) "dx" = ( /obj/effect/turf_decal/sand, @@ -223,9 +221,7 @@ /obj/structure/railing{ dir = 8 }, -/turf/open/misc/beach/coast{ - dir = 4 - }, +/turf/open/misc/beach/sand/coastline_b, /area/virtual_domain/powered) "hk" = ( /obj/structure/reagent_dispensers/watertank, @@ -345,22 +341,12 @@ "ml" = ( /turf/template_noop, /area/virtual_domain/safehouse) -"mq" = ( -/obj/structure/closet/secure_closet/freezer/kitchen/all_access, -/turf/open/floor/wood, -/area/virtual_domain/powered) "mG" = ( /obj/structure/easel, /obj/item/canvas/twentythree_twentythree, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"mP" = ( -/turf/open/misc/beach/coast/corner{ - dir = 1 - }, -/area/virtual_domain/powered) "mX" = ( -/obj/structure/closet/secure_closet/freezer/meat/all_access, /obj/item/food/meat/rawbacon, /obj/item/food/meat/rawbacon, /obj/item/food/meat/rawcutlet, @@ -378,13 +364,8 @@ /turf/open/floor/plating, /area/virtual_domain/powered) "oE" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/light/directional/south, -/turf/open/misc/beach/coast/corner{ - dir = 8 - }, +/turf/open/misc/beach/sand/coastline_b, /area/virtual_domain/powered) "oP" = ( /obj/structure/table/wood, @@ -402,20 +383,10 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/virtual_domain/powered) -"pZ" = ( -/obj/machinery/light/directional/south, -/turf/open/misc/beach/coast{ - dir = 1 - }, -/area/virtual_domain/powered) "qc" = ( /obj/structure/extinguisher_cabinet/directional/south, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"qg" = ( -/obj/structure/sign/poster/contraband/space_up/directional/west, -/turf/open/floor/wood, -/area/virtual_domain/powered) "qR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -472,6 +443,11 @@ }, /turf/open/floor/pod/light, /area/virtual_domain/powered) +"sO" = ( +/obj/effect/turf_decal/sand, +/obj/structure/railing, +/turf/open/floor/sepia, +/area/virtual_domain/powered) "sT" = ( /obj/effect/baseturf_helper/virtual_domain, /turf/template_noop, @@ -544,10 +520,6 @@ /obj/effect/turf_decal/sand, /turf/open/floor/sepia, /area/virtual_domain/powered) -"uV" = ( -/obj/structure/flora/coconuts, -/turf/open/misc/beach/sand, -/area/virtual_domain/powered) "ve" = ( /obj/item/toy/dodgeball, /obj/item/toy/dodgeball, @@ -602,12 +574,6 @@ /obj/item/reagent_containers/pill/morphine, /turf/open/floor/wood, /area/virtual_domain/powered) -"vT" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/misc/beach/coast/corner, -/area/virtual_domain/powered) "vW" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{ @@ -756,9 +722,7 @@ /area/virtual_domain/powered) "zn" = ( /obj/machinery/light/directional/east, -/turf/open/misc/beach/coast{ - dir = 8 - }, +/turf/open/misc/beach/sand/coastline_b, /area/virtual_domain/powered) "zt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -784,6 +748,7 @@ dir = 8 }, /obj/machinery/light/directional/west, +/obj/structure/railing, /turf/open/floor/sepia, /area/virtual_domain/powered) "Ae" = ( @@ -832,11 +797,6 @@ }, /turf/open/floor/wood, /area/virtual_domain/powered) -"Bu" = ( -/turf/open/misc/beach/coast{ - dir = 8 - }, -/area/virtual_domain/powered) "Bw" = ( /obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/beach/sand, @@ -994,11 +954,6 @@ }, /turf/open/floor/wood, /area/virtual_domain/powered) -"Gh" = ( -/obj/effect/turf_decal/sand, -/obj/structure/sign/poster/contraband/starkist/directional/north, -/turf/open/misc/beach/sand, -/area/virtual_domain/powered) "Gz" = ( /obj/structure/flora/tree/palm, /turf/open/misc/beach/sand, @@ -1081,7 +1036,6 @@ /turf/open/misc/beach/sand, /area/virtual_domain/powered) "JE" = ( -/obj/structure/closet/secure_closet/freezer/kitchen/all_access, /obj/item/reagent_containers/condiment/milk, /obj/item/reagent_containers/condiment/mayonnaise, /obj/item/reagent_containers/condiment/flour, @@ -1243,7 +1197,6 @@ /turf/open/misc/beach/sand, /area/virtual_domain/powered) "Pg" = ( -/obj/structure/sign/poster/official/high_class_martini/directional/west, /obj/effect/mob_spawn/ghost_role/human/bartender{ dir = 4 }, @@ -1319,11 +1272,6 @@ /obj/item/clothing/neck/beads, /turf/open/floor/wood, /area/virtual_domain/powered) -"Sg" = ( -/obj/structure/flora/coconuts, -/obj/machinery/light/directional/north, -/turf/open/misc/beach/sand, -/area/virtual_domain/powered) "SB" = ( /obj/machinery/door/airlock/sandstone{ name = "Resort Bathroom" @@ -1359,7 +1307,6 @@ /turf/closed/wall/mineral/sandstone, /area/virtual_domain/powered) "TX" = ( -/obj/structure/sign/poster/contraband/ambrosia_vulgaris/directional/north, /turf/open/floor/iron/grimy, /area/virtual_domain/powered) "Ud" = ( @@ -1437,11 +1384,6 @@ }, /turf/open/floor/carpet/orange, /area/virtual_domain/powered) -"Xt" = ( -/turf/open/misc/beach/coast/corner{ - dir = 4 - }, -/area/virtual_domain/powered) "Xv" = ( /obj/structure/table/wood, /obj/structure/bedsheetbin, @@ -1451,9 +1393,6 @@ /obj/machinery/light/directional/east, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"XM" = ( -/turf/open/misc/beach/coast, -/area/virtual_domain/powered) "XP" = ( /turf/open/floor/carpet/blue, /area/virtual_domain/powered) @@ -1487,14 +1426,6 @@ /obj/machinery/light/directional/west, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"Zb" = ( -/obj/structure/sign/poster/official/cohiba_robusto_ad/directional/west, -/turf/open/floor/wood, -/area/virtual_domain/powered) -"Zd" = ( -/obj/structure/sign/poster/contraband/space_cola/directional/north, -/turf/open/misc/beach/sand, -/area/virtual_domain/powered) "Zg" = ( /obj/structure/table, /obj/machinery/microwave, @@ -2072,7 +2003,7 @@ Al Fn VA kT -Zb +TG TG Fn Fn @@ -2168,7 +2099,7 @@ ab Ir IP YN -uV +wD wD wD wD @@ -2181,7 +2112,7 @@ uU lS lS lS -uU +sO QB Al gl @@ -2249,7 +2180,7 @@ TM IT KH vM -Zd +wD wD wD Bw @@ -2267,7 +2198,7 @@ uU lS lS lS -uU +sO QB Al gl @@ -2289,7 +2220,7 @@ IT tE tE vM -uV +wD NF wD wD @@ -2310,7 +2241,7 @@ uU uU uU uU -uU +sO sp DL gl @@ -2348,7 +2279,7 @@ TJ wb wD wD -vT +gJ gJ gJ gJ @@ -2391,7 +2322,7 @@ yl ag wD wD -XM +dj KZ Ww Ww @@ -2434,7 +2365,7 @@ Au wD rT wD -XM +dj Ww Ww Ww @@ -2477,7 +2408,7 @@ YJ YJ wD wD -XM +dj Ww Ww Ww @@ -2508,7 +2439,7 @@ wD jW Em TG -mq +TG ri Qb TG @@ -2520,13 +2451,13 @@ bQ wD wD wD -XM +dj Ww Ww KZ KZ Ww -pZ +oE QB Al iz @@ -2563,7 +2494,7 @@ XP yB wD wD -XM +dj KZ Ww KZ @@ -2587,7 +2518,7 @@ iz Al dG QB -Sg +Nr wD wD wD @@ -2606,7 +2537,7 @@ XL wD wD wD -XM +dj Ww Ww Ww @@ -2649,7 +2580,7 @@ xq jy wD wD -XM +dj Ww cG Ww @@ -2692,13 +2623,13 @@ CA Uh wD qW -XM +dj Ww Ww Ww Ww Ww -pZ +oE QB Al iz @@ -2734,14 +2665,14 @@ wD wD wD Jt -wD -mP +dj +dj zn -Bu -Bu -Bu -Bu -Xt +dj +dj +dj +dj +dj QB Al iz @@ -2902,7 +2833,7 @@ OE Nw QB Gz -uV +wD wD wD Ud @@ -2987,7 +2918,7 @@ Wg TG RL QB -Gh +Ud Ud Ud Ud @@ -3023,7 +2954,7 @@ TG TG TG TG -qg +TG TG Fn Fn diff --git a/_maps/virtual_domains/gondola_asteroid.dmm b/_maps/virtual_domains/gondola_asteroid.dmm index d6377a4a4c10..0fcd583ef25d 100644 --- a/_maps/virtual_domains/gondola_asteroid.dmm +++ b/_maps/virtual_domains/gondola_asteroid.dmm @@ -11,7 +11,7 @@ "g" = ( /obj/structure/marker_beacon{ light_color = "#FFE8AA"; - light_range = 20 + light_outer_range = 20 }, /turf/open/floor/grass, /area/ruin/space/has_grav/powered/virtual_domain) diff --git a/code/__DEFINES/multiz.dm b/code/__DEFINES/multiz.dm index 370eaa8ba459..9d167495fa88 100644 --- a/code/__DEFINES/multiz.dm +++ b/code/__DEFINES/multiz.dm @@ -1,8 +1,4 @@ /// Attempt to get the turf below the provided one according to Z traits -#define GET_TURF_BELOW(turf) ( \ - (turf.turf_flags & RESERVATION_TURF) ? SSmapping.get_reservation_from_turf(turf)?.get_turf_below(turf) : \ - (!(turf) || !length(SSmapping.multiz_levels) || !SSmapping.multiz_levels[(turf).z][Z_LEVEL_DOWN]) ? null : get_step((turf), DOWN)) +#define GET_TURF_BELOW(turf) ((!(turf) || !length(SSmapping.multiz_levels) || !SSmapping.multiz_levels[(turf).z][Z_LEVEL_DOWN]) ? null : get_step((turf), DOWN)) /// Attempt to get the turf above the provided one according to Z traits -#define GET_TURF_ABOVE(turf) ( \ - (turf.turf_flags & RESERVATION_TURF) ? SSmapping.get_reservation_from_turf(turf)?.get_turf_above(turf) : \ - (!(turf) || !length(SSmapping.multiz_levels) || !SSmapping.multiz_levels[(turf).z][Z_LEVEL_UP]) ? null : get_step((turf), UP)) +#define GET_TURF_ABOVE(turf) ((!(turf) || !length(SSmapping.multiz_levels) || !SSmapping.multiz_levels[(turf).z][Z_LEVEL_UP]) ? null : get_step((turf), UP)) diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index 90be4b2808bb..be6d6015267c 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -102,20 +102,10 @@ #define ROLE_SPACE_PIRATE "Space Pirate" #define ROLE_SPACE_SYNDICATE "Space Syndicate" #define ROLE_SYNDICATE_CYBERSUN "Cybersun Space Syndicate" //Ghost role syndi from Forgottenship ruin -#define ROLE_SYNDICATE_CYBERSUN_CAPTAIN "Cybersun Space Syndicate Captain" //Forgottenship captain syndie -#define ROLE_SPACE_PIRATE "Space Pirate" -#define ROLE_ANCIENT_CREW "Ancient Crew" -#define ROLE_SPACE_DOCTOR "Space Doctor" -#define ROLE_SPACE_BARTENDER "Space Bartender" -#define ROLE_SPACE_BAR_PATRON "Space Bar Patron" -#define ROLE_SKELETON "Skeleton" +#define ROLE_SYNDICATE_CYBERSUN_CAPTAIN "Cybersun Space Syndicate Captain" //Forgottenship captain syndi #define ROLE_ZOMBIE "Zombie" -#define ROLE_MAINTENANCE_DRONE "Maintenance Drone" -#define ROLE_BATTLECRUISER_CREW "Battlecruiser Crew" -#define ROLE_BATTLECRUISER_CAPTAIN "Battlecruiser Captain" #define ROLE_SYNDICATE_DRONE "Syndicate Drone" #define ROLE_VENUSHUMANTRAP "Venus Human Trap" -#define ROLE_ZOMBIE "Zombie" diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 6a8e28331cfc..5b9d561afcae 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -988,7 +988,6 @@ GLOBAL_LIST_EMPTY(the_station_areas) /// Updates the lowest offset value for(var/datum/space_level/level_to_update in levels_checked) z_level_to_lowest_plane_offset[level_to_update.z_value] = plane_offset - z_level_to_stack[level_to_update.z_value] = z_stack // This can be affected by offsets, so we need to update it // PAIN diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index da76024b3d12..397f85a2f95d 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -536,7 +536,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) /obj/machinery/camera/proc/can_see() var/list/see = null var/turf/pos = get_turf(src) - var/turf/directly_above = GET_TURF_ABOVE(pos) var/check_lower = pos != get_lowest_turf(pos) var/check_higher = pos != get_highest_turf(pos) diff --git a/code/game/turfs/open/chasm.dm b/code/game/turfs/open/chasm.dm index 8d5a169b9891..f418962f2cd7 100644 --- a/code/game/turfs/open/chasm.dm +++ b/code/game/turfs/open/chasm.dm @@ -14,7 +14,7 @@ /turf/open/chasm/Initialize(mapload) . = ..() - AddComponent(/datum/component/chasm, SSmapping.get_turf_below(src)) + apply_components() /// Lets people walk into chasms. /turf/open/chasm/CanAllowThrough(atom/movable/mover, border_dir) diff --git a/code/modules/bitrunning/antagonists/outfit.dm b/code/modules/bitrunning/antagonists/outfit.dm index db57af561f8a..e6c8b1ded9ab 100644 --- a/code/modules/bitrunning/antagonists/outfit.dm +++ b/code/modules/bitrunning/antagonists/outfit.dm @@ -31,10 +31,6 @@ picked_hair = /datum/sprite_accessory/hair/business picked_color = "#4B3D28" - user.set_facial_hairstyle("Shaved", update = FALSE) - user.set_haircolor(picked_color, update = FALSE) - user.set_hairstyle(initial(picked_hair.name)) - /datum/outfit/cyber_police/post_equip(mob/living/carbon/human/user, visualsOnly) var/obj/item/clothing/under/officer_uniform = user.w_uniform if(officer_uniform) diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index f47556106530..1bf0fce08a75 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -309,7 +309,7 @@ corners[T.lighting_corner_NW] = 0 turfs += T - var/turf/below = SSmapping.get_turf_below(T) + var/turf/below = GET_TURF_BELOW(T) var/turf/previous = T while(below) // If we find a non transparent previous, end @@ -329,9 +329,9 @@ turfs += below // ANNND then we add the one below it previous = below - below = SSmapping.get_turf_below(below) + below = GET_TURF_BELOW(below) - var/turf/above = SSmapping.get_turf_above(T) + var/turf/above = GET_TURF_ABOVE(T) while(above) // If we find a non transparent turf, end if(!istransparentturf(above) || IS_OPAQUE_TURF(above)) @@ -343,7 +343,7 @@ corners[above.lighting_corner_SW] = 0 corners[above.lighting_corner_NW] = 0 turfs += above - above = SSmapping.get_turf_above(above) + above = GET_TURF_ABOVE(above) source_turf.luminosity = oldlum diff --git a/monkestation/code/modules/antagonists/clock_cult/reebe_modules.dm b/monkestation/code/modules/antagonists/clock_cult/reebe_modules.dm index 8d7f1d42ac6b..665f68709edc 100644 --- a/monkestation/code/modules/antagonists/clock_cult/reebe_modules.dm +++ b/monkestation/code/modules/antagonists/clock_cult/reebe_modules.dm @@ -29,7 +29,7 @@ GLOBAL_LIST_EMPTY(abscond_markers) reebe_loaded = FALSE CRASH("Failed to cache template for loading Reebe.") - if(!reebe_template.load(bottom_left_turfs[1])) + if(!reebe_template.load(reservation.bottom_left_turfs[1])) reebe_loaded = FALSE CRASH("Failed to load the Reebe template.") return TRUE diff --git a/monkestation/code/modules/liquids/liquid_groups.dm b/monkestation/code/modules/liquids/liquid_groups.dm index 0ced5908313f..6e83dfaa1dfe 100644 --- a/monkestation/code/modules/liquids/liquid_groups.dm +++ b/monkestation/code/modules/liquids/liquid_groups.dm @@ -825,7 +825,7 @@ GLOBAL_VAR_INIT(liquid_debug_colors, FALSE) return if(isopenspaceturf(new_turf)) - var/turf/Z_turf_below = SSmapping.get_turf_below(new_turf) + var/turf/Z_turf_below = GET_TURF_BELOW(new_turf) if(!Z_turf_below) return if(isspaceturf(Z_turf_below)) diff --git a/monkestation/code/modules/outdoors/code/sunlight/sunlight_object.dm b/monkestation/code/modules/outdoors/code/sunlight/sunlight_object.dm index 1a4459eab74a..5ccffea23e1b 100644 --- a/monkestation/code/modules/outdoors/code/sunlight/sunlight_object.dm +++ b/monkestation/code/modules/outdoors/code/sunlight/sunlight_object.dm @@ -193,7 +193,6 @@ Sunlight System /* pass recursion_started=TRUE when we are checking our ceiling's stats */ /turf/proc/get_ceiling_status(recursion_started = FALSE) . = list() - //Check yourself (before you wreck yourself) if(isclosedturf(src)) //Closed, but we might be transparent .["SKYVISIBLE"] = istransparentturf(src) // a column of glass should still let the sun in @@ -228,7 +227,8 @@ Sunlight System .["WEATHERPROOF"] |= ceilingStat["WEATHERPROOF"] var/area/turf_area = get_area(src) - if((!isspaceturf(src) && !istype(src, /turf/open/floor/plating/ocean) && !above() && !SSmapping.level_trait(src.z, ZTRAIT_UP) && !turf_area.outdoors && !turf_area.false_outdoors) || (!SSmapping.level_trait(src.z, ZTRAIT_DAYCYCLE) && !SSmapping.level_trait(src.z, ZTRAIT_STARLIGHT))) + var/turf/above_turf = GET_TURF_ABOVE(src) + if((!isspaceturf(src) && !istype(src, /turf/open/floor/plating/ocean) && !above_turf && !SSmapping.level_trait(src.z, ZTRAIT_UP) && !turf_area.outdoors && !turf_area.false_outdoors) || (!SSmapping.level_trait(src.z, ZTRAIT_DAYCYCLE) && !SSmapping.level_trait(src.z, ZTRAIT_STARLIGHT))) .["SKYVISIBLE"] = FALSE .["WEATHERPROOF"] = TRUE @@ -334,7 +334,7 @@ Sunlight System GLOB.SUNLIGHT_QUEUE_WORK += SunlightUpdates - var/turf/T = SSmapping.get_turf_below(src) + var/turf/T = GET_TURF_BELOW(src) if(T) T.reconsider_sunlight()