mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 06:57:42 +01:00
[REFACTOR] Helper proc for unbuckling a mob (#26918)
* Helper proc from unbuckling a mob * Rename to unbuckle * Minor fixes * Move buckled up /mob/living --------- Co-authored-by: Adrer <adrermail@gmail.com>
This commit is contained in:
@@ -165,7 +165,7 @@
|
||||
|
||||
// No cheesing with buckling ourselves, this spinning is too fast for seatbelts
|
||||
if(user.buckled)
|
||||
user.buckled.unbuckle_mob(user, force = TRUE)
|
||||
user.unbuckle(force = TRUE)
|
||||
|
||||
// Check if the machine and the user are still next to each other
|
||||
if(!do_after(user, delay = 1.2 SECONDS, target = src, use_default_checks = FALSE))
|
||||
|
||||
@@ -191,4 +191,4 @@
|
||||
|
||||
/mob/living/proc/check_buckled()
|
||||
if(buckled && !(buckled in loc))
|
||||
buckled.unbuckle_mob(src, force = TRUE)
|
||||
unbuckle(force = TRUE)
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
user.visible_message("<span class='notice'>[user] cuts [C]'s restraints with [src]!</span>")
|
||||
QDEL_NULL(C.handcuffed)
|
||||
if(C.buckled && C.buckled.buckle_requires_restraints)
|
||||
C.buckled.unbuckle_mob(C)
|
||||
C.unbuckle()
|
||||
C.update_handcuffed()
|
||||
return
|
||||
else
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
. += "<span class='notice'>Number of uses: [uses]. This scroll will vanish after the final use.</span>"
|
||||
. += "<span class='notice'>P.S. Don't forget to bring your gear, you'll need it to cast most spells.</span>"
|
||||
|
||||
/obj/item/teleportation_scroll/attack_self(mob/user)
|
||||
/obj/item/teleportation_scroll/attack_self(mob/living/user)
|
||||
if(!uses) //somehow?
|
||||
to_chat(user, "<span class='warning'>You attempt to read the scroll but it disintegrates in your hand, it appears that is has run out of charges!</span>")
|
||||
qdel(src)
|
||||
@@ -59,7 +59,7 @@
|
||||
return
|
||||
|
||||
if(user && user.buckled)
|
||||
user.buckled.unbuckle_mob(user, force = TRUE)
|
||||
user.unbuckle(force = TRUE)
|
||||
|
||||
if(user?.has_buckled_mobs())
|
||||
user.unbuckle_all_mobs(force = TRUE)
|
||||
|
||||
Reference in New Issue
Block a user