cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

indestructible windows cant be destroyed by ingame means anymore (#72289)

Browse Source 
## 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

🆑
fix: indestructible windows cant be destroyed by ingame means anymore
/🆑

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
This commit is contained in:
Salex08
2022-12-30 15:38:32 +01:00
committed by GitHub
co-authored by Fikou Zephyr
parent 4ca3e46399
commit c1b641ee5e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/fireaxe.dm
+3 -2
View File
@@ -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
code/modules/awaymissions/mission_code/murderdome.dm
+7
View File
@@ -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)