From 8525b2129e7da7e22a00dad2c36f62acd9cfd3de Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 7 Jul 2017 12:34:42 -0500 Subject: [PATCH] Windows now have the proper starting health (#1927) --- code/game/objects/structures.dm | 1 - code/game/objects/structures/window.dm | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 8ae4ef71ed..4ba56742bc 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -1,7 +1,6 @@ /obj/structure icon = 'icons/obj/structures.dmi' pressure_resistance = 8 - obj_integrity = 300 max_integrity = 300 var/climb_time = 20 var/climb_stun = 20 diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index f4dd408991..f7e05ae298 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -8,7 +8,6 @@ anchored = 1 //initially is 0 for tile smoothing flags = ON_BORDER max_integrity = 25 - obj_integrity = 25 var/ini_dir = null var/state = WINDOW_OUT_OF_FRAME var/reinf = FALSE @@ -425,7 +424,7 @@ /obj/structure/window/reinforced/unanchored anchored = FALSE - + /obj/structure/window/plasma name = "plasma window" desc = "A window made out of a plasma-silicate alloy. It looks insanely tough to break and burn through." @@ -477,7 +476,7 @@ /obj/structure/window/fulltile/unanchored anchored = FALSE - + /obj/structure/window/plasma/fulltile icon = 'icons/obj/smooth_structures/plasma_window.dmi' icon_state = "plasmawindow" @@ -491,7 +490,7 @@ /obj/structure/window/plasma/fulltile/unanchored anchored = FALSE - + /obj/structure/window/plasma/reinforced/fulltile icon = 'icons/obj/smooth_structures/rplasma_window.dmi' icon_state = "rplasmawindow" @@ -643,7 +642,6 @@ dir = FULLTILE_WINDOW_DIR opacity = TRUE max_integrity = 15 - obj_integrity = 15 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE