cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

You can now mount things from the side (#55741)

Browse Source
This commit is contained in:
Ryll Ryll
2021-01-01 15:29:57 -05:00
committed by GitHub
parent 69b10203f3
commit 91a8cf6cf7
9 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/beds_chairs/alien_nest.dm
+1 -1
View File
@@ -47,7 +47,7 @@
unbuckle_mob(M)
add_fingerprint(user)
/obj/structure/bed/nest/user_buckle_mob(mob/living/M, mob/living/user)
/obj/structure/bed/nest/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.incapacitated() || M.buckled )
return
code/game/objects/structures/beds_chairs/chair.dm
+1 -1
View File
@@ -251,7 +251,7 @@
usr.put_in_hands(C)
qdel(src)
/obj/structure/chair/user_buckle_mob(mob/living/M, force, check_loc = FALSE)
/obj/structure/chair/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
return ..()
/obj/structure/chair/stool/bar
code/game/objects/structures/guillotine.dm
+2 -2
View File
@@ -189,7 +189,7 @@
else
return ..()
/obj/structure/guillotine/user_buckle_mob(mob/living/M, force = FALSE, check_loc = FALSE)
/obj/structure/guillotine/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
if (!anchored)
to_chat(usr, "<span class='warning'>[src] needs to be wrenched to the floor!</span>")
return FALSE
@@ -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, check_loc = FALSE) //check_loc = FALSE to allow moving people in from adjacent turfs
return ..(M, user, 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))
code/game/objects/structures/kitchen_spike.dm
+1 -1
View File
@@ -91,7 +91,7 @@
/obj/structure/kitchenspike/user_buckle_mob(mob/living/M, mob/living/user) //Don't want them getting put on the rack other than by spiking
/obj/structure/kitchenspike/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE) //Don't want them getting put on the rack other than by spiking
return
/obj/structure/kitchenspike/user_unbuckle_mob(mob/living/buckled_mob, mob/living/carbon/human/user)
code/game/objects/structures/manned_turret.dm
+1 -1
View File
@@ -43,7 +43,7 @@
. = ..()
STOP_PROCESSING(SSfastprocess, src)
/obj/machinery/manned_turret/user_buckle_mob(mob/living/M, mob/living/carbon/user)
/obj/machinery/manned_turret/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
if(user.incapacitated() || !istype(user))
return
M.forceMove(get_turf(src))