Even more sprites including decent hoodies

This commit is contained in:
Heroman3003
2023-02-19 05:56:34 +10:00
committed by CHOMPStation2
parent a6491b8d6f
commit be56ab7289
28 changed files with 463 additions and 17 deletions

View File

@@ -77,4 +77,14 @@
/datum/category_item/underwear/bottom/neko /datum/category_item/underwear/bottom/neko
name = "Panties, Neko" name = "Panties, Neko"
icon_state = "panties_neko" icon_state = "panties_neko"
has_color = TRUE
/datum/category_item/underwear/bottom/swimbottom
name = "Swimming Bottoms"
icon_state = "swimbottom"
has_color = TRUE
/datum/category_item/underwear/bottom/onepiece
name = "Swimming One Piece"
icon_state = "onepiece"
has_color = TRUE has_color = TRUE

View File

@@ -90,4 +90,9 @@
/datum/category_item/underwear/top/sarashi /datum/category_item/underwear/top/sarashi
name = "Sarashi" name = "Sarashi"
icon_state = "bandages" icon_state = "bandages"
has_color = TRUE
/datum/category_item/underwear/top/swimtop
name = "Swimming Top"
icon_state = "swimtop"
has_color = TRUE has_color = TRUE

View File

@@ -72,6 +72,22 @@
..() ..()
gear_tweaks += gear_tweak_free_color_choice gear_tweaks += gear_tweak_free_color_choice
/datum/gear/head/halo/alt
display_name = "halo, alt"
path = /obj/item/clothing/head/halo/alt
/datum/gear/head/buckethat
display_name = "hat, bucket"
path = /obj/item/clothing/head/buckethat
/datum/gear/head/buckethat/New()
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/head/nonla
display_name = "hat, non la"
path = /obj/item/clothing/head/nonla
/* /*
Talon hats Talon hats
*/ */

View File

@@ -74,4 +74,11 @@
for(var/gaiter in typesof(/obj/item/clothing/accessory/gaiter)) for(var/gaiter in typesof(/obj/item/clothing/accessory/gaiter))
var/obj/item/clothing/accessory/gaiter_type = gaiter var/obj/item/clothing/accessory/gaiter_type = gaiter
gaiters[initial(gaiter_type.name)] = gaiter_type gaiters[initial(gaiter_type.name)] = gaiter_type
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc)) gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
/datum/gear/mask/lace
display_name = "lace veil"
path = /obj/item/clothing/mask/lacemask
/datum/gear/mask/lace/New()
gear_tweaks += gear_tweak_free_color_choice

View File

@@ -30,5 +30,9 @@
path = /obj/item/clothing/shoes/boots/singer/yellow path = /obj/item/clothing/shoes/boots/singer/yellow
/datum/gear/shoes/antediluvian /datum/gear/shoes/antediluvian
display_name = "antediluvian legwraps" display_name = "legwraps, antediluvian"
path = /obj/item/clothing/shoes/antediluvian path = /obj/item/clothing/shoes/antediluvian
/datum/gear/shoes/flats/alt
display_name = "flats, alt"
path = /obj/item/clothing/shoes/flats/white/color/alt

View File

