mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 06:29:23 +01:00
You can now mount things from the side (#55741)
This commit is contained in:
@@ -63,7 +63,7 @@
|
||||
*/
|
||||
/atom/movable/proc/mouse_buckle_handling(mob/living/M, mob/living/user)
|
||||
if(can_buckle && istype(M) && istype(user))
|
||||
return user_buckle_mob(M, user)
|
||||
return user_buckle_mob(M, user, check_loc = FALSE)
|
||||
|
||||
/**
|
||||
* Returns TRUE if there are mobs buckled to this atom and FALSE otherwise
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -665,7 +665,7 @@
|
||||
|
||||
//ANIMAL RIDING
|
||||
|
||||
/mob/living/simple_animal/user_buckle_mob(mob/living/M, mob/user)
|
||||
/mob/living/simple_animal/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
|
||||
if(user.incapacitated())
|
||||
return
|
||||
for(var/atom/movable/A in get_turf(src))
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
/obj/structure/energy_net/attack_paw(mob/user)
|
||||
return attack_hand()
|
||||
|
||||
/obj/structure/energy_net/user_buckle_mob(mob/living/M, mob/living/user)
|
||||
/obj/structure/energy_net/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
|
||||
return//We only want our target to be buckled
|
||||
|
||||
/obj/structure/energy_net/user_unbuckle_mob(mob/living/buckled_mob, mob/living/user)
|
||||
|
||||
@@ -395,7 +395,7 @@
|
||||
auto.Remove(buckled_mob)
|
||||
. = ..()
|
||||
|
||||
/obj/machinery/power/emitter/prototype/user_buckle_mob(mob/living/M, mob/living/carbon/user)
|
||||
/obj/machinery/power/emitter/prototype/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
|
||||
if(user.incapacitated() || !istype(user))
|
||||
return
|
||||
for(var/atom/movable/A in get_turf(src))
|
||||
|
||||
Reference in New Issue
Block a user