diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 1948c065270..5dc36f4e06b 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -23,7 +23,6 @@ new /obj/item/clothing/head/pin/flower/pink(src) new /obj/item/clothing/head/pin/flower/yellow(src) new /obj/item/clothing/head/pin/flower/blue(src) - new /obj/item/clothing/head/pin/pink(src) new /obj/item/clothing/head/pin/magnetic(src) new /obj/item/clothing/under/sl_suit(src) new /obj/item/clothing/under/sl_suit(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 7b32b371e7f..e78b91197ac 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -152,7 +152,6 @@ sweater["argyle turtleneck sweater"] = /obj/item/clothing/accessory/sweaterargyleturtleneck sweater["tubeneck sweater"] = /obj/item/clothing/accessory/sweatertubeneck sweater["argyle tubeneck sweater"] = /obj/item/clothing/accessory/sweaterargyletubeneck - sweater["keyhole sweater"] = /obj/item/clothing/accessory/sweaterkeyhole gear_tweaks += new/datum/gear_tweak/path(sweater) /datum/gear/accessory/dressshirt @@ -165,11 +164,26 @@ path = /obj/item/clothing/accessory/dressshirt_r flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/accessory/dressshirt_crop + display_name = "cropped dress shirt" + path = /obj/item/clothing/accessory/dressshirt_crop + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/accessory/dressshirt_crop_r + display_name = "cropped dress shirt, rolled up" + path = /obj/item/clothing/accessory/dressshirt_crop_r + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/accessory/longsleeve display_name = "long-sleeved shirt" path = /obj/item/clothing/accessory/longsleeve flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/accessory/blouse + display_name = "blouse" + path = /obj/item/clothing/accessory/blouse + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/accessory/longsleeve_s display_name = "long-sleeved shirt, striped" path = /obj/item/clothing/accessory/longsleeve_s @@ -186,6 +200,11 @@ path = /obj/item/clothing/accessory/tshirt flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/accessory/tshirt + display_name = "cropped t-shirt" + path = /obj/item/clothing/accessory/tshirt_crop + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/accessory/silversun display_name = "silversun floral shirt selection" path = /obj/item/clothing/accessory/silversun diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 9dd15428bc5..9e9c56a55ab 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -125,6 +125,7 @@ /datum/gear/head/pin display_name = "pin selection" path = /obj/item/clothing/head/pin + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION /datum/gear/head/pin/New() ..() @@ -217,11 +218,6 @@ path = /obj/item/clothing/head/beanie flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION -/datum/gear/head/loose_beanie - display_name = "loose beanie" - path = /obj/item/clothing/head/beanie_loose - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - /datum/gear/head/nonla display_name = "non la hat" path = /obj/item/clothing/head/nonla @@ -261,4 +257,4 @@ /datum/gear/head/vysoka display_name = "vysokan fur cap" path = /obj/item/clothing/head/soft/vysoka - flags = GEAR_HAS_DESC_SELECTION \ No newline at end of file + flags = GEAR_HAS_DESC_SELECTION diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index f46a86d4887..6082f0e9857 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -5,14 +5,6 @@ slot = slot_w_uniform sort_category = "Uniforms and Casual Dress" -/datum/gear/uniform/croptop - display_name = "crop top" - path = /obj/item/clothing/under/croptop - -/datum/gear/uniform/cropdress - display_name = "crop dress" - path = /obj/item/clothing/under/cropdress - /datum/gear/uniform/iacjumpsuit display_name = "IAC Jumpsuit" path = /obj/item/clothing/under/rank/iacjumpsuit @@ -65,6 +57,8 @@ skirts["plaid skirt"] = /obj/item/clothing/under/skirt/plaid skirts["pleated skirt"] = /obj/item/clothing/under/skirt/pleated skirts["high skirt"] = /obj/item/clothing/under/skirt/high + skirts["skater skirt"] = /obj/item/clothing/under/skirt/skater + skirts["tube skirt"] = /obj/item/clothing/under/skirt/tube gear_tweaks += new/datum/gear_tweak/path(skirts) /datum/gear/uniform/suit @@ -116,9 +110,7 @@ dress["sundress"] = /obj/item/clothing/under/sundress dress["sundress, white"] = /obj/item/clothing/under/sundress_white dress["dress, flame"] = /obj/item/clothing/under/dress/dress_fire - dress["dress, green"] = /obj/item/clothing/under/dress/dress_green dress["dress, orange"] = /obj/item/clothing/under/dress/dress_orange - dress["dress, pink"] = /obj/item/clothing/under/dress/dress_pink dress["dress, yellow"] = /obj/item/clothing/under/dress/dress_yellow dress["dress, white"] = /obj/item/clothing/under/dress/white dress["dress, stripped"] = /obj/item/clothing/under/dress/stripeddress @@ -131,8 +123,6 @@ dress["cheongsam, blue"] = /obj/item/clothing/under/cheongsam/blue dress["cheongsam, green"] = /obj/item/clothing/under/cheongsam/green dress["cheongsam, purple"] = /obj/item/clothing/under/cheongsam/purple - dress["dress, blue"] = /obj/item/clothing/under/dress/bluedress - dress["dress, dark red"] = /obj/item/clothing/under/dress/darkreddress gear_tweaks += new/datum/gear_tweak/path(dress) /datum/gear/uniform/uniform_captain diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index bb813a12fcb..3444c83a831 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -18,11 +18,6 @@ drop_sound = 'sound/items/drop/ring.ogg' pickup_sound = 'sound/items/pickup/ring.ogg' -/obj/item/clothing/head/pin/pink - icon_state = "pinkpin" - item_state = "pinkpin" - name = "pink hair pin" - /obj/item/clothing/head/pin/clover icon_state = "cloverpin" item_state = "cloverpin" @@ -91,15 +86,11 @@ desc = "A ribbon tied into a bow with a clip on the back to attach to hair." item_state_slots = list(slot_r_hand_str = "pill", slot_l_hand_str = "pill") -/obj/item/clothing/head/pin/bow/big - icon_state = "whiteribbon" - item_state = "whiteribbon" - name = "ribbon" - -/obj/item/clothing/head/pin/bow/big/red - icon_state = "redribbon" - item_state = "redribbon" - name = "red ribbon" +/obj/item/clothing/head/pin/bow/hairband + icon_state = "hairribbon" + item_state = "hairribbon" + name = "hair ribbon" + desc = "A glorified length of ribbon acting as a hairband." /obj/item/clothing/head/powdered_wig name = "powdered wig" @@ -443,13 +434,6 @@ desc = "A head-hugging brimless winter cap. This one is tight." icon_state = "beanie" item_state = "beanie" - -/obj/item/clothing/head/beanie_loose - name = "loose beanie" - desc = "A head-hugging brimless winter cap. This one is loose." - icon_state = "beanie_hang" - item_state = "beanie" - //Flower crowns /obj/item/clothing/head/sunflower_crown diff --git a/code/modules/clothing/suits/hoodies.dm b/code/modules/clothing/suits/hoodies.dm index 4af53288587..ebac02d979c 100644 --- a/code/modules/clothing/suits/hoodies.dm +++ b/code/modules/clothing/suits/hoodies.dm @@ -220,6 +220,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/grey //legacy item. for raiders, shuttle spawn color = "#777777" + /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/short icon_state = "hoodie_short" @@ -228,7 +229,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/crop icon_state = "hoodie_crop" item_state = "hoodie_crop" - + /obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/sleeveless icon_state = "hoodie_sleeveless" item_state = "hoodie_sleeveless" diff --git a/code/modules/clothing/under/accessories/shirts.dm b/code/modules/clothing/under/accessories/shirts.dm index e5967714c99..fdf326ffefe 100644 --- a/code/modules/clothing/under/accessories/shirts.dm +++ b/code/modules/clothing/under/accessories/shirts.dm @@ -53,13 +53,6 @@ desc_fluff = "Does not come with accompanying dog-sized version." icon_state = "sweaterargyletubeneck" item_state = "sweaterargyletubeneck" - -/obj/item/clothing/accessory/sweaterkeyhole - name = "keyhole sweater" - desc = "A sweater, a piece of warm clothing, that has had a hole cut in it. Why would anyone make this?" - desc_fluff = "This style of sweater originates from the aerostats of Venus, and has become widespread throughout the human space of Orion Spur due to its appearance. It's not the most professional take on the sweater ever, but it's certainly eye-catching." - icon_state = "sweaterkeyhole" - item_state = "sweaterkeyhole" /obj/item/clothing/accessory/dressshirt name = "dress shirt" @@ -73,6 +66,24 @@ icon_state = "dressshirt_r" item_state = "dressshirt_r" +/obj/item/clothing/accessory/dressshirt_crop + name = "cropped dress shirt" + desc = "A casual cropped dress shirt." + icon_state = "dressshirt_crop" + item_state = "dressshirt_crop" + +/obj/item/clothing/accessory/dressshirt_crop_r + name = "cropped dress shirt" + desc = "A casual cropped dress shirt. This one has its sleeves rolled up." + icon_state = "dressshirt_crop_r" + item_state = "dressshirt_crop_r" + +/obj/item/clothing/accessory/blouse + name = "blouse" + desc = "A loose fitting garment." + icon_state = "blouse" + item_state = "blouse" + //Legacy /obj/item/clothing/accessory/wcoat name = "waistcoat" @@ -111,6 +122,12 @@ icon_state = "tshirt" item_state = "tshirt" +/obj/item/clothing/accessory/tshirt_crop + name = "cropped t-shirt" + desc = "A simple, cheap cropped t-shirt." + icon_state = "tshirt_crop" + item_state = "tshirt_crop" + /obj/item/clothing/accessory/silversun name = "silversun floral shirt" desc = "A stylish Solarian shirt of Silversun design. It bears a floral design. This one is cyan." diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index a56a8f8ab50..d88709ed3f2 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -549,34 +549,3 @@ item_state = "lance_dress_m" worn_state = "lance_dress_m" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - - -/obj/item/clothing/under/dress/bluedress - name = "blue dress" - desc = "A plain blue dress with a white belt." - icon_state = "bluedress" - item_state = "bluedress_s" - worn_state = "bluedress" - - -/obj/item/clothing/under/dress/darkreddress - name = "dark red dress" - desc = "A short, red dress with a black belt. Fancy." - icon_state = "darkreddress" - item_state = "darkreddress_s" - worn_state = "darkreddress" - - -/obj/item/clothing/under/cropdress - name = "crop dress" - desc = "A red skirt and longsleeved button-up crop top." - icon_state = "cropdress" - item_state = "cropdress_s" - worn_state = "cropdress" - -/obj/item/clothing/under/croptop - name = "crop top" - desc = "Light shirt which shows the midsection of the wearer." - icon_state = "croptop" - item_state = "croptop_s" - worn_state = "croptop" diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/under/skirts.dm index 50793a7b717..f3cb7701135 100644 --- a/code/modules/clothing/under/skirts.dm +++ b/code/modules/clothing/under/skirts.dm @@ -27,7 +27,7 @@ icon_state = "skirt_long" item_state = "skirt_long" worn_state = "skirt_long" - + /obj/item/clothing/under/skirt/high name = "high skirt" desc = "A modest skirt going up to the waist." @@ -68,6 +68,22 @@ item_state = "skirt_pleated" worn_state = "skirt_pleated" +/obj/item/clothing/under/skirt/skater + name = "skater skirt" + desc = "A plush skater skirt." + desc_fluff = "Be it ice skating, skateboarding or rollerskating : You should probably wear shorts under these." + icon_state = "skirt_skater" + item_state = "skirt_skater" + worn_state = "skirt_skater" + +/obj/item/clothing/under/skirt/tube + name = "tube skirt" + desc = "A long tube skirt." + desc_fluff = "A pencil skirt. But longer." + icon_state = "skirt_tube" + item_state = "skirt_tube" + worn_state = "skirt_tube" + /obj/item/clothing/under/skirt/offworlder name = "\improper CR skirt" desc = "A very tight form-fitting padded suit that looks extremely comfortable to wear. This variant seems to have a poofy skirt and longer sleeves than normal." diff --git a/html/changelogs/wezzy_polariskill.yml b/html/changelogs/wezzy_polariskill.yml new file mode 100644 index 00000000000..4160c1fbfa4 --- /dev/null +++ b/html/changelogs/wezzy_polariskill.yml @@ -0,0 +1,46 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Fixes shading and missing inhands for high skirt. Adds skater skirt and tube skirt." + - rscdel: "Some clothes have been replaced. Namely, the green dress, pink dress, dark red dress, crop dress, crop top and blue dress." + - rscdel: "Accessories replaced are the red ribbon, pink pins, and white ribbon. Check your loadout to re-make them." + - imageadd: "Beanies and some accessories have been resprited." + - rscadd: "Adds cropped shirts and dress shirts, as well as a blouse." + - rscadd: "Magnet pins are now colorable." \ No newline at end of file diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 5e58689c007..dc2500682c6 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index c52de1655f8..5a1d3005d24 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 95994bb686e..4acb3717da9 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 05ce8b056ab..9603b7564f1 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/skirts.dmi b/icons/obj/clothing/skirts.dmi index 7c132194380..2094b45c4c1 100644 Binary files a/icons/obj/clothing/skirts.dmi and b/icons/obj/clothing/skirts.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 60bc50207d1..05d08581d94 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 563396ba3c4..77ac2803957 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