From 7aec486d70397a0d15aa72fbe301fd3a7048dc1f Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Thu, 29 Jul 2021 16:08:57 -0400
Subject: [PATCH] Merge pull request #11296 from VOREStation/Arokha/randomfixes

Two random map fixes
---
 code/game/objects/effects/step_triggers.dm        | 5 ++++-
 maps/submaps/pois_vr/aerostat/DecoupledEngine.dmm | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm
index a9d1331428..957cd246e6 100644
--- a/code/game/objects/effects/step_triggers.dm
+++ b/code/game/objects/effects/step_triggers.dm
@@ -105,6 +105,8 @@
 
 
 /obj/effect/step_trigger/teleporter/proc/move_object(atom/movable/AM, turf/T)
+	if(!T)
+		return
 	if(AM.anchored && !istype(AM, /obj/mecha))
 		return
 
@@ -160,7 +162,8 @@
 	if(teleport_x && teleport_y && teleport_z)
 		if(teleport_x_offset && teleport_y_offset && teleport_z_offset)
 			var/turf/T = locate(rand(teleport_x, teleport_x_offset), rand(teleport_y, teleport_y_offset), rand(teleport_z, teleport_z_offset))
-			A.forceMove(T)
+			if(T)
+				A.forceMove(T)
 
 /* Teleporter that sends objects stepping on it to a specific landmark. */
 
diff --git a/maps/submaps/pois_vr/aerostat/DecoupledEngine.dmm b/maps/submaps/pois_vr/aerostat/DecoupledEngine.dmm
index 03044d8196..eee3230cdb 100644
--- a/maps/submaps/pois_vr/aerostat/DecoupledEngine.dmm
+++ b/maps/submaps/pois_vr/aerostat/DecoupledEngine.dmm
@@ -67,13 +67,13 @@
 /turf/simulated/floor,
 /area/submap/virgo2/DecoupledEngine)
 "ar" = (
-/obj/structure/sign/poi/engineright{
+/obj/structure/sign/scenery/engineright{
 	dir = 1
 	},
 /turf/simulated/wall/r_wall,
 /area/submap/virgo2/DecoupledEngine)
 "as" = (
-/obj/structure/sign/poi/engineleft{
+/obj/structure/sign/scenery/engineleft{
 	dir = 1
 	},
 /turf/simulated/wall/r_wall,
@@ -474,11 +474,11 @@
 /turf/simulated/floor,
 /area/submap/virgo2/DecoupledEngine)
 "bv" = (
-/obj/structure/sign/poi/engineleft,
+/obj/structure/sign/scenery/engineleft,
 /turf/simulated/wall/durasteel,
 /area/submap/virgo2/DecoupledEngine)
 "bw" = (
-/obj/structure/sign/poi/engineright,
+/obj/structure/sign/scenery/engineright,
 /turf/simulated/wall/r_wall,
 /area/submap/virgo2/DecoupledEngine)
 "bx" = (