diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index ead527d4b68..9974e5653bc 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -436,6 +436,7 @@ /obj/item/clothing/mask/bandana/black = 2, /obj/item/clothing/glasses/regular = 2, /obj/item/clothing/glasses/sunglasses_fake = 2, + /obj/item/clothing/glasses/goggles = 2, /obj/item/clothing/gloves/fingerless = 2, /obj/item/storage/belt/fannypack = 1, /obj/item/storage/belt/fannypack/blue = 1, @@ -519,6 +520,7 @@ /obj/item/clothing/suit/browntrenchcoat = 75, /obj/item/clothing/glasses/regular = 20, /obj/item/clothing/glasses/sunglasses_fake = 20, + /obj/item/clothing/glasses/goggles = 40, /obj/item/clothing/suit/ianshirt = 75, /obj/item/clothing/mask/bandana = 30, /obj/item/clothing/mask/bandana/black = 30, diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm index 16f1ed8eef0..3b7d5a1fedc 100644 --- a/code/modules/client/preference/loadout/loadout_general.dm +++ b/code/modules/client/preference/loadout/loadout_general.dm @@ -93,11 +93,40 @@ display_name = "Shark plushie" path = /obj/item/toy/plushie/shark +/datum/gear/goggles + display_name = "Goggles" + path = /obj/item/clothing/glasses/goggles + /datum/gear/sechud display_name = "Classic security HUD" path = /obj/item/clothing/glasses/hud/security allowed_roles = list("Head of Security", "Warden", "Security Officer", "Internal Affairs Agent","Magistrate") +/datum/gear/sechudgoggles + display_name = "Security HUD goggles" + path = /obj/item/clothing/glasses/hud/security/goggles + allowed_roles = list("Head of Security", "Warden", "Security Officer", "Internal Affairs Agent", "Magistrate") + +/datum/gear/medhudgoggles + display_name = "Health HUD goggles" + path = /obj/item/clothing/glasses/hud/health/goggles + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Chemist", "Geneticist", "Virologist", "Psychiatrist", "Paramedic") + +/datum/gear/diaghudgoggles + display_name = "Diagnostic HUD goggles" + path = /obj/item/clothing/glasses/hud/diagnostic/goggles + allowed_roles = list("Research Director", "Scientist", "Roboticist") + +/datum/gear/hydrohudgoggles + display_name = "Hydroponic HUD goggles" + path = /obj/item/clothing/glasses/hud/hydroponic/goggles + allowed_roles = list("Botanist") + +/datum/gear/skillhudgoggles + display_name = "Skill HUD goggles" + path = /obj/item/clothing/glasses/hud/skills/goggles + allowed_roles = list("Psychiatrist", "Nanotrasen Representative", "Head of Personnel", "Captain") + /datum/gear/cryaonbox display_name = "Box of crayons" path = /obj/item/storage/fancy/crayons diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 8304741ceee..11b892986aa 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -280,6 +280,19 @@ icon_state = "hipster_glasses" item_state = "hipster_glasses" +/obj/item/clothing/glasses/goggles + name = "goggles" + desc = "Just some basic goggles, rather fashionable." + icon_state = "goggles" + item_state = "goggles" + + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/eyes.dmi', + "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi', + "Drask" = 'icons/mob/clothing/species/drask/eyes.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/eyes.dmi' + ) + /obj/item/clothing/glasses/threedglasses name = "\improper 3D glasses" desc = "A long time ago, people used these glasses to makes images from screens threedimensional." diff --git a/code/modules/clothing/glasses/hudgoggles.dm b/code/modules/clothing/glasses/hudgoggles.dm new file mode 100644 index 00000000000..a0569502881 --- /dev/null +++ b/code/modules/clothing/glasses/hudgoggles.dm @@ -0,0 +1,24 @@ +/obj/item/clothing/glasses/hud/security/goggles + name = "security HUD goggles" + desc = "Fashionable security goggles." + icon_state = "sechudgoggles" + +/obj/item/clothing/glasses/hud/health/goggles + name = "health HUD goggles" + desc = "Fashionable medical goggles." + icon_state = "medhudgoggles" + +/obj/item/clothing/glasses/hud/diagnostic/goggles + name = "diagnostic HUD goggles" + desc = "Fashionable diagnostic goggles." + icon_state = "diaghudgoggles" + +/obj/item/clothing/glasses/hud/hydroponic/goggles + name = "hydroponic HUD goggles" + desc = "Fashionable hydroponic goggles." + icon_state = "hydrohudgoggles" + +/obj/item/clothing/glasses/hud/skills/goggles + name = "skills HUD goggles" + desc = "Fashionable skills goggles." + icon_state = "skillhudgoggles" diff --git a/code/modules/crafting/tailoring.dm b/code/modules/crafting/tailoring.dm index babb9a2740a..5415b415c22 100644 --- a/code/modules/crafting/tailoring.dm +++ b/code/modules/crafting/tailoring.dm @@ -50,6 +50,96 @@ time = 20 category = CAT_CLOTHING +/datum/crafting_recipe/hudgogsec + name = "Security HUD goggles" + result = list(/obj/item/clothing/glasses/hud/security/goggles) + time = 2 SECONDS + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/security = 1, + /obj/item/clothing/glasses/goggles = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudgogsecremoval + name = "Security HUD removal (goggles)" + result = list(/obj/item/clothing/glasses/goggles, /obj/item/clothing/glasses/hud/security) + time = 2 SECONDS + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/security/goggles = 1) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudgoghealth + name = "Health HUD goggles" + result = list(/obj/item/clothing/glasses/hud/health/goggles) + time = 2 SECONDS + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/health = 1, + /obj/item/clothing/glasses/goggles = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudgoghealthremoval + name = "Health HUD removal (goggles)" + result = list(/obj/item/clothing/glasses/goggles, /obj/item/clothing/glasses/hud/health) + time = 2 SECONDS + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/health/goggles = 1) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudgogdiagnostic + name = "Diagnostic HUD goggles" + result = list(/obj/item/clothing/glasses/hud/diagnostic/goggles) + time = 2 SECONDS + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/diagnostic = 1, + /obj/item/clothing/glasses/goggles = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudgogdiagnosticremoval + name = "Diagnostic HUD removal (goggles)" + result = list(/obj/item/clothing/glasses/goggles, /obj/item/clothing/glasses/hud/diagnostic) + time = 2 SECONDS + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/diagnostic/goggles = 1) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudgoghydroponic + name = "Hydroponic HUD goggles" + result = list(/obj/item/clothing/glasses/hud/hydroponic/goggles) + time = 2 SECONDS + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/hydroponic = 1, + /obj/item/clothing/glasses/goggles = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudgoghydroponicremoval + name = "Hydroponic HUD removal (goggles)" + result = list(/obj/item/clothing/glasses/goggles, /obj/item/clothing/glasses/hud/hydroponic) + time = 2 SECONDS + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/hydroponic/goggles = 1) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudgogskills + name = "Skills HUD goggles" + result = list(/obj/item/clothing/glasses/hud/skills/goggles) + time = 2 SECONDS + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/skills = 1, + /obj/item/clothing/glasses/goggles = 1, + /obj/item/stack/cable_coil = 5) + category = CAT_CLOTHING + +/datum/crafting_recipe/hudgogskillsremoval + name = "Skills HUD removal (goggles)" + result = list(/obj/item/clothing/glasses/goggles, /obj/item/clothing/glasses/hud/skills) + time = 2 SECONDS + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + reqs = list(/obj/item/clothing/glasses/hud/skills/goggles = 1) + category = CAT_CLOTHING + /datum/crafting_recipe/hudsunsec name = "Security HUDsunglasses" result = list(/obj/item/clothing/glasses/hud/security/sunglasses) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index eedcc0c05cd..10c43eaf23d 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -559,6 +559,14 @@ build_path = /obj/item/assembly/voice/noise category = list("initial", "Miscellaneous") +/datum/design/goggles + name = "Goggles" + id = "goggles" + build_type = AUTOLATHE + materials = list(MAT_METAL = 100, MAT_GLASS = 100) + build_path = /obj/item/clothing/glasses/goggles + category = list("initial", "Miscellaneous") + /datum/design/light_tube name = "Light Tube" id = "light_tube" diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi index 1d77b73a2d8..585217a02ce 100644 Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ diff --git a/icons/mob/clothing/species/drask/eyes.dmi b/icons/mob/clothing/species/drask/eyes.dmi index dead8cdcba4..bbe5ca72ad9 100644 Binary files a/icons/mob/clothing/species/drask/eyes.dmi and b/icons/mob/clothing/species/drask/eyes.dmi differ diff --git a/icons/mob/clothing/species/grey/eyes.dmi b/icons/mob/clothing/species/grey/eyes.dmi index 4dcb18ba8be..a17e4e2242f 100644 Binary files a/icons/mob/clothing/species/grey/eyes.dmi and b/icons/mob/clothing/species/grey/eyes.dmi differ diff --git a/icons/mob/clothing/species/kidan/eyes.dmi b/icons/mob/clothing/species/kidan/eyes.dmi index 56d074e5500..67901173d8d 100644 Binary files a/icons/mob/clothing/species/kidan/eyes.dmi and b/icons/mob/clothing/species/kidan/eyes.dmi differ diff --git a/icons/mob/clothing/species/vox/eyes.dmi b/icons/mob/clothing/species/vox/eyes.dmi index cfec6d30846..103dca449d1 100644 Binary files a/icons/mob/clothing/species/vox/eyes.dmi and b/icons/mob/clothing/species/vox/eyes.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 967fe749cb8..04310be5f5c 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/paradise.dme b/paradise.dme index a2ec506c197..39fb689b5df 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1565,6 +1565,7 @@ #include "code\modules\clothing\glasses\engine_goggles.dm" #include "code\modules\clothing\glasses\glasses.dm" #include "code\modules\clothing\glasses\hudglasses.dm" +#include "code\modules\clothing\glasses\hudgoggles.dm" #include "code\modules\clothing\gloves\boxing_gloves.dm" #include "code\modules\clothing\gloves\colored_gloves.dm" #include "code\modules\clothing\gloves\misc_gloves.dm"