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

Jump to bottom

New goggle sprite #4557

Merged
merged 14 commits into from
Oct 8, 2023
Merged

New goggle sprite #4557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
26649ef
Adds new goggle sprite
irRegularGuy646 Sep 30, 2023
cd25d75
Adds new goggle sprite
irRegularGuy646 Sep 30, 2023
ca13c75
Adds new goggle sprite
irRegularGuy646 Sep 30, 2023
f4a6bbd
Adds "up" sprite to new goggles
irRegularGuy646 Sep 30, 2023
bdb710e
Adds "up" state to new goggle sprite
irRegularGuy646 Sep 30, 2023
47af4d8
Adds a new goggle variant
irRegularGuy646 Sep 30, 2023
e358f7e
Adds new goggles to squad prep
irRegularGuy646 Sep 30, 2023
e431c67
Update helmet.dm
irRegularGuy646 Sep 30, 2023
dad8a16
Update head.dm
irRegularGuy646 Sep 30, 2023
ca51718
Update preferences_gear.dm
irRegularGuy646 Sep 30, 2023
f259fd7
Adds new goggle sprite
irRegularGuy646 Sep 30, 2023
69de800
Revert "Adds new goggle sprite"
irRegularGuy646 Oct 5, 2023
8e6dbfe
Merge branch 'cmss13-devs:master' into not-ugly-goggles
irRegularGuy646 Oct 5, 2023
9f548f7
resolve merge conflict
irRegularGuy646 Oct 5, 2023
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
1 change: 1 addition & 0 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 @@ -148,6 +148,7 @@

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("M5 Integrated Gas Mask", round(scale * 10), /obj/item/prop/helmetgarb/helmet_gasmask, VENDOR_ITEM_REGULAR),
Expand Down
4 changes: 4 additions & 0 deletions code/modules/client/preferences_gear.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ var/global/list/gear_datums_by_name = list()
display_name = "Ballistic goggles, orange"
path = /obj/item/clothing/glasses/mgoggles/orange

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

/datum/gear/eyewear/bimex_shades
display_name = "BiMex personal shades"
path = /obj/item/clothing/glasses/sunglasses/big
Expand Down
7 changes: 7 additions & 0 deletions code/modules/clothing/glasses/glasses.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,13 @@
active_icon_state = "mgogglesorg_down"
inactive_icon_state = "mgogglesorg"

/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_down"
active_icon_state = "mgoggles2_down"
inactive_icon_state = "mgoggles2"

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

Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/head/head.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@
/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/orange = HAT_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/v2 = 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
1 change: 1 addition & 0 deletions code/modules/clothing/head/helmet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ 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/prescription = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/black = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/clothing/glasses/mgoggles/orange = 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.