From d1bb154c00e6c401f71c0236d11daa2cb7ee8d34 Mon Sep 17 00:00:00 2001 From: Geeves Date: Fri, 30 Apr 2021 19:32:21 +0200 Subject: [PATCH] Roller Bed Fix (#11795) --- code/game/objects/items/vitals_monitor.dm | 4 ++++ code/game/objects/structures/stool_bed_chair_nest/bed.dm | 1 - html/changelogs/geeves-roller_bed_fix.yml | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/geeves-roller_bed_fix.yml diff --git a/code/game/objects/items/vitals_monitor.dm b/code/game/objects/items/vitals_monitor.dm index 548d2c13887..a4f45ffdeda 100644 --- a/code/game/objects/items/vitals_monitor.dm +++ b/code/game/objects/items/vitals_monitor.dm @@ -9,6 +9,10 @@ var/obj/structure/bed/roller/bed var/reported_critical = FALSE +/obj/item/vitals_monitor/Destroy() + bed = null + return ..() + /obj/item/vitals_monitor/process() if(!bed) return 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 c9ebd99f750..a1dd361c3ca 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -237,7 +237,6 @@ /obj/structure/bed/roller/Destroy() QDEL_NULL(beaker) - vitals.bed = null QDEL_NULL(vitals) return ..() diff --git a/html/changelogs/geeves-roller_bed_fix.yml b/html/changelogs/geeves-roller_bed_fix.yml new file mode 100644 index 00000000000..17e5d93ab05 --- /dev/null +++ b/html/changelogs/geeves-roller_bed_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "You can now collapse rollerbeds." \ No newline at end of file