diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index bd7bc68b8cb..7c931751547 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -38,6 +38,7 @@ glasses["sunglasses, aviator"] = /obj/item/clothing/glasses/fakesunglasses/aviator glasses["sunglasses, prescription"] = /obj/item/clothing/glasses/fakesunglasses/prescription glasses["sunglasses, fat"] = /obj/item/clothing/glasses/fakesunglasses/big + glasses["sunglasses, visor"] = /obj/item/clothing/glasses/fakesunglasses/visor gear_tweaks += new /datum/gear_tweak/path(glasses) /datum/gear/eyes/sunglasses @@ -53,6 +54,7 @@ glasses["flash-proof sunglasses, aviator"] = /obj/item/clothing/glasses/sunglasses/aviator glasses["flash-proof sunglasses, prescription"] = /obj/item/clothing/glasses/sunglasses/prescription glasses["flash-proof sunglasses, fat"] = /obj/item/clothing/glasses/sunglasses/big + glasses["flash-proof sunglasses, visor"] = /obj/item/clothing/glasses/sunglasses/visor gear_tweaks += new /datum/gear_tweak/path(glasses) /datum/gear/eyes/goggles @@ -82,6 +84,7 @@ medhud["HUD, medical"] = /obj/item/clothing/glasses/hud/health medhud["HUDpatch, medical"] = /obj/item/clothing/glasses/eyepatch/hud/medical medhud["prescription HUD, medical"] = /obj/item/clothing/glasses/hud/health/prescription + medhud["visor sunglasses, medical"] = /obj/item/clothing/glasses/hud/health/aviator/visor gear_tweaks += new /datum/gear_tweak/path(medhud) /datum/gear/eyes/sechuds @@ -99,6 +102,7 @@ sechud["HUD, security"] = /obj/item/clothing/glasses/hud/security sechud["HUDpatch, security"] = /obj/item/clothing/glasses/eyepatch/hud/security sechud["prescription HUD, security"] = /obj/item/clothing/glasses/hud/security/prescription + sechud["visor sunglasses, security"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/visor gear_tweaks += new /datum/gear_tweak/path(sechud) /datum/gear/eyes/hudpatch diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 458c3fb3d07..4497b6b262b 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -160,6 +160,12 @@ BLIND // can't see anything attack_self(usr) +/obj/item/clothing/glasses/hud/health/aviator/visor + name = "medical HUD visor" + desc = "Modified visor glasses with a toggled health HUD. Comes with bonus prescription overlay." + icon_state = "visor_medhud" + off_state = "visor_medhud_off" + /obj/item/clothing/glasses/science name = "science goggles" desc = "Used to protect your eyes against harmful chemicals!" @@ -448,6 +454,12 @@ BLIND // can't see anything icon_state = "bigsunglasses" item_state = "sun" +/obj/item/clothing/glasses/sunglasses/visor + name = "visor sunglasses" + desc = "A pair of visor sunglasses." + icon_state = "visor" + item_state = "visor" + //For style with no powergaming connotations. /obj/item/clothing/glasses/fakesunglasses @@ -480,6 +492,12 @@ BLIND // can't see anything icon_state = "bigsunglasses" item_state = "sun" +/obj/item/clothing/glasses/fakesunglasses/visor + name = "stylish visor sunglasses" + desc = "A pair of designer visor sunglasses." + icon_state = "visor" + item_state = "visor" + /obj/item/clothing/glasses/welding name = "welding goggles" desc = "Protects the eyes from welders, approved by the mad scientist association." @@ -730,6 +748,13 @@ BLIND // can't see anything icon_state = "aviator_sec_idris" off_state = "aviator_sec_idris_off" +obj/item/clothing/glasses/sunglasses/sechud/aviator/visor + name = "security HUD visor" + desc = "NanoTrasen security visor glasses that can be switched between HUD and flash protection modes. They come with a built-in prescription overlay." + icon_state = "visor_sec" + off_state = "visor_sec_off" + item_state_slots = list(slot_r_hand_str = "visor_sec", slot_l_hand_str = "visor_sec") + /obj/item/clothing/glasses/thermal name = "optical thermal scanner" desc = "Thermals in the shape of glasses." diff --git a/html/changelogs/wickedcybs_medvisor.yml b/html/changelogs/wickedcybs_medvisor.yml new file mode 100644 index 00000000000..2cea48a7da7 --- /dev/null +++ b/html/changelogs/wickedcybs_medvisor.yml @@ -0,0 +1,6 @@ +author: WickedCybs + +delete-after: True + +changes: + - rscadd: "Adds a new type of eyewear. Visor sunglasses. HUD variants are included and can be selected from the loadout." diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 3ff55a8e0df..a131f23d6e5 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/items/clothing/lefthand_glasses.dmi b/icons/mob/items/clothing/lefthand_glasses.dmi index 0ae34ef31ac..c33250ef521 100644 Binary files a/icons/mob/items/clothing/lefthand_glasses.dmi and b/icons/mob/items/clothing/lefthand_glasses.dmi differ diff --git a/icons/mob/items/clothing/righthand_glasses.dmi b/icons/mob/items/clothing/righthand_glasses.dmi index 888d004f0a8..55afae307aa 100644 Binary files a/icons/mob/items/clothing/righthand_glasses.dmi and b/icons/mob/items/clothing/righthand_glasses.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 33520ff6066..cf2f6a7be7e 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