Merge pull request #13943 from FunnyCatEnjoyer/FunnyCat2

Adds the tactical AR visor.
This commit is contained in:
Casey
2022-10-23 14:52:06 -04:00
committed by CHOMPStation2
parent 35b0db8c4d
commit a452b89e36
6 changed files with 46 additions and 1 deletions

View File

@@ -444,7 +444,8 @@
/obj/item/weapon/storage/belt/security = 3, /obj/item/weapon/storage/belt/security = 3,
/obj/item/clothing/glasses/sunglasses/sechud = 3, /obj/item/clothing/glasses/sunglasses/sechud = 3,
/obj/item/device/radio/headset/headset_sec/alt = 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 cost = 10
containertype = /obj/structure/closet/crate/nanothreads containertype = /obj/structure/closet/crate/nanothreads

View File

@@ -66,6 +66,10 @@
display_name = "Security HUDpatch MKII" display_name = "Security HUDpatch MKII"
path = /obj/item/clothing/glasses/hud/security/eyepatch2 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 /datum/gear/eyes/medical/medpatch
display_name = "Health HUDpatch" display_name = "Health HUDpatch"
path = /obj/item/clothing/glasses/hud/health/eyepatch path = /obj/item/clothing/glasses/hud/health/eyepatch

View File

@@ -72,6 +72,45 @@
off_state = "eyepatch" off_state = "eyepatch"
enables_planes = list(VIS_CH_STATUS,VIS_CH_HEALTH,VIS_FULLBRIGHT,VIS_MESONS) 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, "<span class='notice'>Your [src] now displays [choice] .</span>")
return 1
/*---Tajaran-specific Eyewear---*/ /*---Tajaran-specific Eyewear---*/
/obj/item/clothing/glasses/tajblind /obj/item/clothing/glasses/tajblind

View File

@@ -1237,6 +1237,7 @@
/obj/item/clothing/mask/bandana/red = 5, /obj/item/clothing/mask/bandana/red = 5,
/obj/item/clothing/suit/storage/hooded/wintercoat/security = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/security = 5,
/obj/item/clothing/accessory/armband = 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/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/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 /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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB