From f0c2873918dfe6c83ca1b11a7c79ff986e16835a Mon Sep 17 00:00:00 2001 From: Vile Beggar Date: Fri, 2 Aug 2024 21:08:53 +0200 Subject: [PATCH] stop phones from going in lockers/crates --- code/game/objects/structures/crates_lockers/closets.dm | 2 ++ code/game/objects/structures/crates_lockers/crates.dm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 93fe78e63d98..77da397b7b0a 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -127,6 +127,8 @@ var/obj/item/explosive/plastic/P = I if(P.active) continue + if(istype(I, /obj/item/phone)) + continue var/item_size = ceil(I.w_class / 2) if(stored_units + item_size > storage_capacity) continue diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 8a10cd4d93ea..59e74100cb5c 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -90,6 +90,8 @@ var/obj/structure/bed/B = O if(B.buckled_mob) continue + if(istype(O, /obj/item/phone)) + continue O.forceMove(src) itemcount++