From 2206b23305c16d570fe9fda32518b173738bec4c Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 14 Aug 2017 17:42:43 -0400 Subject: [PATCH 1/3] If force is less than 10, an item can't damage windows. --- code/game/objects/structures/window.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 51e37d462f..641805f7c8 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -164,6 +164,8 @@ update_verbs() update_nearby_icons() step(src, get_dir(AM, src)) + if(tforce < 10) + return take_damage(tforce) /obj/structure/window/attack_tk(mob/user as mob) From eaf2ec867d0b8177fde8dbc78ab228cea6cfb766 Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 14 Aug 2017 17:46:11 -0400 Subject: [PATCH 2/3] Actually let's make it 5. --- code/game/objects/structures/window.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 641805f7c8..01e4b5172c 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -164,7 +164,7 @@ update_verbs() update_nearby_icons() step(src, get_dir(AM, src)) - if(tforce < 10) + if(tforce < 5) return take_damage(tforce) From 8bbd1318994b58386f549e7f85c56e06ba61d9dd Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 14 Aug 2017 23:25:53 -0400 Subject: [PATCH 3/3] Better spot to do this in --- code/game/objects/structures/window.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 01e4b5172c..25d8e7fc6d 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -164,8 +164,6 @@ update_verbs() update_nearby_icons() step(src, get_dir(AM, src)) - if(tforce < 5) - return take_damage(tforce) /obj/structure/window/attack_tk(mob/user as mob) @@ -293,6 +291,8 @@ /obj/structure/window/proc/hit(var/damage, var/sound_effect = 1) if(reinf) damage *= 0.5 + if(damage < 5) + return take_damage(damage) return