From c1b641ee5ef37e5d4e802835ec26e4d36406b07b Mon Sep 17 00:00:00 2001 From: Salex08 <33989683+Salex08@users.noreply.github.com> Date: Fri, 30 Dec 2022 15:38:32 +0100 Subject: [PATCH] indestructible windows cant be destroyed by ingame means anymore (#72289) ## About The Pull Request closes: https://github.com/tgstation/tgstation/issues/72271 I tested on a local server to see if there are more indestructible things the rcd can destroy couldnt find any further. Also makes sure indestructible windows cant be destroyed by any unintentional means ## Why It's Good For The Game bug fix ## Changelog :cl: fix: indestructible windows cant be destroyed by ingame means anymore /:cl: Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> --- code/game/objects/items/fireaxe.dm | 5 +++-- code/modules/awaymissions/mission_code/murderdome.dm | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm index 9a29ff78acb..196834642bc 100644 --- a/code/game/objects/items/fireaxe.dm +++ b/code/game/objects/items/fireaxe.dm @@ -57,8 +57,9 @@ return if(HAS_TRAIT(src, TRAIT_WIELDED)) //destroys windows and grilles in one hit if(istype(A, /obj/structure/window) || istype(A, /obj/structure/grille)) - var/obj/structure/W = A - W.atom_destruction("fireaxe") + if(!(A.resistance_flags & INDESTRUCTIBLE)) + var/obj/structure/W = A + W.atom_destruction("fireaxe") /* * Bone Axe diff --git a/code/modules/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm index cbdf042c124..2e3f4928fa2 100644 --- a/code/modules/awaymissions/mission_code/murderdome.dm +++ b/code/modules/awaymissions/mission_code/murderdome.dm @@ -4,10 +4,17 @@ flags_1 = PREVENT_CLICK_UNDER_1 | NODECONSTRUCT_1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF +/obj/structure/window/reinforced/fulltile/indestructible/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) + return FALSE + + /obj/structure/grille/indestructible flags_1 = CONDUCT_1 | NODECONSTRUCT_1 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF +/obj/structure/grille/indestructible/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) + return FALSE + /obj/effect/spawner/structure/window/reinforced/indestructible spawn_list = list(/obj/structure/grille/indestructible, /obj/structure/window/reinforced/fulltile/indestructible)