Merge branch 'master' into ss-ticker

code/modules/antagonists/_common/antag_spawner.dm

@@ -32,7 +32,7 @@
 		return FALSE
 	if(checking)
 		to_chat(user, "<span class='danger'>The device is already connecting to Syndicate command. Please wait.</span>")
-		return FALSE	
+		return FALSE
 	return TRUE
 
 /obj/item/antag_spawner/nuke_ops/attack_self(mob/user)
@@ -110,10 +110,10 @@
 
 	if(switch_roles_choice == "Syndicate Cyborg")
 		switch_roles = TRUE
-		rolename = "Syndicate [borg_to_spawn]"
+		rolename = initial(rolename)
 	else
 		switch_roles = FALSE
-		rolename = initial(rolename)
+		rolename = "Syndicate [borg_to_spawn] Cyborg"
 
 	return TRUE
 

code/modules/clothing/glasses/glasses.dm

@@ -178,6 +178,15 @@
 	flags = NODROP
 	flags_cover = null
 
+/obj/item/clothing/glasses/material/lighting
+	name = "Neutron Goggles"
+	desc = "These odd glasses use a form of neutron-based imaging to completely negate the effects of light and darkness."
+	origin_tech = null
+	vision_flags = 0
+
+	flags = NODROP
+	lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
+
 /obj/item/clothing/glasses/regular
 	name = "prescription glasses"
 	desc = "Made by Nerd. Co."

code/modules/customitems/item_defines.dm

@@ -1785,4 +1785,4 @@
 	item_state = "voxbodysuit"
 	item_color = "voxbodysuit"
 	body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
-	species_fit = list("Vox")
+	species_fit = list("Vox")

code/modules/mob/living/carbon/alien/alien.dm

@@ -277,6 +277,7 @@ Des: Removes all infected images from the alien.
 		grant_death_vision()
 		return
 
+	see_invisible = initial(see_invisible)
 	sight = SEE_MOBS
 	if(nightvision)
 		see_in_dark = 8

code/modules/mob/living/carbon/carbon.dm

@@ -1139,6 +1139,8 @@ so that different stomachs can handle things in different ways VB*/
 		grant_death_vision()
 		return
 
+	see_invisible = initial(see_invisible)
+	see_in_dark = initial(see_in_dark)
 	sight = initial(sight)
 	lighting_alpha = initial(lighting_alpha)
 

code/modules/mob/living/carbon/human/species/golem.dm

@@ -607,7 +607,6 @@
 	..()
 	last_banana = world.time
 	last_honk = world.time
-	H.job = "Clown"
 	H.mutations.Add(COMIC)
 	H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(H), slot_r_store)
 	H.equip_to_slot_or_del(new /obj/item/bikehorn(H), slot_l_store)
@@ -682,7 +681,6 @@
 
 /datum/species/golem/tranquillite/on_species_gain(mob/living/carbon/human/H)
 	..()
-	H.job = "Mime"
 	H.equip_to_slot_or_del(new 	/obj/item/clothing/head/beret(H), slot_head)
 	H.equip_to_slot_or_del(new 	/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_r_store)
 	H.equip_to_slot_or_del(new 	/obj/item/cane(H), slot_l_hand)

code/modules/mob/living/living.dm

@@ -1038,13 +1038,3 @@
 			update_transform()
 		if("lighting_alpha")
 			sync_lighting_plane_alpha()
-
-/mob/living/update_sight()
-	if(!client)
-		return
-
-	if(stat == DEAD)
-		grant_death_vision()
-		return
-
-	. = ..()

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

@@ -1303,8 +1303,8 @@ var/list/ai_verbs_default = list(
 
 	see_invisible = initial(see_invisible)
 	see_in_dark = initial(see_in_dark)
-	lighting_alpha = initial(lighting_alpha)
 	sight = initial(sight)
+	lighting_alpha = initial(lighting_alpha)
 
 	if(aiRestorePowerRoutine)
 		sight = sight &~ SEE_TURFS

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -609,4 +609,33 @@
 	..()
 	if(AIStatus == AI_Z_OFF)
 		SSidlenpcpool.idle_mobs_by_zlevel[old_z] -= src
-		toggle_ai(initial(AIStatus)) 
+		toggle_ai(initial(AIStatus)) 
+
+// Simple animals will not be given night vision upon death, as that would result in issues when they are revived.
+/mob/living/simple_animal/grant_death_vision()
+	sight |= SEE_TURFS
+	sight |= SEE_MOBS
+	sight |= SEE_OBJS
+	see_in_dark = 8
+	see_invisible = SEE_INVISIBLE_OBSERVER
+	sync_lighting_plane_alpha()
+
+/mob/living/simple_animal/update_sight()
+	if(!client)
+		return
+
+	if(stat == DEAD)
+		grant_death_vision()
+		return
+
+	see_invisible = initial(see_invisible)
+	see_in_dark = initial(see_in_dark)
+	sight = initial(sight)
+
+	if(client.eye != src)
+		var/atom/A = client.eye
+		if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates.
+			return
+
+	SEND_SIGNAL(src, COMSIG_MOB_UPDATE_SIGHT)
+	sync_lighting_plane_alpha()

code/modules/reagents/chemistry/reagents/drinks.dm

@@ -178,7 +178,7 @@
 
 /datum/reagent/consumable/drink/banana/on_mob_life(mob/living/M)
 	var/update_flags = STATUS_UPDATE_NONE
-	if((ishuman(M) && M.job in list("Clown") ) || issmall(M))
+	if((ishuman(M) && COMIC in M.mutations) || issmall(M))
 		update_flags |= M.adjustBruteLoss(-1, FALSE)
 		update_flags |= M.adjustFireLoss(-1, FALSE)
 	return ..() | update_flags
@@ -194,7 +194,7 @@
 
 /datum/reagent/consumable/drink/nothing/on_mob_life(mob/living/M)
 	var/update_flags = STATUS_UPDATE_NONE
-	if(ishuman(M) && M.job in list("Mime"))
+	if(ishuman(M) && M.mind && M.mind.miming)
 		update_flags |= M.adjustBruteLoss(-1, FALSE)
 		update_flags |= M.adjustFireLoss(-1, FALSE)
 	return ..() | update_flags
@@ -402,7 +402,7 @@
 
 /datum/reagent/consumable/drink/bananahonk/on_mob_life(mob/living/M)
 	var/update_flags = STATUS_UPDATE_NONE
-	if((ishuman(M) && M.job in list("Clown") ) || issmall(M))
+	if((ishuman(M) && COMIC in M.mutations) || issmall(M))
 		update_flags |= M.adjustBruteLoss(-1, FALSE)
 		update_flags |= M.adjustFireLoss(-1, FALSE)
 	return ..() | update_flags