diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm index e6393629158..94bdf86b23d 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm @@ -3086,7 +3086,7 @@ /obj/machinery/light/small/dim/directional/west, /obj/item/polymorph_belt/functioning, /obj/item/pen/edagger, -/obj/item/clothing/under/costume/schoolgirl/red, +/obj/item/clothing/under/costume/seifuku/red, /obj/structure/sign/poster/contraband/communist_state/directional/west, /turf/open/floor/carpet/green, /area/ruin/syndibiodome) diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm index 2a3acd22051..b387af47fdb 100644 --- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm +++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm @@ -15564,7 +15564,7 @@ /area/station/hallway/primary/central) "eHz" = ( /obj/effect/mapping_helpers/broken_floor, -/obj/item/clothing/under/costume/schoolgirl/green{ +/obj/item/clothing/under/costume/seifuku/teal{ pixel_x = -1; pixel_y = -9 }, @@ -28512,7 +28512,7 @@ /area/station/security/courtroom) "iyx" = ( /obj/structure/chair/sofa/middle/brown, -/obj/item/clothing/under/costume/schoolgirl/red{ +/obj/item/clothing/under/costume/seifuku/red{ pixel_y = -7 }, /obj/item/clothing/head/costume/crown{ @@ -64667,7 +64667,7 @@ /area/station/maintenance/starboard/aft) "tmq" = ( /obj/structure/lattice/catwalk, -/obj/item/clothing/under/costume/schoolgirl{ +/obj/item/clothing/under/costume/seifuku{ pixel_y = -1 }, /obj/structure/table, @@ -72891,7 +72891,7 @@ /area/station/maintenance/hallway/abandoned_recreation) "vGQ" = ( /obj/structure/table, -/obj/item/clothing/under/costume/schoolgirl/orange{ +/obj/item/clothing/under/costume/seifuku/tan{ pixel_x = -14; pixel_y = -2 }, diff --git a/_maps/templates/holodeck_animeschool.dmm b/_maps/templates/holodeck_animeschool.dmm index 6b5afca430c..5f81d574431 100644 --- a/_maps/templates/holodeck_animeschool.dmm +++ b/_maps/templates/holodeck_animeschool.dmm @@ -12,7 +12,7 @@ /obj/structure/table, /obj/item/paper, /obj/item/pen, -/obj/item/clothing/under/costume/schoolgirl, +/obj/item/clothing/under/costume/seifuku, /obj/item/toy/katana, /turf/open/floor/holofloor, /area/template_noop) @@ -25,7 +25,7 @@ /obj/structure/table, /obj/item/paper, /obj/item/pen, -/obj/item/clothing/under/costume/schoolgirl/orange, +/obj/item/clothing/under/costume/seifuku/tan, /turf/open/floor/holofloor, /area/template_noop) "E" = ( @@ -37,7 +37,7 @@ /obj/structure/table, /obj/item/paper, /obj/item/pen, -/obj/item/clothing/under/costume/schoolgirl, +/obj/item/clothing/under/costume/seifuku, /turf/open/floor/holofloor, /area/template_noop) "R" = ( @@ -50,14 +50,14 @@ /obj/structure/table, /obj/item/paper, /obj/item/pen, -/obj/item/clothing/under/costume/schoolgirl/green, +/obj/item/clothing/under/costume/seifuku/teal, /turf/open/floor/holofloor, /area/template_noop) "T" = ( /obj/structure/table, /obj/item/paper, /obj/item/pen, -/obj/item/clothing/under/costume/schoolgirl/red, +/obj/item/clothing/under/costume/seifuku/red, /turf/open/floor/holofloor, /area/template_noop) "Y" = ( diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm index da5fc67c6bb..d96d363a96c 100644 --- a/code/_globalvars/phobias.dm +++ b/code/_globalvars/phobias.dm @@ -166,7 +166,7 @@ GLOBAL_LIST_INIT(phobia_objs, list( /obj/item/clothing/head/costume/kitty/genuine, /obj/item/clothing/mask/gas/ninja, /obj/item/clothing/under/syndicate/ninja, - /obj/item/clothing/under/costume/schoolgirl, + /obj/item/clothing/under/costume/seifuku, /obj/item/energy_katana, /obj/item/food/chawanmushi, /obj/item/food/sashimi, diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm index 90e37470871..18d54a58c6f 100644 --- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm +++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm @@ -369,6 +369,26 @@ name = "Sailor Dress(Worn)" icon_file = 'icons/mob/clothing/under/dress.dmi' +/datum/greyscale_config/seifuku + name = "Seifuku" + icon_file = 'icons/obj/clothing/under/costume.dmi' + json_config = 'code/datums/greyscale/json_configs/seifuku.json' + +/datum/greyscale_config/seifuku/worn + name = "Seifuku (Worn)" + icon_file = 'icons/mob/clothing/under/costume.dmi' + json_config = 'code/datums/greyscale/json_configs/seifuku_worn.json' + +/datum/greyscale_config/seifuku_inhands_left + name = "Seifuku Inhands Left" + icon_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' + json_config = 'code/datums/greyscale/json_configs/seifuku_inhands.json' + +/datum/greyscale_config/seifuku_inhands_right + name = "Seifuku Inhands Right" + icon_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' + json_config = 'code/datums/greyscale/json_configs/seifuku_inhands.json' + // SHIRTS, PANTS AND SHORTS /datum/greyscale_config/slacks name = "Slacks" diff --git a/code/datums/greyscale/json_configs/seifuku.json b/code/datums/greyscale/json_configs/seifuku.json new file mode 100644 index 00000000000..dbfb32c5f28 --- /dev/null +++ b/code/datums/greyscale/json_configs/seifuku.json @@ -0,0 +1,22 @@ +{ + "seifuku": [ + { + "type": "icon_state", + "icon_state": "seifuku_ribbon", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "seifuku_skirt", + "blend_mode": "overlay", + "color_ids": [2] + }, + { + "type": "icon_state", + "icon_state": "seifuku_shirt", + "blend_mode": "overlay", + "color_ids": [3] + } + ] +} diff --git a/code/datums/greyscale/json_configs/seifuku_inhands.json b/code/datums/greyscale/json_configs/seifuku_inhands.json new file mode 100644 index 00000000000..dbfb32c5f28 --- /dev/null +++ b/code/datums/greyscale/json_configs/seifuku_inhands.json @@ -0,0 +1,22 @@ +{ + "seifuku": [ + { + "type": "icon_state", + "icon_state": "seifuku_ribbon", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "seifuku_skirt", + "blend_mode": "overlay", + "color_ids": [2] + }, + { + "type": "icon_state", + "icon_state": "seifuku_shirt", + "blend_mode": "overlay", + "color_ids": [3] + } + ] +} diff --git a/code/datums/greyscale/json_configs/seifuku_worn.json b/code/datums/greyscale/json_configs/seifuku_worn.json new file mode 100644 index 00000000000..4c523c60aa9 --- /dev/null +++ b/code/datums/greyscale/json_configs/seifuku_worn.json @@ -0,0 +1,42 @@ +{ + "seifuku": [ + { + "type": "icon_state", + "icon_state": "seifuku_ribbon", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "seifuku_skirt", + "blend_mode": "overlay", + "color_ids": [2] + }, + { + "type": "icon_state", + "icon_state": "seifuku_shirt", + "blend_mode": "overlay", + "color_ids": [3] + } + ], + "seifuku_d": [ + { + "type": "icon_state", + "icon_state": "seifuku_ribbon_d", + "blend_mode": "overlay", + "color_ids": [1] + }, + { + "type": "icon_state", + "icon_state": "seifuku_skirt_d", + "blend_mode": "overlay", + "color_ids": [2] + }, + { + "type": "icon_state", + "icon_state": "seifuku_shirt_d", + "blend_mode": "overlay", + "color_ids": [3] + } + ] +} diff --git a/code/game/objects/effects/spawners/costume.dm b/code/game/objects/effects/spawners/costume.dm index e5280f7e661..32f5bcd4fc8 100644 --- a/code/game/objects/effects/spawners/costume.dm +++ b/code/game/objects/effects/spawners/costume.dm @@ -47,7 +47,7 @@ /obj/effect/spawner/costume/nyangirl name = "nyangirl costume spawner" items = list( - /obj/item/clothing/under/costume/schoolgirl, + /obj/item/clothing/under/costume/seifuku, /obj/item/clothing/head/costume/kitty, /obj/item/clothing/glasses/blindfold, ) diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 50bd398793a..84586ce3356 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -590,8 +590,8 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w H.fully_replace_character_name(H.real_name,newname) H.update_body_parts() if(animetype == "Yes") - var/seifuku = pick(typesof(/obj/item/clothing/under/costume/schoolgirl)) - var/obj/item/clothing/under/costume/schoolgirl/I = new seifuku + var/seifuku = pick(typesof(/obj/item/clothing/under/costume/seifuku)) + var/obj/item/clothing/under/costume/seifuku/I = new seifuku var/olduniform = H.w_uniform H.temporarilyRemoveItemFromInventory(H.w_uniform, TRUE, FALSE) H.equip_to_slot_or_del(I, ITEM_SLOT_ICLOTHING) diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index 6e24bb17f5d..87b0f330dad 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -31,29 +31,34 @@ icon_state = "griffin" can_adjust = FALSE -/obj/item/clothing/under/costume/schoolgirl - name = "blue schoolgirl uniform" +/obj/item/clothing/under/costume/seifuku + name = "schoolgirl uniform" desc = "It's just like one of my Japanese animes!" - icon_state = "schoolgirl" - inhand_icon_state = null + greyscale_colors = "#942737#4A518D#EBEBEB" + icon = 'icons/map_icons/clothing/under/costume.dmi' + icon_state = "/obj/item/clothing/under/costume/seifuku" + post_init_icon_state = "seifuku" + greyscale_config_inhand_left = /datum/greyscale_config/seifuku_inhands_left + greyscale_config_inhand_right = /datum/greyscale_config/seifuku_inhands_right + inhand_icon_state = "seifuku" + greyscale_config = /datum/greyscale_config/seifuku + greyscale_config_worn = /datum/greyscale_config/seifuku/worn + flags_1 = IS_PLAYER_COLORABLE_1 body_parts_covered = CHEST|GROIN|ARMS female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - can_adjust = FALSE + alternate_worn_layer = UNDER_SUIT_LAYER -/obj/item/clothing/under/costume/schoolgirl/red - name = "red schoolgirl uniform" - icon_state = "schoolgirlred" - inhand_icon_state = null +/obj/item/clothing/under/costume/seifuku/red + icon_state = "/obj/item/clothing/under/costume/seifuku/red" + greyscale_colors = "#3F4453#BB2E2E#EBEBEB" -/obj/item/clothing/under/costume/schoolgirl/green - name = "green schoolgirl uniform" - icon_state = "schoolgirlgreen" - inhand_icon_state = null +/obj/item/clothing/under/costume/seifuku/teal + icon_state = "/obj/item/clothing/under/costume/seifuku/teal" + greyscale_colors = "#942737#2BA396#EBEBEB" -/obj/item/clothing/under/costume/schoolgirl/orange - name = "orange schoolgirl uniform" - icon_state = "schoolgirlorange" - inhand_icon_state = null +/obj/item/clothing/under/costume/seifuku/tan + icon_state = "/obj/item/clothing/under/costume/seifuku/tan" + greyscale_colors = "#87502E#B9A56A#EBEBEB" /obj/item/clothing/under/costume/pirate name = "pirate outfit" diff --git a/code/modules/deathmatch/deathmatch_loadouts.dm b/code/modules/deathmatch/deathmatch_loadouts.dm index c3d0764832c..8729c2d811d 100644 --- a/code/modules/deathmatch/deathmatch_loadouts.dm +++ b/code/modules/deathmatch/deathmatch_loadouts.dm @@ -298,7 +298,7 @@ desc = "What" l_hand = /obj/item/toy/katana - uniform = /obj/item/clothing/under/costume/schoolgirl + uniform = /obj/item/clothing/under/costume/seifuku suit = /obj/item/clothing/suit/costume/joker shoes = /obj/item/clothing/shoes/clown_shoes/meown_shoes head = /obj/item/clothing/head/costume/kitty diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index e0e079b6e8c..f6234aa4421 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -96,10 +96,10 @@ GLOBAL_LIST_INIT(autodrobe_entretainers_items, list( GLOBAL_LIST_INIT(autodrobe_fancy_items, list( /obj/item/clothing/under/rank/captain/suit = 1, /obj/item/clothing/under/rank/captain/suit/skirt = 1, - /obj/item/clothing/under/costume/schoolgirl = 3, - /obj/item/clothing/under/costume/schoolgirl/red = 3, - /obj/item/clothing/under/costume/schoolgirl/green = 3, - /obj/item/clothing/under/costume/schoolgirl/orange = 3, + /obj/item/clothing/under/costume/seifuku = 3, + /obj/item/clothing/under/costume/seifuku/red = 3, + /obj/item/clothing/under/costume/seifuku/teal = 3, + /obj/item/clothing/under/costume/seifuku/tan = 3, /obj/item/clothing/under/dress/skirt = 3, /obj/item/clothing/neck/tie = 3, /obj/item/clothing/head/hats/tophat = 3, diff --git a/icons/map_icons/clothing/under/costume.dmi b/icons/map_icons/clothing/under/costume.dmi index 4cc1261c71d..4e4975cce13 100644 Binary files a/icons/map_icons/clothing/under/costume.dmi and b/icons/map_icons/clothing/under/costume.dmi differ diff --git a/icons/mob/clothing/under/costume.dmi b/icons/mob/clothing/under/costume.dmi index a7dd73cfe3a..65643aa8db6 100644 Binary files a/icons/mob/clothing/under/costume.dmi and b/icons/mob/clothing/under/costume.dmi differ diff --git a/icons/mob/inhands/clothing/suits_lefthand.dmi b/icons/mob/inhands/clothing/suits_lefthand.dmi index 661d98d87e2..ce0c699dd10 100644 Binary files a/icons/mob/inhands/clothing/suits_lefthand.dmi and b/icons/mob/inhands/clothing/suits_lefthand.dmi differ diff --git a/icons/mob/inhands/clothing/suits_righthand.dmi b/icons/mob/inhands/clothing/suits_righthand.dmi index 6e9b9ab23cf..5ba0c51ac1a 100644 Binary files a/icons/mob/inhands/clothing/suits_righthand.dmi and b/icons/mob/inhands/clothing/suits_righthand.dmi differ diff --git a/icons/obj/clothing/under/costume.dmi b/icons/obj/clothing/under/costume.dmi index 42aa61e66b8..b05808ec5c2 100644 Binary files a/icons/obj/clothing/under/costume.dmi and b/icons/obj/clothing/under/costume.dmi differ