@@ -225,4 +225,91 @@ Talon winter coat
"blue mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/hop, "blue mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/hop,
"gold mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/cap "gold mantle"=/obj/item/clothing/accessory/poncho/roles/cloak/mantle/cap
) )
gear_tweaks += new/datum/gear_tweak/path(mantles) gear_tweaks += new/datum/gear_tweak/path(mantles)
//Boat cloaks
/datum/gear/suit/roles/boatcloak
display_name = "boat cloak, colorable"
path = /obj/item/clothing/accessory/poncho/roles/cloak/boat
/datum/gear/suit/roles/boatcloak/New()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/roles/capboatcloak
display_name = "boat cloak, site manager"
path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/cap
allowed_roles = list("Site Manager")
/datum/gear/suit/roles/hopboatcloak
display_name = "boat cloak, head of personnel"
path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/hop
allowed_roles = list("Head of Personnel")
/datum/gear/suit/roles/boatcloaks
display_name = "boat cloak selection"
path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/security
/datum/gear/suit/roles/boatcloaks/New()
..()
var/list/boatcloaks = list(
"security boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/security,
"engineering boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/engineering,
"atmospherics boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/atmos,
"medical boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/medical,
"service boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/service,
"cargo boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/cargo,
"mining boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/mining,
"research boat cloak"=/obj/item/clothing/accessory/poncho/roles/cloak/boat/science
)
gear_tweaks += new/datum/gear_tweak/path(boatcloaks)
//Shrouds
/datum/gear/suit/roles/shroud
display_name = "shroud, colorable"
path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud
/datum/gear/suit/roles/shroud/New()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/suit/roles/capshroud
display_name = "shroud, site manager"
path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/cap
allowed_roles = list("Site Manager")
/datum/gear/suit/roles/hopshroud
display_name = "shroud, head of personnel"
path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/hop
allowed_roles = list("Head of Personnel")
/datum/gear/suit/roles/shrouds
display_name = "shroud selection"
path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/security
/datum/gear/suit/roles/shrouds/New()
..()
var/list/shrouds = list(
"security shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/security,
"engineering shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/engineering,
"atmospherics shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/atmos,
"medical shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/medical,
"service shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/service,
"cargo shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/cargo,
"mining shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/mining,
"research shroud"=/obj/item/clothing/accessory/poncho/roles/cloak/shroud/science
)
gear_tweaks += new/datum/gear_tweak/path(shrouds)
//Actually colorable hoodies
/datum/gear/suit/roles/choodies
display_name = "hoodie selection, colorable"
path = /obj/item/clothing/suit/storage/hooded/toggle/colorable
/datum/gear/suit/roles/choodies/New()
..()
var/list/choodies = list(
"normal hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable,
"sleeveless hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/sleeveless,
"cropped hoodie"=/obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped
)
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += new/datum/gear_tweak/path(choodies)

View File

@@ -346,4 +346,27 @@ Talon jumpsuit
/datum/gear/uniform/antediluvianalt /datum/gear/uniform/antediluvianalt
display_name = "corset, antediluvian alt" display_name = "corset, antediluvian alt"
path = /obj/item/clothing/under/dress/antediluvian/sheerless path = /obj/item/clothing/under/dress/antediluvian/sheerless
//Colorable skirts
/datum/gear/uniform/coloredskirts
display_name = "skirt selection, colorable"
path = /obj/item/clothing/under/skirt/colorable
/datum/gear/uniform/coloredskirts/New()
..()
var/list/skirts = list(
"casual skirt"=/obj/item/clothing/under/skirt/colorable,
"puffy skirt"=/obj/item/clothing/under/skirt/colorable/puffy,
"skater skirt"=/obj/item/clothing/under/skirt/colorable/skater,
"pleated skirt"=/obj/item/clothing/under/skirt/colorable/pleated,
"pencil skirt"=/obj/item/clothing/under/skirt/colorable/pencil,
"plaid skirt"=/obj/item/clothing/under/skirt/colorable/plaid,
"tube skirt"=/obj/item/clothing/under/skirt/colorable/tube,
"long skirt"=/obj/item/clothing/under/skirt/colorable/long,
"high skirt"=/obj/item/clothing/under/skirt/colorable/high,
"swept skirt"=/obj/item/clothing/under/skirt/colorable/swept,
"jumper skirt"=/obj/item/clothing/under/skirt/colorable/jumper,
"jumper dress"=/obj/item/clothing/under/skirt/colorable/jumperdress
)
gear_tweaks += list(new/datum/gear_tweak/path(skirts), gear_tweak_free_color_choice)

View File

@@ -76,3 +76,20 @@
/obj/item/clothing/head/hood/winter /obj/item/clothing/head/hood/winter
sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi', sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/head/mob_vr_teshari.dmi',
SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi') SPECIES_VOX = 'icons/inventory/head/mob_vox.dmi')
//Better hoodies hood
/obj/item/clothing/head/hood/toggleable
name = "super special hood"
desc = "This hood is so special that you weren't even supposed to lay eyes on it! Tell a developer!"
var/open = FALSE
/obj/item/clothing/head/hood/toggleable/colorable
name = "hoodie hood"
desc = "It's the hood part of a hoodie. What kind of hoodie would it be without one? A poser, obviously."
icon = 'icons/inventory/head/item_vr.dmi'
icon_override = 'icons/inventory/head/mob_vr.dmi'
icon_state = "choodie"
/obj/item/clothing/head/hood/toggleable/colorable/update_icon()
. = ..()
icon_state = "[initial(icon_state)][open ? "_open" : ""]"

