From 44d0c051006c8bb5ca53514407886a4fb886f147 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 7 Dec 2018 13:40:37 -0800 Subject: [PATCH 1/3] Update toolbox.dm --- code/game/objects/items/storage/toolbox.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 6667cee76a..5c6bd7602a 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -87,8 +87,10 @@ /obj/item/storage/toolbox/mechanical/old/heirloom/afterattack(atom/A, mob/user, proximity) //Citadel Adds massive buff to machinery destruction . = ..() if(proximity) - if(isobj(A)) + if(isobj(A) && !isitem(A)) var/obj/O = A + if(O.damage_deflection >= 18) //Eh fine. + return O.take_damage(20) /obj/item/storage/toolbox/mechanical/old/heirloom/PopulateContents() From 900da0624bbb961026b50bbef671a09bc2ea3d6e Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 11 Dec 2018 01:53:27 -0800 Subject: [PATCH 2/3] Update toolbox.dm --- code/game/objects/items/storage/toolbox.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 5c6bd7602a..c28f7e2aaa 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -87,9 +87,9 @@ /obj/item/storage/toolbox/mechanical/old/heirloom/afterattack(atom/A, mob/user, proximity) //Citadel Adds massive buff to machinery destruction . = ..() if(proximity) - if(isobj(A) && !isitem(A)) - var/obj/O = A - if(O.damage_deflection >= 18) //Eh fine. + if(isobj(A)) + var/obj/machinery/door/O = A + if(istype(O) && (O.damage_deflection >= 18)) //Eh fine. //This is a meme cast do not do what I did! return O.take_damage(20) From b079a5e8df19357adfb4af771b3434202dcdc645 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 18 Dec 2018 18:06:04 -0800 Subject: [PATCH 3/3] Update toolbox.dm --- code/game/objects/items/storage/toolbox.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index c28f7e2aaa..0a02cc0d4c 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -89,9 +89,9 @@ if(proximity) if(isobj(A)) var/obj/machinery/door/O = A - if(istype(O) && (O.damage_deflection >= 18)) //Eh fine. //This is a meme cast do not do what I did! + if(istype(O) && (O.damage_deflection >= 10)) //Eh fine. //This is a meme cast do not do what I did! return - O.take_damage(20) + O.take_damage(13) /obj/item/storage/toolbox/mechanical/old/heirloom/PopulateContents() return