From 55d0dc8003211ec05b82789b144c3b0551015266 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Fri, 21 Aug 2020 23:55:32 +0200 Subject: [PATCH] Fixes the exploit where you can put unlimited items in a locker --- code/game/objects/structures/crates_lockers/closets.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 6db1846e872..138c77f92eb 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -25,9 +25,13 @@ ..() spawn(1) if(!opened) // if closed, any item at the crate's loc is put in the contents + var/itemcount = 0 for(var/obj/item/I in loc) if(I.density || I.anchored || I == src) continue I.forceMove(src) + // Ensure the storage cap is respected + if(++itemcount >= storage_capacity) + break // Fix for #383 - C4 deleting fridges with corpses /obj/structure/closet/Destroy()