View File

@@ -96,9 +96,30 @@
/obj/item/clothing/head/wedding /obj/item/clothing/head/wedding
name = "wedding veil" name = "wedding veil"
desc = "A lace veil worn over the face, typically by a bride during their wedding." desc = "A lace veil worn over the face, typically by a bride during their wedding."
icon_state = "weddingveil"
icon = 'icons/inventory/head/item_vr.dmi' icon = 'icons/inventory/head/item_vr.dmi'
icon_override = 'icons/inventory/head/mob_vr.dmi' icon_override = 'icons/inventory/head/mob_vr.dmi'
icon_state = "weddingveil"
/obj/item/clothing/head/halo/alt
name = "metal halo"
desc = "A halo made of a light metal. This one doesn't float, but it's still a circle on your head!"
icon = 'icons/inventory/head/item_vr.dmi'
icon_override = 'icons/inventory/head/mob_vr.dmi'
icon_state = "halo_alt"
/obj/item/clothing/head/buckethat
name = "bucket hat"
desc = "Turns out these are actually called 'gatsby caps' but telling people you wear a bucket is slightly more interesting, so that's what it's called."
icon = 'icons/inventory/head/item_vr.dmi'
icon_override = 'icons/inventory/head/mob_vr.dmi'
icon_state = "buckethat"
/obj/item/clothing/head/nonla
name = "non la"
desc = "A conical hat typically woven from leaves, good for keeping the sun AND rain off your head, in case it happens to be sunny while raining."
icon = 'icons/inventory/head/item_vr.dmi'
icon_override = 'icons/inventory/head/mob_vr.dmi'
icon_state = "nonla"
//////////TALON HATS////////// //////////TALON HATS//////////

View File

@@ -1,4 +1,11 @@
/obj/item/clothing/mask/emotions /obj/item/clothing/mask/emotions
sprite_sheets = list( sprite_sheets = list(
SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi' SPECIES_TESHARI = 'icons/inventory/face/mob_vr_teshari.dmi'
) )
/obj/item/clothing/mask/lacemask
name = "lace mask"
desc = "A sheer lace mask that rests above the nose and trails down below the chin."
icon = 'icons/inventory/face/item_vr.dmi'
icon_state = "lace_mask"
icon_override = 'icons/inventory/face/mob_vr.dmi'

View File

@@ -98,4 +98,11 @@
icon = 'icons/inventory/feet/item_vr.dmi' icon = 'icons/inventory/feet/item_vr.dmi'
icon_override = 'icons/inventory/feet/mob_vr.dmi' icon_override = 'icons/inventory/feet/mob_vr.dmi'
icon_state = "antediluvian" icon_state = "antediluvian"
item_state = "antediluvian" item_state = "antediluvian"
//Alternative flats
/obj/item/clothing/shoes/flats/white/color/alt
icon = 'icons/inventory/feet/item_vr.dmi'
icon_override = 'icons/inventory/feet/mob_vr.dmi'
icon_state = "flatsalt"
item_state = "flatsalt"

View File

@@ -32,8 +32,8 @@
..() ..()
/obj/item/clothing/suit/storage/hooded/proc/RemoveHood() /obj/item/clothing/suit/storage/hooded/proc/RemoveHood()
icon_state = toggleicon
hood_up = FALSE hood_up = FALSE
update_icon()
hood.canremove = TRUE // This shouldn't matter anyways but just incase. hood.canremove = TRUE // This shouldn't matter anyways but just incase.
if(ishuman(hood.loc)) if(ishuman(hood.loc))
var/mob/living/carbon/H = hood.loc var/mob/living/carbon/H = hood.loc
@@ -55,16 +55,20 @@
to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>") to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
return return
else else
if(color != hood.color)
hood.color = color
H.equip_to_slot_if_possible(hood,slot_head,0,0,1) H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
hood_up = TRUE hood_up = TRUE
hood.canremove = FALSE hood.canremove = FALSE
icon_state = "[toggleicon]_t" update_icon()
H.update_inv_wear_suit() H.update_inv_wear_suit()
if(color != hood.color)
hood.color = color
else else
RemoveHood() RemoveHood()
/obj/item/clothing/suit/storage/hooded/update_icon()
. = ..()
icon_state = "[toggleicon][hood_up ? "_t" : ""]"
/obj/item/clothing/suit/storage/hooded/costume /obj/item/clothing/suit/storage/hooded/costume
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER flags_inv = HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER

