Skip to content

Commit

Permalink
Adds Kimonos and Yukatas (#374)
Browse files Browse the repository at this point in the history
  • Loading branch information
Draggeru authored Nov 13, 2023
1 parent fdbb981 commit e144030
Show file tree
Hide file tree
Showing 14 changed files with 117 additions and 0 deletions.
1 change: 1 addition & 0 deletions maplestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5718,6 +5718,7 @@
#include "maplestation_modules\story_content\captain_equipment\code\captainclothing.dm"
#include "maplestation_modules\story_content\casual_clothing\code\casualclothing.dm"
#include "maplestation_modules\story_content\chaplain_equipment\code\chaplainclothing.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\noble_equipment\code\beacon.dm"
#include "maplestation_modules\story_content\noble_equipment\code\nobleclothing.dm"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@
name = "Sandals"
item_path = /obj/item/clothing/shoes/sandal

/datum/loadout_item/shoes/blacksandals
name = "Black Sandals"
item_path = /obj/item/clothing/shoes/sandal/black

/datum/loadout_item/shoes/trainers
name = "Workout Trainers"
item_path = /obj/item/clothing/shoes/trainers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,3 +354,27 @@
/datum/loadout_item/under/formal/chesedsuit
name = "Blue Waistcoat"
item_path = /obj/item/clothing/under/chesedsuit

/datum/loadout_item/under/formal/kimono
name = "Black Kimono"
item_path = /obj/item/clothing/under/kimono

/datum/loadout_item/under/formal/kimono2
name = "Red Kimono"
item_path = /obj/item/clothing/under/kimono/red

/datum/loadout_item/under/formal/kimono3
name = "Purple Kimono"
item_path = /obj/item/clothing/under/kimono/purple

/datum/loadout_item/under/formal/yukata
name = "Black Yukata"
item_path = /obj/item/clothing/under/yukata

/datum/loadout_item/under/formal/yukata2
name = "Green Yukata"
item_path = /obj/item/clothing/under/yukata/green

/datum/loadout_item/under/formal/yukata3
name = "Blue Yukata"
item_path = /obj/item/clothing/under/yukata/blue
64 changes: 64 additions & 0 deletions maplestation_modules/story_content/kimono/code/kimonoclothing.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/obj/item/clothing/under/kimono
name = "black kimono"
desc = "A black kimono made with silk."
icon = 'maplestation_modules/story_content/kimono/kimono_icon.dmi'
worn_icon = 'maplestation_modules/story_content/kimono/kimono_worn.dmi'
lefthand_file = 'maplestation_modules/story_content/kimono/kimono_lhand.dmi'
righthand_file = 'maplestation_modules/story_content/kimono/kimono_rhand.dmi'
digitigrade_file = 'maplestation_modules/story_content/kimono/kimono_digi.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
body_parts_covered = CHEST|GROIN|ARMS
alternate_worn_layer = ABOVE_SHOES_LAYER
icon_state = "kimono1"
inhand_icon_state = "kimono1"
can_adjust = FALSE

/obj/item/clothing/under/kimono/red
name = "red kimono"
desc = "A red kimono made with silk."
icon_state = "kimono2"
inhand_icon_state = "kimono2"

/obj/item/clothing/under/kimono/purple
name = "purple kimono"
desc = "A purple kimono made with silk."
icon_state = "kimono3"
inhand_icon_state = "kimono3"

/obj/item/clothing/under/yukata
name = "black yukata"
desc = "A black cotton yukata."
icon = 'maplestation_modules/story_content/kimono/kimono_icon.dmi'
worn_icon = 'maplestation_modules/story_content/kimono/kimono_worn.dmi'
lefthand_file = 'maplestation_modules/story_content/kimono/kimono_lhand.dmi'
righthand_file = 'maplestation_modules/story_content/kimono/kimono_rhand.dmi'
digitigrade_file = 'maplestation_modules/story_content/kimono/kimono_digi.dmi'
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
body_parts_covered = CHEST|GROIN|ARMS
alternate_worn_layer = ABOVE_SHOES_LAYER
icon_state = "yukata1"
inhand_icon_state = "yukata1"
can_adjust = FALSE

/obj/item/clothing/under/yukata/green
name = "green yukata"
desc = "A green cotton yukata."
icon_state = "yukata2"
inhand_icon_state = "yukata2"

/obj/item/clothing/under/yukata/blue
name = "blue yukata"
desc = "A blue cotton yukata."
icon_state = "yukata3"
inhand_icon_state = "yukata3"

/obj/item/clothing/shoes/sandal/black
desc = "A pair of rather plain black wooden sandals."
name = "black sandals"
icon = 'maplestation_modules/story_content/kimono/kimono_icon.dmi'
worn_icon = 'maplestation_modules/story_content/kimono/kimono_worn.dmi'
lefthand_file = 'maplestation_modules/story_content/kimono/kimono_lhand.dmi'
righthand_file = 'maplestation_modules/story_content/kimono/kimono_rhand.dmi'
supports_variations_flags = CLOTHING_NO_VARIATION
icon_state = "blacksandals"
inhand_icon_state = "blacksandals"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -217,3 +217,27 @@
icon_state = "penrosescarf"
inhand_icon_state = "penrosescarf"
resistance_flags = FIRE_PROOF|ACID_PROOF

/obj/item/clothing/head/costume/hairpin
name = "elaborate hairpin"
desc = "A jewled hairpin only made for the most delicate of being."
icon = 'maplestation_modules/story_content/noble_equipment/icons/noble_item.dmi'
worn_icon = 'maplestation_modules/story_content/noble_equipment/icons/noble_worn.dmi'
lefthand_file = 'maplestation_modules/story_content/noble_equipment/icons/noble_lhand.dmi'
righthand_file = 'maplestation_modules/story_content/noble_equipment/icons/noble_rhand.dmi'
icon_state = "hairpin_fancy"
inhand_icon_state = "hairpin_fancy"

/obj/item/clothing/under/kimono/fancy
name = "fancy kimono"
desc = "A beatifuly elaborate kimono made from fine delicate silk."
icon = 'maplestation_modules/story_content/noble_equipment/icons/noble_item.dmi'
worn_icon = 'maplestation_modules/story_content/noble_equipment/icons/noble_worn.dmi'
lefthand_file = 'maplestation_modules/story_content/noble_equipment/icons/noble_lhand.dmi'
righthand_file = 'maplestation_modules/story_content/noble_equipment/icons/noble_rhand.dmi'
icon_state = "kimono_fancy"
inhand_icon_state = "kimono_fancy"
supports_variations_flags = CLOTHING_NO_VARIATION
can_adjust = TRUE
body_parts_covered = CHEST|GROIN|ARMS
alternate_worn_layer = ABOVE_SHOES_LAYER
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit e144030

Please sign in to comment.