From e7c5148e5776c883a57ea5e2a42c132feb1aec2b Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Sun, 1 Oct 2017 23:16:38 +0100 Subject: [PATCH 1/4] Garbage Cans are now functional --- code/game/objects/structures/crates_lockers/crates.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 66132aa9b8b..a48d2344845 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -469,6 +469,15 @@ user.visible_message("[user] has secured [src]'s floor casters.", \ "You have secured [src]'s floor casters.") anchored = TRUE + if(opened) + if(isrobot(user)) + return + if(!user.drop_item()) //couldn't drop the item + to_chat(user, "\The [W] is stuck to your hand, you cannot put it in \the [src]!") + return + if(W) + W.forceMove(loc) + else return attack_hand(user) /obj/structure/closet/crate/radiation desc = "A crate with a radiation sign on it." From 39be6a372d51bc670318b5cb586be44fff88276f Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Mon, 2 Oct 2017 15:28:27 +0100 Subject: [PATCH 2/4] Removed needless "\the"s --- 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 a48d2344845..830b810e0cf 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -473,7 +473,7 @@ if(isrobot(user)) return if(!user.drop_item()) //couldn't drop the item - to_chat(user, "\The [W] is stuck to your hand, you cannot put it in \the [src]!") + to_chat(user, "[W] is stuck to your hand, you cannot put it in [src]!") return if(W) W.forceMove(loc) From 90fc6b4de2bf79e12296420c8858a607582845fe Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Tue, 10 Oct 2017 16:30:08 +0100 Subject: [PATCH 3/4] Garbage Cans inherit full properties from crates --- code/game/objects/structures/crates_lockers/crates.dm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 830b810e0cf..06168775ad7 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -469,15 +469,8 @@ user.visible_message("[user] has secured [src]'s floor casters.", \ "You have secured [src]'s floor casters.") anchored = TRUE - if(opened) - if(isrobot(user)) - return - if(!user.drop_item()) //couldn't drop the item - to_chat(user, "[W] is stuck to your hand, you cannot put it in [src]!") - return - if(W) - W.forceMove(loc) - else return attack_hand(user) + else + ..() /obj/structure/closet/crate/radiation desc = "A crate with a radiation sign on it." From bb3415187acaf7b2d57066d894b48d50b2510942 Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Wed, 11 Oct 2017 22:27:47 +0100 Subject: [PATCH 4/4] Identation Feex --- code/game/objects/structures/crates_lockers/crates.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 06168775ad7..043fdf2f9c4 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -443,9 +443,9 @@ anchored = TRUE /obj/structure/closet/crate/can/attackby(obj/item/weapon/W, mob/living/user, params) - add_fingerprint(user) - user.changeNext_move(CLICK_CD_MELEE) if(iswrench(W)) + add_fingerprint(user) + user.changeNext_move(CLICK_CD_MELEE) if(anchored) playsound(loc, W.usesound, 100, 1) user.visible_message("[user] starts loosening [src]'s floor casters.", \