diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 5f8536c0006..ef0cc6dafd0 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1265,6 +1265,7 @@ "health_hud_prescription", "security_hud_prescription", "diagnostic_hud_prescription", + "science_hud_prescription", "health_hud_aviator", "security_hud_aviator", "diagnostic_hud_aviator", diff --git a/modular_skyrat/modules/huds/code/designs.dm b/modular_skyrat/modules/huds/code/designs.dm index 08155cb0b85..efec8821049 100644 --- a/modular_skyrat/modules/huds/code/designs.dm +++ b/modular_skyrat/modules/huds/code/designs.dm @@ -28,6 +28,18 @@ category = list(RND_CATEGORY_EQUIPMENT) departmental_flags = DEPARTMENT_BITFLAG_SCIENCE +/datum/design/science_hud_prescription + name = "Prescription Science HUD" + desc = "These glasses scan the contents of containers and projects their contents to the user in an easy to read format. This one has a prescription lens." + id = "science_hud_prescription" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/gold = 350) + build_path = /obj/item/clothing/glasses/hud/science/prescription + category = list( + RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL + /datum/design/mesons_prescription name = "Prescription Optical Meson Scanners" desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition. Prescription lens has been added into this design." diff --git a/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm b/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm index 9f495a13646..9c3574cb807 100644 --- a/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm +++ b/modular_skyrat/modules/huds/code/glasses/HUD_Glasses.dm @@ -22,6 +22,23 @@ worn_icon = 'modular_skyrat/modules/huds/icons/hudeyes.dmi' vision_correction = TRUE +/obj/item/clothing/glasses/hud/science/prescription + name = "prescription science glasses" + desc = "These glasses scan the contents of containers and projects their contents to the user in an easy to read format. This one has prescription lenses." + icon = 'modular_skyrat/modules/huds/icons/huds.dmi' + icon_state = "glasses_sciencehud" + worn_icon = 'modular_skyrat/modules/huds/icons/hudeyes.dmi' + vision_correction = TRUE + flash_protect = FLASH_PROTECTION_NONE + glass_colour_type = /datum/client_colour/glass_colour/purple + resistance_flags = ACID_PROOF + armor_type = /datum/armor/prescription_science + clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_RESEARCH_SCANNER) + +/datum/armor/prescription_science + fire = 80 + acid = 100 + /obj/item/clothing/glasses/meson/prescription name = "prescription optical meson scanner" desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This one has prescription lens fitted in." diff --git a/modular_skyrat/modules/huds/icons/hudeyes.dmi b/modular_skyrat/modules/huds/icons/hudeyes.dmi index 90ff433026c..f5a2ff9ce07 100644 Binary files a/modular_skyrat/modules/huds/icons/hudeyes.dmi and b/modular_skyrat/modules/huds/icons/hudeyes.dmi differ diff --git a/modular_skyrat/modules/huds/icons/huds.dmi b/modular_skyrat/modules/huds/icons/huds.dmi index 6d7d026614b..0945b75dba7 100644 Binary files a/modular_skyrat/modules/huds/icons/huds.dmi and b/modular_skyrat/modules/huds/icons/huds.dmi differ diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm index dcb509cd77a..5d27601e630 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm @@ -150,7 +150,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/scipatch name = "Science Eyepatch" item_path = /obj/item/clothing/glasses/hud/eyepatch/sci - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) /datum/loadout_item/glasses/mesonpatch name = "Meson Eyepatch" @@ -182,6 +182,11 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla item_path = /obj/item/clothing/glasses/hud/diagnostic/prescription restricted_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST) +/datum/loadout_item/glasses/science_glasses + name = "Prescription Science glasses" + item_path = /obj/item/clothing/glasses/hud/science/prescription + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) + /datum/loadout_item/glasses/aviator_security name = "Security HUD Aviators" item_path = /obj/item/clothing/glasses/hud/ar/aviator/security @@ -205,7 +210,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/aviator_science name = "Science Aviators" item_path = /obj/item/clothing/glasses/hud/ar/aviator/science - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) /datum/loadout_item/glasses/prescription_aviator_security @@ -231,7 +236,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/prescription_aviator_science name = "Prescription Science Aviators" item_path = /obj/item/clothing/glasses/hud/ar/aviator/science/prescription - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) /datum/loadout_item/glasses/retinal_projector_security name = "Retinal Projector Security HUD" @@ -256,7 +261,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla /datum/loadout_item/glasses/retinal_projector_science name = "Science Retinal Projector" item_path = /obj/item/clothing/glasses/hud/ar/projector/science - restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD) + restricted_roles = list(JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST) /* * FAMILIES