Merge branch 'Bleeding-Edge' into blow-on-food-sanity

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)

html/changelog.html

@@ -73,6 +73,11 @@ <h2>/vg/station 13 Credits</h2>
 		*** DO NOT FUCK WITH THIS FILE OR YOU WILL CAUSE MERGE CONFLICTS. ***
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">2024.11.03</h2>
+			<h3 class="author">SECBATON-GRIFFON updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Emags now properly break open secure crates again.</li>
+			</ul>
 			<h2 class="date">2024.10.31</h2>
 			<h3 class="author">Eneocho updated:</h3>
 			<ul class="changes bgimages16">
@@ -1556,11 +1561,6 @@ <h3 class="author">nervere updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Fixed mannequin&#39;s trash item being called a &#34;pedestale&#34; instead of pedestal.</li>
 			</ul>
-			<h2 class="date">2024.04.01</h2>
-			<h3 class="author">hacker-on-steroids updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">dispensers can now be picked up during april fools</li>
-			</ul>
 		</div>
 		<!--
 		Credits Section

html/changelogs/.all_changelog.yml

@@ -1,8 +1,5 @@
 DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 ---
-2024-04-01:
-  hacker-on-steroids:
-  - rscadd: dispensers can now be picked up during april fools
 2024-04-02:
   malfunctioning-ai:
   - bugfix: Fixes gas reactions not working in pipes.
@@ -1542,3 +1539,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   noirogen:
   - bugfix: Fixes an issue where hostile mob's friends list entries get deleted while
       in use after they take damage.
+2024-11-03:
+  SECBATON-GRIFFON:
+  - bugfix: Emags now properly break open secure crates again.