Merge branch 'master' into deadmin-prefs

code/modules/mob/living/silicon/ai/ai_defense.dm

@@ -28,7 +28,7 @@
 				if(2)
 					SSshuttle.requestEvac(src,"ALERT: Energy surge detected in AI core! Station integrity may be compromised! Initiati--%m091#ar-BZZT")
 
-/mob/living/silicon/ai/ex_act(severity, target)
+/mob/living/silicon/ai/ex_act(severity, target, origin)
 	switch(severity)
 		if(1)
 			gib()

code/modules/mob/living/silicon/ai/freelook/eye.dm

@@ -84,7 +84,6 @@
 		if(ai.client && !ai.multicam_on)
 			ai.client.eye = src
 		update_ai_detect_hud()
-		update_parallax_contents()
 		//Holopad
 		if(istype(ai.current, /obj/machinery/holopad))
 			var/obj/machinery/holopad/H = ai.current

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

@@ -4,7 +4,7 @@
 	stat = DEAD
 	update_mobility()
 	update_sight()
-	clear_fullscreens()
+	wipe_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.
 	remove_from_alive_mob_list()

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

@@ -13,7 +13,7 @@
 	emitter_next_use = world.time + emitter_emp_cd
 	//Need more effects that aren't instadeath or permanent law corruption.
 
-/mob/living/silicon/pai/ex_act(severity, target)
+/mob/living/silicon/pai/ex_act(severity, target, origin)
 	take_holo_damage(severity * 50)
 	switch(severity)
 		if(1)	//RIP

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

@@ -184,7 +184,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
 		gib()
 	return TRUE
 
-/mob/living/silicon/robot/ex_act(severity, target)
+/mob/living/silicon/robot/ex_act(severity, target, origin)
 	switch(severity)
 		if(1)
 			gib()

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

@@ -78,7 +78,7 @@
 	GLOB.silicon_mobs -= src
 	return ..()
 
-/mob/living/silicon/contents_explosion(severity, target)
+/mob/living/silicon/contents_explosion(severity, target, origin)
 	return
 
 /mob/living/silicon/proc/cancelAlarm()

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

@@ -144,6 +144,6 @@
 	P.on_hit(src, 0, def_zone)
 	return BULLET_ACT_HIT
 
-/mob/living/silicon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash/static)
+/mob/living/silicon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/tiled/flash/static)
 	if(affect_silicon)
 		return ..()