Skip to content

Commit ff0872e

Browse files
Fixes emags not working right on secure crates (#37313)
* Fixes emags not working right on secure crates * for real this time * sanity * cleanup
1 parent 98707bb commit ff0872e

File tree

1 file changed

+10
-6
lines changed
  • code/game/objects/structures/crates_lockers

1 file changed

+10
-6
lines changed

code/game/objects/structures/crates_lockers/crates.dm

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -528,12 +528,16 @@
528528
return 0
529529

530530
/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob)
531-
if(istype(W, /obj/item/weapon/card) && !opened && !broken)
532-
togglelock(user)
533-
return
534-
else if(W.is_screwdriver(user) && !opened && !locked && src.has_lockless_type)
535-
remove_lock(user)
536-
return
531+
if(!opened)
532+
if(!broken)
533+
if(emag_check(W,user))
534+
return
535+
if(istype(W, /obj/item/weapon/card/id))
536+
togglelock(user)
537+
return
538+
if(W.is_screwdriver(user) && !locked && src.has_lockless_type)
539+
remove_lock(user)
540+
return
537541
return ..()
538542

539543
/obj/structure/closet/crate/secure/emag_act(mob/user)

0 commit comments

Comments
 (0)