From cd3952cb9e67a779e922f4febe355d0f878872c9 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Mon, 2 Dec 2019 19:08:21 +0100 Subject: [PATCH 1/3] Fixes holodeck sleepers leaving sleeper buffers behind when deleted. --- code/game/machinery/Sleeper.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 68f7327551..5118f96ab7 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -36,12 +36,13 @@ RefreshParts() add_inital_chems() -/obj/machinery/sleeper/Destroy() - var/obj/item/reagent_containers/sleeper_buffer/buffer = new /obj/item/reagent_containers/sleeper_buffer(loc) - buffer.volume = reagents.maximum_volume - buffer.reagents.maximum_volume = reagents.maximum_volume - reagents.trans_to(buffer.reagents, reagents.total_volume) - ..() +/obj/machinery/sleeper/deconstruct(disassembled = TRUE) + if(!CHECK_BITFIELD(flags_1, NODECONSTRUCT_1 | HOLOGRAM_1)) + var/obj/item/reagent_containers/sleeper_buffer/buffer = new (loc) + buffer.volume = reagents.maximum_volume + buffer.reagents.maximum_volume = reagents.maximum_volume + reagents.trans_to(buffer.reagents, reagents.total_volume) + return ..() /obj/machinery/sleeper/proc/add_inital_chems() for(var/i in available_chems) From 30b67afed97887b7c4d7c69cff0f8d3a98e1773e Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Mon, 2 Dec 2019 19:18:36 +0100 Subject: [PATCH 2/3] holodeck machineries and structures have nodeconstruct_1, which means they won't call on_deconstruct anyway. --- code/game/machinery/Sleeper.dm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 5118f96ab7..bfe68d07e5 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -36,13 +36,11 @@ RefreshParts() add_inital_chems() -/obj/machinery/sleeper/deconstruct(disassembled = TRUE) - if(!CHECK_BITFIELD(flags_1, NODECONSTRUCT_1 | HOLOGRAM_1)) - var/obj/item/reagent_containers/sleeper_buffer/buffer = new (loc) - buffer.volume = reagents.maximum_volume - buffer.reagents.maximum_volume = reagents.maximum_volume - reagents.trans_to(buffer.reagents, reagents.total_volume) - return ..() +/obj/machinery/sleeper/on_deconstruction(disassembled = TRUE) + var/obj/item/reagent_containers/sleeper_buffer/buffer = new (loc) + buffer.volume = reagents.maximum_volume + buffer.reagents.maximum_volume = reagents.maximum_volume + reagents.trans_to(buffer.reagents, reagents.total_volume) /obj/machinery/sleeper/proc/add_inital_chems() for(var/i in available_chems) From 5669c77d4805a7e422205da9c3da2ec1cd1f0acb Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Mon, 2 Dec 2019 19:21:01 +0100 Subject: [PATCH 3/3] Bad --- code/game/machinery/Sleeper.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index bfe68d07e5..3f3bacc64f 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -36,7 +36,7 @@ RefreshParts() add_inital_chems() -/obj/machinery/sleeper/on_deconstruction(disassembled = TRUE) +/obj/machinery/sleeper/on_deconstruction() var/obj/item/reagent_containers/sleeper_buffer/buffer = new (loc) buffer.volume = reagents.maximum_volume buffer.reagents.maximum_volume = reagents.maximum_volume