diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index 8143bc3c9e..b24b758d73 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -101,7 +101,9 @@ return /turf/open/floor/plating/asteroid/singularity_act() - return + if(turf_z_is_planet(src)) + return ..() + ChangeTurf(/turf/open/space) /turf/open/floor/plating/asteroid/singularity_pull(S, current_size) if(dug) diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm.rej b/code/game/turfs/simulated/floor/plating/asteroid.dm.rej deleted file mode 100644 index d8845745e8..0000000000 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm.rej +++ /dev/null @@ -1,14 +0,0 @@ -diff a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm (rejected hunks) -@@ -101,10 +101,9 @@ - return - - /turf/open/floor/plating/asteroid/singularity_act() -- if(!turf_z_is_planet(src)) -- ChangeTurf(/turf/open/space) -- else -+ if(turf_z_is_planet(src)) - return ..() -+ ChangeTurf(/turf/open/space) - - /turf/open/floor/plating/asteroid/singularity_pull(S, current_size) - return