cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds HUD goggles and basic goggles (#22864)

Browse Source 
* Added HUD goggles

* Added HUD goggles and species variants

* Adds HUD goggles with species variants (fixed)

* Update code/modules/client/preference/loadout/loadout_general.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* makes hud goggles craftable and adds to vendor

* changed dmi name to goggles

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
Pineapple Salad
2023-11-03 20:27:29 +00:00
committed by GitHub
co-authored by Henri215 Contrabang
parent abe4110704
commit 8e6defe682
13 changed files with 167 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vendors/generic_vendors.dm
Vendored
+2
View File
@@ -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,
code/modules/client/preference/loadout/loadout_general.dm
+29
View File
@@ -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
code/modules/clothing/glasses/glasses.dm
+13
View File
@@ -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."
code/modules/clothing/glasses/hudgoggles.dm
+24
View File
@@ -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"
code/modules/crafting/tailoring.dm
+90
View File
@@ -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)
code/modules/research/designs/autolathe_designs.dm
+8
View File
@@ -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"
icons/mob/clothing/eyes.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

icons/mob/clothing/species/drask/eyes.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 11 KiB

icons/mob/clothing/species/grey/eyes.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

icons/mob/clothing/species/kidan/eyes.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

icons/mob/clothing/species/vox/eyes.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB

icons/obj/clothing/glasses.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 14 KiB

paradise.dme
+1
View File
@@ -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"