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.

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

Seperates goggles from the base ballistic helmet. #3389

Merged
merged 2 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/datums/components/storage/concrete/pockets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
/obj/item/clothing/glasses/hud/health/night,
/obj/item/clothing/glasses/hud/security/night,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/clothing/glasses/sunglasses/ballistic,
/obj/item/ammo_casing,
/obj/item/ammo_box/magazine/illestren_a850r,
))
Expand Down
3 changes: 2 additions & 1 deletion code/modules/cargo/packs/spacesuit_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@
desc = "Contains one full set of bulletproof armor, guaranteed to reduce a bullet's stopping power by half but with limited protection against melee weaponry."
cost = 1750
contains = list(/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/head/helmet/bulletproof)
/obj/item/clothing/head/helmet/bulletproof,
/obj/item/clothing/glasses/sunglasses/ballistic)
crate_name = "bulletproof armor crate"
crate_type = /obj/structure/closet/crate/secure/plasma

Expand Down
8 changes: 8 additions & 0 deletions code/modules/clothing/glasses/_glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,14 @@
throwforce = 12
glass_colour_type = /datum/client_colour/glass_colour/red

/obj/item/clothing/glasses/sunglasses/ballistic
name = "ballistic goggles"
desc = "A pair of flash-proof ballistic goggles."
icon_state = "ballistic_goggles"
item_state = "ballistic_goggles"
supports_variations = KEPORI_VARIATION | VOX_VARIATION
glass_colour_type = /datum/client_colour/glass_colour/lightblue

/obj/item/clothing/glasses/welding
name = "welding goggles"
desc = "Protects the eyes from bright flashes; approved by the mad scientist association."
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 @@ -219,6 +219,7 @@
can_flashlight = TRUE
dog_fashion = null
allow_post_reskins = TRUE
supports_variations = KEPORI_VARIATION
unique_reskin = list(
"None" = "helmetalt",
"Desert" = "helmetalt_desert",
Expand Down Expand Up @@ -567,6 +568,7 @@
icon_state = "m10helm"
can_flashlight = TRUE
dog_fashion = null
supports_variations = null
unique_reskin = list(
"None" = "m10helm",
"Desert" = "m10helm_desert",
Expand All @@ -582,6 +584,7 @@
can_flashlight = TRUE
dog_fashion = null
allow_post_reskins = TRUE
supports_variations = null
unique_reskin = list(
"None" = "x11helm",
"Desert" = "x11helm_desert",
Expand Down
Binary file modified icons/mob/clothing/eyes.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/head/armor.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/helmet_overlays.dmi
Binary file not shown.
Binary file modified icons/mob/species/kepori/onmob_eyes_kepori.dmi
Binary file not shown.
Binary file modified icons/mob/species/kepori/onmob_head_kepori.dmi
Binary file not shown.
Binary file modified icons/mob/species/vox/onmob_eyes_vox.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/glasses.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/head/armor.dmi
Binary file not shown.
Loading