From d89e0de32cce9a0d39c4e8945096527e4b3a5d4d Mon Sep 17 00:00:00 2001 From: Seris02 Date: Sun, 2 Feb 2020 11:43:20 +0800 Subject: [PATCH 1/4] yeehaw --- code/game/objects/structures/crates_lockers/crates.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index eaa9074bd8..3858cb6a8c 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -31,6 +31,11 @@ return 1 return !density +/obj/structure/closet/crate/crowbar_act(mob/user,obj/item/tool) + if (manifest) + tear_manifest(user) + return ..() + /obj/structure/closet/crate/update_icon() icon_state = "[initial(icon_state)][opened ? "open" : ""]" From 6af421994abb0185573cb45fea2de4eea565fcb5 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Sat, 8 Feb 2020 13:53:43 +0800 Subject: [PATCH 2/4] yay --- .../game/objects/structures/crates_lockers/crates.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 3858cb6a8c..7eb0860ac0 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -31,11 +31,6 @@ return 1 return !density -/obj/structure/closet/crate/crowbar_act(mob/user,obj/item/tool) - if (manifest) - tear_manifest(user) - return ..() - /obj/structure/closet/crate/update_icon() icon_state = "[initial(icon_state)][opened ? "open" : ""]" @@ -50,6 +45,13 @@ if(manifest) tear_manifest(user) +/obj/structure/closet/crate/tool_interact(obj/item/W, mob/user) + if(istype(W, /obj/item/crowbar)) + if (manifest) + tear_manifest(user) + return TRUE + return ..() + /obj/structure/closet/crate/open(mob/living/user) . = ..() if(. && manifest) From 6d8bfd2a380aa8bfc3535098b52549bd4e4c986d Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Sat, 8 Feb 2020 14:01:51 +0800 Subject: [PATCH 3/4] tru --- code/game/objects/structures/crates_lockers/crates.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 7eb0860ac0..708cee2aa4 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -46,7 +46,7 @@ tear_manifest(user) /obj/structure/closet/crate/tool_interact(obj/item/W, mob/user) - if(istype(W, /obj/item/crowbar)) + if(istype(W, /obj/item/wirecutters)) if (manifest) tear_manifest(user) return TRUE From 4ac7fff7e3d7a75ca35deb78070341f0f63c16e3 Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Thu, 13 Feb 2020 13:37:47 +0800 Subject: [PATCH 4/4] ye --- code/game/objects/structures/crates_lockers/crates.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 708cee2aa4..1d6c98b779 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -46,10 +46,9 @@ tear_manifest(user) /obj/structure/closet/crate/tool_interact(obj/item/W, mob/user) - if(istype(W, /obj/item/wirecutters)) - if (manifest) - tear_manifest(user) - return TRUE + if(W.tool_behaviour == TOOL_WIRECUTTER && manifest) + tear_manifest(user) + return TRUE return ..() /obj/structure/closet/crate/open(mob/living/user)