From 39cc83501b9d5f6bdcd6315a9e52e766e16be498 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Wed, 9 Oct 2019 09:58:27 -0400 Subject: [PATCH] Fixes Explosions (#12539) --- code/game/machinery/Sleeper.dm | 12 ++++++++++++ code/game/objects/items/weapons/storage/storage.dm | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 3f0b5f91b00..fbe594f2269 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -346,8 +346,20 @@ /obj/machinery/sleeper/ex_act(severity) if(filtering) toggle_filter() + if(occupant) + occupant.ex_act(severity) ..() +/obj/machinery/sleeper/handle_atom_del(atom/A) + ..() + if(A == occupant) + occupant = null + updateUsrDialog() + update_icon() + if(A == beaker) + beaker = null + updateUsrDialog() + /obj/machinery/sleeper/emp_act(severity) if(filtering) toggle_filter() diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 1b12c828417..9ef53c54601 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -566,4 +566,10 @@ ..() /obj/item/storage/AllowDrop() - return TRUE \ No newline at end of file + return TRUE + +/obj/item/storage/ex_act(severity) + for(var/atom/A in contents) + A.ex_act(severity) + CHECK_TICK + ..() \ No newline at end of file