for-God-has-redeemed-us-all

code/modules/mining/abandonedcrates.dm

@@ -202,8 +202,15 @@
 			return 1
 	return ..()
 
+/obj/structure/closet/crate/secure/loot/emag_act(mob/user)
+	if(locked)
+		boom(user)
+
 /obj/structure/closet/crate/secure/loot/togglelock(mob/user)
 	if(locked)
 		boom(user)
 	else
-		..()
+		..()
+
+/obj/structure/closet/crate/secure/loot/deconstruct(disassembled = TRUE)
+	boom()

code/modules/mining/equipment/marker_beacons.dm

@@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
 	update_icon()
 
 /obj/structure/marker_beacon/deconstruct(disassembled = TRUE)
-	if(can_deconstruct)
+	if(!(flags & NODECONSTRUCT))
 		var/obj/item/stack/marker_beacon/M = new(loc)
 		M.picked_color = picked_color
 		M.update_icon()

code/modules/mining/equipment/survival_pod.dm

@@ -271,8 +271,9 @@
 	return !arbitraryatmosblockingvar
 
 /obj/structure/fans/deconstruct()
-	if(buildstacktype)
-		new buildstacktype(loc, buildstackamount)
+	if(!(flags & NODECONSTRUCT))
+		if(buildstacktype)
+			new buildstacktype(loc, buildstackamount)
 	qdel(src)
 
 /obj/structure/fans/attackby(obj/item/W, mob/user, params)

code/modules/mining/satchel_ore_boxdm.dm

@@ -63,10 +63,6 @@
 		to_chat(usr, "<span class='notice'>You empty the box.</span>")
 	updateUsrDialog()
 
-obj/structure/ore_box/ex_act(severity, target)
-	if(prob(100 / severity) && severity < 3)
-		qdel(src) //nothing but ores can get inside unless its a bug and ores just return nothing on ex_act, not point in calling it on them
-
 /obj/structure/ore_box/deconstruct(disassembled = TRUE, mob/user)
 	var/obj/item/stack/sheet/wood/W = new (loc, 4)
 	if(user)
@@ -84,7 +80,7 @@ obj/structure/ore_box/ex_act(severity, target)
 		CHECK_TICK
 
 /obj/structure/ore_box/onTransitZ()
-	return 
+	return
 
 /obj/structure/ore_box/verb/empty_box()
 	set name = "Empty Ore Box"