diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index d459f4a3f0..dcab43baae 100644 --- a/code/__defines/misc_vr.dm +++ b/code/__defines/misc_vr.dm @@ -1 +1,9 @@ -#define ECO_MODIFIER 10 \ No newline at end of file +#define ECO_MODIFIER 10 + +// Because of omnihud having overlapping issues, we have extra ones. +#define BACKUP_HUD 11 // HUD for showing whether or not they have a backup implant. +#define STATUS_R_HUD 12 // HUD for showing the same STATUS_HUD info on the right side, but not for 'boring' statuses (transparent icons) +#define HEALTH_VR_HUD 13 // HUD with blank 100% bar so it's hidden most of the time. + +#undef TOTAL_HUDS //Undo theirs. +#define TOTAL_HUDS 13 // Total number of HUDs. \ No newline at end of file diff --git a/code/defines/procs/hud.dm b/code/defines/procs/hud.dm index d662241c61..d712bf854f 100644 --- a/code/defines/procs/hud.dm +++ b/code/defines/procs/hud.dm @@ -18,7 +18,7 @@ proc/process_med_hud(var/mob/M, var/local_scanner, var/mob/Alt) if(local_scanner) P.Client.images += patient.hud_list[HEALTH_HUD] P.Client.images += patient.hud_list[STATUS_HUD] - P.Client.images += patient.hud_list[IMPLOYAL_HUD] //VOREStation Edit - Commandeered to be backup implant indicator + P.Client.images += patient.hud_list[BACKUP_HUD] //VOREStation Edit - Backup implant indicator else var/sensor_level = getsensorlevel(patient) if(sensor_level >= SUIT_SENSOR_VITAL) diff --git a/code/defines/procs/hud_vr.dm b/code/defines/procs/hud_vr.dm index 63c8fa2706..7ea10110a3 100644 --- a/code/defines/procs/hud_vr.dm +++ b/code/defines/procs/hud_vr.dm @@ -8,12 +8,14 @@ proc/process_omni_hud(var/mob/M, var/mode, var/mob/Alt) continue P.Client.images += guy.hud_list[ID_HUD] - P.Client.images += guy.hud_list[HEALTH_HUD] - P.Client.images += guy.hud_list[IMPLOYAL_HUD] + P.Client.images += guy.hud_list[HEALTH_VR_HUD] - //if(shades.mode == "med") //Medical advanced version - //Nothing special to show, really, just records become available. + if(mode == "med") //Medical advanced version + P.Client.images += guy.hud_list[STATUS_R_HUD] + P.Client.images += guy.hud_list[BACKUP_HUD] if(mode == "sec") //Security advanced version P.Client.images += guy.hud_list[WANTED_HUD] if(mode == "best") //Command/omni advanced version P.Client.images += guy.hud_list[WANTED_HUD] + P.Client.images += guy.hud_list[STATUS_R_HUD] + P.Client.images += guy.hud_list[BACKUP_HUD] diff --git a/code/game/jobs/job/special.dm b/code/game/jobs/job/special.dm index 703c86ddce..0f369e2cb3 100644 --- a/code/game/jobs/job/special.dm +++ b/code/game/jobs/job/special.dm @@ -30,7 +30,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom/officer(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/omnihud/best(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/omnihud/all(H), slot_l_store) H.implant_loyalty() @@ -72,7 +72,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), slot_gloves) H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom/officer(H), slot_head) - H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/omnihud(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/omnihud(H), slot_l_store) H.implant_loyalty() diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index bbab86d493..b6625bce7e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -853,9 +853,7 @@ /obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4, /obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe = 12, /obj/item/device/healthanalyzer = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2, - /obj/item/stack/medical/advanced/bruise_pack = 3, /obj/item/stack/medical/advanced/ointment = 3, /obj/item/stack/medical/splint = 2, - /obj/item/weapon/storage/box/khcrystal = 4, - /obj/item/weapon/storage/box/backup_kit = 2) //VOREStation Add - khcrystal and backup_kit + /obj/item/stack/medical/advanced/bruise_pack = 3, /obj/item/stack/medical/advanced/ointment = 3, /obj/item/stack/medical/splint = 2) contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/antitox = 6) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. req_log_access = access_cmo diff --git a/code/game/machinery/vending_vr.dm b/code/game/machinery/vending_vr.dm index f877ebf31e..3ab4133bfb 100644 --- a/code/game/machinery/vending_vr.dm +++ b/code/game/machinery/vending_vr.dm @@ -1,26 +1,29 @@ -/obj/machinery/vending/hydroseeds - products = list(/obj/item/seeds/bananaseed = 3,/obj/item/seeds/berryseed = 3,/obj/item/seeds/carrotseed = 3,/obj/item/seeds/chantermycelium = 3,/obj/item/seeds/chiliseed = 3, - /obj/item/seeds/cornseed = 3, /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/potatoseed = 3, /obj/item/seeds/replicapod = 3,/obj/item/seeds/soyaseed = 3, - /obj/item/seeds/sunflowerseed = 3,/obj/item/seeds/tomatoseed = 3,/obj/item/seeds/towermycelium = 3,/obj/item/seeds/wheatseed = 3,/obj/item/seeds/appleseed = 3, - /obj/item/seeds/poppyseed = 3,/obj/item/seeds/sugarcaneseed = 3,/obj/item/seeds/ambrosiavulgarisseed = 3,/obj/item/seeds/peanutseed = 3,/obj/item/seeds/whitebeetseed = 3,/obj/item/seeds/watermelonseed = 3,/obj/item/seeds/lavenderseed = 3,/obj/item/seeds/limeseed = 3, - /obj/item/seeds/lemonseed = 3,/obj/item/seeds/orangeseed = 3,/obj/item/seeds/grassseed = 3,/obj/item/seeds/cocoapodseed = 3,/obj/item/seeds/plumpmycelium = 2, - /obj/item/seeds/cabbageseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/plastiseed = 3,/obj/item/seeds/riceseed = 3,/obj/item/seeds/shrinkshroom = 3,/obj/item/seeds/megashroom = 3) +//Tweaked existing vendors +/obj/machinery/vending/hydroseeds/New() + products += list(/obj/item/seeds/shrinkshroom = 3,/obj/item/seeds/megashroom = 3) + ..() -/obj/machinery/vending/security - req_access = list(access_security) - products = list(/obj/item/weapon/handcuffs = 8,/obj/item/weapon/grenade/flashbang = 4,/obj/item/device/flash = 5, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12,/obj/item/weapon/storage/box/evidence = 6, - /obj/item/weapon/gun/energy/taser = 8,/obj/item/weapon/gun/energy/stunrevolver = 4, +/obj/machinery/vending/security/New() + products += list(/obj/item/weapon/gun/energy/taser = 8,/obj/item/weapon/gun/energy/stunrevolver = 4, /obj/item/weapon/reagent_containers/spray/pepper = 6,/obj/item/taperoll/police = 6, - /obj/item/weapon/gun/projectile/sec/flash = 4, /obj/item/ammo_magazine/c45m/flash = 8) + /obj/item/weapon/gun/projectile/sec/flash = 4, /obj/item/ammo_magazine/c45m/flash = 8, + /obj/item/clothing/glasses/omnihud/sec = 4) + ..() +/obj/machinery/vending/tool/New() + products += list(/obj/item/weapon/reagent_containers/spray/windowsealant = 5) + ..() -/obj/machinery/vending/tool - products = list(/obj/item/stack/cable_coil/random = 10,/obj/item/weapon/crowbar = 5,/obj/item/weapon/weldingtool = 3,/obj/item/weapon/wirecutters = 5, - /obj/item/weapon/wrench = 5,/obj/item/device/analyzer = 5,/obj/item/device/t_scanner = 5,/obj/item/weapon/screwdriver = 5, - /obj/item/device/flashlight/glowstick = 3, /obj/item/device/flashlight/glowstick/red = 3, /obj/item/device/flashlight/glowstick/blue = 3, - /obj/item/device/flashlight/glowstick/orange =3, /obj/item/device/flashlight/glowstick/yellow = 3, /obj/item/weapon/reagent_containers/spray/windowsealant = 5) +/obj/machinery/vending/engivend/New() + products += list(/obj/item/clothing/glasses/omnihud/eng = 4) + ..() +/obj/machinery/vending/medical/New() + products += list(/obj/item/weapon/storage/box/khcrystal = 4,/obj/item/weapon/storage/box/backup_kit = 2, + /obj/item/clothing/glasses/omnihud/med = 2, /obj/item/device/glasses_kit = 1) + ..() + +//Custom vendors /obj/machinery/vending/dinnerware name = "Dinnerware" desc = "A kitchen and restaurant equipment vendor." @@ -55,7 +58,11 @@ desc = "A technological marvel, supposedly able to cook or mix a large variety of food or drink." icon_state = "boozeomat" icon_deny = "boozeomat-deny" - products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4, + products = list(/obj/item/weapon/tray = 8, + /obj/item/weapon/material/kitchen/utensil/fork = 6, + /obj/item/weapon/material/kitchen/utensil/knife = 6, + /obj/item/weapon/material/kitchen/utensil/spoon = 6, + /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4, /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4, /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4, diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 4cb92a0780..d68ae92a39 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -54,6 +54,7 @@ imp.part = affected BITSET(H.hud_updateflag, IMPLOYAL_HUD) + BITSET(H.hud_updateflag, BACKUP_HUD) //VOREStation Add - Backup HUD updates src.imp = null update() diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm new file mode 100644 index 0000000000..bec6894dd2 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -0,0 +1,7 @@ +/datum/gear/eyes/arglasses + display_name = "AR glasses" + path = /obj/item/clothing/glasses/omnihud + +/datum/gear/eyes/arglassespres + display_name = "AR glasses, prescription" + path = /obj/item/clothing/glasses/omnihud/prescription diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm new file mode 100644 index 0000000000..c001127eb4 --- /dev/null +++ b/code/modules/clothing/glasses/glasses_vr.dm @@ -0,0 +1,58 @@ +/obj/item/clothing/glasses/proc/prescribe(var/mob/user) + prescription = !prescription + + //Look it's really not that fancy. It's not ACTUALLY unique scrip data. + if(prescription) + name = "[initial(name)] (pr)" + user.visible_message("[user] replaces the lenses in \the [src] with a new prescription.") + else + name = "[initial(name)]" + user.visible_message("[user] replaces the prescription lenses in \the [src] with generics.") + + playsound(user,'sound/items/screwdriver.ogg', 50, 1) + +//Prescription kit +/obj/item/device/glasses_kit + name = "prescription glasses kit" + desc = "A kit containing all the needed tools and parts to develop and apply a prescription for someone." + icon = 'icons/obj/device.dmi' + icon_state = "modkit" + var/scrip_loaded = 0 + +/obj/item/device/glasses_kit/afterattack(var/target, var/mob/living/carbon/human/user, var/proximity) + if(!proximity) + return + if(!istype(user)) + return + + //Too difficult + if(target == user) + user << "You can't use this on yourself. Get someone to help you." + return + + //We're applying a prescription + if(istype(target,/obj/item/clothing/glasses)) + var/obj/item/clothing/glasses/G = target + if(!scrip_loaded) + user << "You need to build a prescription from someone first! Use the kit on someone." + return + + if(do_after(user,5 SECONDS)) + G.prescribe(user) + scrip_loaded = 0 + + //We're getting a prescription + else if(ishuman(target)) + var/mob/living/carbon/human/T = target + if(T.glasses || (T.head && T.head.flags_inv & HIDEEYES)) + user << "The person's eyes can't be covered!" + return + + T.visible_message("[user] begins making measurements for prescription lenses for [target].","[user] begins measuring your eyes. Hold still!") + if(do_after(user,5 SECONDS,T)) + T.flash_eyes() + scrip_loaded = 1 + T.visible_message("[user] finishes making prescription lenses for [target].","Gah, that's bright!") + + else + ..() diff --git a/code/modules/clothing/glasses/hud_vr.dm b/code/modules/clothing/glasses/hud_vr.dm index 6e3728792e..3619700463 100644 --- a/code/modules/clothing/glasses/hud_vr.dm +++ b/code/modules/clothing/glasses/hud_vr.dm @@ -1,50 +1,86 @@ -/obj/item/clothing/glasses/sunglasses/omnihud - name = "AR sunglasses" - desc = "The KHI-63 AR Sunglasses are a design from Kitsuhana Heavy Industries. \ - Not as complete as specialist HUD systems in their standard configuration, but they \ - do combine features from several different existing HUDs." +/obj/item/clothing/glasses/omnihud + name = "a.r. glasses" + desc = "The KHI-62 AR Glasses are a design from Kitsuhana Heavy Industries. These are a cheap export version \ + for Nanotrasen. Probably not as complete as KHI could make them, but more readily available for NT." origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 3) var/obj/item/clothing/glasses/hud/omni/hud = null - - icon = 'icons/vore/custom_items_vr.dmi' - icon_override = 'icons/vore/custom_clothes_vr.dmi' - icon_state = "omniglasses" var/mode = "civ" + icon_state = "glasses" + var/flash_prot = 0 //0 for none, 1 for flash weapon protection, 2 for welder protection New() ..() src.hud = new/obj/item/clothing/glasses/hud/omni(src) return -/obj/item/clothing/glasses/sunglasses/omnihud/cmo - name = "AR-M sunglasses" - desc = "The KHI-63-M AR Sunglasses are a design from Kitsuhana Heavy Industries. \ - These have been upgraded with advanced medical records integration." + proc/flashed() + if(flash_prot && ishuman(loc)) + loc << "Your [src.name] darken to try and protect your eyes!" + + prescribe(var/mob/user) + prescription = !prescription + + //Look it's really not that fancy. It's not ACTUALLY unique scrip data. + if(prescription) + name = "[initial(name)] (pr)" + user.visible_message("[user] uploads new prescription data to \the [src.name].") + else + name = "[initial(name)]" + user.visible_message("[user] deletes the prescription data of \the [src.name].") + + playsound(user,'sound/items/screwdriver.ogg', 50, 1) + +/obj/item/clothing/glasses/omnihud/prescription + name = "AR glasses (pr)" + prescription = 1 + +/obj/item/clothing/glasses/omnihud/med + name = "AR-M glasses" + desc = "The KHI-62-M AR glasses are a design from Kitsuhana Heavy Industries. \ + These have been upgraded with medical records access and virus database integration." mode = "med" -/obj/item/clothing/glasses/sunglasses/omnihud/hos - name = "AR-S sunglasses" - desc = "The KHI-63-S AR Sunglasses are a design from Kitsuhana Heavy Industries. \ - These have been upgraded with advanced security records integration." +/obj/item/clothing/glasses/omnihud/sec + name = "AR-S glasses" + desc = "The KHI-62-S AR glasses are a design from Kitsuhana Heavy Industries. \ + These have been upgraded with security records integration and flash protection." mode = "sec" + flash_prot = 1 //Flash protection. -/obj/item/clothing/glasses/sunglasses/omnihud/best - name = "AR-B sunglasses" - desc = "The KHI-63-B AR Sunglasses are a design from Kitsuhana Heavy Industries. \ - These have been upgraded with advanced medical and security records integration." +/obj/item/clothing/glasses/omnihud/eng + name = "AR-E glasses" + desc = "The KHI-62-E AR glasses are a design from Kitsuhana Heavy Industries. \ + These have been upgraded with advanced electrochromic lenses to protect your eyes during welding." + mode = "civ" + flash_prot = 2 //Welding protection. + +/obj/item/clothing/glasses/omnihud/rnd + name = "AR-R glasses" + desc = "The KHI-62-R AR glasses are a design from Kitsuhana Heavy Industries. \ + These have been ... modified ... to fit into a different frame." + icon = 'icons/obj/clothing/glasses.dmi' + icon_override = null + icon_state = "purple" + mode = "civ" + +/obj/item/clothing/glasses/omnihud/all + name = "AR-B glasses" + desc = "The KHI-62-B AR glasses are a design from Kitsuhana Heavy Industries. \ + These have been upgraded with every feature the lesser models have. Now we're talkin'." mode = "best" + flash_prot = 2 //Welding protection. /obj/item/clothing/glasses/hud/omni name = "internal omni hud" - desc = "You shouldn't see this. This is an internal item for sunglasses." - var/obj/item/clothing/glasses/sunglasses/omnihud/shades = null + desc = "You shouldn't see this. This is an internal item for glasses." + var/obj/item/clothing/glasses/omnihud/shades = null vision_flags = SEE_MOBS see_invisible = SEE_INVISIBLE_NOLIGHTING New() ..() - if(istype(loc,/obj/item/clothing/glasses/sunglasses/omnihud)) + if(istype(loc,/obj/item/clothing/glasses/omnihud)) shades = loc else qdel(src) diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm index 85512ffdcc..1d6d77c5ab 100644 --- a/code/modules/mob/living/carbon/human/examine_vr.dm +++ b/code/modules/mob/living/carbon/human/examine_vr.dm @@ -114,10 +114,10 @@ //For OmniHUD records access for appropriate models /proc/hasHUD_vr(mob/living/carbon/human/H, hudtype) - if(!(istype(H.glasses, /obj/item/clothing/glasses/sunglasses/omnihud))) + if(!(istype(H.glasses, /obj/item/clothing/glasses/omnihud))) return 0 //Not wearing omnis, don't care. - var/obj/item/clothing/glasses/sunglasses/omnihud/omni = H.glasses + var/obj/item/clothing/glasses/omnihud/omni = H.glasses switch(hudtype) if("security") diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index c83d3d98b3..b06a95597e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -32,6 +32,11 @@ hud_list[HEALTH_HUD] = new /image/hud_overlay('icons/mob/hud_med.dmi', src, "100") hud_list[STATUS_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudhealthy") + //VOREStation Add - Custom HUDs + hud_list[HEALTH_VR_HUD] = new /image/hud_overlay('icons/mob/hud_med_vr.dmi', src, "100") + hud_list[STATUS_R_HUD] = new /image/hud_overlay('icons/mob/hud_vr.dmi', src, "hudhealthy") + hud_list[BACKUP_HUD] = new /image/hud_overlay('icons/mob/hud_vr.dmi', src, "hudblank") + //VOREStation Add End hud_list[LIFE_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudhealthy") hud_list[ID_HUD] = new /image/hud_overlay(using_map.id_hud_icons, src, "hudunknown") hud_list[WANTED_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudblank") @@ -710,6 +715,12 @@ var/obj/item/clothing/glasses/welding/W = src.glasses if(!W.up) number += 2 + //VOREStation Add - Omnihud Handling + if(istype(src.glasses, /obj/item/clothing/glasses/omnihud)) + var/obj/item/clothing/glasses/omnihud/omn = src.glasses + number += omn.flash_prot + omn.flashed() + //VOREStation Add End return number //Used by various things that knock people out by applying blunt trauma to the head. diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index efd0c787a6..aba26a8293 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1334,8 +1334,8 @@ // The purpose of this is to stop xray and w/e from preventing you from using huds -- Love, Doohl var/obj/item/clothing/glasses/hud/O = G //VOREStation Add - Support for omnihud glasses - if(istype(G, /obj/item/clothing/glasses/sunglasses/omnihud)) - var/obj/item/clothing/glasses/sunglasses/omnihud/S = G + if(istype(G, /obj/item/clothing/glasses/omnihud)) + var/obj/item/clothing/glasses/omnihud/S = G O = S.hud //VOREStation Add End if(istype(G, /obj/item/clothing/glasses/sunglasses/sechud)) @@ -1662,6 +1662,7 @@ else holder.icon_state = "hudsyndicate" hud_list[SPECIALROLE_HUD] = holder + attempt_vr(src,"handle_hud_list_vr",list()) //VOREStation Add - Custom HUDs. hud_updateflag = 0 /mob/living/carbon/human/handle_stunned() diff --git a/code/modules/mob/living/carbon/human/life_vr.dm b/code/modules/mob/living/carbon/human/life_vr.dm index eae5ed7210..2c0e594f7a 100644 --- a/code/modules/mob/living/carbon/human/life_vr.dm +++ b/code/modules/mob/living/carbon/human/life_vr.dm @@ -5,3 +5,33 @@ else if (nutrition <= 50 && stat != 2 && weight > 70 && weight_loss) weight -= metabolism*(0.01*weight_loss) // starvation weight loss + +/mob/living/carbon/human/proc/handle_hud_list_vr() + + //Right-side status hud updates with left side one. + if (BITTEST(hud_updateflag, STATUS_HUD)) + var/image/other_status = hud_list[STATUS_HUD] + var/image/status_r = hud_list[STATUS_R_HUD] + status_r.icon_state = other_status.icon_state + + //Our custom health bar HUD + if (BITTEST(hud_updateflag, HEALTH_HUD)) + var/image/other_health = hud_list[HEALTH_HUD] + var/image/health_us = hud_list[HEALTH_VR_HUD] + health_us.icon_state = other_health.icon_state + + //Backup implant hud status + if (BITTEST(hud_updateflag, BACKUP_HUD)) + var/image/holder = hud_list[BACKUP_HUD] + + holder.icon_state = "hudblank" + + for(var/obj/item/weapon/implant/I in src) + if(I.implanted) + if(istype(I,/obj/item/weapon/implant/backup)) + if(!mind) + holder.icon_state = "hud_backup_nomind" + else if(!(mind.name in transcore.body_scans)) + holder.icon_state = "hud_backup_nobody" + else + holder.icon_state = "hud_backup_norm" \ No newline at end of file diff --git a/code/modules/research/designs_vr.dm b/code/modules/research/designs_vr.dm index 9b1781c2e8..b2776ec826 100644 --- a/code/modules/research/designs_vr.dm +++ b/code/modules/research/designs_vr.dm @@ -30,11 +30,11 @@ sort_string = "TAAAB" /datum/design/item/hud/omni - name = "AR sunglasses" + name = "AR glasses" id = "omnihud" req_tech = list(TECH_MAGNET = 4, TECH_COMBAT = 3, TECH_BIO = 3) materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 1000) - build_path = /obj/item/clothing/glasses/sunglasses/omnihud + build_path = /obj/item/clothing/glasses/omnihud sort_string = "GAAFB" // Resleeving Circuitboards diff --git a/code/modules/resleeving/implant.dm b/code/modules/resleeving/implant.dm index 39d9c76fdc..3c3a6abddd 100644 --- a/code/modules/resleeving/implant.dm +++ b/code/modules/resleeving/implant.dm @@ -42,9 +42,12 @@ last_attempt = world.time var/mob/living/carbon/human/H = loc - //Okay we're in a human with a mind at least - if(istype(H) && H == imp_in && H.mind && H.stat < DEAD) - transcore.m_backup(H.mind) + //We're in a human, at least. + if(istype(H)) + BITSET(H.hud_updateflag, BACKUP_HUD) + //Okay we've got a mind at least + if(H == imp_in && H.mind && H.stat < DEAD) + transcore.m_backup(H.mind) spawn(attempt_delay) backup() diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index c0ae20b531..df5180baf1 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -168,7 +168,7 @@ new /obj/item/weapon/card/id/centcom/fluff/aronai(src) new /obj/item/fluff/permit/aronai_kadigan(src) new /obj/item/clothing/under/rank/khi/fluff/aronai(src) - new /obj/item/clothing/glasses/sunglasses/omnihud(src) + new /obj/item/clothing/glasses/omnihud/all(src) //Gun and holster new /obj/item/weapon/gun/projectile/khi/pistol(src) new /obj/item/ammo_magazine/c45m/flash(src) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 20e083255a..eeba443b76 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -785,10 +785,11 @@ starting_accessories = list(/obj/item/clothing/accessory/black) //Kisukegema:Kisuke `the nerd` Gema -/obj/item/clothing/glasses/sunglasses/omnihud/kamina +/obj/item/clothing/glasses/omnihud/kamina name = "Kamina glasses" icon_state = "kamina" desc = "ROW ROW, FIGHT THE POWER." + flash_prot = 1 //Why not. //Kitsuhana Uniforms /obj/item/clothing/under/rank/khi diff --git a/icons/mob/hud_med_vr.dmi b/icons/mob/hud_med_vr.dmi new file mode 100644 index 0000000000..5fac5f46ef Binary files /dev/null and b/icons/mob/hud_med_vr.dmi differ diff --git a/icons/mob/hud_vr.dmi b/icons/mob/hud_vr.dmi new file mode 100644 index 0000000000..b96ae9c6de Binary files /dev/null and b/icons/mob/hud_vr.dmi differ diff --git a/maps/virgo/virgo-1.dmm b/maps/virgo/virgo-1.dmm index 69ea01fb8b..577649ff61 100644 --- a/maps/virgo/virgo-1.dmm +++ b/maps/virgo/virgo-1.dmm @@ -1066,7 +1066,7 @@ "auz" = (/obj/machinery/computer/security,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "auA" = (/obj/machinery/computer/secure_data,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "auB" = (/obj/structure/filingcabinet,/obj/item/device/radio/intercom{broadcasting = 0; dir = 2; frequency = 1475; icon_state = "intercom"; listening = 1; name = "Station Intercom (Security)"; pixel_x = 0; pixel_y = -21},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) -"auC" = (/obj/structure/closet/secure_closet/hos,/obj/item/clothing/glasses/sunglasses/omnihud/hos,/obj/item/clothing/suit/space/void/security/fluff/hos{armor = list("melee" = 70, "bullet" = 60, "laser" = 60, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 10); species_restricted = null},/obj/item/clothing/head/helmet/space/void/security/fluff/hos{armor = list("melee" = 70, "bullet" = 60, "laser" = 60, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 10); species_restricted = null},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) +"auC" = (/obj/structure/closet/secure_closet/hos,/obj/item/clothing/suit/space/void/security/fluff/hos{armor = list("melee" = 70, "bullet" = 60, "laser" = 60, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 10); species_restricted = null},/obj/item/clothing/head/helmet/space/void/security/fluff/hos{armor = list("melee" = 70, "bullet" = 60, "laser" = 60, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 10); species_restricted = null},/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/hos) "auD" = (/obj/structure/grille,/obj/structure/cable/green,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/polarized,/obj/structure/window/reinforced/polarized{dir = 8},/obj/structure/window/reinforced/polarized{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/heads/hos) "auE" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/security/main) "auF" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/security/main) @@ -2790,7 +2790,7 @@ "bbH" = (/obj/effect/decal/cleanable/cobweb2,/obj/effect/decal/cleanable/cobweb2{icon_state = "spiderling"; name = "dead spider"; tag = "icon-spiderling"},/turf/simulated/floor,/area/maintenance/medbay_fore) "bbI" = (/obj/machinery/floodlight,/turf/simulated/floor,/area/rnd/research_storage) "bbJ" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/table/standard,/obj/item/device/t_scanner,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor,/area/rnd/research_storage) -"bbK" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/gloves,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/plating,/area/rnd/research_storage) +"bbK" = (/obj/structure/table/rack,/obj/item/weapon/storage/box/gloves,/obj/item/weapon/storage/toolbox/emergency,/obj/item/clothing/glasses/omnihud/rnd,/turf/simulated/floor/plating,/area/rnd/research_storage) "bbL" = (/turf/simulated/floor/tiled/white,/area/rnd/research) "bbM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/research) "bbN" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/rnd/research) @@ -3477,7 +3477,7 @@ "boS" = (/turf/simulated/floor/tiled,/area/rnd/lab) "boT" = (/obj/machinery/r_n_d/protolathe,/turf/simulated/floor/tiled,/area/rnd/lab) "boU" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/lab) -"boV" = (/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module{pixel_x = 2; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module,/obj/effect/floor_decal/corner/purple{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/rnd/lab) +"boV" = (/obj/structure/table/standard,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module{pixel_x = 2; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module,/obj/effect/floor_decal/corner/purple{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/item/clothing/glasses/omnihud/rnd,/turf/simulated/floor/tiled/white,/area/rnd/lab) "boW" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/disposalpipe/segment,/obj/machinery/camera/network/northern_star{c_tag = "Hall - Central Primary Port Fore 2"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "boX" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "boY" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) @@ -3648,7 +3648,7 @@ "bsh" = (/obj/structure/filingcabinet/chestdrawer{name = "Medical Forms"},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/reception) "bsi" = (/obj/structure/filingcabinet/medical{desc = "A large cabinet with hard copy medical records."; name = "Medical Records"},/obj/machinery/alarm{pixel_y = 22},/obj/effect/floor_decal/corner/paleblue/full{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = 25},/turf/simulated/floor/tiled/white,/area/medical/reception) "bsj" = (/obj/structure/table/rack,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/item/weapon/storage/belt/medical,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/item/clothing/accessory/stethoscope,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bsk" = (/obj/structure/table/standard,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bsk" = (/obj/structure/table/standard,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/item/device/flashlight/pen,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/item/device/glasses_kit,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bsl" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/beakers,/obj/item/weapon/storage/box/syringes{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/syringes,/obj/machinery/alarm{pixel_y = 22},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bsm" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/gloves{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/masks{pixel_y = 0},/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bsn" = (/obj/structure/closet/secure_closet/medical3,/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) @@ -3819,7 +3819,7 @@ "bvw" = (/obj/structure/table/reinforced,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bvx" = (/obj/structure/table/reinforced,/obj/machinery/computer/skills{pixel_y = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bvy" = (/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) -"bvz" = (/obj/structure/closet/secure_closet/CMO,/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/item/clothing/glasses/sunglasses/omnihud/cmo,/obj/item/weapon/cmo_disk_holder,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) +"bvz" = (/obj/structure/closet/secure_closet/CMO,/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/item/weapon/cmo_disk_holder,/turf/simulated/floor/tiled/white,/area/crew_quarters/heads/cmo) "bvA" = (/obj/structure/table/steel,/obj/item/weapon/autopsy_scanner,/obj/item/weapon/surgical/scalpel,/obj/machinery/light{dir = 1},/obj/item/weapon/surgical/cautery,/obj/effect/floor_decal/corner/paleblue{dir = 5},/turf/simulated/floor/tiled,/area/medical/morgue) "bvB" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/medical/virology) "bvC" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/medical/virology) @@ -4383,7 +4383,7 @@ "bGo" = (/obj/structure/closet/crate,/obj/item/weapon/tank/emergency/oxygen/engi,/obj/item/weapon/tank/emergency/oxygen/double,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/research) "bGp" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/obj/machinery/meter,/turf/simulated/floor,/area/maintenance/research) "bGq" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/research) -"bGr" = (/obj/structure/table/standard,/turf/simulated/floor/reinforced,/area/rnd/misc_lab) +"bGr" = (/obj/structure/table/standard,/obj/item/clothing/glasses/omnihud/rnd,/turf/simulated/floor/reinforced,/area/rnd/misc_lab) "bGs" = (/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor/reinforced,/area/rnd/misc_lab) "bGt" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/research) "bGu" = (/obj/effect/floor_decal/corner/purple{dir = 6},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/rnd/research) @@ -4561,7 +4561,7 @@ "bJK" = (/obj/effect/floor_decal/corner/pink{dir = 6},/obj/structure/closet{name = "welding equipment"},/obj/item/clothing/head/welding{pixel_x = -3; pixel_y = 5},/obj/item/clothing/head/welding{pixel_x = -3; pixel_y = 5},/obj/item/clothing/glasses/welding,/obj/item/clothing/glasses/welding,/turf/simulated/floor/tiled/white,/area/assembly/robotics) "bJL" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bJM" = (/obj/structure/grille,/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = -32},/obj/structure/cable/green,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/polarized{dir = 8; id = "hop_office"},/obj/structure/window/reinforced/polarized{dir = 2; id = "hop_office"},/obj/structure/window/reinforced/polarized{dir = 4; id = "hop_office"},/turf/simulated/floor/plating,/area/crew_quarters/heads/hop) -"bJN" = (/obj/structure/closet/secure_closet/hop,/obj/effect/floor_decal/corner/blue{dir = 9},/obj/item/clothing/glasses/sunglasses/omnihud,/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) +"bJN" = (/obj/structure/closet/secure_closet/hop,/obj/effect/floor_decal/corner/blue{dir = 9},/obj/item/clothing/glasses/omnihud,/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop) "bJO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/mob/living/simple_animal/corgi/Ian,/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) "bJP" = (/obj/structure/bed/chair/office/dark,/obj/effect/landmark/start{name = "Head of Personnel"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) "bJQ" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/heads/hop) @@ -4751,7 +4751,7 @@ "bNs" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/research) "bNt" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bNu" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) -"bNv" = (/obj/structure/closet/secure_closet/RD,/obj/item/clothing/glasses/sunglasses/omnihud,/turf/simulated/floor/tiled/dark,/area/rnd/rdoffice) +"bNv" = (/obj/structure/closet/secure_closet/RD,/obj/item/clothing/glasses/omnihud/rnd,/turf/simulated/floor/tiled/dark,/area/rnd/rdoffice) "bNw" = (/obj/machinery/light{dir = 8},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/tiled,/area/assembly/robotics) "bNx" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/assembly/robotics) "bNy" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/assembly/robotics) @@ -4982,7 +4982,7 @@ "bRP" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "bRQ" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/machinery/door/window/westleft{name = "EVA Suit Storage"; req_access = list(5)},/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/void/medical,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/medical,/obj/item/weapon/tank/oxygen,/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay) "bRR" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/medical/resleeving) -"bRS" = (/obj/structure/table/standard,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled,/area/assembly/robotics) +"bRS" = (/obj/structure/table/standard,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/item/clothing/glasses/omnihud/rnd,/turf/simulated/floor/tiled,/area/assembly/robotics) "bRT" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/clonepod/transhuman,/turf/simulated/floor/tiled/white,/area/medical/resleeving) "bRU" = (/obj/effect/floor_decal/corner/paleblue/full,/obj/machinery/computer/transhuman/resleeving,/turf/simulated/floor/tiled/white,/area/medical/resleeving) "bRV" = (/turf/simulated/wall,/area/medical/patient_c) @@ -5281,7 +5281,7 @@ "bXC" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/obj/item/device/taperecorder,/turf/simulated/floor/carpet,/area/crew_quarters/captain) "bXD" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bXE" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bXF" = (/obj/structure/table/woodentable,/obj/item/weapon/stamp/captain,/obj/item/clothing/glasses/sunglasses/omnihud/best,/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bXF" = (/obj/structure/table/woodentable,/obj/item/weapon/stamp/captain,/obj/item/clothing/glasses/omnihud/all,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bXG" = (/obj/structure/table/woodentable,/obj/machinery/computer/skills,/obj/item/weapon/hand_tele,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bXH" = (/obj/machinery/door/window/southright{name = "Captain's Desk Door"; req_access = list(20)},/turf/simulated/floor/wood,/area/crew_quarters/captain) "bXI" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/folder/blue,/obj/item/device/megaphone,/obj/machinery/requests_console{announcementConsole = 1; department = "Colony Director's Desk"; departmentType = 5; name = "Station Administrator RC"; pixel_x = 30; pixel_y = 0},/obj/structure/window/reinforced,/obj/item/weapon/pen/multi,/turf/simulated/floor/wood,/area/crew_quarters/captain) @@ -5375,6 +5375,7 @@ "bZs" = (/obj/structure/window/reinforced/polarized{dir = 1; id = "pr5_window_tint"},/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/polarized{dir = 2; id = "pr5_window_tint"},/obj/structure/window/reinforced/polarized{dir = 4; id = "pr5_window_tint"},/obj/structure/window/reinforced/polarized{dir = 8; id = "pr5_window_tint"},/turf/simulated/floor,/area/medical/patient_c) "bZt" = (/obj/effect/floor_decal/corner/pink{dir = 9},/obj/structure/bed/chair/office/light,/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/camera/network/medbay{c_tag = "MED - Patient Room E"; dir = 4},/turf/simulated/floor/tiled/white,/area/medical/patient_c) "bZu" = (/obj/machinery/transhuman/synthprinter,/turf/simulated/floor/tiled/white,/area/assembly/robotics) +"bZv" = (/obj/structure/closet/secure_closet/engineering_chief,/obj/effect/floor_decal/corner/blue/full{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "bZw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bZx" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/patient_wing) "bZy" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/medical{name = "Patient Room D"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/patient_d) @@ -7673,7 +7674,6 @@ "cRH" = (/obj/machinery/computer/atmos_alert,/obj/effect/floor_decal/corner/blue/full{dir = 8},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cRI" = (/obj/machinery/computer/station_alert/all,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cRJ" = (/obj/structure/table/reinforced,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/light{dir = 1},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 27},/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) -"cRK" = (/obj/structure/closet/secure_closet/engineering_chief,/obj/effect/floor_decal/corner/blue/full{dir = 1},/obj/item/clothing/glasses/sunglasses/omnihud,/turf/simulated/floor/tiled,/area/crew_quarters/heads/chief) "cRL" = (/obj/machinery/button/remote/driver{id = "enginecore"; name = "Emergency Core Eject"; pixel_x = 0; pixel_y = 21},/obj/structure/window/basic,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/heads/chief) "cRM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/engineering) "cRN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/meter,/turf/simulated/floor,/area/maintenance/engineering) @@ -10158,7 +10158,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaecxAcxAcxAcxAcxAaaeaaeaaecwBcwBcwBcwBcwBcwBcwBcMWcMXcMYcMZcNacNbcNccNdcFrcFraaicLJcNecNfcNecLJaaiaaicLKcNgcNhcNicNjcLKaafaafaafcEwcNkcNlcNmcNncNocNpcNqcNqcxRcNrcNscNtcFIcNucJscHAcHAcHAcHAcNvcHBcFIaaiaaicxWcBVcxWaafaafaafaafaafczpcNwcAWcNxcNycBZcNzcCbcCccNAcAWcAWczpcNBcHIcNCcHIcNDcHIcHHcCgcCicBaaafaafcDBcNEcNFcNGcJEcNHcNIcNJcNKcNLcNMcKMcNNcNOcNPcNQcKMaafaafcCmcNRcCmcCmcCmcthcNScuxcNTcNUcthcEUcNVcGpcNWcuxcDJcIpcNXcIpcNYcIpcIpaafaafaafaafaafaafcLfcNZcOacObcLfcLfcOccLfcLfcOdcFdcLlcOecOfcLlcLlcOgcOhcOicLlcOjcOkcOlcLpcLpcOmcLpcLpcxvcOncLvcLvcOocLvcLvcOpcOqcOrcLvaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaeaaeaaeaaeaaeaaeaaaaaeabxaafaafaafaafaafcwBcwBcwBcwBcFrcFrcFrcFrcFrcFraafaaicLJcNecNecNecLJaaiaaicLKcOscOtcOucOvcLKcOwcOwcOwcEwcEwcOxcOycEwcOzcOAcOBcOCcODcOEcOFcOGcODcOHcJscOIcOJcHAcOKcOKcOKcFIaaiaaicxWcBVcxWaafaafaafaafaafczpcOLcAWcKBcOMcAWcONcAYcOOcKBcOPcOPczpcOQcORcOSdIncOUcOVcOWcCgcCicBaaafcOXcOXcOYcOZcPacOXcOXcOXcPbcPccPdcOXcOXcOXcOXcOXcOXcOXcOXaafcCmcKQcCmaafaafcthcthcPecPfcPgcthcPhcPicPjcPkcuxcuxcIpcPlcIpcPmcIpaafaafaafaafaafaafaafcLfcPncPocPpcPqcPpcPrcPscPtcGBcGCcPucPvcPwcPxcPycPxcPzcPAcLlcPBcPCcPDcPEcPDcPFcPGcPHcGRcGScPIcPJcPKcPLcPMcPLcPNcPOcLvaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaeaaaaaaaaaaaaaaaaaaaaiaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaicLJcPPcPQcPRcLJaaiaafcLKcPScPTcPUcPVcLKcPWcPXcPYcPZcEwcQacEwcFEcFEcQbcFEcQccODcQdcQecQfcODcQgcQgcQgcQgcQgcQgcQgcQgaaiaaiaaicxWcBVcxWcBaaafaafaafaafczpczpczpczpcQhcQicQjcQkcQlczpczpczpczpczpczpczpczpczpczpczpcCgcCicBacOXcOXcQmcQncQocQpcQqcQrcQscQtcQucQvcQwcQxcQycQzcQAcQBcQCcOXcOXcCmcKQcCmaaiaafaafcthcthcthcthcthcthcthcthcthcQDcQEcIpcIpcIpcIpcIpaafaafaafaafaafaafaafcLfcQFcQGcQHcQIcQJcQKcQLcLfczSczTcLlcQMcQNcQOcQPdHLcQRcQScQTcQUcQVdHMcQXcQYcQZcRacLpcAicAjcRccRdcRecRfcRgcRhcRicRjcLvaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaeaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaiaaiaaiabxcLJcRkcRlcRmcLJabxcRncRncRncRncRocRpcOwcRqcRrcRscRtcRucRvcRwcRxcRycRzcRAcRucRBcRCcRDcREcRFcRGcRHcRIcRJcRKcQgcRLcQgcQgaaiaaicxWcRMcRNcBacBacBacBacBacBacROcRPczpcRQczpcRRczpcRQczpcCgcCgcCgcCgcCgcCgcCgcCgcCgcCgcRScRTcRUcOXcRVcRWcRWcRXcRYcRYcRZcSacSbcSccSdcSecSfcSgcSgcSgcShcRWcSicOXcSjcSkcCmaaiaaiaafaafaafaafaafaafaafaafcSlcSmcSncSncSocSlaafaafaafaafaafaafaafaafaafaafcLfcLfcLfcLfcLfcLfcLfcLfcLfcBncwkcLlcLlcLlcLlcLlcLlcLlcLlcLlcLpcLpcLpcLpcLpcLpcLpcLpcwvcBqcLvcLvcLvcLvcLvcLvcLvcLvcLvaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaeaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaiaaiaaiabxcLJcRkcRlcRmcLJabxcRncRncRncRncRocRpcOwcRqcRrcRscRtcRucRvcRwcRxcRycRzcRAcRucRBcRCcRDcREcRFcRGcRHcRIcRJbZvcQgcRLcQgcQgaaiaaicxWcRMcRNcBacBacBacBacBacBacROcRPczpcRQczpcRRczpcRQczpcCgcCgcCgcCgcCgcCgcCgcCgcCgcCgcRScRTcRUcOXcRVcRWcRWcRXcRYcRYcRZcSacSbcSccSdcSecSfcSgcSgcSgcShcRWcSicOXcSjcSkcCmaaiaaiaafaafaafaafaafaafaafaafcSlcSmcSncSncSocSlaafaafaafaafaafaafaafaafaafaafcLfcLfcLfcLfcLfcLfcLfcLfcLfcBncwkcLlcLlcLlcLlcLlcLlcLlcLlcLlcLpcLpcLpcLpcLpcLpcLpcLpcwvcBqcLvcLvcLvcLvcLvcLvcLvcLvcLvaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaeaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaiaaiaaiabxabxcSpaaicSqabxabxcRncSrcSscStcSucSvcSwcSxcSycSzcRtcSAcSBcSCcSCcSDcSEcSFcSGcSHcRCcRDcREcSIcSJcSKcSKcSLcSMcSNcSKcSOcQgaaiaaicxWcSPcSQcSRcSScSTcSUcSUcSUcSUcSScSScSScSVcSWcSXcSScSUcSUcSYcSUcSUcSUcSUcSUcSUcSUcSUcSZcTacTbcOXcTccRWcRWcTdcRWcRWcTecTfcTgcThcTicTfcTecRWcRWcRWcTjcRWcRWcOXcTkcKQcCmaaiaaiaaiaafaafaafaafaafaafaafcSlcTlcSncSncTmcSlaafaafaafaafaafaafaafaafaafaafcTncTocTpcTqcTrcTscTtcTucTncTvcTwcpkcTxcTycTycTzcTycTAcTBcTCcTycTDcTycTEcTycTycTFcpkcTGcTHcTIcTJcTKcTLcTMcTNcTOcTPcTIaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaeaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaiaaiaaicTQcTRcTRcTScTRcTTcTUcTVcRncTWcTXcTXcTYcTZcUacUbcUccUdcRtcUecUfcSFcUgcUhcSFcUicUjcUkcRCcUlcUmcUncUocUpcUqcUrcUscUtcUucUvcQgaaiaaicxWcUwcBRcBacBacBacBacBacBacBacBacBacUxcUycHMcUzcEHcBacBacBacBacBacBacBacBacBacBacBacUAcEHcUBcOXcUCcUCcRWcUDcUEcUFcUGcUHcTgcUIcUJcUKcUGcULcUCcRWcUMcUEcUCcOXcUNcKQcCmaaiaaiaaiaaiaafaafaafaafaafaafcSlcSlcUOcUPcSlcSlaafaafaafaafaafaafaafaafaafaafcTncUQcURcURcUScURcURcUTcUUcUVcUWcUXcUYcUYcUYcUZcUYcVacVbcVccVdcVecUYcVfcUYcUYcUYcUXcVgcVhcVicVjcVjcVjcVkcVjcVjcVlcTIaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaebJqbJqaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaiaaicVmcVncVocVpcVqcVrcVscVtcVucVvcVwcVxcVycVzcVAcVBcVCcVDcVEcRtcVFcUfcVGcVHcVIcVJcSCcVKcVLcVMcVNcVOcVPcVQcVRcVScVTcVUcVVcVWcVXcQgaaiaaicxWcVYcxWcBaaaiaaiaaiaaiaaiaaiaaicBacBacBacBacBacBacBaaafaafaafaafaafaafaafaafaafcBacBacVZcWacOXcWbcWbcWccRWcWbcWdcUGcWecTgcThcTicWfcUGcWbcWbcRWcWccWbcWbcOXcWgcWhcCmaaiaaiaaiaaiaaiaafaafaafaafaafaaicWicSncWjcWiaaiaafaafaafaafaafcWkcWkcWkcWkaafcTncWlcWmcWncWocWpcWqcWrcWrcWscWtcWucWtcWtcWtcWvcWtcWtcWtcWwcWxcWycWycWzcWycWycWycWAcWBcWCcWDcWDcWEcWFcWGcWHcWHcWIcTIaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/vorestation.dme b/vorestation.dme index df67e42a8b..231066d99c 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1245,6 +1245,7 @@ #include "code\modules\client\preference_setup\loadout\loadout_cosmetics.dm" #include "code\modules\client\preference_setup\loadout\loadout_ears.dm" #include "code\modules\client\preference_setup\loadout\loadout_eyes.dm" +#include "code\modules\client\preference_setup\loadout\loadout_eyes_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_general.dm" #include "code\modules\client\preference_setup\loadout\loadout_gloves.dm" #include "code\modules\client\preference_setup\loadout\loadout_gloves_vr.dm" @@ -1270,6 +1271,7 @@ #include "code\modules\clothing\clothing_accessories.dm" #include "code\modules\clothing\ears\ears.dm" #include "code\modules\clothing\glasses\glasses.dm" +#include "code\modules\clothing\glasses\glasses_vr.dm" #include "code\modules\clothing\glasses\hud.dm" #include "code\modules\clothing\glasses\hud_vr.dm" #include "code\modules\clothing\gloves\arm_guards.dm"