From 65ef181428aaac562f8d70d363fa3ae8975724e8 Mon Sep 17 00:00:00 2001 From: Casper3667 <8396443+Casper3667@users.noreply.github.com> Date: Sun, 19 Dec 2021 05:10:34 +0100 Subject: [PATCH] fixes chair dismantling being reversed (#12841) Co-authored-by: TGW Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com> --- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 2 +- html/changelogs/ChairDismantle.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/ChairDismantle.yml diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index a57808a286e..faaa4d84047 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -213,7 +213,7 @@ /obj/structure/bed/dismantle(obj/item/W, mob/user) playsound(src.loc, W.usesound, 50, 1) user.visible_message("[user] begins dismantling \the [src].", SPAN_NOTICE("You begin dismantling \the [src].")) - if(!do_after(user, 20 / W.toolspeed)) + if(do_after(user, 20 / W.toolspeed)) user.visible_message("\The [user] dismantles \the [src].", SPAN_NOTICE("You dismantle \the [src].")) if(padding_material) padding_material.place_sheet(get_turf(src)) diff --git a/html/changelogs/ChairDismantle.yml b/html/changelogs/ChairDismantle.yml new file mode 100644 index 00000000000..b0e200f72bd --- /dev/null +++ b/html/changelogs/ChairDismantle.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "Beds and chairs can now be properly dismantled again."