cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

golems no longer cause hijacks to fail (#21392)

Browse Source
This commit is contained in:
GDN
2023-06-28 08:30:36 -05:00
committed by GitHub
parent 7f58c19977
commit 629a249d83
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/emergency.dm
+3 -1
View File
@@ -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.