From 629a249d838ec546a46df9467f9fb693d89f7cd0 Mon Sep 17 00:00:00 2001
From: GDN <96800819+GDNgit@users.noreply.github.com>
Date: Wed, 28 Jun 2023 08:30:36 -0500
Subject: [PATCH] golems no longer cause hijacks to fail (#21392)

---
 code/modules/shuttle/emergency.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 1b328d6f183..caccc2c3e44 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -304,7 +304,7 @@
 			continue
 		if(isanimal(player)) //Poly does not own the shuttle
 			continue
-		if(ishuman(player)) //hostages allowed on the shuttle, check for restraints
+		if(ishuman(player)) //hostages allowed on the shuttle, check for restraints/them being golems
 			var/mob/living/carbon/human/H = player
 			if(!H.check_death_method() && H.health <= HEALTH_THRESHOLD_DEAD) //new crit users who are in hard crit are considered dead
 				continue
@@ -316,6 +316,8 @@
 				var/obj/structure/closet/C = H.loc
 				if(C.welded || C.locked)
 					continue
+			if(isgolem(H)) // golems are often used in hijacks, so they really shouldn't all be forced to space themselves before the shuttle docks
+				continue
 		var/special_role = player.mind.special_role
 		if(special_role)
 			// There's a long list of special roles, but almost all of them are antags anyway.