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

[MIRROR] Adds an Armored Jacket to Security #1643

Merged
merged 1 commit into from
Jan 24, 2024
Merged

[MIRROR] Adds an Armored Jacket to Security #1643

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_nova/master_files/icons/mob/clothing/suits/armor.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified modular_nova/master_files/icons/obj/clothing/suits/armor.dmi
View file
Open in desktop
Binary file not shown.
9 changes: 9 additions & 0 deletions modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,15 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su
item_path = /obj/item/clothing/suit/british_officer
restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER)

/datum/loadout_item/suit/peacekeeper_jacket
name = "Peacekeeper Jacket"
item_path = /obj/item/clothing/suit/armor/vest/peacekeeper/jacket
restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER)

/datum/loadout_item/suit/peacekeeper_jacket/badge
name = "Badged Peacekeeper Jacket"
item_path = /obj/item/clothing/suit/armor/vest/peacekeeper/jacket/badge

/datum/loadout_item/suit/offdep_jacket
name = "Off-Department Jacket"
item_path = /obj/item/clothing/suit/toggle/jacket/assistant
Expand Down
2 changes: 2 additions & 0 deletions modular_nova/modules/sec_haul/code/misc/vending.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
products = list(/obj/item/clothing/suit/hooded/wintercoat/security = 5,
/obj/item/clothing/suit/toggle/jacket/sec = 5,
/obj/item/clothing/suit/armor/vest/peacekeeper/brit = 5,
/obj/item/clothing/suit/armor/vest/peacekeeper/jacket = 5,
/obj/item/clothing/suit/armor/vest/peacekeeper/jacket/badge = 5,
/obj/item/clothing/neck/security_cape = 5,
/obj/item/clothing/neck/security_cape/armplate = 5,
/obj/item/storage/backpack/security = 5,
Expand Down
20 changes: 20 additions & 0 deletions modular_nova/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,26 @@
worn_icon_state = "peacekeeper_spacecoat"
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/suit/armor/vest/peacekeeper/jacket
name = "peacekeeper jacket"
desc = "A slightly vintage canvas and aramid jacket; hi-vis checkers included. Armored and stylish? Implausible."
icon = 'modular_nova/master_files/icons/obj/clothing/suits/armor.dmi'
worn_icon = 'modular_nova/master_files/icons/mob/clothing/suits/armor.dmi'
icon_state = "peacekeeper_jacket"
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
heat_protection = CHEST|GROIN|ARMS

/obj/item/clothing/suit/armor/vest/peacekeeper/jacket/Initialize(mapload)
. = ..()
AddComponent(/datum/component/toggle_icon, "zipper")

/obj/item/clothing/suit/armor/vest/peacekeeper/jacket/badge
name = "badged peacekeeper jacket"
desc = "A slightly vintage canvas and aramid jacket; hi-vis checkers and chevron badge included. Armored and stylish? Implausible."
icon_state = "peacekeeper_jacket_badge"

//PEACEKEEPER GLOVES
/obj/item/clothing/gloves/combat/peacekeeper
name = "peacekeeper gloves"
Expand Down
Loading