cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fix guillotine buckling (#1299)

Browse Source 
* Fix guillotine buckling (#54357)

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>

* Fix guillotine buckling

Co-authored-by: Yenwodyah <yenwodyah@gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-10-14 12:31:27 +02:00
committed by GitHub
co-authored by Jared-Fogle Yenwodyah
parent 74332d4ccb
commit 4370c8c17b
2 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/guillotine.dm
+3 -3
View File
@@ -189,9 +189,9 @@
else
return ..()
/obj/structure/guillotine/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE)
/obj/structure/guillotine/user_buckle_mob(mob/living/M, force = FALSE, check_loc = FALSE)
if (!anchored)
to_chat(usr, "<span class='warning'>The [src] needs to be wrenched to the floor!</span>")
to_chat(usr, "<span class='warning'>[src] needs to be wrenched to the floor!</span>")
return FALSE
if (!istype(M, /mob/living/carbon/human))
@@ -202,7 +202,7 @@
to_chat(usr, "<span class='warning'>You need to raise the blade before buckling someone in!</span>")
return FALSE
return ..(M, force, FALSE)
return ..(M, force, check_loc = FALSE) //check_loc = FALSE to allow moving people in from adjacent turfs
/obj/structure/guillotine/post_buckle_mob(mob/living/M)
if (!istype(M, /mob/living/carbon/human))