diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm index 5c4ddf1a6a..fc8d9b373b 100644 --- a/code/datums/supplypacks/security.dm +++ b/code/datums/supplypacks/security.dm @@ -444,7 +444,8 @@ /obj/item/weapon/storage/belt/security = 3, /obj/item/clothing/glasses/sunglasses/sechud = 3, /obj/item/device/radio/headset/headset_sec/alt = 3, - /obj/item/clothing/suit/storage/hooded/wintercoat/security = 3 + /obj/item/clothing/suit/storage/hooded/wintercoat/security = 3, + /obj/item/clothing/glasses/sunglasses/sechud/tactical_sec_vis = 3 ) cost = 10 containertype = /obj/structure/closet/crate/nanothreads diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index 23c3d490e1..e444dcaa85 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -66,6 +66,10 @@ display_name = "Security HUDpatch MKII" path = /obj/item/clothing/glasses/hud/security/eyepatch2 +/datum/gear/eyes/security/tac_sec_visor + display_name = "Tactical AR visor (Security)" + path = /obj/item/clothing/glasses/sunglasses/sechud/tactical_sec_vis + /datum/gear/eyes/medical/medpatch display_name = "Health HUDpatch" path = /obj/item/clothing/glasses/hud/health/eyepatch diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm index 63be852414..880547db4b 100644 --- a/code/modules/clothing/glasses/glasses_vr.dm +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -72,6 +72,45 @@ off_state = "eyepatch" enables_planes = list(VIS_CH_STATUS,VIS_CH_HEALTH,VIS_FULLBRIGHT,VIS_MESONS) +/obj/item/clothing/glasses/sunglasses/sechud/tactical_sec_vis + name = "tactical AR visor" + desc = "Special AR visor designed for security teams, protects your eyes and provides useful data. The red lights provide extra style and intimidation." + icon_state = "tacsecvis1" + icon = 'icons/inventory/eyes/item_vr.dmi' + icon_override = 'icons/inventory/eyes/mob_vr.dmi' + enables_planes = list(VIS_CH_ID,VIS_CH_WANTED,VIS_CH_IMPTRACK,VIS_CH_IMPLOYAL,VIS_CH_IMPCHEM) + flash_protection = FLASH_PROTECTION_MODERATE + item_flags = AIRTIGHT + body_parts_covered = EYES + action_button_name = "Change scanning pattern" + action_button_is_hands_free = TRUE + var/static/list/tac_sec_vis_anim = list() + +/obj/item/clothing/glasses/sunglasses/sechud/tactical_sec_vis/Initialize(mapload) + . = ..() + tac_sec_vis_anim = list( + "Scanning pattern 1" = image(icon = src.icon, icon_state = "tacsecvis1"), + "Scanning pattern 2" = image(icon = src.icon, icon_state = "tacsecvis2"), + "Scanning pattern 3" = image(icon = src.icon, icon_state = "tacsecvis3"), + "Scanning pattern 4" = image(icon = src.icon, icon_state = "tacsecvis4"), + ) + +/obj/item/clothing/glasses/sunglasses/sechud/tactical_sec_vis/attack_self(mob/user) + . = ..() + if(!istype(user) || user.incapacitated()) + return + + var/static/list/options = list("Scanning pattern 1" = "tacsecvis1", "Scanning pattern 2" = "tacsecvis2", "Scanning pattern 3" = "tacsecvis3","Scanning pattern 4" ="tacsecvis4") + + var/choice = show_radial_menu(user, src, tac_sec_vis_anim, custom_check = FALSE, radius = 36, require_near = TRUE) + + if(src && choice && !user.incapacitated() && in_range(user,src)) + icon_state = options[choice] + user.update_inv_glasses() + user.update_action_buttons() + to_chat(user, "Your [src] now displays [choice] .") + return 1 + /*---Tajaran-specific Eyewear---*/ /obj/item/clothing/glasses/tajblind diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 52640d7b7a..46d1e0cfc7 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1225,6 +1225,7 @@ /obj/item/clothing/mask/bandana/red = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/security = 5, /obj/item/clothing/accessory/armband = 5, + /obj/item/clothing/glasses/sunglasses/sechud/tactical_sec_vis = 5, //VoreStation edit - cool visor!!! /obj/item/clothing/glasses/hud/security/eyepatch2 = 5, //VoreStation edit - cool eyepatch! /obj/item/clothing/accessory/holster/armpit = 2, //VOREStation edit - gives some variety of available holsters for those who forgot to bring their own /obj/item/clothing/accessory/holster/waist = 2, //VOREStation edit - But also reduces the number per type, so there's 8 overall rather than like, 20 diff --git a/icons/inventory/eyes/item_vr.dmi b/icons/inventory/eyes/item_vr.dmi index 4822216c87..cc158df7ad 100644 Binary files a/icons/inventory/eyes/item_vr.dmi and b/icons/inventory/eyes/item_vr.dmi differ diff --git a/icons/inventory/eyes/mob_vr.dmi b/icons/inventory/eyes/mob_vr.dmi index e2ad4dd16c..2a413394e9 100644 Binary files a/icons/inventory/eyes/mob_vr.dmi and b/icons/inventory/eyes/mob_vr.dmi differ