only bother with the whole shuttle thing if admins aren't overriding …

…the spawn location
cmss13-devs · Feb 24, 2024 · 7dac02f · 7dac02f
1 parent eefc60c
commit 7dac02f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm
@@ -275,7 +275,7 @@
 		if(M.client)
 			to_chat(M, SPAN_NOTICE("Distress beacon: [src.name] finalized."))
 
-	if(shuttle_id)
+	if(shuttle_id && !override_spawn_loc)
 		if(!SSmapping.shuttle_templates[shuttle_id])
 			message_admins("Distress beacon: [name] does not have a valid shuttle_id: [shuttle_id]")
 			CRASH("ert called with invalid shuttle_id")