Merge pull request #7264 from Zuhayr/master

Fixes, death refactor.
2026-08-23 03:56:27 +01:00 · 2014-12-07 19:38:21 -05:00
parent 5b6d3ab55a b556609e27
commit b4becaa587
38 changed files with 210 additions and 489 deletions
@@ -302,4 +302,10 @@
 /obj/item/device/paicard/emp_act(severity)
 	for(var/mob/M in src)
 		M.emp_act(severity)
-	..()
+	..()
+
+/obj/item/device/paicard/ex_act(severity)
+	if(pai)
+		pai.ex_act(severity)
+	else
+		del(src)