From 5cec6a1cdd9fdcc38ba55595333d1aea8cb91d8b Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Sat, 17 May 2025 09:16:01 -0400
Subject: [PATCH] ERT no longer initially spawns in nullspace (#29347)

---
 code/modules/response_team/ert.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm
index 54939c3dbb6..dc3574238b7 100644
--- a/code/modules/response_team/ert.dm
+++ b/code/modules/response_team/ert.dm
@@ -150,7 +150,7 @@ GLOBAL_LIST_EMPTY(ert_request_messages)
 			R.force_modules = list("Engineering", "Medical")
 		return R
 
-	var/mob/living/carbon/human/M = new(null)
+	var/mob/living/carbon/human/M = new(spawn_location)
 
 	if(new_gender)
 		if(new_gender == "Male")
@@ -217,7 +217,6 @@ GLOBAL_LIST_EMPTY(ert_request_messages)
 	if(!(M.mind in SSticker.minds))
 		SSticker.minds += M.mind //Adds them to regular mind list.
 	SSticker.mode.ert += M.mind
-	M.forceMove(spawn_location)
 
 	SSjobs.CreateMoneyAccount(M, role, null)