From 04a7c6656137163e02232f8ff360933faa6832f4 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Sat, 26 Sep 2020 01:38:04 +0100 Subject: [PATCH] fix turret removal --- code/game/machinery/_machinery.dm | 1 + code/game/machinery/porta_turret/portable_turret.dm | 1 + code/game/machinery/porta_turret/portable_turret_construct.dm | 1 + 3 files changed, 3 insertions(+) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index b82d932e6d..46b4bbe574 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -381,6 +381,7 @@ Class Procs: /obj/machinery/obj_break(damage_flag) if(!(flags_1 & NODECONSTRUCT_1)) stat |= BROKEN + return TRUE /obj/machinery/contents_explosion(severity, target) if(occupant) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 54d320e93b..8f7aee68ce 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -300,6 +300,7 @@ else to_chat(user, "You remove the turret but did not manage to salvage anything.") qdel(src) + return else if((istype(I, /obj/item/wrench)) && (!on)) if(raised) diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm index 7c2000175e..2a73ee8d89 100644 --- a/code/game/machinery/porta_turret/portable_turret_construct.dm +++ b/code/game/machinery/porta_turret/portable_turret_construct.dm @@ -151,6 +151,7 @@ turret.installation = installed_gun.type turret.setup(installed_gun) qdel(src) + return else if(istype(I, /obj/item/crowbar)) I.play_tool_sound(src, 75)