Merge pull request #2681 from Yoshax/mightywings

Adds HUD Aviators

code/modules/client/preference_setup/loadout/loadout_eyes.dm

@@ -38,6 +38,16 @@
 	display_name = "Security HUD, prescription (Security)"
 	path = /obj/item/clothing/glasses/hud/security/prescription
 
+/datum/gear/eyes/secaviators
+	display_name = "Security HUD Aviators"
+	path = /obj/item/clothing/glasses/sunglasses/sechud/aviator
+	allowed_roles = list("Security Officer","Head of Security","Warden")
+
+/datum/gear/eyes/secaviators/prescription
+	display_name = "Security HUD Aviators, prescription"
+	path = /obj/item/clothing/glasses/sunglasses/sechud/aviator/prescription
+	allowed_roles = list("Security Officer","Head of Security","Warden")
+
 /datum/gear/eyes/medical
 	display_name = "Medical HUD (Medical)"
 	path = /obj/item/clothing/glasses/hud/health

code/modules/clothing/glasses/glasses.dm

@@ -186,7 +186,6 @@ BLIND     // can't see anything
 /obj/item/clothing/glasses/welding/attack_self()
 	toggle()
 
-
 /obj/item/clothing/glasses/welding/verb/toggle()
 	set category = "Object"
 	set name = "Adjust welding goggles"
@@ -258,6 +257,53 @@ BLIND     // can't see anything
 	desc = "Flash-resistant goggles with inbuilt combat and security information."
 	icon_state = "swatgoggles"
 
+/obj/item/clothing/glasses/sunglasses/sechud/aviator
+	name = "HUD aviators"
+	desc = "Modified aviator glasses that can be switch between HUD and flash protection modes."
+	icon_state = "sec_hud"
+	off_state = "sec_flash"
+	action_button_name = "Toggle Mode"
+	var/on = 1
+	toggleable = 1
+	activation_sound = 'sound/effects/pop.ogg'
+
+	var/hud_holder
+
+/obj/item/clothing/glasses/sunglasses/sechud/aviator/New()
+	..()
+	hud_holder = hud
+
+/obj/item/clothing/glasses/sunglasses/sechud/aviator/Destroy()
+	qdel(hud_holder)
+	hud_holder = null
+	hud = null
+	. = ..()
+
+/obj/item/clothing/glasses/sunglasses/sechud/aviator/attack_self(mob/user)
+	if(toggleable && !user.incapacitated())
+		on = !on
+		if(on)
+			src.hud = hud_holder
+			to_chat(user, "You switch the [src] to HUD mode.")
+		else
+			src.hud = null
+			to_chat(user, "You switch \the [src] to flash protection mode.")
+		update_icon()
+		user << activation_sound
+		user.update_inv_glasses()
+		user.update_action_buttons()
+
+/obj/item/clothing/glasses/sunglasses/sechud/aviator/update_icon()
+	if(on)
+		icon_state = initial(icon_state)
+	else
+		icon_state = off_state
+
+/obj/item/clothing/glasses/sunglasses/sechud/aviator/prescription
+	name = "Prescription HUD aviators"
+	desc = "Modified aviator glasses that can be switch between HUD and flash protection modes. Comes with bonus prescription lenses."
+	prescription = 6
+
 /obj/item/clothing/glasses/thermal
 	name = "Optical Thermal Scanner"
 	desc = "Thermals in the shape of glasses."

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

@@ -677,6 +677,10 @@
 		number -= 1
 	if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses))
 		number += 1
+	if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses/sechud/aviator))
+		var/obj/item/clothing/glasses/sunglasses/sechud/aviator/S = src.glasses
+		if(!S.on)
+			number += 1
 	if(istype(src.glasses, /obj/item/clothing/glasses/welding))
 		var/obj/item/clothing/glasses/welding/W = src.glasses
 		if(!W.up)

html/changelogs/AtomicWorm-toggle-sechud.yml

@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Broseph Stylin
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Added HUD aviators to the loadout. They're restricted to security, and can toggle between HUD and flash protection modes, but won't offer both at once."