Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds hair and outfit for Lini #492

Merged
merged 2 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions maplestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6498,6 +6498,7 @@
#include "maplestation_modules\story_content\grey_equipment\code\greyclothing.dm"
#include "maplestation_modules\story_content\kimono\code\kimonoclothing.dm"
#include "maplestation_modules\story_content\laurence_equipment\code\laurence_clothing.dm"
#include "maplestation_modules\story_content\lini_equipment\code\liniclothing.dm"
#include "maplestation_modules\story_content\noble_equipment\code\beacon.dm"
#include "maplestation_modules\story_content\noble_equipment\code\nobleclothing.dm"
#include "maplestation_modules\story_content\noname_equipment\code\nonameclothing.dm"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,7 @@
/datum/loadout_item/shoes/grey
name = "Designer Boots"
item_path = /obj/item/clothing/shoes/greyboots

/datum/loadout_item/shoes/lini
name = "Berbier Boots"
item_path = /obj/item/clothing/shoes/liniboots
Original file line number Diff line number Diff line change
Expand Up @@ -370,3 +370,7 @@
/datum/loadout_item/under/formal/grey
name = "Designer Outfit"
item_path = /obj/item/clothing/under/jumpsuit/greyshirt

/datum/loadout_item/under/jumpsuit/pilot
name = "Berbier Uniform"
item_path = /obj/item/clothing/under/jumpsuit/lini
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@
icon = 'maplestation_modules/icons/mob/human_face.dmi'
icon_state = "hair_fresh"

/datum/sprite_accessory/hair/pilot
name = "Ex-Pilot"
icon = 'maplestation_modules/icons/mob/human_face.dmi'
icon_state = "hair_expilot"

/// -- Undershirts --
/datum/sprite_accessory/undershirt/ratvarsoul
name = "Ratvar's Soul"
Expand Down
Binary file modified maplestation_modules/icons/mob/human_face.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/obj/item/clothing/under/jumpsuit/lini
name = "Berbier Uniform"
desc = "An old uniform leftover from Lini's time with her old mercenary company, B.M.M.I. I. Worn more for convenience than anything."
resistance_flags = FIRE_PROOF|ACID_PROOF
icon = 'maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi'
worn_icon = 'maplestation_modules/story_content/lini_equipment/icons/liniuniform_worn.dmi'
icon_state = "liniuniform"

/obj/item/clothing/shoes/liniboots
name = "Berbier Boots"
desc = "Steel toed boots, durable and lightweight."
icon = 'maplestation_modules/story_content/casual_clothing/icons/casual_icon.dmi'
resistance_flags = FIRE_PROOF|ACID_PROOF
icon = 'maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi'
worn_icon = 'maplestation_modules/story_content/lini_equipment/icons/liniuniform_worn.dmi'
icon_state = "liniboots"
Binary file not shown.
Binary file not shown.
Loading