Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Goggles Updated #507

Closed
wants to merge 9 commits into from
Closed

Goggles Updated #507

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
662df5f
goggles
AmoryBlaine Oct 2, 2024
ea96c5f
goggle updates
AmoryBlaine Oct 13, 2024
7a12745
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 int…
AmoryBlaine Oct 13, 2024
6d365e2
Update code/modules/clothing/glasses/glasses.dm
AmoryBlaine Nov 7, 2024
56d1e22
Update code/modules/clothing/glasses/glasses.dm
AmoryBlaine Nov 7, 2024
6675107
Update code/modules/clothing/glasses/glasses.dm
AmoryBlaine Nov 7, 2024
fa43492
Update code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
AmoryBlaine Nov 7, 2024
b67e472
Update code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
AmoryBlaine Nov 7, 2024
1af9f57
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 int…
AmoryBlaine Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@

list("MISCELLANEOUS", -1, null, null, null),
list("Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles, VENDOR_ITEM_REGULAR),
list("M1A1 Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/v2, VENDOR_ITEM_REGULAR),
list("Prescription ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR),
list("Marine RPG glasses", round(scale * 10), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR),
list("Ballistic goggles, sun-shaded", round(scale * 10), /obj/item/clothing/glasses/mgoggles/black, VENDOR_ITEM_REGULAR),
list("Ballistic goggles, laser-shaded", round(scale * 10), /obj/item/clothing/glasses/mgoggles/orange, VENDOR_ITEM_REGULAR),
list("prescription glasses", round(scale * 10), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR),
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved
list("M10 Helmet Camouflage Wrap", round(scale * 10), /obj/item/prop/helmetgarb/camocover, VENDOR_ITEM_REGULAR),
list("M10 Helmet Netting", round(scale * 10), /obj/item/prop/helmetgarb/netting, VENDOR_ITEM_REGULAR),
list("M10 Helmet Rain Cover", round(scale * 10), /obj/item/prop/helmetgarb/raincover, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -321,9 +321,9 @@

list("MISCELLANEOUS", -1, null, null, null),
list("Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles, VENDOR_ITEM_REGULAR),
list("M1A1 Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/v2, VENDOR_ITEM_REGULAR),
list("Prescription ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR),
list("Marine RPG glasses", round(scale * 10), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR),
list("Ballistic goggles, sun-shaded", round(scale * 10), /obj/item/clothing/glasses/mgoggles/black, VENDOR_ITEM_REGULAR),
list("Ballistic goggles, laser-shaded", round(scale * 10), /obj/item/clothing/glasses/mgoggles/orange, VENDOR_ITEM_REGULAR),
list("prescription glasses", round(scale * 10), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR),
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved
list("Firearm Lubricant", round(scale * 15), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR),
list("USCM Flair", round(scale * 15), /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR),
list("FORECON Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/forecon, VENDOR_ITEM_REGULAR),
Expand Down
1 change: 0 additions & 1 deletion code/game/machinery/vending/vendor_types/wo_vendors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@

list("MISCELLANEOUS", -1, null, null, null),
list("Ballistic goggles", floor(scale * 5), /obj/item/clothing/glasses/mgoggles, VENDOR_ITEM_REGULAR),
list("M1A1 Ballistic goggles", floor(scale * 5), /obj/item/clothing/glasses/mgoggles/v2, VENDOR_ITEM_REGULAR),
list("Prescription ballistic goggles", floor(scale * 5), /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR),
list("Marine RPG glasses", floor(scale * 5), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR),
list("M10 Helmet Netting", floor(scale * 5), /obj/item/prop/helmetgarb/netting, VENDOR_ITEM_REGULAR),
Expand Down
24 changes: 2 additions & 22 deletions code/modules/client/preferences_gear.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,38 +46,18 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
display_name = "Prescription Glasses"
path = /obj/item/clothing/glasses/regular/hipster

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

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

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

/datum/gear/eyewear/goggles_black/prescription
display_name = "Prescription ballistic goggles, black"
display_name = "Prescription ballistic goggles, sun-shaded"
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"
display_name = "Prescription ballistic goggles, laser-shaded"
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
42 changes: 14 additions & 28 deletions code/modules/clothing/glasses/glasses.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,8 @@
user_head?.vis_contents -= mob_glass_overlay

/obj/item/clothing/glasses/mgoggles
name = "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."
name = "ballistic goggles"
desc = "A pair of Sun, Wind, and Dust Goggles featuring standard clear lenses rated for ballistic protection."
icon_state = "mgoggles"
flags_equip_slot = SLOT_EYES|SLOT_FACE
flags_obj = OBJ_NO_HELMET_BAND|OBJ_IS_HELMET_GARB
Expand All @@ -422,56 +422,43 @@
garbage = FALSE

/obj/item/clothing/glasses/mgoggles/prescription
name = "prescription marine ballistic goggles"
desc = "Standard issue USCM goggles. Mostly used to decorate one's helmet. Contains prescription lenses in case you weren't sure if they were lame or not."
name = "custom ballistic goggles"
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved
desc = "A pair of Sun, Wind, and Dust Goggles featuring specially ordered custom clear prescription lenses rated for ballistic protection."
icon_state = "mgoggles"
prescription = TRUE

/obj/item/clothing/glasses/mgoggles/black
name = "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."
name = "sun-shaded ballistic goggles"
desc = "A pair of Sun, Wind, and Dust Goggles featuring dark sunshade lenses rated for ballistic protection."
icon_state = "mgogglesblk"
active_icon_state = "mgogglesblk_down"
inactive_icon_state = "mgogglesblk"
eye_protection = EYE_PROTECTION_FLASH

/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."
name = "custom sun-shaded ballistic goggles"
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved
desc = "A pair of Sun, Wind, and Dust Goggles featuring specially ordered custom dark sunshade prescription lenses rated for ballistic protection."
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."
name = "laser-shaded ballistic goggles"
desc = "A pair of Sun, Wind, and Dust Goggles featuring brown lenses rated for ballistic and laser protection."
icon_state = "mgogglesorg"
active_icon_state = "mgogglesorg_down"
inactive_icon_state = "mgogglesorg"
eye_protection = EYE_PROTECTION_FLASH

/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."
name = "custom laser-shaded ballistic goggles"
AmoryBlaine marked this conversation as resolved.
Show resolved Hide resolved
desc = "A pair of Sun, Wind, and Dust Goggles featuring specially ordered custom brown prescription lenses rated for ballistic and laser protection."
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 Expand Up @@ -673,7 +660,6 @@
item_state = "securityhud"
eye_protection = EYE_PROTECTION_FLASH


/obj/item/clothing/glasses/sunglasses/sechud/tactical
name = "tactical SWAT HUD"
gender = NEUTER
Expand Down
2 changes: 0 additions & 2 deletions code/modules/clothing/head/head.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,6 @@
/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
2 changes: 0 additions & 2 deletions code/modules/clothing/head/helmet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,6 @@ 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,
Expand Down
Binary file modified icons/mob/humans/onmob/eyes.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/humans/onmob/helmet_garb.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/humans/onmob/mask.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/glasses.dmi
View file
Open in desktop
Binary file not shown.
Loading