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

Goggs #2

Closed
wants to merge 1 commit into from
Closed

Goggs #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 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 @@ -251,8 +251,8 @@
list("ShMB/4 Gas Mask", round(scale * 15), /obj/item/clothing/mask/gas/upp, VENDOR_ITEM_REGULAR),

list("MISCELLANEOUS", -1, null, null, null),
list("Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles, VENDOR_ITEM_REGULAR),
list("Prescription ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR),
list("Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/black/upp, VENDOR_ITEM_REGULAR),
list("Prescription ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/black/upp/prescription, VENDOR_ITEM_REGULAR),
list("Firearm Lubricant", round(scale * 15), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR),
list("UPP Airborne Reconnaissance Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/upp/naval, VENDOR_ITEM_REGULAR),
list("UPPA Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/upp, VENDOR_ITEM_REGULAR),
Expand Down
11 changes: 11 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 @@ -535,6 +535,17 @@

attached_item.update_icon()

/obj/item/clothing/glasses/mgoggles/black/upp
name = "upp ballistic goggles"
desc = "The Union's solution to preventing dust and debris from irritating the eyes of its soldiers. Features built in sun tinting lenses to help preserve the eyesight of soldiers, on top of the one way polarization."
icon_state = "uppgoggles"
active_icon_state = "uppgoggles_down"
inactive_icon_state = "uppgoggles"


/obj/item/clothing/glasses/mgoggles/black/upp/prescription
prescription = TRUE

//welding goggles

/obj/item/clothing/glasses/welding
Expand Down
Binary file modified icons/mob/humans/onmob/helmet_garb.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.