From 0803eafe8efc16e2f38348201cc00053231510fc Mon Sep 17 00:00:00 2001 From: Geeves Date: Wed, 3 Jun 2020 11:11:00 +0200 Subject: [PATCH] Drill Bracing Fix (#9003) --- code/modules/mining/drilling/drill.dm | 18 ++++++++++-------- html/changelogs/geeves-drill_deletion.yml | 6 ++++++ 2 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 html/changelogs/geeves-drill_deletion.yml diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index 4a8b8084060..bbcd1f8cfe6 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -351,15 +351,13 @@ /obj/machinery/mining/drill/proc/check_supports() supported = FALSE - if((!supports || !supports.len) && initial(anchored) == 0) - icon_state = "mining_drill" - anchored = FALSE - active = FALSE - else - anchored = TRUE - if(supports && length(supports) >= braces_needed) supported = TRUE + anchored = TRUE + else + icon_state = "mining_drill" + active = FALSE + anchored = FALSE update_icon() @@ -491,6 +489,10 @@ else disconnect() +/obj/machinery/mining/brace/Destroy() + disconnect() + return ..() + /obj/machinery/mining/brace/proc/connect() var/turf/T = get_step(get_turf(src), src.dir) @@ -521,4 +523,4 @@ connected.supports -= src connected.check_supports() - connected = null + connected = null \ No newline at end of file diff --git a/html/changelogs/geeves-drill_deletion.yml b/html/changelogs/geeves-drill_deletion.yml new file mode 100644 index 00000000000..3af820e459c --- /dev/null +++ b/html/changelogs/geeves-drill_deletion.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Drills are no longer permanently rooted in place if one of their braces explodes or gets deleted." \ No newline at end of file