View File

@@ -159,3 +159,23 @@
/obj/item/clothing/suit/storage/hooded/wintercoat /obj/item/clothing/suit/storage/hooded/wintercoat
sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/suit/mob_vr_teshari.dmi', sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/suit/mob_vr_teshari.dmi',
SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi') SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi')
//Hoodies worth their weight in gold (as in you can unbutton them and toggle the hood independently)
/obj/item/clothing/suit/storage/hooded/toggle/colorable
name = "hoodie"
desc = "A rather plain hoodie. If you can't find it in your closet, chances are your significant other is borrowing it."
icon = 'icons/inventory/suit/item_vr.dmi'
icon_override = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "choodie"
hoodtype = /obj/item/clothing/head/hood/toggleable/colorable
open = FALSE
/obj/item/clothing/suit/storage/hooded/toggle/colorable/sleeveless
name = "sleeveless hoodie"
desc = "Either your arms were too hot or the sleeves vaporized when you gave someone a 'gunshow' with your muscles. Either way, the sleeves are missing."
icon_state = "choodie_sleeveless"
/obj/item/clothing/suit/storage/hooded/toggle/colorable/cropped
name = "cropped hoodie"
desc = "It's not that this is a size too small, you just like showing off your tum. I guess."
icon_state = "choodie_crop"

View File

@@ -68,19 +68,27 @@
if(open == 1) //Will check whether icon state is currently set to the "open" or "closed" state and switch it around with a message to the user if(open == 1) //Will check whether icon state is currently set to the "open" or "closed" state and switch it around with a message to the user
open = 0 open = 0
icon_state = initial(icon_state) update_icon()
flags_inv = HIDETIE|HIDEHOLSTER flags_inv = HIDETIE|HIDEHOLSTER
to_chat(usr, "You button up the coat.") to_chat(usr, "You button up the coat.")
else if(open == 0) else if(open == 0)
open = 1 open = 1
icon_state = "[icon_state]_open" update_icon()
flags_inv = HIDEHOLSTER flags_inv = HIDEHOLSTER
to_chat(usr, "You unbutton the coat.") to_chat(usr, "You unbutton the coat.")
else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed
to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how silly you are.") to_chat(usr, "You attempt to button-up the velcro on your [src], before promptly realising how silly you are.")
return return
update_clothing_icon() //so our overlays update if(istype(hood,/obj/item/clothing/head/hood/toggleable)) //checks if a hood (which you should use) is attached
var/obj/item/clothing/head/hood/toggleable/T = hood
T.open = open //copy the jacket's open state to the hood
T.update_icon(usr) //usr as an arg to fix a weird runtime
T.update_clothing_icon()
update_clothing_icon() //so our overlays update
/obj/item/clothing/suit/storage/hooded/toggle/update_icon()
. = ..()
icon_state = "[toggleicon][open ? "_open" : ""][hood_up ? "_t" : ""]"
//New Vest 4 pocket storage and badge toggles, until suit accessories are a thing. //New Vest 4 pocket storage and badge toggles, until suit accessories are a thing.
/obj/item/clothing/suit/storage/vest/heavy/New() /obj/item/clothing/suit/storage/vest/heavy/New()

View File

