diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 9f008afe08..01787a5931 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -279,3 +279,7 @@ /datum/gear/accessory/cowledvest display_name = "cowled vest" path = /obj/item/clothing/accessory/cowledvest + +/datum/gear/accessory/asymovercoat + display_name = "orange asymmetrical overcoat" + path = /obj/item/clothing/accessory/asymovercoat diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index eb107985cf..5bfccbd0b2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -366,4 +366,24 @@ /datum/gear/head/jingasa display_name = "jingasa" - path = /obj/item/clothing/head/jingasa \ No newline at end of file +<<<<<<< HEAD + path = /obj/item/clothing/head/jingasa +======= + path = /obj/item/clothing/head/jingasa + +/datum/gear/head/sunflower_crown + display_name = "sunflower crown" + path = /obj/item/clothing/head/sunflower_crown + +/datum/gear/head/lavender_crown + display_name = "lavender crown" + path = /obj/item/clothing/head/lavender_crown + +/datum/gear/head/poppy_crown + display_name = "poppy crown" + path = /obj/item/clothing/head/poppy_crown + +/datum/gear/head/rose_crown + display_name = "rose crown" + path = /obj/item/clothing/head/rose_crown +>>>>>>> 7a84236... Adds 2 uniforms, 1 accessory, and flower crowns to loadout (#7385) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 2e480190cc..0d6cd267ac 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -580,4 +580,12 @@ /datum/gear/uniform/yellowswoop display_name = "yellow swooped dress" - path = /obj/item/clothing/under/dress/yellowswoop \ No newline at end of file + path = /obj/item/clothing/under/dress/yellowswoop + +/datum/gear/uniform/greenasym + display_name = "green asymmetrical jumpsuit" + path = /obj/item/clothing/under/greenasym + +/datum/gear/uniform/cyberpunkharness + display_name = "cyberpunk strapped harness" + path = /obj/item/clothing/under/cyberpunkharness \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm index 4cf239f985..29ea588317 100644 --- a/code/modules/clothing/under/accessories/clothing.dm +++ b/code/modules/clothing/under/accessories/clothing.dm @@ -400,3 +400,11 @@ name = "green asymmetrical jacket" desc = "Insultingly avant-garde in aqua." icon_state = "asym_green" +<<<<<<< HEAD +======= + +/obj/item/clothing/accessory/asymovercoat + name = "orange asymmetrical overcoat" + desc = "An asymmetrical orange overcoat in a 2560's fashion." + icon_state = "asymovercoat" +>>>>>>> 7a84236... Adds 2 uniforms, 1 accessory, and flower crowns to loadout (#7385) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 1fcddc2b77..3cc22185d4 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -804,6 +804,18 @@ Uniforms and such icon_state = "rippedpunk" index = 1 +/obj/item/clothing/under/greenasym + name = "green asymmetrical jumpsuit" + desc = "A green futuristic uniform with asymmetrical pants. Trendy!" + icon_state = "greenasym" + index = 1 + +/obj/item/clothing/under/cyberpunkharness + name = "cyberpunk strapped harness" + desc = "A cyberpunk styled harness and pants. Perfect for your dystopian future." + icon_state = "cyberhell" + index = 1 + /* * swimsuit */ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index a9e2f8eb92..e3edb23202 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform_1.dmi b/icons/mob/uniform_1.dmi index 32b15484a0..20749c8afc 100644 Binary files a/icons/mob/uniform_1.dmi and b/icons/mob/uniform_1.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 0bc7a9fcb2..aa0df8a3b2 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/uniforms_1.dmi b/icons/obj/clothing/uniforms_1.dmi index 47b06c8b29..32a55ec9c2 100644 Binary files a/icons/obj/clothing/uniforms_1.dmi and b/icons/obj/clothing/uniforms_1.dmi differ