From 3181843ce40d145991cb6237c00ef0ecd275ca65 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Sun, 28 Apr 2019 12:31:07 +0200 Subject: [PATCH] Code review fixes, no drop sanity check --- code/game/objects/structures/extinguisher.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 04f0a2e0d43..0bb117bf4ac 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -43,7 +43,6 @@ playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened update_icon() - return /obj/structure/extinguisher_cabinet/Destroy() QDEL_NULL(has_extinguisher) @@ -54,6 +53,8 @@ return if(istype(O, /obj/item/extinguisher)) if(!has_extinguisher && opened) + if((O.flags & NODROP) || (flags & NODROP)) + return user.drop_item(O) contents += O has_extinguisher = O