@@ -572,3 +572,120 @@
desc = "A shoulder mantle bearing the colors usually found on a Site Manager, a commanding blue with regal gold inlay." desc = "A shoulder mantle bearing the colors usually found on a Site Manager, a commanding blue with regal gold inlay."
icon_state = "capmantle" icon_state = "capmantle"
item_state = "capmantle" item_state = "capmantle"
<<<<<<< HEAD
=======
//Boat cloaks
/obj/item/clothing/accessory/poncho/roles/cloak/boat
name = "boat cloak"
desc = "A cloak that might've been worn on boats once or twice. It's just a flappy cape otherwise."
icon_state = "boatcloak"
item_state = "boatcloak"
/obj/item/clothing/accessory/poncho/roles/cloak/boat/cap
name = "site manager boat cloak"
icon_state = "capboatcloak"
item_state = "capboatcloak"
/obj/item/clothing/accessory/poncho/roles/cloak/boat/hop
name = "head of personnel boat cloak"
icon_state = "hopboatcloak"
item_state = "hopboatcloak"
/obj/item/clothing/accessory/poncho/roles/cloak/boat/security
name = "security boat cloak"
icon_state = "secboatcloak"
item_state = "secboatcloak"
/obj/item/clothing/accessory/poncho/roles/cloak/boat/engineering
name = "engineering boat cloak"
icon_state = "engboatcloak"
item_state = "engboatcloak"
/obj/item/clothing/accessory/poncho/roles/cloak/boat/atmos
name = "atmospherics boat cloak"
icon_state = "atmosboatcloak"
item_state = "atmosboatcloak"
/obj/item/clothing/accessory/poncho/roles/cloak/boat/medical
name = "medical boat cloak"
icon_state = "medboatcloak"
item_state = "medboatcloak"
/obj/item/clothing/accessory/poncho/roles/cloak/boat/service
name = "service boat cloak"
icon_state = "botboatcloak"
item_state = "botboatcloak"
/obj/item/clothing/accessory/poncho/roles/cloak/boat/cargo
name = "cargo boat cloak"
icon_state = "supboatcloak"
item_state = "supboatcloak"
/obj/item/clothing/accessory/poncho/roles/cloak/boat/mining
name = "mining boat cloak"
icon_state = "minboatcloak"
item_state = "minboatcloak"
/obj/item/clothing/accessory/poncho/roles/cloak/boat/science
name = "research boat cloak"
icon_state = "sciboatcloak"
item_state = "sciboatcloak"
//Shrouds
/obj/item/clothing/accessory/poncho/roles/cloak/shroud
name = "shroud cape"
desc = "A sharp looking cape that covers more of one side than the other. Just a bit edgy."
icon_state = "shroud"
item_state = "shroud"
/obj/item/clothing/accessory/poncho/roles/cloak/shroud/cap
name = "site manager shroud"
icon_state = "capshroud"
item_state = "capshroud"
/obj/item/clothing/accessory/poncho/roles/cloak/shroud/hop
name = "head of personnel shroud"
icon_state = "hopshroud"
item_state = "hopshroud"
/obj/item/clothing/accessory/poncho/roles/cloak/shroud/security
name = "security shroud"
icon_state = "secshroud"
item_state = "secshroud"
/obj/item/clothing/accessory/poncho/roles/cloak/shroud/engineering
name = "engineering shroud"
icon_state = "engshroud"
item_state = "engshroud"
/obj/item/clothing/accessory/poncho/roles/cloak/shroud/atmos
name = "atmospherics shroud"
icon_state = "atmosshroud"
item_state = "atmosshroud"
/obj/item/clothing/accessory/poncho/roles/cloak/shroud/medical
name = "medical shroud"
icon_state = "medshroud"
item_state = "medshroud"
/obj/item/clothing/accessory/poncho/roles/cloak/shroud/service
name = "service shroud"
icon_state = "botshroud"
item_state = "botshroud"
/obj/item/clothing/accessory/poncho/roles/cloak/shroud/cargo
name = "cargo shroud"
icon_state = "supshroud"
item_state = "supshroud"
/obj/item/clothing/accessory/poncho/roles/cloak/shroud/mining
name = "mining shroud"
icon_state = "minshroud"
item_state = "minshroud"
/obj/item/clothing/accessory/poncho/roles/cloak/shroud/science
name = "research shroud"
icon_state = "scishroud"
item_state = "scishroud"
>>>>>>> 770f8fb231... Merge pull request #14505 from Burrito-Justice/master

View File

