diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index db858a2ab8..71927bff27 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -84,6 +84,8 @@ levelupdate() if(climbable) verbs += /turf/simulated/proc/climb_wall + if(is_outdoors()) //VOREStation edit - quick fix for a planetary lighting issue + SSplanets.addTurf(src) /turf/simulated/examine(mob/user) . = ..() diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm index 14c7cce1a3..bc7d77ee09 100644 --- a/code/game/turfs/simulated/outdoors/outdoors.dm +++ b/code/game/turfs/simulated/outdoors/outdoors.dm @@ -60,11 +60,12 @@ var/list/turf_edge_cache = list() return . = ..() - +/* VOREStation remove - handled by parent /turf/simulated/floor/Initialize(mapload) if(is_outdoors()) SSplanets.addTurf(src) . = ..() +*/ /turf/simulated/floor/Destroy() if(is_outdoors()) diff --git a/code/game/turfs/simulated/outdoors/sky.dm b/code/game/turfs/simulated/outdoors/sky.dm index 2f9f8106bb..6b94f245c1 100644 --- a/code/game/turfs/simulated/outdoors/sky.dm +++ b/code/game/turfs/simulated/outdoors/sky.dm @@ -14,7 +14,7 @@ /turf/simulated/sky/Initialize() . = ..() - SSplanets.addTurf(src) + //SSplanets.addTurf(src) VOREStation edit - Handled by parent set_light(2, 2, "#FFFFFF") /turf/simulated/sky/north diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index ea678af404..db007c3d27 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -661,6 +661,31 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/asteroid_steel/outdoors) +<<<<<<< HEAD +======= +/turf/simulated/open/virgo3c + VIRGO3C_SET_ATMOS + +/* Handled by parent now +/turf/simulated/open/virgo3c/Initialize(mapload) + . = ..() + if(is_outdoors()) + SSplanets.addTurf(src) +*/ + +/turf/simulated/mineral/cave/virgo3c + VIRGO3C_SET_ATMOS + outdoors = 0 + +/turf/simulated/mineral/floor/virgo3c + VIRGO3C_SET_ATMOS + outdoors = 0 + +/turf/simulated/mineral/floor/ignore_mapgen/virgo3c + VIRGO3C_SET_ATMOS + outdoors = 0 + +>>>>>>> 723789a563... Small fix for planetary lighting (#15783) /turf/simulated/floor/outdoors/grass/virgo3c VIRGO3C_SET_ATMOS diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index bfaa882bc3..b23fde6a79 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -8,10 +8,12 @@ VIRGO3B_TURF_CREATE(/turf/simulated/floor/water/indoors) VIRGO3B_TURF_CREATE(/turf/simulated/open) /turf/simulated/open/virgo3b edge_blending_priority = 0.5 //Turfs which also have e_b_p and higher than this will plop decorative edges onto this turf +/* Handled by parent now /turf/simulated/open/virgo3b/Initialize(mapload) . = ..() if(is_outdoors()) SSplanets.addTurf(src) +*/ VIRGO3B_TURF_CREATE(/turf/simulated/floor)