Skip to content

Commit

Permalink
Adds Old Detective Suits to Loadouts + Fixes Generic Bowman Headset S…
Browse files Browse the repository at this point in the history
…prite (shiptest-ss13#3898)

## About The Pull Request

Adds the hardworn and noir suits and jumpskirts to loadout. They're
stripped of any negligible armour values they once held. Also fixes the
generic bowman to have a sprite.

## Why It's Good For The Game

They look better than the other suits.

## Changelog

:cl:
add: Added hardworn and noir suits and suitskirts to loadout.
del: Removed the 10 melee armour from detective suits.
fix: Generic Bowmans now have a sprite
/:cl:

---------

Co-authored-by: github-actions <[email protected]>
  • Loading branch information
generalthrax and actions-user authored Dec 12, 2024
1 parent 081e9cd commit d1eec14
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 4 deletions.
6 changes: 3 additions & 3 deletions code/game/objects/items/devices/radio/headset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
/obj/item/radio/headset/headset_com/alt
name = "command bowman headset"
desc = "An officer's headset. Protects ears from flashbangs."
icon_state = "com_headset_alt"
icon_state = "headset_alt"

/obj/item/radio/headset/headset_com/alt/ComponentInitialize()
. = ..()
Expand All @@ -333,7 +333,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
/obj/item/radio/headset/heads/captain/alt
name = "captain's bowman headset"
desc = "Dresses the ears of independent ship captains across the frontier. Protects ears from flashbangs."
icon_state = "com_headset_alt"
icon_state = "headset_alt"

/obj/item/radio/headset/heads/captain/alt/ComponentInitialize()
. = ..()
Expand Down Expand Up @@ -459,7 +459,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
/obj/item/radio/headset/heads/hos/alt
name = "\proper the head of security's bowman headset"
desc = "The headset of the man in charge of keeping order and protecting the innocent. Protects ears from flashbangs."
icon_state = "com_headset_alt"
icon_state = "headset_alt"

/obj/item/radio/headset/heads/hos/ComponentInitialize()
. = ..()
Expand Down
16 changes: 16 additions & 0 deletions code/modules/client/loadout/loadout_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,22 @@
display_name = "suit, checkered"
path = /obj/item/clothing/under/suit/checkered

/datum/gear/uniform/suit/detective
display_name = "suit, hardworn"
path = /obj/item/clothing/under/rank/security/detective

/datum/gear/uniform/suit/detective/skirt
display_name = "suitskirt, hardworn"
path = /obj/item/clothing/under/rank/security/detective/skirt

/datum/gear/uniform/suit/detective/grey
display_name = "suit, noir"
path = /obj/item/clothing/under/rank/security/detective/grey

/datum/gear/uniform/suit/detective/grey/skirt
display_name = "suitskirt, noir"
path = /obj/item/clothing/under/rank/security/detective/grey/skirt

// Dresses
/datum/gear/uniform/dress
subtype_path = /datum/gear/uniform/dress
Expand Down
1 change: 0 additions & 1 deletion code/modules/clothing/under/jobs/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
desc = "Someone who wears this means business."
icon_state = "detective"
item_state = "det"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
strip_delay = 50
alt_covers_chest = TRUE
sensor_mode = 3
Expand Down
Binary file modified icons/mob/clothing/ears.dmi
Binary file not shown.

0 comments on commit d1eec14

Please sign in to comment.