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

[Skyrat Mirror] Adds the Sol Patrol Cap and Sol Police Helmet to the security vendor #28

Closed
wants to merge 1 commit into from
Closed

[Skyrat Mirror] Adds the Sol Patrol Cap and Sol Police Helmet to the security vendor #28

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
Binary file modified modular_skyrat/master_files/icons/mob/clothing/head.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_skyrat/master_files/icons/mob/clothing/head/helmet.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_skyrat/master_files/icons/obj/clothing/hats.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_skyrat/master_files/icons/obj/clothing/head/helmet.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion modular_skyrat/modules/cargo/code/packs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
name = "Helmets Crate"
desc = "Contains three standard-issue brain buckets."
cost = CARGO_CRATE_VALUE * 2
contains = list(/obj/item/clothing/head/helmet/sec/redsec = 3)
contains = list(/obj/item/clothing/head/helmet/sec/sol = 3)
crate_name = "helmet crate"

/datum/supply_pack/security/deployablebarricades
Expand Down
21 changes: 20 additions & 1 deletion modular_skyrat/modules/customization/modules/clothing/head/head.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
armor_type = /datum/armor/head_helmet

/obj/item/clothing/head/hats/sec/cap/peacekeeper/sol/dark
name = "police patrol cap"
desc = "A dark colored hat with a silver badge, for the officer interested in style."
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
icon_state = "policeofficerpatrolcap"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
armor_type = /datum/armor/head_helmet

/obj/item/clothing/head/hats/hos/cap/peacekeeper/sol
name = "sol police chief cap"
desc = "A blue hat adorned with gold, rumoured to be used to distract Agents with its swag."
Expand All @@ -80,6 +89,16 @@
icon_state = "policetrafficcap"
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
armor_type = /datum/armor/head_helmet
/obj/item/clothing/head/helmet/sec/sol
name = "sol police helmet"
desc = "A helmet to protect any officer from bludgeoning attacks, or the occasional bullet."
icon = 'modular_skyrat/master_files/icons/obj/clothing/head/helmet.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head/helmet.dmi'
icon_state = "security_helmet_novisor"
base_icon_state = "security_helmet_novisor"
actions_types = NONE
supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON
armor_type = /datum/armor/head_helmet

/obj/item/clothing/head/colourable_flatcap
name = "colourable flat cap"
Expand Down Expand Up @@ -129,7 +148,7 @@
desc = "A tar black naval cap with a silver disk in the center."
icon_state = "imphos"
armor_type = /datum/armor/hats_hos

/obj/item/clothing/head/hats/imperial/cmo
name = "chief medical officer's naval cap"
desc = "A teal naval cap with a silver disk in the center."
Expand Down
2 changes: 2 additions & 0 deletions modular_skyrat/modules/sec_haul/code/misc/vending.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@
/obj/item/clothing/head/security_cap = 10,
/obj/item/clothing/head/beret/sec/peacekeeper = 5,
/obj/item/clothing/head/costume/ushanka/sec = 10,
/obj/item/clothing/head/helmet/sec/sol = 5,
/obj/item/clothing/head/hats/sec/peacekeeper/sol = 5,
/obj/item/clothing/head/hats/sec/peacekeeper/sol/traffic = 5,
/obj/item/clothing/head/hats/sec/cap/peacekeeper/sol/dark = 5,
/obj/item/clothing/gloves/color/black/security = 10,
)
premium = list( /obj/item/clothing/under/rank/security/officer/formal = 3,
Expand Down
Loading