Allows for easier pulling onto beds and chairs, buckling someone stops anyone currently pulling them. (#21960)

* wham-bam

* oops
This commit is contained in:
Contrabang
2023-09-01 23:04:04 +01:00
committed by GitHub
parent 7bf1b53f35
commit b99db3d3d0
5 changed files with 17 additions and 1 deletions
@@ -26,6 +26,11 @@ LINEN BINS
var/list/nightmare_messages = list("black")
var/comfort = 0.5
/obj/item/bedsheet/attack_hand(mob/user)
if(isturf(loc) && user.Move_Pulled(src)) // make sure its on the ground first, prevents a speed exploit
return
return ..()
/obj/item/bedsheet/attack_self(mob/user as mob)
user.drop_item()
if(layer == initial(layer))
@@ -30,6 +30,11 @@
. = ..()
. += "<span class='notice'>Click dragging someone to a bed will buckle them in. Functions just like a chair except you can walk over them.</span>"
/obj/structure/bed/attack_hand(mob/user)
if(user.Move_Pulled(src))
return
return ..()
/obj/structure/bed/psych
name = "psych bed"
desc = "For prime comfort during psychiatric evaluations."
@@ -84,6 +84,11 @@
return
. = ..()
/obj/structure/chair/attack_hand(mob/user)
if(user.Move_Pulled(src))
return
return ..()
/obj/structure/chair/attack_tk(mob/user as mob)
if(!anchored || has_buckled_mobs() || !isturf(user.loc))
..()