diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 35fa13a5451d..4e04aa1c855f 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -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, diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index a6559ca8c673..ec7773a18b4d 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -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" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index ed23d34b7149..8919fc88f18c 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -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 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 28f8ca0989fa..8b3bed2740c7 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -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 diff --git a/code/modules/holidays/halloween_loadout.dm b/code/modules/holidays/halloween_loadout.dm index ac08942a4c2c..9447b646b597 100644 --- a/code/modules/holidays/halloween_loadout.dm +++ b/code/modules/holidays/halloween_loadout.dm @@ -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" @@ -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 diff --git a/code/modules/loadout/loadout_shoes.dm b/code/modules/loadout/loadout_shoes.dm index 134e1708e66f..a6225d362cfe 100644 --- a/code/modules/loadout/loadout_shoes.dm +++ b/code/modules/loadout/loadout_shoes.dm @@ -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 diff --git a/code/modules/loadout/loadout_uniform.dm b/code/modules/loadout/loadout_uniform.dm index 790528e3528b..d10f97fa2cb2 100644 --- a/code/modules/loadout/loadout_uniform.dm +++ b/code/modules/loadout/loadout_uniform.dm @@ -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 diff --git a/icons/clothing/uniform/costume/aquiline.dmi b/icons/clothing/uniform/costume/aquiline.dmi index 0872977608cf..49fdfbbc34a7 100644 Binary files a/icons/clothing/uniform/costume/aquiline.dmi and b/icons/clothing/uniform/costume/aquiline.dmi differ diff --git a/icons/clothing/uniform/misc/tourist.dmi b/icons/clothing/uniform/misc/tourist.dmi new file mode 100644 index 000000000000..7ea32ba43832 Binary files /dev/null and b/icons/clothing/uniform/misc/tourist.dmi differ