diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 51f6433d2213..506978820261 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -528,12 +528,16 @@ return 0 /obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, /obj/item/weapon/card) && !opened && !broken) - togglelock(user) - return - else if(W.is_screwdriver(user) && !opened && !locked && src.has_lockless_type) - remove_lock(user) - return + if(!opened) + if(!broken) + if(emag_check(W,user)) + return + if(istype(W, /obj/item/weapon/card/id)) + togglelock(user) + return + if(W.is_screwdriver(user) && !locked && src.has_lockless_type) + remove_lock(user) + return return ..() /obj/structure/closet/crate/secure/emag_act(mob/user) diff --git a/html/changelog.html b/html/changelog.html index 6bc01bac2970..47be5aa65625 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -73,6 +73,11 @@

/vg/station 13 Credits

*** DO NOT FUCK WITH THIS FILE OR YOU WILL CAUSE MERGE CONFLICTS. *** -->
+

2024.11.03

+

SECBATON-GRIFFON updated:

+

2024.10.31

Eneocho updated: