mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-26 14:31:59 +01:00
Buckling someone else now takes some seconds (#11709)
* Buckling someone else now takes some seconds * resting * changelog update * fixes lying
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
return ..()
|
||||
|
||||
|
||||
/obj/proc/buckle(atom/movable/MA)
|
||||
/obj/proc/buckle(atom/movable/MA, mob/user)
|
||||
if ((MA.loc != loc) && !(density && get_dist(src, MA) <= 1))
|
||||
return 0
|
||||
if (MA.loc != loc)
|
||||
@@ -31,6 +31,13 @@
|
||||
if (is_type_in_list(MA, can_buckle))
|
||||
if(!(MA.can_be_buckled) || MA.buckled_to)
|
||||
return 0
|
||||
if(user)
|
||||
if(MA != user)
|
||||
if(isliving(MA))
|
||||
var/mob/living/L = MA
|
||||
if(!L.lying)
|
||||
if(!do_mob(user, L, 3 SECONDS))
|
||||
return 0
|
||||
MA.buckled_to = src
|
||||
buckled = MA
|
||||
if(istype(MA, /mob/living))
|
||||
@@ -83,7 +90,7 @@
|
||||
add_fingerprint(user)
|
||||
unbuckle()//this is now just for safety, buckling someone into an occupied chair will fail, instead of removing the occupant
|
||||
|
||||
if(buckle(MA))
|
||||
if(buckle(MA, user))
|
||||
if(MA == user)
|
||||
MA.visible_message(\
|
||||
"<b>[MA.name]</b> buckles themselves to [src].",\
|
||||
|
||||
Reference in New Issue
Block a user