diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 43dad2c7ccd..d3d133ca0c2 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -393,12 +393,14 @@ plant(user) /obj/item/chair/proc/plant(mob/user) + if(QDELETED(src)) + return for(var/obj/A in get_turf(loc)) if(istype(A, /obj/structure/chair)) - to_chat(user, "There is already a chair here.") + to_chat(user, "There is already \a [A] here.") return - user.visible_message("[user] rights \the [src.name].", "You right \the [name].") + user.visible_message("[user] rights [src].", "You right [src].") var/obj/structure/chair/C = new origin_type(get_turf(loc)) C.setDir(dir) qdel(src) @@ -435,13 +437,6 @@ playsound(src.loc, 'sound/weapons/punch1.ogg', 50, 1, -1) smash(user) -/obj/item/chair/stool/attack_self(mob/user as mob) - ..() - new origin_type(get_turf(loc)) - user.unEquip(src) - user.visible_message("[user] puts [src] down.", "You put [src] down.") - qdel(src) - /obj/item/chair/stool/attack(mob/M as mob, mob/user as mob) if(prob(5) && istype(M,/mob/living)) user.visible_message("[user] breaks [src] over [M]'s back!.")