diff --git a/maplestation_modules/code/modules/clothing/under/loadout_under.dm b/maplestation_modules/code/modules/clothing/under/loadout_under.dm index d1865087ed73..3407a4ea5564 100644 --- a/maplestation_modules/code/modules/clothing/under/loadout_under.dm +++ b/maplestation_modules/code/modules/clothing/under/loadout_under.dm @@ -80,6 +80,14 @@ icon_state = "chesed_suit" clothing_traits = list(TRAIT_CAFFEINE_LOVER) +/obj/item/clothing/under/mvfjumpsuit + name = "pale jumpsuit" + desc = "An old-fashioned pale white jumpsuit. Common in spaces within the Mira-Vodyanoy Foundation's sphere of influence." + icon = 'maplestation_modules/icons/obj/clothing/under/jumpsuit.dmi' + worn_icon = 'maplestation_modules/icons/mob/clothing/under/jumpsuit.dmi' + icon_state = "mvf_jumpsuit" + can_adjust = FALSE + // https://github.com/Skyrat-SS13/Skyrat-tg/pull/17098 /obj/item/clothing/under/dress/countess name = "countess dress" diff --git a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm index 09245fb4d465..5ddbb16f1f81 100644 --- a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm +++ b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_under.dm @@ -409,3 +409,7 @@ name = "Violet Nurse Uniform" item_path = /obj/item/clothing/under/dress/vince additional_displayed_text = list("Character Item") + +/datum/loadout_item/under/jumpsuit/mvfjumpsuit + name = "Pale Jumpsuit" + item_path = /obj/item/clothing/under/mvfjumpsuit 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 2520d30660e4..3597dfc07391 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 @@ -513,3 +513,9 @@ name = "High Black Stockings" icon_state = "highblackstocking" icon = 'maplestation_modules/icons/mob/clothing/underwear.dmi' + +/// --- Facial Hair --- +/datum/sprite_accessory/facial_hair/foxmarkings // not exactly hair but i'm not coding a unique system for this *yet* + name = "Facial Markings" + icon_state = "facial_foxmarkings" + icon = 'maplestation_modules/icons/mob/human_face.dmi' diff --git a/maplestation_modules/code/modules/surgery/organs/tails.dm b/maplestation_modules/code/modules/surgery/organs/tails.dm index 4b74371ab8d6..f19b9f3c48cb 100644 --- a/maplestation_modules/code/modules/surgery/organs/tails.dm +++ b/maplestation_modules/code/modules/surgery/organs/tails.dm @@ -8,3 +8,14 @@ icon_state = "fox" icon = 'maplestation_modules/icons/mob/mutant_bodyparts.dmi' color_src = HAIR_COLOR + +/obj/item/organ/external/tail/cat/fivefox + name = "five fox tails" + icon = 'maplestation_modules/icons/obj/surgery.dmi' + icon_state = "severedfivefoxtail" + +/datum/sprite_accessory/tails/human/fivefox + name = "Five Fox" + icon_state = "fivefox" + icon = 'maplestation_modules/icons/mob/mutant_bodyparts.dmi' + color_src = HAIR_COLOR diff --git a/maplestation_modules/code/modules/vending/clothesmate.dm b/maplestation_modules/code/modules/vending/clothesmate.dm index 8748b25ce97d..0e6a669b2e78 100644 --- a/maplestation_modules/code/modules/vending/clothesmate.dm +++ b/maplestation_modules/code/modules/vending/clothesmate.dm @@ -16,6 +16,7 @@ /obj/item/clothing/under/spacer_turtleneck/plain = 3, /obj/item/clothing/under/spacer_turtleneck/skirt = 3, /obj/item/clothing/under/spacer_turtleneck/skirt/plain = 3, + /obj/item/clothing/under/mvfjumpsuit = 3, /obj/item/clothing/under/arbitersuit = 2, /obj/item/clothing/under/chesedsuit = 2, ), diff --git a/maplestation_modules/icons/mob/clothing/under/jumpsuit.dmi b/maplestation_modules/icons/mob/clothing/under/jumpsuit.dmi new file mode 100644 index 000000000000..3f11e54623a9 Binary files /dev/null and b/maplestation_modules/icons/mob/clothing/under/jumpsuit.dmi differ diff --git a/maplestation_modules/icons/mob/human_face.dmi b/maplestation_modules/icons/mob/human_face.dmi index 5d3959da2151..de86dbc81977 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/icons/mob/mutant_bodyparts.dmi b/maplestation_modules/icons/mob/mutant_bodyparts.dmi index eb3e768f68d7..f80e69165898 100644 Binary files a/maplestation_modules/icons/mob/mutant_bodyparts.dmi and b/maplestation_modules/icons/mob/mutant_bodyparts.dmi differ diff --git a/maplestation_modules/icons/obj/clothing/under/jumpsuit.dmi b/maplestation_modules/icons/obj/clothing/under/jumpsuit.dmi new file mode 100644 index 000000000000..05009c164358 Binary files /dev/null and b/maplestation_modules/icons/obj/clothing/under/jumpsuit.dmi differ diff --git a/maplestation_modules/icons/obj/surgery.dmi b/maplestation_modules/icons/obj/surgery.dmi index 3c7b2e2b5a42..429cf7214e45 100644 Binary files a/maplestation_modules/icons/obj/surgery.dmi and b/maplestation_modules/icons/obj/surgery.dmi differ diff --git a/maplestation_modules/story_content/wollys_items/code/wollysitems.dm b/maplestation_modules/story_content/wollys_items/code/wollysitems.dm index b2a559973fd6..72d4a55f091f 100644 --- a/maplestation_modules/story_content/wollys_items/code/wollysitems.dm +++ b/maplestation_modules/story_content/wollys_items/code/wollysitems.dm @@ -84,6 +84,23 @@ since some of them are two per character or singleton, i'm gonna save space and // clothing & armor +/obj/item/clothing/under/elijumpsuit + name = "modified pale jumpsuit" + desc = "An old-fashioned pale white jumpsuit. This one has been modified with peculiar markings." + icon = 'maplestation_modules/story_content/wollys_items/icons/obj/clothing/jumpsuit.dmi' + worn_icon = 'maplestation_modules/story_content/wollys_items/icons/mob/clothing/jumpsuit.dmi' + icon_state = "eli_suit" + can_adjust = FALSE + +/obj/item/clothing/mask/elikitsune + name = "advanced kitsune mask" // todo + desc = "todo" + w_class = WEIGHT_CLASS_SMALL + flags_inv = HIDEFACE|HIDEFACIALHAIR + icon = 'maplestation_modules/story_content/wollys_items/icons/obj/clothing/mask.dmi' + worn_icon = 'maplestation_modules/story_content/wollys_items/icons/mob/clothing/mask.dmi' + icon_state = "eli_mask" + /obj/item/clothing/suit/toggle/cyrilcloak name = "Claw-Sewn Cloak" desc = "A warm cloak hand sewn by a tailor's hand. Its meant for cold winter climates, not brooding in a dark corner, mind you." @@ -137,6 +154,16 @@ since some of them are two per character or singleton, i'm gonna save space and item_path = /obj/item/clothing/suit/matthewjacket additional_displayed_text = list("Character Item") +/datum/loadout_item/under/jumpsuit/elijumpsuit + name = "Modified Pale Jumpsuit" + item_path = /obj/item/clothing/under/elijumpsuit + additional_displayed_text = list("Character Item") + +/datum/loadout_item/mask/elimask + name = "Advanced Kitsune Mask" + item_path = /obj/item/clothing/mask/elikitsune + additional_displayed_text = list("Character Item") + // sheathes /obj/item/storage/belt/sheathe/maugrim diff --git a/maplestation_modules/story_content/wollys_items/icons/mob/clothing/jumpsuit.dmi b/maplestation_modules/story_content/wollys_items/icons/mob/clothing/jumpsuit.dmi new file mode 100644 index 000000000000..ef5cd1790ff7 Binary files /dev/null and b/maplestation_modules/story_content/wollys_items/icons/mob/clothing/jumpsuit.dmi differ diff --git a/maplestation_modules/story_content/wollys_items/icons/mob/clothing/mask.dmi b/maplestation_modules/story_content/wollys_items/icons/mob/clothing/mask.dmi new file mode 100644 index 000000000000..4e25ab9681fd Binary files /dev/null and b/maplestation_modules/story_content/wollys_items/icons/mob/clothing/mask.dmi differ diff --git a/maplestation_modules/story_content/wollys_items/icons/obj/clothing/jumpsuit.dmi b/maplestation_modules/story_content/wollys_items/icons/obj/clothing/jumpsuit.dmi new file mode 100644 index 000000000000..eb239a941782 Binary files /dev/null and b/maplestation_modules/story_content/wollys_items/icons/obj/clothing/jumpsuit.dmi differ diff --git a/maplestation_modules/story_content/wollys_items/icons/obj/clothing/mask.dmi b/maplestation_modules/story_content/wollys_items/icons/obj/clothing/mask.dmi new file mode 100644 index 000000000000..ac46e46a3141 Binary files /dev/null and b/maplestation_modules/story_content/wollys_items/icons/obj/clothing/mask.dmi differ