Schoolgirl Outfit Resprited Renamed and GAGsified (#91871)
## About The Pull Request Renames the schoolgirl costume to seifuku, the japanese name for sailor style uniforms. Resprites the uniform using GAGs. Adds an 'adjust' style for the uniforms(rolled sleeves). Tweaks the stock uniform colors from blue, red, green, and orange to blue, red, teal, and tan. stock options blue, red, teal, tan. long sleeve/short sleeve  custom colors as example +anyone sad about the sailor moon reference being replaced with more basic colors dont worry you can still make them :)  ## Why It's Good For The Game Updates the sprite to be more inline with our current clothes. Makes the sprite in-game player customizable. ## Changelog 🆑 image: resprites the schoolgirl outfit using GAGs /🆑
@@ -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)
|
||||
|
||||
@@ -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
|
||||
},
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -367,6 +367,26 @@ SKYRAT EDIT END */
|
||||
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"
|
||||
|
||||
@@ -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]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -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]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -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]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -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,
|
||||
)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -284,7 +284,7 @@
|
||||
display_name = "Coder"
|
||||
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
|
||||
|
||||
@@ -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,
|
||||
|
||||
|
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 8.3 KiB |
|
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 66 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 27 KiB |