Merge pull request #2330 from Robertha89/master

Science Goggle Analysers

code/modules/clothing/glasses/glasses.dm

@@ -79,9 +79,27 @@
 
 /obj/item/clothing/glasses/science
 	name = "Science Goggles"
-	desc = "nothing"
+	desc = "A pair of snazzy goggles used to protect against chemical spills. Fitted with an analyzer for scanning items."
 	icon_state = "purple"
 	item_state = "glasses"
+	prescription_upgradable = 0
+
+/obj/item/clothing/glasses/science/equipped(mob/user, slot)
+	if(slot == slot_glasses)
+		user.scanner.Grant(user)
+	..(user, slot)
+
+/obj/item/clothing/glasses/science/dropped(mob/user)
+	user.scanner.devices -= 1
+	..(user)
+
+/obj/item/clothing/glasses/science/night
+	name = "Night Vision Science Goggle"
+	desc = "Now you can science in darkness."
+	icon_state = "nvpurple"
+	item_state = "glasses"
+	darkness_view = 8
+	see_darkness = 0
 
 /obj/item/clothing/glasses/janitor
 	name = "Janitorial Goggles"

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

@@ -68,6 +68,7 @@
 
 	//Some tidying-up.
 	flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'Nanotrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
+	scanner.Grant(src)
 	update_icons()
 
 /mob/living/silicon/robot/drone/init()

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

@@ -150,6 +150,7 @@ var/list/robot_verbs_default = list(
 	hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[NATIONS_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
+	scanner.Grant(src)
 
 /mob/living/silicon/robot/proc/init(var/alien=0)
 	aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src)

code/modules/mob/mob_defines.dm

@@ -131,6 +131,9 @@
 
 	var/datum/hud/hud_used = null
 
+	var/research_scanner = 0 //For research scanner equipped mobs. Enable to show research data when examining.
+	var/datum/action/scan_mode/scanner = new
+
 	var/list/grabbed_by = list(  )
 	var/list/requests = list(  )
 

code/modules/research/designs/equipment_designs.dm

@@ -10,7 +10,7 @@
 	materials = list(MAT_METAL = 1000, MAT_GLASS = 500, MAT_PLASMA = 1500, MAT_URANIUM = 200)
 	build_path = /obj/item/weapon/weldingtool/experimental
 	category = list("Equipment")
-	
+
 /datum/design/health_hud
 	name = "Health Scanner HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
@@ -120,4 +120,24 @@
 	materials = list(MAT_METAL = 6000, MAT_GLASS = 2000)
 	build_path = /obj/item/device/detective_scanner
 	locked = 1      //no validhunting scientists.
+	category = list("Equipment")
+
+/datum/design/sci_goggles
+	name = "Science Goggles"
+	desc = "Goggles fitted with a portable analyzer capable of determining the research worth of an item or components of a machine."
+	id = "scigoggles"
+	req_tech = list("materials" = 3, "magnets" = 3, "engineering" = 2)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 250, MAT_GLASS = 300)
+	build_path = /obj/item/clothing/glasses/science
+	category = list("Equipment")
+
+/datum/design/nv_sci_goggles
+	name = "Night Vision Science Goggles"
+	desc = "Like Science google, but works in darkness."
+	id = "nvscigoggles"
+	req_tech = list("materials" = 5, "magnets" = 5, "engineering" = 4)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 250, MAT_GLASS = 300, MAT_PLASMA = 250, MAT_URANIUM = 1000)
+	build_path = /obj/item/clothing/glasses/science
 	category = list("Equipment")

code/modules/research/rdconsole.dm

@@ -54,7 +54,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	var/selected_category
 	var/list/datum/design/matching_designs = list() //for the search function
 
-/obj/machinery/computer/rdconsole/proc/CallTechName(var/ID) //A simple helper proc to find the name of a tech with a given ID.
+/proc/CallTechName(ID) //A simple helper proc to find the name of a tech with a given ID.
 	var/datum/tech/check_tech
 	var/return_name = null
 	for(var/T in subtypesof(/datum/tech))
@@ -68,7 +68,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 	return return_name
 
-/obj/machinery/computer/rdconsole/proc/CallMaterialName(var/ID)
+proc/CallMaterialName(ID)
 	var/datum/reagent/temp_reagent
 	var/return_name = null
 	if (copytext(ID, 1, 2) == "$")
@@ -183,7 +183,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 /obj/machinery/computer/rdconsole/Topic(href, href_list)
 	if(..())
 		return 1
-		
+
 	if(!allowed(usr) && !isobserver(usr))
 		return 1
 
@@ -1115,7 +1115,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 	dat += "</tr></table></div>"
 	return dat
-	
+
 /obj/machinery/computer/rdconsole/core
 	name = "Core R&D Console"
 	desc = "A console used to interface with R&D tools."
@@ -1126,7 +1126,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	desc = "A console used to interface with R&D tools."
 	id = 2
 	req_access = list(access_robotics)
-	
+
 /obj/machinery/computer/rdconsole/experiment
 	name = "E.X.P.E.R.I-MENTOR R&D Console"
 	desc = "A console used to interface with R&D tools."
@@ -1137,4 +1137,3 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	desc = "A console used to interface with R&D tools."
 	id = 4
 	req_access = list(access_mechanic)
-