[MIRROR] Aviator Expansion

code/datums/uplink/devices and tools.dm

@@ -132,12 +132,18 @@
 
 
 /datum/uplink_item/item/tools/thermal
-	name = "Thermal Imaging Glasses"
+	name = "Thermal Imaging Glasses (Goggles)"
 	desc = "A pair of meson goggles that have been modified to instead show synthetics or living creatures, through thermal imaging."
 	item_cost = 24
 	path = /obj/item/clothing/glasses/thermal/syndi
 	antag_roles = list(MODE_TRAITOR)
 
+/datum/uplink_item/item/tools/thermal_avi
+	name = "Thermal Imaging Glasses (Aviators)"
+	desc = "A pair of aviator sunglasses that have been modified to instead show synthetics or living creatures, through thermal imaging."
+	item_cost = 24
+	path = /obj/item/clothing/glasses/thermal/syndi/aviators
+	antag_roles = list(MODE_TRAITOR)
 
 /datum/uplink_item/item/tools/flashdark
 	name = "Flashdark"

code/modules/client/preference_setup/loadout/lists/eyegear.dm

@@ -35,6 +35,7 @@
 	options["Goggles, corrective"] = /obj/item/clothing/glasses/science/prescription
 	options["HUD"] = /obj/item/clothing/glasses/hud/science
 	options["HUD, corrective"] = /obj/item/clothing/glasses/hud/science/prescription
+	options["Aviators"] = /obj/item/clothing/glasses/hud/science/aviators
 	gear_tweaks += new /datum/gear_tweak/path (options)
 
 
@@ -75,6 +76,7 @@
 	options["Goggles"] = /obj/item/clothing/glasses/hud/health/goggle
 	options["Goggles, corrective"] = /obj/item/clothing/glasses/hud/health/goggle/prescription
 	options["Eyepatch"] = /obj/item/clothing/glasses/eyepatch/hud/medical
+	options["Aviators"] = /obj/item/clothing/glasses/hud/health/aviators
 	gear_tweaks += new /datum/gear_tweak/path (options)
 
 
@@ -91,6 +93,7 @@
 	options["Goggles"] = /obj/item/clothing/glasses/meson
 	options["Goggles, corrective"] = /obj/item/clothing/glasses/meson/prescription
 	options["Eyepatch"] = /obj/item/clothing/glasses/eyepatch/hud/meson
+	options["Aviators"] = /obj/item/clothing/glasses/meson/aviators
 	gear_tweaks += new /datum/gear_tweak/path (options)
 
 
@@ -106,6 +109,7 @@
 	var/list/options = list()
 	options["HUD"] = /obj/item/clothing/glasses/hud/janitor
 	options["HUD, corrective"] = /obj/item/clothing/glasses/hud/janitor/prescription
+	options["Aviators"] = /obj/item/clothing/glasses/hud/janitor/aviators
 	gear_tweaks += new /datum/gear_tweak/path (options)
 
 

code/modules/clothing/glasses/glasses.dm

@@ -129,6 +129,13 @@
 	desc = "Used for seeing walls, floors, and stuff through anything. This set has corrective lenses."
 	prescription = 5
 
+/obj/item/clothing/glasses/meson/aviators
+	name = "HUD aviators"
+	desc = "A meson HUD integrated into a pair of aviator sunglasses. It does little to protect against the sun, but it sure looks cool."
+	icon_state = "meson_avi_on"
+	off_state = "avi_off"
+	item_state = "meson_avi_on"
+
 /obj/item/clothing/glasses/science
 	name = "science goggles"
 	desc = "Goggles fitted with a portable analyzer capable of determining the fabricator training potential of an item or components of a machine. Sensitive to EMP."
@@ -165,6 +172,13 @@
 	. = ..()
 	overlay = GLOB.global_hud.nvg
 
+/obj/item/clothing/glasses/night/aviators
+	name = "HUD aviators"
+	desc = "Night-vision glasses integrated into a pair of aviator sunglasses. It does little to protect against the sun, but it sure looks cool."
+	icon_state = "nvg_avi_on"
+	off_state = "avi_off"
+	item_state = "nvg_avi_on"
+
 /obj/item/clothing/glasses/tacgoggles
 	name = "tactical goggles"
 	desc = "Self-polarizing goggles with light amplification for dark environments. Made from durable synthetic."

code/modules/clothing/glasses/hud.dm

@@ -44,6 +44,13 @@
 	off_state = "healthhudpresc_off"
 	item_state = "healthhudpresc"
 
+/obj/item/clothing/glasses/hud/health/aviators
+	name = "HUD aviators"
+	desc = "A medical HUD integrated into a pair of aviator sunglasses. It does little to protect against the sun, but it sure looks cool."
+	icon_state = "health_avi_on"
+	off_state = "avi_off"
+	item_state = "health_avi_on"
+
 /obj/item/clothing/glasses/hud/health/goggle
 	name = "medical HUD visor"
 	desc = "A medical HUD integrated with a wide visor."
@@ -138,6 +145,13 @@
 	desc = "A janitor HUD integrated with a set of prescription glasses."
 	prescription = 5
 
+/obj/item/clothing/glasses/hud/janitor/aviators
+	name = "HUD aviators"
+	desc = "A janitorial HUD integrated into a pair of aviator sunglasses. It does little to protect against the sun, but it sure looks cool."
+	icon_state = "jani_avi_on"
+	off_state = "avi_off"
+	item_state = "jani_avi_on"
+
 /obj/item/clothing/glasses/hud/janitor/process_hud(mob/M)
 	process_jani_hud(M)
 
@@ -156,3 +170,10 @@
 	item_state = "scihudpresc"
 	desc = "A science HUD integrated with a set of prescription glasses."
 	prescription = 5
+
+/obj/item/clothing/glasses/hud/science/aviators
+	name = "HUD aviators"
+	desc = "A scientific HUD integrated into a pair of aviator sunglasses. It does little to protect against the sun, but it sure looks cool."
+	icon_state = "sci_avi_on"
+	off_state = "avi_off"
+	item_state = "sci_avi_on"

code/modules/clothing/glasses/thermals.dm

@@ -21,6 +21,20 @@
 	icon_state = "meson"
 	origin_tech = list(TECH_MAGNET = 3, TECH_ESOTERIC = 4)
 
+/obj/item/clothing/glasses/thermal/aviators
+	name = "HUD aviators"
+	desc = "A thermal HUD integrated into a pair of aviator sunglasses. See through walls and look cool at the same time."
+	icon_state = "thermal_avi_on"
+	off_state = "avi_off"
+	item_state = "thermal_avi_on"
+
+/obj/item/clothing/glasses/thermal/syndi/aviators
+	name = "aviator sunglasses"
+	desc = "An anachronistic style of glare protection popularized by military pilot mystique. These ones have black frames and lenses."
+	icon_state = "syn_avi_on"
+	off_state = "syn_avi_off"
+	item_state = "syn_avi_on"
+
 /obj/item/clothing/glasses/thermal/plain
 	toggleable = FALSE
 	activation_sound = null