diff --git a/code/datums/underwear/bottom.dm b/code/datums/underwear/bottom.dm index 358fe20104..d32d7952c1 100644 --- a/code/datums/underwear/bottom.dm +++ b/code/datums/underwear/bottom.dm @@ -95,4 +95,14 @@ /datum/category_item/underwear/bottom/onepiece name = "Swimming One Piece" icon_state = "onepiece" - has_color = TRUE \ No newline at end of file + has_color = TRUE + +/datum/category_item/underwear/top/onepiece_alt + name = "Swimming One Piece, Alt" + icon_state = "swim_onepiece" + has_color = TRUE + +/datum/category_item/underwear/top/onepiece_strapless + name = "Swimming One Piece, Strapless" + icon_state = "swim_strapless_onepiece" + has_color = TRUE diff --git a/code/datums/underwear/socks.dm b/code/datums/underwear/socks.dm index ac29b579d1..e06782b8d2 100644 --- a/code/datums/underwear/socks.dm +++ b/code/datums/underwear/socks.dm @@ -208,4 +208,8 @@ /datum/category_item/underwear/socks/stirrup_thigh_black name = "Black Stirrup Stockings" icon_state = "leggings-stir-black" - has_color = TRUE \ No newline at end of file + has_color = TRUE + +/datum/category_item/underwear/socks/stirrup_pantyhose + name = "Pantyhose, stirrup" + icon_state = "pantyhose-stir" diff --git a/code/datums/underwear/top.dm b/code/datums/underwear/top.dm index 5af7870f04..336bebd1cc 100644 --- a/code/datums/underwear/top.dm +++ b/code/datums/underwear/top.dm @@ -51,10 +51,20 @@ name = "Fishnet top" icon_state = "fishnet_body" +/datum/category_item/underwear/top/fishnet_base_alt + name = "Fishnet top, alt" + icon_state = "fishnet_body_alt" + has_color = TRUE + /datum/category_item/underwear/top/fishnet_sleeves name = "Fishnet with sleeves" icon_state = "fishnet_sleeves" +/datum/category_item/underwear/top/fishnet_sleeves_alt + name = "Fishnet with sleeves, alt" + icon_state = "fishnet_sleeves_alt" + has_color = TRUE + /datum/category_item/underwear/top/fishnet_gloves name = "Fishnet with gloves" icon_state = "fishnet_gloves" @@ -95,4 +105,4 @@ /datum/category_item/underwear/top/swimtop name = "Swimming Top" icon_state = "swimtop" - has_color = TRUE \ No newline at end of file + has_color = TRUE diff --git a/code/datums/underwear/undershirts.dm b/code/datums/underwear/undershirts.dm index 2c32ad8e76..6611092b38 100644 --- a/code/datums/underwear/undershirts.dm +++ b/code/datums/underwear/undershirts.dm @@ -189,13 +189,38 @@ icon_state = "pinkblack_tshirt" /datum/category_item/underwear/undershirt/turtle + name = "Turtleneck, Old" + icon_state = "turtleneck_old" + has_color = TRUE + +/datum/category_item/underwear/undershirt/sleevelessturtle + name = "Turtleneck, Sleeveless, Old" + icon_state = "turtleneck_sleeveless_old" + has_color = TRUE + +/datum/category_item/underwear/undershirt/turtleneck name = "Turtleneck" icon_state = "turtleneck" has_color = TRUE -/datum/category_item/underwear/undershirt/sleevelessturtle +/datum/category_item/underwear/undershirt/turtleneck_smooth + name = "Turtleneck, Smooth" + icon_state = "turtleneck_smooth" + has_color = TRUE + +/datum/category_item/underwear/undershirt/turtlesleeveless name = "Turtleneck, Sleeveless" - icon_state = "sleevelessturtle" + icon_state = "turtleneck_sleeveless" + has_color = TRUE + +/datum/category_item/underwear/undershirt/leotardturtle + name = "Leotard Turtleneck" + icon_state = "leotard_turtleneck" + has_color = TRUE + +/datum/category_item/underwear/undershirt/leotardturtlesleeveless + name = "Leotard Turtleneck, Sleeveless" + icon_state = "leotard_turtleneck_sleeveless" has_color = TRUE /datum/category_item/underwear/undershirt/dress_shirt_fem @@ -226,4 +251,4 @@ /datum/category_item/underwear/undershirt/leotard name = "Leotard" icon_state = "leotard" - has_color = TRUE \ No newline at end of file + has_color = TRUE diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index 3531cfff72..de4aad90d2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -76,3 +76,7 @@ /datum/gear/mask/lace/New() gear_tweaks += gear_tweak_free_color_choice + +/datum/gear/mask/half + display_name = "black half-mask" + path = /obj/item/clothing/accessory/gaiter/half diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index e7ea6ce7e3..55f72d248d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -497,6 +497,10 @@ ) gear_tweaks += new/datum/gear_tweak/path(cowboy_outfits) +/datum/gear/uniform/hightrousers + display_name = "high-waisted trousers" + path = /obj/item/clothing/under/dress/hightrousers + /* * 80s */ @@ -586,3 +590,16 @@ /datum/gear/uniform/fienddress display_name = "fiendish dress" path = /obj/item/clothing/under/fienddress + +//tabard dresses +/datum/gear/uniform/tabarddress + display_name = "tabard-dress selection" + path = /obj/item/clothing/under/dress/tabard + +/datum/gear/uniform/tabarddress/New() + ..() + var/list/tabarddress = list( + "white tabard-dress"=/obj/item/clothing/under/dress/tabard, + "black tabard-dress"=/obj/item/clothing/under/dress/tabard/black + ) + gear_tweaks += list(new/datum/gear_tweak/path(tabarddress)) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index f40deb8f6b..759d17d892 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -341,7 +341,17 @@ "X" = image(icon = src.icon, icon_state = "xmask"), "Bugeyes" = image(icon = src.icon, icon_state = "bugmask"), "Double" = image(icon = src.icon, icon_state = "doublemask"), - "Mark" = image(icon = src.icon, icon_state = "markmask") + "Mark" = image(icon = src.icon, icon_state = "markmask"), + "Line" = image(icon = src.icon, icon_state = "linemask"), + "Minus" = image(icon = src.icon, icon_state = "minusmask"), + "Four" = image(icon = src.icon, icon_state = "fourmask"), + "Diamond" = image(icon = src.icon, icon_state = "diamondmask"), + "Cat" = image(icon = src.icon, icon_state = "catmask"), + "Big Eyes" = image(icon = src.icon, icon_state = "bigeyemask"), + "Good" = image(icon = src.icon, icon_state = "goodmask"), + "Bad" = image(icon = src.icon, icon_state = "badmask"), + "Happy" = image(icon = src.icon, icon_state = "happymask"), + "Sad" = image(icon = src.icon, icon_state = "sadmask") ) /obj/item/clothing/mask/paper/attack_self(mob/user) @@ -353,7 +363,11 @@ "Sleeping" ="sleepingmask", "Heart" = "heartmask", "Core" = "coremask", "Plus" = "plusmask", "Square" ="squaremask", "Bullseye" = "bullseyemask", "Vertical" = "verticalmask", "Horizontal" = "horizontalmask", "X" ="xmask", - "Bugeyes" = "bugmask", "Double" = "doublemask", "Mark" = "markmask") + "Bugeyes" = "bugmask", "Double" = "doublemask", "Mark" = "markmask", + "Line" = "linemask", "Minus" = "minusmask", "Four" = "fourmask", + "Diamond" = "diamondmask", "Cat" = "catmask", "Big Eyes" = "bigeyemask", + "Good" = "goodmask", "Bad" = "badmask", "Happy" = "happymask", "Sad" = "sadmask" + ) var/choice = show_radial_menu(user, src, papermask_designs, custom_check = FALSE, radius = 36, require_near = TRUE) @@ -405,4 +419,4 @@ desc = "100% synthetic \"Country Girls LLC.\" brand mouth wheat. Warning: not for actual consumption." icon_state = "mouthwheat" w_class = ITEMSIZE_SMALL - body_parts_covered = 0 \ No newline at end of file + body_parts_covered = 0 diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 0c70e7d5f5..8eefbcbcea 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -562,6 +562,10 @@ name = "white neck gaiter" icon_state = "gaiter_snow" +/obj/item/clothing/accessory/gaiter/half //functions like a gaiter + name = "black half-mask" + icon_state = "half_mask" + /* * Pride Pins */ diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index e378c8f195..e55c8587ba 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -614,6 +614,16 @@ desc = "Just looking at this makes you want to sing." icon_state = "ysing" +/obj/item/clothing/under/dress/tabard + name = "white tabard-dress" + desc = "A gold-trimmed white tabard-dress with a large V-shaped boob window. For when you want to show off your hips and look classy at the same time." + icon_state = "white_tabard" + +/obj/item/clothing/under/dress/tabard/black + name = "black tabard-dress" + desc = "A gold-trimmed black tabard-dress with a large circular boob window. For when you want to show off your hips and look classy at the same time." + icon_state = "black_tabard" + /* * Wedding Stuff */ diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index d168ddc1eb..18622cb4d8 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -75,6 +75,10 @@ name = "black jeans short shorts" icon_state = "black_shorts_f" +/obj/item/clothing/under/shorts/black/ripped + name = "black ripped shorts" + icon_state = "black_shorts_ripped" + /obj/item/clothing/under/shorts/jeans/grey name = "grey jeans shorts" icon_state = "greyshorts" diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index feef4aef9b..fdae1d2f36 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -234,6 +234,48 @@ species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI) flags = HAIR_TIEABLE +/datum/sprite_accessory/hair/bobcutovereye + name = "Bobcut Over Eye" + icon_state = "hair_bobcutovereye1" + +/datum/sprite_accessory/hair/bobcutovereye2 + name = "Bobcut Over Eye 2" + icon_state = "hair_bobcutovereye2" + +/datum/sprite_accessory/hair/bobcutovereye3 + name = "Bobcut Over Eye 3" + icon_state = "hair_bobcutovereye3" + +/datum/sprite_accessory/hair/bonnie + name = "Bonnie" + icon_state = "hair_bonnie" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonniealt + name = "Bonnie Alt" + icon_state = "hair_bonniealt" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnielong + name = "Bonnie, Long" + icon_state = "hair_bonnie_long" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonniealtlong + name = "Bonnie Alt, Long" + icon_state = "hair_bonniealt_long" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnieshort + name = "Bonnie, Short" + icon_state = "hair_bonnie_short" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonniealtshort + name = "Bonnie Alt, Short" + icon_state = "hair_bonniealt_short" + flags = HAIR_TIEABLE + /datum/sprite_accessory/hair/bowl name = "Bowl" icon_state = "hair_bowlcut" @@ -407,6 +449,10 @@ name = "Dave" icon_state = "hair_dave" +/datum/sprite_accessory/hair/dawn + name = "Dawn" + icon_state = "hair_dawn" + /datum/sprite_accessory/hair/devillock name = "Devil Lock" icon_state = "hair_devilock" @@ -444,6 +490,10 @@ icon_state = "hair_drillruru" flags = HAIR_TIEABLE +/datum/sprite_accessory/hair/eagle + name = "Eagle" + icon_state = "hair_eagle" + /datum/sprite_accessory/hair/elize name = "Elize" icon_state = "hair_elize" @@ -513,6 +563,11 @@ gender = MALE flags = HAIR_VERY_SHORT +/datum/sprite_accessory/hair/falcon + name = "Falcon" + icon_state = "hair_falcon" + flags = HAIR_TIEABLE + /datum/sprite_accessory/hair/familyman name = "Family Man" icon_state = "hair_thefamilyman" @@ -555,6 +610,15 @@ name = "Flow Hair" icon_state = "hair_f" +/datum/sprite_accessory/hair/fluffy + name = "Fluffy" + icon_state = "hair_fluffy" + +/datum/sprite_accessory/hair/fluffylong + name = "Fluffy, Long" + icon_state = "hair_fluffy_long" + flags = HAIR_TIEABLE + /datum/sprite_accessory/hair/longfringe name = "Fringe Long" icon_state = "hair_longfringe" @@ -636,6 +700,16 @@ name = "Hitop" icon_state = "hair_hitop" +/datum/sprite_accessory/hair/hummingbird + name = "Hummingbird" + icon_state = "hair_hummingbird" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/inari + name = "Inari" + icon_state = "hair_inari" + flags = HAIR_TIEABLE + /datum/sprite_accessory/hair/jade name = "Jade" icon_state = "hair_jade" @@ -716,6 +790,16 @@ icon_state = "hair_hbraid" flags = HAIR_TIEABLE +/datum/sprite_accessory/hair/macaw + name = "Macaw" + icon_state = "hair_macaw" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/magpie + name = "Magpie" + icon_state = "hair_magpie" + flags = HAIR_TIEABLE + /datum/sprite_accessory/hair/manbun name = "Manbun" icon_state = "hair_manbun" @@ -816,6 +900,21 @@ name = "Overeye Very Short" icon_state = "hair_veryshortovereye" +/datum/sprite_accessory/hair/overear + name = "Over Ear, Right" + icon_state = "hair_overear1" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/overear2 + name = "Over Ear, Left" + icon_state = "hair_overear2" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/owl + name = "Owl" + icon_state = "hair_owl" + flags = HAIR_TIEABLE + /datum/sprite_accessory/hair/parted name = "Parted" icon_state = "hair_parted" @@ -879,6 +978,16 @@ icon_state = "hair_spikyponytail" flags = HAIR_TIEABLE +/datum/sprite_accessory/hair/thinponytail + name = "Ponytail Thin" + icon_state = "hair_thinponytail" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/thinponytaillong + name = "Ponytail Thin, Long" + icon_state = "hair_thinponytail_long" + flags = HAIR_TIEABLE + /datum/sprite_accessory/hair/poofy name = "Poofy" icon_state = "hair_poofy" @@ -889,6 +998,11 @@ icon_state = "hair_poofy2" flags = HAIR_TIEABLE +/datum/sprite_accessory/hair/princess + name = "Princess" + icon_state = "hair_princess" + flags = HAIR_TIEABLE + /datum/sprite_accessory/hair/proper name = "Proper" icon_state = "hair_proper" @@ -1065,6 +1179,16 @@ icon_state = "hair_spikey" species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI) +/datum/sprite_accessory/hair/starling + name = "Starling" + icon_state = "hair_starling" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/stork + name = "Stork" + icon_state = "hair_stork" + flags = HAIR_TIEABLE + /datum/sprite_accessory/hair/straightlong name = "Straight Long" icon_state = "hair_straightlong" @@ -1087,6 +1211,11 @@ icon_state = "hair_sweptfringe" flags = HAIR_TIEABLE +/datum/sprite_accessory/hair/taro + name = "Taro" + icon_state = "hair_taro" + flags = HAIR_TIEABLE + /datum/sprite_accessory/hair/terezi name = "Terezi" icon_state = "hair_terezi" @@ -1135,6 +1264,21 @@ icon_state = "hair_twintail" flags = HAIR_TIEABLE +/datum/sprite_accessory/hair/twintails + name = "Twintails" + icon_state = "hair_twintails" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/twintailslong + name = "Twintails, Long" + icon_state = "hair_twintails_long" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/twintailsshort + name = "Twintails, Short" + icon_state = "hair_twintails_short" + flags = HAIR_TIEABLE + /datum/sprite_accessory/hair/twinbob name = "Twinbun Bob" icon_state = "hair_bunbob" diff --git a/code/modules/mob/new_player/sprite_accessories_tail.dm b/code/modules/mob/new_player/sprite_accessories_tail.dm index 1821ffe6aa..a4f1e457f5 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -380,6 +380,54 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/tail/bigsnaketail + name = "large snake tail (vwag)" + desc = "" + icon_state = "bigsnaketail" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "bigsnaketail_w" + +/datum/sprite_accessory/tail/bigsnaketailstripes + name = "large snake tail, striped (vwag)" + desc = "" + icon_state = "bigsnaketailstripes" + extra_overlay = "bigsnaketailstripes-tips" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "bigsnaketailstripes_w" + extra_overlay_w = "bigsnaketailstripes-tips_w" + +/datum/sprite_accessory/tail/bigsnaketailstripes_alt + name = "large snake tail, striped, alt (vwag)" + desc = "" + icon_state = "bigsnaketailstripesalt" + extra_overlay = "bigsnaketailstripesalt-tips" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "bigsnaketailstripesalt_w" + extra_overlay_w = "bigsnaketailstripesalt-tips_w" + +/datum/sprite_accessory/tail/bigsnaketaildual + name = "large snake tail, dual color (vwag)" + desc = "" + icon_state = "bigsnaketaildual" + extra_overlay = "bigsnaketaildual-tips" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "bigsnaketaildual_w" + extra_overlay_w = "bigsnaketaildual-tips_w" + +/datum/sprite_accessory/tail/bigsnaketailunder + name = "large snake tail, under (vwag)" + desc = "" + icon_state = "bigsnaketailunder" + extra_overlay = "bigsnaketailunder-tips" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "bigsnaketailunder_w" + extra_overlay_w = "bigsnaketailunder-tips_w" + /datum/sprite_accessory/tail/vulpan_alt name = "vulpkanin alt style, colorable" desc = "" @@ -1009,4 +1057,4 @@ extra_overlay = "zorgoia_fluff" extra_overlay2 = "zorgoia_fluff_top" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY \ No newline at end of file + color_blend_mode = ICON_MULTIPLY diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi index e758fe7d4d..bbe864ceac 100644 Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ diff --git a/icons/inventory/face/item.dmi b/icons/inventory/face/item.dmi index d1ea8a3fe9..618421ed5f 100644 Binary files a/icons/inventory/face/item.dmi and b/icons/inventory/face/item.dmi differ diff --git a/icons/inventory/face/item_vr.dmi b/icons/inventory/face/item_vr.dmi index cfa0381377..073f1df938 100644 Binary files a/icons/inventory/face/item_vr.dmi and b/icons/inventory/face/item_vr.dmi differ diff --git a/icons/inventory/face/mob.dmi b/icons/inventory/face/mob.dmi index 4459d4e85b..25b3466e07 100644 Binary files a/icons/inventory/face/mob.dmi and b/icons/inventory/face/mob.dmi differ diff --git a/icons/inventory/face/mob_vr.dmi b/icons/inventory/face/mob_vr.dmi index 6270461d76..6596062c57 100644 Binary files a/icons/inventory/face/mob_vr.dmi and b/icons/inventory/face/mob_vr.dmi differ diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index 8cf0bffad3..388f08c467 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index 09e27fc452..dbf1d39f83 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi index 1c3ad0e96c..950bf15d4c 100644 Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 8a7596f854..afbc6248ad 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/human_face_m.dmi b/icons/mob/human_face_m.dmi index 872cce2f3c..7986fb844f 100644 Binary files a/icons/mob/human_face_m.dmi and b/icons/mob/human_face_m.dmi differ diff --git a/icons/mob/vore/tails_vr.dmi b/icons/mob/vore/tails_vr.dmi index fafe63b1c6..a2b7e44ffe 100644 Binary files a/icons/mob/vore/tails_vr.dmi and b/icons/mob/vore/tails_vr.dmi differ