diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index f0a31f0d81..ef9ec65e2e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -418,3 +418,20 @@ /datum/gear/accessory/ceremonial_loins display_name = "ceremonial loincloth" path = /obj/item/clothing/accessory/ceremonial_loins + +/datum/gear/accessory/frontbow + display_name = "ribbon bow, front (colorable)" + path = /obj/item/clothing/accessory/frontbow + +/datum/gear/accessory/frontbow/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/accessory/backbow + display_name = "ribbon bow, back (colorable)" + path = /obj/item/clothing/accessory/backbow + +/datum/gear/accessory/backbow/New() + ..() + gear_tweaks += gear_tweak_free_color_choice + diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index b37fa4bb4f..a9fb73cfd2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -158,3 +158,11 @@ /datum/gear/eyes/circuitry display_name = "goggles, circuitry (empty)" path = /obj/item/clothing/glasses/circuitry + +/datum/gear/eyes/masquerade + display_name = "masquerade mask (colorable)" + path = /obj/item/clothing/glasses/masquerade + +/datum/gear/eyes/masquerade/New() + ..() + gear_tweaks += gear_tweak_free_color_choice diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 6c8dff423c..ab079c92db 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -710,3 +710,19 @@ "jumper dress" = /obj/item/clothing/under/skirt/colorable/jumperdress ) gear_tweaks += list(new/datum/gear_tweak/path(skirts), gear_tweak_free_color_choice) + + +//Magical Girl Outfits +/datum/gear/uniform/magicalgirl + display_name = "outfit, magical girl selection" + description = "A selection of magical girl costumes worn on the clothing slot." + path = /obj/item/clothing/under/magicalgirl + +/datum/gear/uniform/magicalgirl/New() + ..() + var/list/costumes = list() + for(var/costume in typesof(/obj/item/clothing/under/magicalgirl)) + var/obj/item/clothing/under/magicalgirl/costume_type = costume + costumes[initial(costume_type.name)] = costume_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(costumes)) + diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 4b95f8d161..30b3d7d354 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -595,3 +595,8 @@ BLIND // can't see anything to_chat(usr, "You push \the [src] up from in front of your eyes.") update_clothing_icon() usr.update_action_buttons() + +/obj/item/clothing/glasses/masquerade + name = "masquerade mask" + desc = "A fancy party mask that only covers your eyes. No one will have any idea who you are!" + icon_state = "masquerade" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 0acc7f73d3..82f6699b31 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -603,3 +603,17 @@ desc = "A Gilthari ZeitMeister classic, a finely tuned wristwatch with a fancy leather strap." description_fluff = "Made from real synth leather." icon_state = "watch_leather" + +//magical girl ribbon bows + +/obj/item/clothing/accessory/frontbow + name = "ribbon bow" + desc = "An oversized bow that sits just below the collar. Seems like something a magical girl would wear." + icon_state = "frontbow" + slot = ACCESSORY_SLOT_TIE + +/obj/item/clothing/accessory/backbow + name = "waist bow" + desc = "An oversized bow that sits on the small of your back. Seems like something a magical girl would wear." + icon_state = "backbow" + slot = ACCESSORY_SLOT_DECOR diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index da8776f32b..53f2e096dd 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -158,3 +158,65 @@ unicolor = "yellow" //End of old costumes + +//magical girl outfits +/obj/item/clothing/under/magicalgirl + name = "magical girl costume" + desc = "It's just like one of your Japanese animes! This costume's particularly popular among Lunar cosplayers." + icon_state = "magicalgirl_classic" + item_state_slots = list(slot_r_hand_str = "lightblue", slot_l_hand_str = "lightblue") + +/obj/item/clothing/under/magicalgirl/blue + name = "blue magical girl costume" + desc = "It's just like one of your Japanese animes! Despite not being inherently transhumanist, this costume's particularly among Mercurials." + icon_state = "magicalgirl_blue" + item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue") + +/obj/item/clothing/under/magicalgirl/red + name = "red magical girl costume" + desc = "It's just like one of your Japanese animes! This costume's particularly popular among Martian cosplayers." + icon_state = "magicalgirl_red" + item_state_slots = list(slot_r_hand_str = "red", slot_l_hand_str = "red") + +/obj/item/clothing/under/magicalgirl/green + name = "green magical girl costume" + desc = "It's just like one of your Japanese animes! This costume's particular popular among cosplayers from Callisto." + icon_state = "magicalgirl_green" + item_state_slots = list(slot_r_hand_str = "green", slot_l_hand_str = "green") + +/obj/item/clothing/under/magicalgirl/orange + name = "orange magical girl costume" + desc = "It's just like one of your Japanese animes! This costume's particularly popular among Venusian cosplayers." + icon_state = "magicalgirl_orange" + item_state_slots = list(slot_r_hand_str = "orange", slot_l_hand_str = "orange") + +/obj/item/clothing/under/magicalgirl/pink + name = "pink magical girl costume" + desc = "It's just like one of your Japanese animes! This costume's particularly popular among Lunar cosplayers." + icon_state = "magicalgirl_pink" + item_state_slots = list(slot_r_hand_str = "pink", slot_l_hand_str = "pink") + +/obj/item/clothing/under/magicalgirl/purple + name = "purple magical girl costume" + desc = "It's just like one of your Japanese animes! This costume's particularly popular among Titanian cosplayers." + icon_state = "magicalgirl_purple" + item_state_slots = list(slot_r_hand_str = "purple", slot_l_hand_str = "purple") + +/obj/item/clothing/under/magicalgirl/navy + name = "navy magical girl costume" + desc = "It's just like one of your Japanese animes! This costume would probably be a hit on Uranus." + icon_state = "magicalgirl_navy" + item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue") + +/obj/item/clothing/under/magicalgirl/turquoise + name = "turquoise magical girl costume" + desc = "It's just like one of your Japanese animes! This costume would probably be a hit on Neptune." + icon_state = "magicalgirl_turquoise" + item_state_slots = list(slot_r_hand_str = "lightblue", slot_l_hand_str = "lightblue") + +/obj/item/clothing/under/magicalgirl/black + name = "black magical girl costume" + desc = "It's just like one of your Japanese animes! This costume's particularly popular among Plutonian cosplayers." + icon_state = "magicalgirl_black" + item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black") + diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 0be51e7c5c..15afeddf06 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index b40d14d740..c1169a52c9 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 578925732d..fcff8b4596 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/mob/species/teshari/eyes.dmi b/icons/mob/species/teshari/eyes.dmi index 05c1634891..824a601be4 100644 Binary files a/icons/mob/species/teshari/eyes.dmi and b/icons/mob/species/teshari/eyes.dmi differ diff --git a/icons/mob/species/teshari/ties.dmi b/icons/mob/species/teshari/ties.dmi index 17aed58c78..cfaba777ed 100644 Binary files a/icons/mob/species/teshari/ties.dmi and b/icons/mob/species/teshari/ties.dmi differ diff --git a/icons/mob/species/teshari/uniform.dmi b/icons/mob/species/teshari/uniform.dmi index 40529d5372..f2d92df56d 100644 Binary files a/icons/mob/species/teshari/uniform.dmi and b/icons/mob/species/teshari/uniform.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index aa3f0bfe33..cf55b25774 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index c8d985cd45..15bfd9b666 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 93d368d42c..a236a3cdfb 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 37e89004a3..a2274dd075 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 4215354433..e6e2322c60 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