diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 9cafb97563e..7c4659ff308 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -152,6 +152,19 @@ if(slot == ITEM_SLOT_EYES) return 1 +/obj/item/clothing/glasses/science/suicide_act(mob/living/carbon/user) + user.visible_message(span_suicide("[user] is tightening \the [src]'s straps around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!")) + return OXYLOSS + +/obj/item/clothing/glasses/science/night + name = "night vision science goggles" + desc = "Lets the user see in the dark and recognize chemical compounds at a glance." + icon_state = "scihudnight" + darkness_view = 8 + flash_protect = FLASH_PROTECTION_SENSITIVE + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + glass_colour_type = /datum/client_colour/glass_colour/green + /obj/item/clothing/glasses/night name = "night vision goggles" desc = "You can totally see in the dark now!" @@ -162,10 +175,6 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE glass_colour_type = /datum/client_colour/glass_colour/green -/obj/item/clothing/glasses/science/suicide_act(mob/living/carbon/user) - user.visible_message(span_suicide("[user] is tightening \the [src]'s straps around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!")) - return OXYLOSS - /obj/item/clothing/glasses/eyepatch name = "eyepatch" desc = "Yarr." @@ -304,6 +313,7 @@ icon_state = "sunhudsci" desc = "A pair of tacky purple sunglasses that allow the wearer to recognize various chemical compounds with only a glance." clothing_traits = list(TRAIT_REAGENT_SCANNER) + actions_types = list(/datum/action/item_action/toggle_research_scanner) /obj/item/clothing/glasses/sunglasses/gar name = "black gar glasses" diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 00adcf2f3b7..89a9280a677 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -217,6 +217,16 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE +/datum/design/nv_sci_goggles + name = "Night Vision Science Goggles" + desc = "Goggles that lets the user see in the dark and recognize chemical compounds at a glance." + id = "nv_scigoggles" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium = 1000) + build_path = /obj/item/clothing/glasses/science/night + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + /datum/design/roastingstick name = "Advanced Roasting Stick" desc = "A roasting stick for cooking sausages in exotic ovens." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 0546874b7f1..87014d579f6 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1108,6 +1108,7 @@ "health_hud_night", "night_visision_goggles", "nvgmesons", + "nv_scigoggles", "security_hud_night", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi index e3f1224c717..f5390c257e0 100644 Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 70b1a43408a..7e5e8c6e560 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