From 25fac9ebc2a657ffe6cb9b5cca2fd3d3f53235c0 Mon Sep 17 00:00:00 2001 From: HelmCrab <90987989+Thera-Pissed@users.noreply.github.com> Date: Sun, 23 Jun 2024 22:14:36 -0500 Subject: [PATCH] grilles and windows. windows get broken and are dumb to break --- code/game/objects/structures/grille.dm | 6 ++++++ code/game/objects/structures/window.dm | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 5bca53e84dd6..b4998d948530 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -227,6 +227,12 @@ qdel(src) ..() +/obj/structure/grille/deconstruct_act(mob/living/user, obj/item/I) + if (I.use_tool(src, user, 1 SECONDS, volume=100)) + to_chat(user, "You slice [src] apart.") + deconstruct(FALSE) + return TRUE + /obj/structure/grille/obj_break() if(!broken && !(flags_1 & NODECONSTRUCT_1)) new broken_type(src.loc) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index cb37f300ad77..af0de94d1f66 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -286,6 +286,12 @@ qdel(src) update_nearby_icons() +/obj/structure/window/deconstruct_act(mob/living/user, obj/item/I) + if (I.use_tool(src, user, 5 SECONDS, volume=100)) + to_chat(user, "You shatter [src] with the [I].") + deconstruct(FALSE) + return TRUE + /obj/structure/window/proc/spawnDebris(location) . = list() . += new /obj/item/shard(location) @@ -471,6 +477,12 @@ if(RWINDOW_BARS_CUT) . += "The main pane can be easily moved out of the way to reveal some bolts holding the frame in." +/obj/structure/window/reinforced/deconstruct_act(mob/living/user, obj/item/I) + if (I.use_tool(src, user, 20 SECONDS, volume=100)) + to_chat(user, "You shatter [src] with the [I].") + deconstruct(FALSE) + return TRUE + /obj/structure/window/reinforced/spawner/east dir = EAST @@ -591,6 +603,12 @@ if(RWINDOW_BARS_CUT) . += "The main pane can be easily moved out of the way to reveal some bolts holding the frame in." +/obj/structure/window/plasma/reinforced/deconstruct_act(mob/living/user, obj/item/I) + if (I.use_tool(src, user, 40 SECONDS, volume=100)) + to_chat(user, "You shatter [src] with the [I].") + deconstruct(FALSE) + return TRUE + /obj/structure/window/plasma/reinforced/spawner/east dir = EAST