From 5f33ae47fa30d7661e40671aeb48f0c41b23d6da Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Mon, 3 Jun 2019 23:38:18 +0200 Subject: [PATCH] Singularity on Lavaland improvements --- _maps/map_files/generic/Lavaland.dmm | 1 + code/game/turfs/simulated/floor/asteroid.dm | 6 ------ code/game/turfs/simulated/walls.dm | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 66ed729e9d6..3bfdb1d12b2 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -628,6 +628,7 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/effect/baseturf_helper/lava_land/surface, /turf/simulated/floor/plasteel, /area/mine/eva) "bH" = ( diff --git a/code/game/turfs/simulated/floor/asteroid.dm b/code/game/turfs/simulated/floor/asteroid.dm index 8ed3cd22b4b..bae38df854a 100644 --- a/code/game/turfs/simulated/floor/asteroid.dm +++ b/code/game/turfs/simulated/floor/asteroid.dm @@ -95,12 +95,6 @@ slowdown = 0 return -/turf/simulated/floor/plating/asteroid/singularity_act() - return - -/turf/simulated/floor/plating/asteroid/singularity_pull(S, current_size) - return - /turf/simulated/floor/plating/asteroid/basalt name = "volcanic floor" baseturf = /turf/simulated/floor/plating/asteroid/basalt diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 23038b21be5..8163bc75acc 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -136,7 +136,7 @@ var/obj/structure/sign/poster/P = O P.roll_and_drop(src) else - O.loc = src + O.forceMove(src) ChangeTurf(/turf/simulated/floor/plating)