Merge remote-tracking branch 'upstream/master' into poolit

Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm

code/modules/mining/abandonedcrates.dm

@@ -82,8 +82,8 @@
 				if (attempts == 0)
 					user << "<span class='danger'>The crate's anti-tamper system activates!</span>"
 					var/turf/T = get_turf(src.loc)
-					explosion(T, 0, 0, 0, 1)
-					del(src)
+					explosion(T, -1, -1, 1, 1)
+					qdel(src)
 					return
 		else
 			user << "<span class='notice'>You attempt to interact with the device using a hand gesture, but it appears this crate is from before the DECANECT came out.</span>"

code/modules/mining/equipment_locker.dm

@@ -264,7 +264,7 @@
 	s.set_up(5, 1, src)
 	s.start()
 	if(prob(50 / severity) && severity < 3)
-		del(src)
+		qdel(src)
 
 /**********************Mining Equipment Locker Items**************************/
 

code/modules/mining/manufacturing.dm

@@ -43,7 +43,7 @@
 
 	ex_act(severity)
 		switch(severity)
-			if(1.0) del(src)
+			if(1.0) qdel(src)
 			if(2.0)
 				if (prob(60)) stat |= BROKEN
 			if(3.0)
@@ -54,10 +54,6 @@
 		if (prob(25)) del src
 		return
 
-	meteorhit()
-		if (prob(50)) del src
-		return
-
 	power_change()
 		if(stat & BROKEN) icon_state = "fab-broken"
 		else