Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/modules/mob/living/carbon/human/life.dm

code/modules/admin/admin.dm

@@ -1097,7 +1097,7 @@ proc/admin_notice(var/message, var/rights)
 	else
 		new chosen(usr.loc)
 
-	log_admin("[key_name(usr)] spawned [chosen] at ([usr.x],[usr.y],[usr.z])")
+	log_and_message_admins("spawned [chosen] at ([usr.x],[usr.y],[usr.z])")
 	feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 

code/modules/admin/player_panel.dm

@@ -358,7 +358,7 @@
 			dat += "<td>NA</td>"
 
 
-		dat += {"<td>[(M.client ? "[M.client]" : "No client")]</td>
+		dat += {"<td>[M.key ? (M.client ? M.key : "[M.key] (DC)") : "No key"]</td>
 		<td align=center><A HREF='?src=\ref[src];adminplayeropts=\ref[M]'>X</A></td>
 		<td align=center><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>
 		"}

code/modules/admin/topic.dm

@@ -1651,18 +1651,7 @@
 									var/mob/M = O
 									M.real_name = obj_name
 
-		if (number == 1)
-			log_admin("[key_name(usr)] created a [english_list(paths)]")
-			for(var/path in paths)
-				if(ispath(path, /mob))
-					message_admins("[key_name_admin(usr)] created a [english_list(paths)]", 1)
-					break
-		else
-			log_admin("[key_name(usr)] created [number]ea [english_list(paths)]")
-			for(var/path in paths)
-				if(ispath(path, /mob))
-					message_admins("[key_name_admin(usr)] created [number]ea [english_list(paths)]", 1)
-					break
+		log_and_message_admins("created [number] [english_list(paths)]")
 		return
 
 	else if(href_list["secretsfun"])

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

@@ -1197,7 +1197,7 @@
 			damageoverlay.overlays += I
 
 	if( stat == DEAD )
-		sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
+		sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS|SEE_SELF
 		see_in_dark = 8
 		if(!druggy)		see_invisible = SEE_INVISIBLE_LEVEL_TWO
 		if(healths)		healths.icon_state = "health7"	//DEAD healthmeter
@@ -1208,17 +1208,6 @@
 						item.zoom()
 						break
 
-				/*
-				if(locate(/obj/item/weapon/gun/energy/sniperrifle, contents))
-					var/obj/item/weapon/gun/energy/sniperrifle/s = locate() in src
-					if(s.zoom)
-						s.zoom()
-				if(locate(/obj/item/device/binoculars, contents))
-					var/obj/item/device/binoculars/b = locate() in src
-					if(b.zoom)
-						b.zoom()
-				*/
-
 	else
 		sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
 		see_invisible = see_in_dark>2 ? SEE_INVISIBLE_LEVEL_ONE : SEE_INVISIBLE_LIVING
@@ -1237,7 +1226,7 @@
 				seer = 0
 
 		else
-			sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
+			sight = species.vision_flags
 			see_in_dark = species.darksight
 			see_invisible = see_in_dark>2 ? SEE_INVISIBLE_LEVEL_ONE : SEE_INVISIBLE_LIVING
 		var/tmp/glasses_processed = 0
@@ -1261,6 +1250,14 @@
 		if(!seer && !glasses_processed)
 			see_invisible = SEE_INVISIBLE_LIVING
 
+			var/equipped_glasses = glasses
+			var/obj/item/weapon/rig/rig = back
+			if(istype(rig) && rig.visor)
+				if(!rig.helmet || (head && rig.helmet == head))
+					if(rig.visor && rig.visor.vision && rig.visor.active && rig.visor.vision.glasses)
+						equipped_glasses = rig.visor.vision.glasses
+			if(equipped_glasses)
+				process_glasses(equipped_glasses)
 		if(healths)
 			if (analgesic > 100)
 				healths.icon_state = "health_health_numb"
@@ -1279,6 +1276,8 @@
 							if(0 to 20)				healths.icon_state = "health5"
 							else					healths.icon_state = "health6"
 
+			if(!seer)
+				see_invisible = SEE_INVISIBLE_LIVING
 		if(nutrition_icon)
 			switch(nutrition)
 				if(450 to INFINITY)				nutrition_icon.icon_state = "nutrition0"

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

@@ -47,7 +47,7 @@
 	var/list/unarmed_attacks = null          // For empty hand harm-intent attack
 	var/brute_mod = 1                        // Physical damage multiplier.
 	var/burn_mod = 1                         // Burn damage multiplier.
-	var/vision_flags = 0                     // Same flags as glasses.
+	var/vision_flags = SEE_SELF              // Same flags as glasses.
 
 	// Death vars.
 	var/meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/human

code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm

@@ -42,7 +42,7 @@
 	breath_type = null
 	poison_type = null
 
-	vision_flags = SEE_MOBS
+	vision_flags = SEE_SELF|SEE_MOBS
 
 	has_organ = list(
 		"heart" =           /obj/item/organ/heart,

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

@@ -383,8 +383,7 @@ var/list/ai_verbs_default = list(
 
 /mob/living/silicon/ai/check_eye(var/mob/user as mob)
 	if (!camera)
-		return null
-	user.reset_view(camera)
+		return -1
 	return 0
 
 /mob/living/silicon/ai/restrained()

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

@@ -120,7 +120,6 @@
 /mob/living/silicon/pai/check_eye(var/mob/user as mob)
 	if (!src.current)
 		return -1
-	user.reset_view(src.current)
 	return 0
 
 /mob/living/silicon/pai/blob_act()

code/modules/overmap/ships/computers/helm.dm

@@ -53,11 +53,10 @@
 
 /obj/machinery/computer/helm/check_eye(var/mob/user as mob)
 	if (!manual_control)
-		return null
+		return -1
 	if (!get_dist(user, src) > 1 || user.blinded || !linked )
-		return null
-	user.reset_view(linked)
-	return 1
+		return -1
+	return 0
 
 /obj/machinery/computer/helm/attack_hand(var/mob/user as mob)
 	if(..())
@@ -67,6 +66,8 @@
 
 	if(!isAI(user))
 		user.set_machine(src)
+		if(linked)
+			user.reset_view(linked)
 
 	ui_interact(user)