diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 817fcdce..29e1a000 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -337,6 +337,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("black gloves", /obj/item/clothing/gloves/color/black, 3), \ null, \ new/datum/stack_recipe("blindfold", /obj/item/clothing/glasses/sunglasses/blindfold, 2), \ + new/datum/stack_recipe("eyepatch", /obj/item/clothing/glasses/eyepatch, 2), \ )) /obj/item/stack/sheet/cloth diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 5c2bdab3..7625f229 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -72,6 +72,12 @@ 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." vision_correction = 1 +/obj/item/clothing/glasses/meson/eyepatch + name = "meson scanner eyepatch" + desc = "An eyepatch with a built-in meson scanner." + icon_state = "mesonpatch" + item_state = "mesonpatch" + /obj/item/clothing/glasses/meson/night name = "night vision meson scanner" desc = "An optical meson scanner fitted with an amplified visible light spectrum overlay, providing greater visual clarity in darkness." @@ -108,6 +114,12 @@ if(slot == SLOT_GLASSES) return 1 +/obj/item/clothing/glasses/science/eyepatch + name = "science eyepatch" + desc = "An eyepatch with an analyser for scanning items and reagents." + icon_state = "scipatch" + item_state = "scipatch" + /obj/item/clothing/glasses/night name = "night vision goggles" desc = "You can totally see in the dark now!" @@ -122,6 +134,12 @@ desc = "NVGs but for those with nearsightedness." vision_correction = 1 +/obj/item/clothing/glasses/night/eyepatch + name = "night vision eyepatch" + desc = "An eyepatch with night vision technology!" + icon_state = "nightpatch" + item_state = "nightpatch" + /obj/item/clothing/glasses/science/suicide_act(mob/living/carbon/user) user.visible_message("[user] is tightening \the [src]'s straps around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") return OXYLOSS diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 2bba49e4..120e690c 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -37,6 +37,12 @@ hud_type = DATA_HUD_MEDICAL_ADVANCED glass_colour_type = /datum/client_colour/glass_colour/lightblue +/obj/item/clothing/glasses/hud/health/eyepatch + name = "health scanner HUD eyepatch" + desc = "A heads-up display, in an eyepatch, that scans the humans in view and provides accurate data about their health status." + icon_state = "medpatch" + item_state = "medpatch" + /obj/item/clothing/glasses/hud/health/prescription name = "prescription health scanner HUD" desc = "A heads-up display, made with a prescription lens, that scans the humans in view and provides accurate data about their health status." @@ -84,6 +90,12 @@ hud_type = DATA_HUD_DIAGNOSTIC_BASIC glass_colour_type = /datum/client_colour/glass_colour/lightorange +/obj/item/clothing/glasses/hud/diagnostic/eyepatch + name = "diagnostic HUD eyepatch" + desc = "A heads-up display, in an eyepatch, capable of analyzing the integrity and status of robotics and exosuits." + icon_state = "diapatch" + item_state = "diapatch" + /obj/item/clothing/glasses/hud/diagnostic/prescription name = "prescription diagnostic HUD" desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits. This one has a prescription lens." @@ -141,7 +153,7 @@ /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch - name = "eyepatch HUD" + name = "Security eyepatch HUD" desc = "A heads-up display that connects directly to the optical nerve of the user, replacing the need for that useless eyeball." icon_state = "hudpatch" diff --git a/code/modules/crafting/recipes/recipes_clothing.dm b/code/modules/crafting/recipes/recipes_clothing.dm index 32de354b..7b1d9944 100644 --- a/code/modules/crafting/recipes/recipes_clothing.dm +++ b/code/modules/crafting/recipes/recipes_clothing.dm @@ -43,6 +43,24 @@ /obj/item/stack/cable_coil = 5) category = CAT_CLOTHING +/datum/crafting_recipe/hudeyesec + name = "Security HUD eyepatch" + result = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/security/sunglasses = 1, + /obj/item/clothing/glasses/eyepatch = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudeyesecremoval + name = "Security HUD removal (Eyepatch)" + result = /obj/item/clothing/glasses/hud/security/sunglasses + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch = 1) + category = CAT_CLOTHING + /datum/crafting_recipe/hudsunsecremoval name = "Security HUD removal" result = /obj/item/clothing/glasses/sunglasses @@ -61,6 +79,16 @@ /obj/item/stack/cable_coil = 5) category = CAT_CLOTHING +/datum/crafting_recipe/hudeyemed + name = "Medical HUD eyepatch" + result = /obj/item/clothing/glasses/hud/health/eyepatch + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/health = 1, + /obj/item/clothing/glasses/eyepatch = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + /datum/crafting_recipe/hudsunmedremoval name = "Medical HUD removal" result = /obj/item/clothing/glasses/sunglasses @@ -69,6 +97,86 @@ reqs = list(/obj/item/clothing/glasses/hud/health/sunglasses = 1) category = CAT_CLOTHING +/datum/crafting_recipe/hudeyemedremoval + name = "Medical HUD removal (Eyepatch)" + result = /obj/item/clothing/glasses/eyepatch + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/health/eyepatch = 1) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudeyedia + name = "Diagnostic HUD eyepatch" + result = /obj/item/clothing/glasses/hud/diagnostic/eyepatch + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/diagnostic = 1, + /obj/item/clothing/glasses/eyepatch = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudeyediaremoval + name = "Diagnostic HUD removal" + result = /obj/item/clothing/glasses/eyepatch + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/diagnostic/eyepatch = 1) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudeyesci + name = "Science eyepatch" + result = /obj/item/clothing/glasses/science/eyepatch + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/science = 1, + /obj/item/clothing/glasses/eyepatch = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudeyesciremoval + name = "Science eyepatch removal" + result = /obj/item/clothing/glasses/eyepatch + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/science/eyepatch = 1) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudeyemeson + name = "Meson eyepatch" + result = /obj/item/clothing/glasses/meson/eyepatch + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/meson = 1, + /obj/item/clothing/glasses/eyepatch = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudeyemesonremoval + name = "Meson eyepatch removal" + result = /obj/item/clothing/glasses/eyepatch + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/meson/eyepatch = 1) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudeyenv + name = "Night Vision eyepatch" + result = /obj/item/clothing/glasses/night/eyepatch + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/night = 1, + /obj/item/clothing/glasses/eyepatch = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudeyenvremoval + name = "Night Vision eyepatch removal" + result = /obj/item/clothing/glasses/eyepatch + time = 20 + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/night/eyepatch = 1) + category = CAT_CLOTHING + /datum/crafting_recipe/beergoggles name = "Beer Goggles" result = /obj/item/clothing/glasses/sunglasses/reagent diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 7dff564d..6c86002d 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 2b803c77..f2146e22 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