diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index 75697053aa..70bfe855cd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -143,3 +143,11 @@ Talon winter coat hoodies[initial(hoodie.name)] = hoodie gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hoodies)) gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/suit/cyberpunk_recolorable + display_name = "cyberpunk jacket (recolorable)" + path = /obj/item/clothing/suit/cyberpunk/recolorable + cost = 2 //It's got armor, yo. + +/datum/gear/suit/cyberpunk_recolorable/New() + gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 16a0996f95..da716f5f6e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -301,4 +301,18 @@ Talon jumpsuit var/list/pants = list() for(var/obj/item/clothing/under/pants/altevian/pants_type as anything in typesof(/obj/item/clothing/under/pants/altevian)) pants[initial(pants_type.name)] = pants_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants)) \ No newline at end of file + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants)) + + +//Feminine Colored Jumpsuits. +/datum/gear/suit/f_jumpsuit_alt + display_name = "Colored Feminine Jumpsuit" + path = /obj/item/clothing/under/color/fjumpsuit + +/datum/gear/uniform/f_jumpsuit_alt/New() + ..() + var/list/jumpsuits = list() + for(var/jumpsuit_style in typesof(/obj/item/clothing/under/color/fjumpsuit)) + var/obj/item/clothing/under/color/fjumpsuit/jumpsuit = jumpsuit_style + jumpsuits[initial(jumpsuit.name)] = jumpsuit + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpsuits)) diff --git a/code/modules/clothing/suits/miscellaneous_vr.dm b/code/modules/clothing/suits/miscellaneous_vr.dm index 9a10952789..67c255b1ee 100644 --- a/code/modules/clothing/suits/miscellaneous_vr.dm +++ b/code/modules/clothing/suits/miscellaneous_vr.dm @@ -140,3 +140,10 @@ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "cyberpunk" armor = list("melee" = 10, "bullet" = 20, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0) + +// Cyberpunk recolorable vest +/obj/item/clothing/suit/cyberpunk/recolorable + name = "cyberpunk vest" + desc = "A high tech looking vest. It's made out of tough materials, and can protect fairly well against bullets. Wake the fuck up, Samurai." + + icon_state = "cyberpunk_recolor" \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index ef719641c9..628e2e25d4 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -376,4 +376,87 @@ name = "Central Command undersuit" desc = "A very descript undersuit, intended for wearing under a voidsuit or other EVA equipment. This one is specifically made for NanoTrasen Central Command officers, and comes with a swanky gold trim and other fancy markings." icon_state = "bodysuit_cent" - item_state = "bodysuit_cent" \ No newline at end of file +<<<<<<< HEAD + item_state = "bodysuit_cent" +======= + item_state = "bodysuit_cent" + + +//FEMININE JUMPSUITS. +/obj/item/clothing/under/color/fjumpsuit //They won't see this so we can make it whatever we want. + name = "blue feminine jumpsuit" + desc = "It's very smart and in a ladies size!" + icon = 'icons/inventory/uniform/item.dmi' + default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi' + icon_state = "blue" // In hand + worn_state = "bluef" // On mob + +/obj/item/clothing/under/color/fjumpsuit/bluef + name = "blue feminine jumpsuit" + icon_state = "blue" + worn_state = "bluef" +/obj/item/clothing/under/color/fjumpsuit/aquaf + name = "aqua feminine jumpsuit" + icon_state = "aqua" + worn_state = "aquaf" +/obj/item/clothing/under/color/fjumpsuit/brownf + name = "brown feminine jumpsuit" + icon_state = "brown" + worn_state = "brownf" +/obj/item/clothing/under/color/fjumpsuit/darkbluef + name = "dark blue feminine jumpsuit" + icon_state = "darkblue" + worn_state = "darkbluef" +/obj/item/clothing/under/color/fjumpsuit/darkredf + name = "dark red feminine jumpsuit" + icon_state = "darkred" + worn_state = "darkredf" +/obj/item/clothing/under/color/fjumpsuit/greenf + name = "green feminine jumpsuit" + icon_state = "green" + worn_state = "greenf" +/obj/item/clothing/under/color/fjumpsuit/lightbluef + name = "light blue feminine jumpsuit" + icon_state = "lightblue" + worn_state = "lightbluef" +/obj/item/clothing/under/color/fjumpsuit/lightbrownf + name = "light brown feminine jumpsuit" + icon_state = "lightbrown" + worn_state = "lightbrownf" +/obj/item/clothing/under/color/fjumpsuit/lightgreenf + name = "light green feminine jumpsuit" + icon_state = "lightgreen" + worn_state = "lightgreenf" +/obj/item/clothing/under/color/fjumpsuit/lightpurplef + name = "light purple feminine jumpsuit" + icon_state = "lightpurple" + worn_state = "lightpurplef" +/obj/item/clothing/under/color/fjumpsuit/lightredf + name = "light red feminine jumpsuit" + icon_state = "lightred" + worn_state = "lightredf" +/obj/item/clothing/under/color/fjumpsuit/maroonf + name = "maroon feminine jumpsuit" + icon_state = "maroon" + worn_state = "maroonf" +/obj/item/clothing/under/color/fjumpsuit/pinkf + name = "pink feminine jumpsuit" + icon_state = "pink" + worn_state = "pinkf" +/obj/item/clothing/under/color/fjumpsuit/purplef + name = "purple feminine jumpsuit" + icon_state = "purple" + worn_state = "purplef" +/obj/item/clothing/under/color/fjumpsuit/redf + name = "red feminine jumpsuit" + icon_state = "red" + worn_state = "redf" +/obj/item/clothing/under/color/fjumpsuit/yellowf + name = "yellow feminine jumpsuit" + icon_state = "yellow" + worn_state = "yellowf" +/obj/item/clothing/under/color/fjumpsuit/yellowgreenf + name = "yellow-green feminine jumpsuit" + icon_state = "yellowgreen" + worn_state = "yellowgreenf" +>>>>>>> 344a971aac... Merge pull request #13880 from Cameron653/colorable_jacket diff --git a/icons/inventory/suit/item_vr.dmi b/icons/inventory/suit/item_vr.dmi index fb17453b3c..6c461429e8 100644 Binary files a/icons/inventory/suit/item_vr.dmi and b/icons/inventory/suit/item_vr.dmi differ diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi index eb19cb108c..488b75567e 100644 Binary files a/icons/inventory/suit/mob_vr.dmi and b/icons/inventory/suit/mob_vr.dmi differ diff --git a/icons/inventory/uniform/mob_vr.dmi b/icons/inventory/uniform/mob_vr.dmi index fb8ffe188e..eeca09d7c0 100644 Binary files a/icons/inventory/uniform/mob_vr.dmi and b/icons/inventory/uniform/mob_vr.dmi differ