Skip to content

Commit

Permalink
New goggle sprite (#4557)
Browse files Browse the repository at this point in the history
# About the pull request

adds an alternative sprite for a pair of ballistic goggles.

# Explain why it's good for the game

I personally think that the classic goggles look like ass but it seems
some people like them, so I decided to add my resprite as a separate
item.


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/71989367/dd99b67f-b258-451b-bedd-375f86b84197)

![image](https://github.com/cmss13-devs/cmss13/assets/71989367/7ab87ae0-1a74-4ac5-86a5-e3a3fcf577d2)


</details>


# Changelog
:cl:
add: Added new "M1A1" ballistic goggle reskin
/:cl:
  • Loading branch information
irRegularGuy646 authored Oct 8, 2023
1 parent 3655599 commit f2b3774
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 0 deletions.
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,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
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
Binary file not shown.
Binary file modified icons/mob/humans/onmob/helmet_garb.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/mask.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/glasses.dmi
Binary file not shown.

0 comments on commit f2b3774

Please sign in to comment.