From 9aed532f428f5fce9af63e15575632ab11e3d3c7 Mon Sep 17 00:00:00 2001 From: Adrer Date: Tue, 30 Aug 2022 19:09:46 +0200 Subject: [PATCH] Improves thermal drill clarity (#18924) * Improves thermal drill clarity * Also remove progress bar on stop Co-authored-by: adrermail@gmail.com --- code/game/objects/structures/safe.dm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 737894bd880..5c9b7dbd3ad 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -141,7 +141,7 @@ GLOBAL_LIST_EMPTY(safes) if(..()) return TRUE - if(drill) + if(drill && !broken) switch(alert("What would you like to do?", "Thermal Drill", "Turn [drill_timer ? "Off" : "On"]", "Remove Drill", "Cancel")) if("Turn On") if(do_after(user, 2 SECONDS, target = src)) @@ -155,6 +155,7 @@ GLOBAL_LIST_EMPTY(safes) deltimer(drill_timer) drill_timer = null drill.soundloop.stop() + cut_overlay(progress_bar) update_icon() STOP_PROCESSING(SSobj, src) if("Remove Drill") @@ -166,6 +167,10 @@ GLOBAL_LIST_EMPTY(safes) update_icon() if("Cancel") return + else if(drill && broken) + user.put_in_hands(drill) + drill = null + update_icon() else ui_interact(user) @@ -346,9 +351,11 @@ GLOBAL_LIST_EMPTY(safes) broken = TRUE drill_timer = null drill.soundloop.stop() + playsound(loc, 'sound/machines/ding.ogg', 50, 1) + cut_overlay(progress_bar) update_icon() STOP_PROCESSING(SSobj, src) - + /** * # Floor Safe *