From 8cf817cfec8241b734fbf857d79692b96b904aea Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sun, 30 Oct 2016 11:51:21 -0400 Subject: [PATCH] Brass windows are now slightly harder to destroy --- code/__DEFINES/misc.dm | 3 +++ code/game/objects/items/weapons/twohanded.dm | 7 +++--- code/game/objects/structures/window.dm | 23 +++++++++++--------- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 6a9dcd5c963..55bfa500d6c 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -445,6 +445,9 @@ var/global/list/ghost_others_options = list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE // Evil narsie colour #define NARSIE_WINDOW_COLOUR "#7D1919" +//let's just pretend fulltile windows being children of border windows is fine +#define FULLTILE_WINDOW_DIR NORTHEAST + // Defib stats #define DEFIB_TIME_LIMIT 120 #define DEFIB_TIME_LOSS 60 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 73c4802f187..211e49f9d26 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -187,12 +187,13 @@ user.visible_message("[user] axes [user.p_them()]self from head to toe! It looks like [user.p_theyre()] trying to commit suicide!") return (BRUTELOSS) -/obj/item/weapon/twohanded/fireaxe/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) - if(!proximity) return +/obj/item/weapon/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity) + if(!proximity) + return if(wielded) //destroys windows and grilles in one hit if(istype(A,/obj/structure/window)) var/obj/structure/window/W = A - W.take_damage(400, BRUTE, "melee", 0) + W.take_damage(200, BRUTE, "melee", 0) else if(istype(A,/obj/structure/grille)) var/obj/structure/grille/G = A G.take_damage(40, BRUTE, "melee", 0) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index db48108b7fd..9c1c7c683aa 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -42,6 +42,7 @@ var/shards = 1 if(fulltile) shards++ + setDir() var/rods = 0 if(reinf) rods++ @@ -73,11 +74,13 @@ /obj/structure/window/setDir(direct) if(!fulltile) ..() + else + ..(FULLTILE_WINDOW_DIR) /obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover) && mover.checkpass(PASSGLASS)) return 1 - if(dir == SOUTHWEST || dir == SOUTHEAST || dir == NORTHWEST || dir == NORTHEAST) + if(dir == FULLTILE_WINDOW_DIR) return 0 //full tile window, you can't move into it! if(get_dir(loc, target) == dir) return !density @@ -250,7 +253,6 @@ return 0 setDir(turn(dir, 90)) -// updateSilicate() air_update_turf(1) ini_dir = dir add_fingerprint(usr) @@ -270,7 +272,6 @@ return 0 setDir(turn(dir, 270)) -// updateSilicate() air_update_turf(1) ini_dir = dir add_fingerprint(usr) @@ -302,7 +303,7 @@ /obj/structure/window/CanAtmosPass(turf/T) if(get_dir(loc, T) == dir) return !density - if(dir == SOUTHWEST || dir == SOUTHEAST || dir == NORTHWEST || dir == NORTHEAST) + if(dir == FULLTILE_WINDOW_DIR) return !density return 1 @@ -341,7 +342,7 @@ /obj/structure/window/CanAStarPass(ID, to_dir) if(!density) return 1 - if((dir == SOUTHWEST) || (dir == to_dir)) + if((dir == FULLTILE_WINDOW_DIR) || (dir == to_dir)) return 0 return 1 @@ -370,7 +371,7 @@ /obj/structure/window/fulltile icon = 'icons/obj/smooth_structures/window.dmi' icon_state = "window" - dir = NORTHEAST + dir = FULLTILE_WINDOW_DIR max_integrity = 50 fulltile = 1 smooth = SMOOTH_TRUE @@ -380,7 +381,7 @@ /obj/structure/window/reinforced/fulltile icon = 'icons/obj/smooth_structures/reinforced_window.dmi' icon_state = "r_window" - dir = NORTHEAST + dir = FULLTILE_WINDOW_DIR max_integrity = 100 fulltile = 1 smooth = SMOOTH_TRUE @@ -391,7 +392,7 @@ /obj/structure/window/reinforced/tinted/fulltile icon = 'icons/obj/smooth_structures/tinted_window.dmi' icon_state = "tinted_window" - dir = NORTHEAST + dir = FULLTILE_WINDOW_DIR fulltile = 1 smooth = SMOOTH_TRUE canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile/) @@ -411,7 +412,7 @@ desc = "A reinforced, air-locked pod window." icon = 'icons/obj/smooth_structures/shuttle_window.dmi' icon_state = "shuttle_window" - dir = NORTHEAST + dir = FULLTILE_WINDOW_DIR max_integrity = 100 wtype = "shuttle" fulltile = 1 @@ -437,6 +438,7 @@ icon_state = "clockwork_window_single" resistance_flags = FIRE_PROOF | ACID_PROOF max_integrity = 100 + armor = list(melee = 60, bullet = 25, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 100, fire = 80, acid = 100) explosion_block = 2 //fancy AND hard to destroy. the most useful combination. glass_type = /obj/item/stack/sheet/brass glass_amount = 1 @@ -488,6 +490,7 @@ smooth = SMOOTH_TRUE canSmoothWith = null fulltile = 1 - dir = NORTHEAST + dir = FULLTILE_WINDOW_DIR max_integrity = 150 glass_amount = 2 + made_glow = TRUE