Skip to content

Commit

Permalink
Seperates goggles from the base ballistic helmet. (shiptest-ss13#3389)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

![obraz](https://github.com/user-attachments/assets/b7840360-db17-42e5-8c23-d161e59acf8f)
Woah! Best sprite showcase of 2024!


Note: Those goggles, unlike the ones that factions have, do NOT have a
sechud. They are just fancy sunglasses.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
- Probably good to have them seperated, just like how inteq did it.
- Indie sec drip.
- I REALLY want this for the shiptest-ss13#3380.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Added "ballistic goggles" - new indie security clothing item.
imageadd: Added Kepori bulletproof helmet sprites.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Sadhorizon authored and MysticalFaceLesS committed Sep 22, 2024
1 parent b915fd0 commit 2a55090
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 1 deletion.
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.

0 comments on commit 2a55090

Please sign in to comment.