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

Adds Aquiline Enforcer Helmet and Tourist Costume (October 2023 General Costume Addition PR) #6042

Merged
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/game/machinery/vending.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2479,6 +2479,7 @@
/obj/item/clothing/suit/banana = 3,
/obj/item/clothing/suit/assassin = 3,
/obj/item/clothing/head/bard = 3,
/obj/item/clothing/head/helmet/aquiline = 3,
/obj/item/clothing/under/aquiline_enforcer = 3,
/obj/item/clothing/under/yoko = 3,
/obj/item/clothing/under/kamina = 3,
Expand Down
8 changes: 8 additions & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,14 @@
/obj/item/clothing/head/helmet/kettle/eyes
icon_state = "kettle_eyes"

//Dredd
/obj/item/clothing/head/helmet/aquiline
name = "aquiline enforcer helmet"
desc = "Prior to the Final War, issues with law enforcement on Old Earth became so bad that in many countries the police became little more than roving executioners. This striking helmet was designed to help law enforcement officers easily identify themselves in crowds."
icon = 'icons/clothing/uniform/costume/aquiline.dmi'
icon_state = "dreddhelm"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL

//More Warhammer Fun
/obj/item/clothing/head/helmet/utilitarian
name = "utilitarian military helmet"
Expand Down
7 changes: 7 additions & 0 deletions code/modules/clothing/shoes/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -286,3 +286,10 @@
icon = 'icons/clothing/shoes/ballet.dmi'
icon_state = "ballet"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL

/obj/item/clothing/shoes/socksandals
name = "socks and sandals"
desc = "These broken in leather sandals go great with a brand new pair of white socks. The ultimate in comfort for a wandering sightseer."
icon = 'icons/clothing/uniform/misc/tourist.dmi'
icon_state = "touristsandal"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
7 changes: 7 additions & 0 deletions code/modules/clothing/under/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2356,3 +2356,10 @@
icon = 'icons/clothing/uniform/costume/darkcleric.dmi'
icon_state = "darkcleric"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL

/obj/item/clothing/under/tourist
name = "tourist liesurewear"
desc = "This loud shirt is made of mid-grade cashmere. This premier liesurewear pairs well with a nice pair of khaki shorts that stop uncomfortably above the knee."
icon = 'icons/clothing/uniform/misc/tourist.dmi'
icon_state = "tourist"
worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
12 changes: 10 additions & 2 deletions code/modules/holidays/halloween_loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,13 @@
path = /obj/item/clothing/head/medievalfake/crusader/winged

/datum/loadout_entry/seasonal/halloween/costumes/head/darkcleric
display_name = "Costume Head - Dark Cleric Circlet"
name = "Costume Head - Dark Cleric Circlet"
path = /obj/item/clothing/head/darkcleric

/datum/loadout_entry/seasonal/halloween/costumes/head/aquiline
name = "Costume Head - Aquiline Enforcer"
path = /obj/item/clothing/head/helmet/aquiline

// Mask
/datum/loadout_entry/seasonal/halloween/costumes/mask
name = "Costume Mask - Fake Moustache"
Expand Down Expand Up @@ -429,9 +433,13 @@
path = /obj/item/clothing/under/imperial

/datum/loadout_entry/seasonal/halloween/costumes/under/dark_cleric
display_name = "Costume Uniform - Dark Cleric Armor"
name = "Costume Uniform - Dark Cleric Armor"
path = /obj/item/clothing/under/darkcleric

/datum/loadout_entry/seasonal/halloween/costumes/under/aquiline
name = "Costume Uniform - Aquiline Enforcer"
path = /obj/item/clothing/under/aquiline_enforcer

// Gloves

/datum/loadout_entry/seasonal/halloween/costumes/gloves
Expand Down
4 changes: 4 additions & 0 deletions code/modules/loadout/loadout_shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -227,3 +227,7 @@
/datum/loadout_entry/shoes/ballet
name = "Antheia Pointe Shoes"
path = /obj/item/clothing/shoes/ballet

/datum/loadout_entry/shoes/socksandals
name = "Sandals With Socks"
path = /obj/item/clothing/shoes/socksandals
4 changes: 4 additions & 0 deletions code/modules/loadout/loadout_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,10 @@ Swimsuits
name = "Antheia Tutu"
path = /obj/item/clothing/under/ballet

/datum/loadout_entry/uniform/tourist
name = "Tourist Liesurewear"
path = /obj/item/clothing/under/tourist

//Tajaran wears

/datum/loadout_entry/uniform/tajaran/summercloths_selection
Expand Down
Binary file modified icons/clothing/uniform/costume/aquiline.dmi
Binary file not shown.
Binary file added icons/clothing/uniform/misc/tourist.dmi
Binary file not shown.
Loading