diff --git a/maplestation.dme b/maplestation.dme index da33d403e6fc..285bdf723a62 100644 --- a/maplestation.dme +++ b/maplestation.dme @@ -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" diff --git a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm index ea16bdf2c9a0..b05bba011ae3 100644 --- a/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm +++ b/maplestation_modules/code/modules/loadouts/loadout_items/loadout_datum_shoes.dm @@ -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 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 34ff29261444..ec04b27c75c4 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 @@ -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 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 b7c471787c00..2db2272d064b 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 @@ -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" diff --git a/maplestation_modules/icons/mob/human_face.dmi b/maplestation_modules/icons/mob/human_face.dmi index 83eee0524d79..c0b2638db4d8 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/lini_equipment/code/liniclothing.dm b/maplestation_modules/story_content/lini_equipment/code/liniclothing.dm new file mode 100644 index 000000000000..6d68baaafb9d --- /dev/null +++ b/maplestation_modules/story_content/lini_equipment/code/liniclothing.dm @@ -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" diff --git a/maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi b/maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi new file mode 100644 index 000000000000..2ea18ddaa3c3 Binary files /dev/null and b/maplestation_modules/story_content/lini_equipment/icons/liniuniform_item.dmi differ diff --git a/maplestation_modules/story_content/lini_equipment/icons/liniuniform_worn.dmi b/maplestation_modules/story_content/lini_equipment/icons/liniuniform_worn.dmi new file mode 100644 index 000000000000..85f36db1c4ca Binary files /dev/null and b/maplestation_modules/story_content/lini_equipment/icons/liniuniform_worn.dmi differ