From ee2583ed8f07e7c0119a48a6ec7562e40ae57ef4 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 10 Jan 2021 08:23:37 +0100 Subject: [PATCH] [MIRROR] removes cardboard box and supplypod shitcode (#2609) * improves cardboard box and supplypod code (#56043) Doesn't let force default to TRUE just in case someone tries to open when they're not supposed to. * removes cardboard box and supplypod shitcode Co-authored-by: spessbro <51048066+spessbro@users.noreply.github.com> --- .../objects/structures/crates_lockers/closets/cardboardbox.dm | 2 +- code/modules/cargo/supplypod.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 17a2ce98c97..50328bdf544 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -34,7 +34,7 @@ /obj/structure/closet/cardboard/proc/ResetMoveDelay() move_delay = FALSE -/obj/structure/closet/cardboard/open(mob/living/user, force = TRUE) +/obj/structure/closet/cardboard/open(mob/living/user, force = FALSE) if(opened || !can_open(user, force)) return FALSE var/list/alerted = null diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index af1411d6bc8..619b6795e20 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -192,7 +192,7 @@ /obj/structure/closet/supplypod/toggle(mob/living/user) return -/obj/structure/closet/supplypod/open(mob/living/user, force = TRUE) +/obj/structure/closet/supplypod/open(mob/living/user, force = FALSE) return /obj/structure/closet/supplypod/proc/handleReturnAfterDeparting(atom/movable/holder = src)