Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not

code/modules/mob/living/silicon/pai/death.dm

@@ -7,6 +7,6 @@
 	clear_fullscreens()
 
 	//New pAI's get a brand new mind to prevent meta stuff from their previous life. This new mind causes problems down the line if it's not deleted here.
-	GLOB.alive_mob_list -= src
+	remove_from_alive_mob_list()
 	ghostize()
 	qdel(src)

code/modules/mob/living/silicon/pai/pai_defense.dm

@@ -1,5 +1,3 @@
-#define PAI_EMP_SILENCE_DURATION 3 MINUTES
-
 /mob/living/silicon/pai/blob_act(obj/structure/blob/B)
 	return FALSE
 
@@ -9,7 +7,7 @@
 		return
 	take_holo_damage(severity/2)
 	DefaultCombatKnockdown(severity*4)
-	silent = max(silent, (PAI_EMP_SILENCE_DURATION) / SSmobs.wait / severity)
+	short_radio()
 	if(holoform)
 		fold_in(force = TRUE)
 	emitter_next_use = world.time + emitter_emp_cd

code/modules/mob/living/silicon/robot/robot.dm

@@ -95,8 +95,8 @@
 		if(mmi.brainmob)
 			if(mmi.brainmob.stat == DEAD)
 				mmi.brainmob.stat = CONSCIOUS
-				GLOB.dead_mob_list -= mmi.brainmob
-				GLOB.alive_mob_list += mmi.brainmob
+				mmi.brainmob.remove_from_dead_mob_list()
+				mmi.brainmob.add_to_alive_mob_list()
 			mind.transfer_to(mmi.brainmob)
 			mmi.update_icon()
 		else