@@ -505,4 +505,85 @@
/obj/item/clothing/under/dress/antediluvian/sheerless /obj/item/clothing/under/dress/antediluvian/sheerless
desc = "A regal black and gold tight corset with silky sleeves. This one is just the corset and sleeves, sans lace stockings and gloves." desc = "A regal black and gold tight corset with silky sleeves. This one is just the corset and sleeves, sans lace stockings and gloves."
worn_state = "antediluvian_c" worn_state = "antediluvian_c"
//Colorable skirts
/obj/item/clothing/under/skirt/colorable
name = "skirt"
desc = "A rather plain looking skirt."
icon = 'icons/inventory/uniform/item_vr.dmi'
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
icon_state = "skirt_casual"
item_state = "skirt_casual"
worn_state = "skirt_casual"
/obj/item/clothing/under/skirt/colorable/puffy
icon_state = "skirt_puffy"
item_state = "skirt_puffy"
worn_state = "skirt_puffy"
/obj/item/clothing/under/skirt/colorable/skater
desc = "A skirt with loose frills."
icon_state = "skirt_skater"
item_state = "skirt_skater"
worn_state = "skirt_skater"
/obj/item/clothing/under/skirt/colorable/pleated
desc = "A short skirt featuring pleat trailing up from the hem."
icon_state = "skirt_pleated"
item_state = "skirt_pleated"
worn_state = "skirt_pleated"
/obj/item/clothing/under/skirt/colorable/pencil
name = "pencil skirt"
desc = "A short skirt that's almost as thin as a pencil. Almost."
icon_state = "skirt_pencil"
item_state = "skirt_pencil"
worn_state = "skirt_pencil"
/obj/item/clothing/under/skirt/colorable/plaid
name = "plaid skirt"
desc = "A skirt featuring a plaid pattern."
icon_state = "skirt_plaid"
item_state = "skirt_plaid"
worn_state = "skirt_plaid"
/obj/item/clothing/under/skirt/colorable/tube
desc = "A long thin skirt that trails beyond the knees."
icon_state = "skirt_tube"
item_state = "skirt_tube"
worn_state = "skirt_tube"
/obj/item/clothing/under/skirt/colorable/long
name = "long skirt"
icon_state = "skirt_long"
item_state = "skirt_long"
worn_state = "skirt_long"
/obj/item/clothing/under/skirt/colorable/high
name = "high skirt"
desc = "A skirt that rests at the waist instead of the hips."
icon_state = "skirt_high"
item_state = "skirt_high"
worn_state = "skirt_high"
/obj/item/clothing/under/skirt/colorable/swept
name = "swept skirt"
desc = "A skirt with an angled hem; shorter on one side, longer on the other, like a sweep."
icon_state = "skirt_swept"
item_state = "skirt_swept"
worn_state = "skirt_swept"
/obj/item/clothing/under/skirt/colorable/jumper
name = "jumper skirt"
desc = "A skirt that's held up by suspenders."
icon_state = "skirt_jumper"
item_state = "skirt_jumper"
worn_state = "skirt_jumper"
/obj/item/clothing/under/skirt/colorable/jumperdress
name = "jumper dress"
desc = "A dress held up by suspenders. Not quite a skirt anymore."
icon_state = "skirt_jumperdress"
item_state = "skirt_jumperdress"
worn_state = "skirt_jumperdress"

View File

@@ -227,7 +227,7 @@
/obj/item/clothing/head/fluff/nikki, /obj/item/clothing/head/fluff/nikki,
/obj/item/clothing/under/skirt/outfit/fluff/nikki, /obj/item/clothing/under/skirt/outfit/fluff/nikki,
/obj/item/clothing/shoes/fluff/nikki) /obj/item/clothing/shoes/fluff/nikki)
// DefiintelyNotARock:Aku Zoles // DefiintelyNotARock:Aku Zoles
/obj/item/weapon/storage/secure/briefcase/dealer /obj/item/weapon/storage/secure/briefcase/dealer
name = "Aku's Dealer briefcase" name = "Aku's Dealer briefcase"
@@ -299,6 +299,18 @@ Swimsuits, for general use, to avoid arriving to work with your swimsuit.
name = "Cow Bikini Swimsuit capsule" name = "Cow Bikini Swimsuit capsule"
has_items = list(/obj/item/clothing/under/swimsuit/cowbikini) has_items = list(/obj/item/clothing/under/swimsuit/cowbikini)
/obj/item/weapon/storage/box/fluff/swimsuit/stripperpink
name = "Skimpy Pink Swimsuit capsule"
has_items = list(/obj/item/clothing/under/swimsuit/stripper/stripper_pink)
/obj/item/weapon/storage/box/fluff/swimsuit/strippergreen
name = "Skimpy Green Swimsuit capsule"
has_items = list(/obj/item/clothing/under/swimsuit/stripper/stripper_green)
/obj/item/weapon/storage/box/fluff/swimsuit/mankini
name = "Pink Mankini capsule"
has_items = list(/obj/item/clothing/under/swimsuit/stripper/mankini)
//Monkey boxes for the new primals we have //Monkey boxes for the new primals we have
/obj/item/weapon/storage/box/monkeycubes/sobakacubes /obj/item/weapon/storage/box/monkeycubes/sobakacubes
name = "sobaka cube box" name = "sobaka cube box"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 60 KiB