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
2026-07-15 09:03:23 +01:00 · 2015-06-22 13:40:07 -07:00
parent 0918ded8be 44f7ad997c
commit bcb4a9601f
104 changed files with 541 additions and 624 deletions
@@ -192,15 +192,15 @@
 	ex_act(severity)
 		switch(severity)
 			if(1.0)
-				del(src)
+				qdel(src)
 				return
 			if(2.0)
 				if (prob(50))
-					del(src)
+					qdel(src)
 					return
 			if(3.0)
 				if (prob(25))
-					del(src)
+					qdel(src)
 					return
 		return