Skip to content

Commit

Permalink
Adds more prescription goggles to loadout point buy (#5492)
Browse files Browse the repository at this point in the history
# About the pull request
this adds prescription variants of the goggles which lacked prescription
variants, so the black, orange, and M1A1
 
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game


more customizability is always good for a game 
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: adds prescription variants of the orange, black, and M1A1 goggles
/:cl:
  • Loading branch information
Releasethesea authored Jan 20, 2024
1 parent a3037ec commit 93b857f
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 0 deletions.
12 changes: 12 additions & 0 deletions code/modules/client/preferences_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,26 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
display_name = "Ballistic goggles, black"
path = /obj/item/clothing/glasses/mgoggles/black

/datum/gear/eyewear/goggles_black/prescription
display_name = "Prescription ballistic goggles, black"
path = /obj/item/clothing/glasses/mgoggles/black/prescription

/datum/gear/eyewear/goggles_orange
display_name = "Ballistic goggles, orange"
path = /obj/item/clothing/glasses/mgoggles/orange

/datum/gear/eyewear/goggles_orange/prescription
display_name = "Prescription ballistic goggles, orange"
path = /obj/item/clothing/glasses/mgoggles/orange/prescription

/datum/gear/eyewear/goggles2
display_name = "Ballistic goggles, M1A1"
path = /obj/item/clothing/glasses/mgoggles/v2

/datum/gear/eyewear/goggles2/prescription
display_name = "Prescription ballistic goggles, M1A1"
path = /obj/item/clothing/glasses/mgoggles/v2/prescription

/datum/gear/eyewear/bimex_shades
display_name = "BiMex personal shades"
path = /obj/item/clothing/glasses/sunglasses/big
Expand Down
24 changes: 24 additions & 0 deletions code/modules/clothing/glasses/glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -434,20 +434,44 @@
active_icon_state = "mgogglesblk_down"
inactive_icon_state = "mgogglesblk"

/obj/item/clothing/glasses/mgoggles/black/prescription
name = "prescription black marine ballistic goggles"
desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has black tinted lenses. ntop of that, these ones contain prescription lenses."
icon_state = "mgogglesblk"
active_icon_state = "mgogglesblk_down"
inactive_icon_state = "mgogglesblk"
prescription = TRUE

/obj/item/clothing/glasses/mgoggles/orange
name = "orange marine ballistic goggles"
desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has amber colored day lenses."
icon_state = "mgogglesorg"
active_icon_state = "mgogglesorg_down"
inactive_icon_state = "mgogglesorg"

/obj/item/clothing/glasses/mgoggles/orange/prescription
name = "prescription orange marine ballistic goggles"
desc = "Standard issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This one has amber colored day lenses."
icon_state = "mgogglesorg"
active_icon_state = "mgogglesorg_down"
inactive_icon_state = "mgogglesorg"
prescription = TRUE

/obj/item/clothing/glasses/mgoggles/v2
name = "M1A1 marine ballistic goggles"
desc = "Newer issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This version has larger lenses."
icon_state = "mgoggles2"
active_icon_state = "mgoggles2_down"
inactive_icon_state = "mgoggles2"

/obj/item/clothing/glasses/mgoggles/v2/prescription
name = "prescription M1A1 marine ballistic goggles"
desc = "Newer issue USCM goggles. While commonly found mounted atop M10 pattern helmets, they are also capable of preventing insects, dust, and other things from getting into one's eyes. This version has larger lenses."
icon_state = "mgoggles2"
active_icon_state = "mgoggles2_down"
inactive_icon_state = "mgoggles2"
prescription = TRUE

/obj/item/clothing/glasses/mgoggles/on_enter_storage(obj/item/storage/internal/S)
..()

Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/head/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,11 @@
/obj/item/clothing/glasses/mgoggles = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/prescription = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/black = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/black/prescription = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/orange = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/orange/prescription = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/v2 = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/v2/prescription = HAT_GARB_RELAY_ICON_STATE,
/obj/item/prop/helmetgarb/helmet_nvg = HAT_GARB_RELAY_ICON_STATE,
/obj/item/prop/helmetgarb/helmet_nvg/cosmetic = HAT_GARB_RELAY_ICON_STATE,
/obj/item/prop/helmetgarb/helmet_nvg/marsoc = HAT_GARB_RELAY_ICON_STATE,
Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,12 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
// EYEWEAR
/obj/item/clothing/glasses/mgoggles = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/v2 = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/v2/prescription = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/prescription = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/black = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/black/prescription = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/orange = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/orange/prescription = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/sunglasses = "sunglasses",
/obj/item/clothing/glasses/sunglasses/prescription = "sunglasses",
/obj/item/clothing/glasses/sunglasses/aviator = "aviator",
Expand Down

0 comments on commit 93b857f

Please sign in to comment.