diff --git a/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm b/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm index 4ec6c6078a8b..50c44c5db047 100644 --- a/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -84,6 +84,11 @@ icon = 'maplestation_modules/icons/mob/human_face.dmi' icon_state = "hair_expilot" +/datum/sprite_accessory/hair/braidedbun + name = "Braided Bun" + icon = 'maplestation_modules/icons/mob/human_face.dmi' + icon_state = "hair_braidbun" + // https://github.com/NovaSector/NovaSector/pull/697 /datum/sprite_accessory/hair/gloomy_medium name = "Gloomy (Medium)" diff --git a/maplestation_modules/icons/mob/human_face.dmi b/maplestation_modules/icons/mob/human_face.dmi index 670e2533012e..0e22f23f2fb0 100644 Binary files a/maplestation_modules/icons/mob/human_face.dmi and b/maplestation_modules/icons/mob/human_face.dmi differ diff --git a/maplestation_modules/story_content/noname_equipment/code/nonameclothing.dm b/maplestation_modules/story_content/noname_equipment/code/nonameclothing.dm index 1d4a744fe125..dfda59ae6708 100644 --- a/maplestation_modules/story_content/noname_equipment/code/nonameclothing.dm +++ b/maplestation_modules/story_content/noname_equipment/code/nonameclothing.dm @@ -154,3 +154,35 @@ icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' icon_state = "amboots" + +// --- bnuuy --- + +/obj/item/clothing/head/costume/hat/blanche + name = "fluffy sun hat" + desc = "A white sunhat with fluffy rabbit ears. Stylish!" + icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' + worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' + icon_state = "blhat" + +/obj/item/clothing/glasses/blanche + name = "feathery monocle" + desc = "A monocle decorated with white feathers and black lace. With a red gem in front, they can't see your eye, but you can certainly see them." + icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' + worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' + icon_state = "blmask" + +/obj/item/clothing/under/jumpsuit/blanche + name = "white fluffy dress" + desc = "A large white dress decorated with various playing card suits. On the side is a large golden stopwatch, just to check if you're late." + icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' + worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' + icon_state = "bldress" + resistance_flags = INDESTRUCTIBLE + alternate_worn_layer = ABOVE_SHOES_LAYER + +/obj/item/clothing/shoes/blanche + name = "delicate white heels" + desc = "Small white heels with red claws in the front, along with large cuffs. Hop away!" + icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi' + worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi' + icon_state = "blshoes" diff --git a/maplestation_modules/story_content/noname_equipment/code/nonameitems.dm b/maplestation_modules/story_content/noname_equipment/code/nonameitems.dm index c9c84924ea3b..e9621be95e49 100644 --- a/maplestation_modules/story_content/noname_equipment/code/nonameitems.dm +++ b/maplestation_modules/story_content/noname_equipment/code/nonameitems.dm @@ -189,5 +189,24 @@ /obj/item/chair/atrox = 1, /obj/item/chair/plastic = 1, //coping /obj/item/cane/atrox = 1, + /obj/item/clothing/head/costume/hat/blanche = 1, + /obj/item/clothing/glasses/blanche = 1, + /obj/item/clothing/under/jumpsuit/blanche = 1, + /obj/item/clothing/shoes/blanche = 1, + /obj/item/cane/blanche = 1, ) generate_items_inside(items_inside, src) + +// --- bnuuy items --- + +/obj/item/cane/blanche + name = "red umbrella" + desc = "A plain red umbrella to keep you dry, or alternatively, swat people away." + icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi' + icon_state = "blbrella" + inhand_icon_state = "blbrella" + lefthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi' + righthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi' + force = 5 + throwforce = 5 + w_class = WEIGHT_CLASS_SMALL diff --git a/maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi b/maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi index 1f4238dd1e3c..8d3848dad7ae 100644 Binary files a/maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi and b/maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi differ diff --git a/maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi b/maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi index f90c1c6c7805..d49bddf6f0d5 100644 Binary files a/maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi and b/maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi differ diff --git a/maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi b/maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi index 804eb76d37be..52078562f0eb 100644 Binary files a/maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi and b/maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi differ diff --git a/maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi b/maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi index a2d1d96d1a11..3e6ce823b99d 100644 Binary files a/maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi and b/maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi differ diff --git a/maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi b/maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi index 1e548cae8614..5e8cc1572a61 100644 Binary files a/maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi and b/maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi differ