From 90fc6b4de2bf79e12296420c8858a607582845fe Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Tue, 10 Oct 2017 16:30:08 +0100 Subject: [PATCH] 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."