Merge pull request #7885 from Baystation12/master

Updating dev-freeze from master.

code/game/objects/items/weapons/kitchen.dm

@@ -61,6 +61,8 @@
 		playsound(M.loc,'sound/items/eatfood.ogg', rand(10,40), 1)
 		overlays.Cut()
 		return
+	else
+		..()
 
 /obj/item/weapon/kitchen/utensil/fork
 	name = "fork"

code/modules/admin/admin_verbs.dm

@@ -309,24 +309,7 @@ var/list/admin_verbs_mentor = list(
 		admin_verbs_rejuv,
 		admin_verbs_sounds,
 		admin_verbs_spawn,
-		/*Debug verbs added by "show debug verbs"*/
-		/client/proc/Cell,
-		/client/proc/do_not_use_these,
-		/client/proc/camera_view,
-		/client/proc/sec_camera_report,
-		/client/proc/intercom_view,
-		/client/proc/atmosscan,
-		/client/proc/powerdebug,
-		/client/proc/count_objects_on_z_level,
-		/client/proc/count_objects_all,
-		/client/proc/cmd_assume_direct_control,
-		/client/proc/jump_to_dead_group,
-		/client/proc/startSinglo,
-		/client/proc/ticklag,
-		/client/proc/cmd_admin_grantfullaccess,
-		/client/proc/kaboom,
-		/client/proc/splash,
-		/client/proc/cmd_admin_areatest
+		debug_verbs
 		)
 
 /client/proc/hide_most_verbs()//Allows you to keep some functionality while hiding some verbs

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

@@ -1426,21 +1426,19 @@
 				client.screen |= G.overlay
 			if(G.vision_flags)
 				sight |= G.vision_flags
-				if(!druggy)
+				if(!druggy && !seer)
 					see_invisible = SEE_INVISIBLE_MINIMUM
-			if(istype(G,/obj/item/clothing/glasses/night))
+			if(istype(G,/obj/item/clothing/glasses/night) && !seer)
 				see_invisible = SEE_INVISIBLE_MINIMUM
 	/* HUD shit goes here, as long as it doesn't modify sight flags */
 	// The purpose of this is to stop xray and w/e from preventing you from using huds -- Love, Doohl
+			var/obj/item/clothing/glasses/hud/O = G
 			if(istype(G, /obj/item/clothing/glasses/sunglasses/sechud))
-				var/obj/item/clothing/glasses/sunglasses/sechud/O = G
-				if(O.hud)		O.hud.process_hud(src)
-				if(!druggy)		see_invisible = SEE_INVISIBLE_LIVING
-			else if(istype(G, /obj/item/clothing/glasses/hud))
-				var/obj/item/clothing/glasses/hud/O = G
+				var/obj/item/clothing/glasses/sunglasses/sechud/S = G
+				O = S.hud
+			if(istype(O))
 				O.process_hud(src)
-				if(!druggy)
-					see_invisible = SEE_INVISIBLE_LIVING
+				if(!druggy && !seer)	see_invisible = SEE_INVISIBLE_LIVING
 
 	proc/handle_random_events()
 		// Puke if toxloss is too high

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

@@ -54,4 +54,4 @@
 			var/obj/item/device/aicard/card = loc
 			card.update_icon()
 
-	return ..(gibbed)
+	return ..(gibbed,"gives one shrill beep before falling lifeless.")

code/modules/surgery/encased.dm

@@ -67,8 +67,7 @@
 /datum/surgery_step/open_encased/retract
 	allowed_tools = list(
 	/obj/item/weapon/retractor = 100, 	\
-	/obj/item/weapon/crowbar = 75,	\
-	/obj/item/weapon/kitchen/utensil/fork = 20
+	/obj/item/weapon/crowbar = 75
 	)
 
 	min_duration = 30
@@ -124,8 +123,7 @@
 /datum/surgery_step/open_encased/close
 	allowed_tools = list(
 	/obj/item/weapon/retractor = 100, 	\
-	/obj/item/weapon/crowbar = 75,	\
-	/obj/item/weapon/kitchen/utensil/fork = 20
+	/obj/item/weapon/crowbar = 75
 	)
 
 	min_duration = 20