Skip to content

Commit

Permalink
Adds more of my own character content, plus two bits of generic conte…
Browse files Browse the repository at this point in the history
…nt (#648)
  • Loading branch information
Wollywoger authored Jan 26, 2025
1 parent 4e8bc38 commit 21fcfee
Show file tree
Hide file tree
Showing 15 changed files with 57 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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'
11 changes: 11 additions & 0 deletions maplestation_modules/code/modules/surgery/organs/tails.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions maplestation_modules/code/modules/vending/clothesmate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand Down
Binary file not shown.
Binary file modified maplestation_modules/icons/mob/human_face.dmi
Binary file not shown.
Binary file modified maplestation_modules/icons/mob/mutant_bodyparts.dmi
Binary file not shown.
Binary file not shown.
Binary file modified maplestation_modules/icons/obj/surgery.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 21fcfee

Please sign in to comment.