cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 05:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes change Turf, see PR#3726 (#10078)

Browse Source
This commit is contained in:
Kashargul
2025-02-09 00:08:36 +01:00
committed by GitHub
parent 3fb4c887c4
commit c59496b35c
2 changed files with 32 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/turf_changing.dm
+30 -61
View File
@@ -77,70 +77,39 @@
cut_overlays(TRUE)
RemoveElement(/datum/element/turf_z_transparency)
changing_turf = TRUE
qdel(src)
var/turf/new_turf //CHOMPEdit
var/turf/W = new N( locate(src.x, src.y, src.z) )
if(ispath(N, /turf/simulated/floor))
//CHOMPEdit Begin
var/turf/simulated/W = new N( locate(src.x, src.y, src.z), is_turfchange=TRUE )
W.lighting_corners_initialised = old_lighting_corners_initialized
if(old_shandler)
W.shandler = old_shandler
old_shandler.holder = W
else if((SSplanets && SSplanets.z_to_planet.len >= z && SSplanets.z_to_planet[z]) && has_dynamic_lighting())
W.shandler = new(src)
W.shandler.manualInit()
//CHOMPEdit End
if(old_fire)
fire = old_fire
W.fire = old_fire
W.RemoveLattice()
//CHOMPEdit Begin
W.lighting_corners_initialised = old_lighting_corners_initialized
var/turf/simulated/W_sim = W
if(istype(W_sim) && old_shandler)
W_sim.shandler = old_shandler
old_shandler.holder = W
else if(istype(W_sim) && (SSplanets && SSplanets.z_to_planet.len >= z && SSplanets.z_to_planet[z]) && has_dynamic_lighting())
W_sim.shandler = new(src)
W_sim.shandler.manualInit()
//CHOMPEdit End
if(old_fire)
old_fire.RemoveFire()
if (istype(W,/turf/simulated/floor))
W.RemoveLattice()
if(tell_universe)
universe.OnTurfChange(W)
if(tell_universe)
universe.OnTurfChange(W)
if(SSair)
SSair.mark_for_update(src) //handle the addition of the new turf.
for(var/turf/space/S in range(W,1))
S.update_starlight()
W.levelupdate()
W.update_icon(1)
W.post_change()
new_turf = W //CHOMPEdit
. = W
else
//CHOMPEdit Begin
var/turf/W = new N( locate(src.x, src.y, src.z), is_turfchange=TRUE )
W.lighting_corners_initialised = old_lighting_corners_initialized
var/turf/simulated/W_sim = W
if(istype(W_sim) && old_shandler)
W_sim.shandler = old_shandler
old_shandler.holder = W
else if(istype(W_sim) && (SSplanets && SSplanets.z_to_planet.len >= z && SSplanets.z_to_planet[z]) && has_dynamic_lighting())
W_sim.shandler = new(src)
W_sim.shandler.manualInit()
//CHOMPEdit End
if(old_fire)
old_fire.RemoveFire()
if(tell_universe)
universe.OnTurfChange(W)
if(SSair)
SSair.mark_for_update(src)
for(var/turf/space/S in range(W,1))
S.update_starlight()
W.levelupdate()
W.update_icon(1)
W.post_change()
new_turf = W //CHOMPEdit
. = W
if(SSair)
SSair.mark_for_update(W)
for(var/turf/space/S in range(W, 1))
S.update_starlight()
W.levelupdate()
W.update_icon(1)
W.post_change()
. = W
dangerous_objects = old_dangerous_objects
@@ -177,10 +146,10 @@
if(SUNLIGHT_ONLY_SHADE)
vis_contents += sim_self.shandler.pshandler.vis_shade
var/is_open = istype(new_turf,/turf/simulated/open)
var/is_open = istype(W,/turf/simulated/open)
propogate_sunlight_changes(oldtype, old_density, new_turf)
propogate_sunlight_changes(oldtype, old_density, W)
var/turf/simulated/cur_turf = src
if(istype(cur_turf) && is_open != was_open)
do
@@ -189,7 +158,7 @@
cur_turf.make_outdoors()
else
cur_turf.make_indoors()
cur_turf.propogate_sunlight_changes(oldtype, old_density, new_turf, above = TRUE)
cur_turf.propogate_sunlight_changes(oldtype, old_density, W, above = TRUE)
while(istype(cur_turf,/turf/simulated/open) && HasBelow(cur_turf.z))
//CHOMPEdit End
code/modules/lighting/lighting_overlay.dm
+2
View File
@@ -112,6 +112,8 @@
//CHOMPEdit Begin
/datum/lighting_object/proc/update_sun()
if(QDELETED(src))
return
//Used to have more code here, but it became redundant.
affected_turf.set_luminosity(1)