diff --git a/aurorastation.dme b/aurorastation.dme index 355a026e66d..535980a2d0d 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1254,6 +1254,7 @@ #include "code\modules\clothing\under\color.dm" #include "code\modules\clothing\under\miscellaneous.dm" #include "code\modules\clothing\under\shorts.dm" +#include "code\modules\clothing\under\skirts.dm" #include "code\modules\clothing\under\syndicate.dm" #include "code\modules\clothing\under\accessories\accessory.dm" #include "code\modules\clothing\under\accessories\armband.dm" diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 3b98de2ab07..60e59c20803 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -144,7 +144,7 @@ delete_me = 1 /obj/effect/landmark/costume/maid/New() - new /obj/item/clothing/under/blackskirt(src.loc) + new /obj/item/clothing/under/skirt/(src.loc) var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears ) new CHOICE(src.loc) new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index ba7ab11a82d..f496d4c0b12 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -377,9 +377,9 @@ new /obj/item/clothing/under/color/green(src) new /obj/item/clothing/under/color/orange(src) new /obj/item/clothing/under/color/pink(src) - new /obj/item/clothing/under/dress/plaid_blue(src) - new /obj/item/clothing/under/dress/plaid_red(src) - new /obj/item/clothing/under/dress/plaid_purple(src) + new /obj/item/clothing/under/skirt/plaid_blue(src) + new /obj/item/clothing/under/skirt/plaid_red(src) + new /obj/item/clothing/under/skirt/plaid_purple(src) new /obj/item/clothing/shoes/blue(src) new /obj/item/clothing/shoes/yellow(src) new /obj/item/clothing/shoes/green(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index ae64bc0f7a0..1d8443707b3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -94,4 +94,8 @@ display_name = "HUDpatch, Welding" path = /obj/item/clothing/glasses/eyepatch/hud/welder allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice","Research Director","Roboticist") - cost = 2 \ No newline at end of file + cost = 2 + +/datum/gear/eyes/spiffygogs + display_name = "Orange Goggles" + path = /obj/item/clothing/glasses/spiffygogs diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index a00f445fb29..0dfbc181ab8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -173,3 +173,11 @@ surgical["surgical cap, green"] = /obj/item/clothing/head/surgery/green surgical["surgical cap, black"] = /obj/item/clothing/head/surgery/black gear_tweaks += new/datum/gear_tweak/path(surgical) + +/datum/gear/head/headbando + display_name = "Basic Headband" + path = /obj/item/clothing/head/headbando + +/datum/gear/head/headbando/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 50e9800a4ac..8b003bdb385 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -25,6 +25,10 @@ jackets["flannel jacket, grey"] = /obj/item/clothing/suit/storage/toggle/flannel/gray jackets["flannel jacket, purple"] = /obj/item/clothing/suit/storage/toggle/flannel/purple jackets["flannel jacket, yellow"] = /obj/item/clothing/suit/storage/toggle/flannel/yellow + jackets["black vest"] = /obj/item/clothing/suit/storage/toggle/leather_vest + jackets["brown vest"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless + jackets["leather coat"] = /obj/item/clothing/suit/leathercoat + gear_tweaks += new/datum/gear_tweak/path(jackets) /datum/gear/suit/hazard_vest diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index e3af9f70d98..06a04cfa820 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -40,16 +40,23 @@ /datum/gear/uniform/skirt display_name = "skirt selection" - path = /obj/item/clothing/under/dress/plaid_blue + path = /obj/item/clothing/under/skirt/ /datum/gear/uniform/skirt/New() ..() var/skirts = list() - skirts["plaid skirt, blue"] = /obj/item/clothing/under/dress/plaid_blue - skirts["plaid skirt, purple"] = /obj/item/clothing/under/dress/plaid_purple - skirts["plaid skirt, red"] = /obj/item/clothing/under/dress/plaid_red - skirts["jumpskirt, black"] = /obj/item/clothing/under/blackjumpskirt - skirts["skirt, black"] = /obj/item/clothing/under/blackskirt + skirts["plaid skirt, blue"] = /obj/item/clothing/under/skirt/plaid_blue + skirts["plaid skirt, purple"] = /obj/item/clothing/under/skirt/plaid_purple + skirts["plaid skirt, red"] = /obj/item/clothing/under/skirt/plaid_red + skirts["jumpskirt, black"] = /obj/item/clothing/under/skirt/blackjumpskirt + skirts["skirt, black"] = /obj/item/clothing/under/skirt/ + skirts["skirt, khaki"] = /obj/item/clothing/under/skirt/khaki + skirts["short skirt, black"] = /obj/item/clothing/under/skirt/short_black + skirts["short skirt, blue"] = /obj/item/clothing/under/skirt/blue + skirts["short skirt, red"] = /obj/item/clothing/under/skirt/red + skirts["skirt, swept"] = /obj/item/clothing/under/skirt/swept + + gear_tweaks += new/datum/gear_tweak/path(skirts) /datum/gear/uniform/suit @@ -168,6 +175,25 @@ pants["khaki pants"] = /obj/item/clothing/under/pants/khaki pants["track pants"] = /obj/item/clothing/under/pants/track pants["camo pants"] = /obj/item/clothing/under/pants/camo + pants["athletic shorts, black"] = /obj/item/clothing/under/shorts + pants["athletic shorts, red"] = /obj/item/clothing/under/shorts/red + pants["athletic shorts, green"] = /obj/item/clothing/under/shorts/green + pants["athletic shorts, black"] = /obj/item/clothing/under/shorts/black + pants["athletic shorts, grey"] = /obj/item/clothing/under/shorts/grey + pants["jean shorts"] = /obj/item/clothing/under/shorts/jeans + pants["jean short shorts"] = /obj/item/clothing/under/shorts/jeans/female + pants["classic jeans shorts"] = /obj/item/clothing/under/shorts/jeans/classic + pants["classic jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/classic/female + pants["mustang jeans shorts"] = /obj/item/clothing/under/shorts/jeans/mustang + pants["mustang jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/mustang/female + pants["young folks jeans shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks + pants["young folks jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks/female + pants["black jeans shorts"] = /obj/item/clothing/under/shorts/jeans/black + pants["black jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/black/female + pants["grey jeans shorts"] = /obj/item/clothing/under/shorts/jeans/grey + pants["grey jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans + pants["khaki shorts"] = /obj/item/clothing/under/shorts/khaki + pants["khaki shorts shorts"] = /obj/item/clothing/under/shorts/khaki/female gear_tweaks += new/datum/gear_tweak/path(pants) /datum/gear/uniform/turtleneck diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index c086c34947f..efe40dfba32 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -482,3 +482,41 @@ ..() overlay = global_hud.nvg +//from verkister +/obj/item/clothing/glasses/spiffygogs + name = "Orange Goggles" + desc = "You can almost feel the raw power radiating off these strange specs." + icon_state = "spiffygogs" + item_state = "spiffygogs" + action_button_name = "Adjust Goggles" + var/up = 0 + item_flags = AIRTIGHT + +/obj/item/clothing/glasses/spiffygogs/attack_self() + toggle() + + +/obj/item/clothing/glasses/spiffygogs/verb/toggle() + set category = "Object" + set name = "Adjust Goggles" + set src in usr + + if(usr.canmove && !usr.stat && !usr.restrained()) + if(src.up) + src.up = !src.up + flags_inv |= HIDEEYES + body_parts_covered |= EYES + icon_state = initial(icon_state) + item_state = initial(item_state) + item_flags |= AIRTIGHT + usr << "You flip \the [src] down over your eyes." + else + src.up = !src.up + flags_inv &= ~HIDEEYES + body_parts_covered &= ~EYES + icon_state = "[initial(icon_state)]up" + item_state = "[initial(item_state)]up" + item_flags &= ~AIRTIGHT + usr << "You push \the [src] up off your eyes." + update_clothing_icon() + usr.update_action_buttons() diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 8c340616ce7..9bb3bb0aafa 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -361,3 +361,10 @@ /obj/item/clothing/head/turban/yellow icon_state = "turban_yellow" item_state = "turban_yellow" + +//praise verkister +/obj/item/clothing/head/headbando + name = "basic headband" + desc = "Perfect for martial artists, sweaty rogue operators, and tunnel gangsters." + icon_state = "headbando" + item_state = "headbando" \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 1fe74e5c85e..96de3517e02 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -195,8 +195,11 @@ /obj/item/clothing/suit/leathercoat name = "leather coat" desc = "A long, thick black leather coat." - icon_state = "leathercoat" - item_state = "leathercoat" + icon_state = "leathercoat_alt" + item_state = "leathercoat_alt" + body_parts_covered = UPPER_TORSO|ARMS + min_cold_protection_temperature = T0C - 20 + siemens_coefficient = 0.7 /obj/item/clothing/suit/browncoat name = "brown leather coat" @@ -272,6 +275,15 @@ desc = "A black leather coat. A corporate logo is proudly displayed on the back." icon_state = "leather_jacket_nt" +/obj/item/clothing/suit/storage/toggle/leather_vest + name = "leather vest" + desc = "A black leather vest." + icon_state = "leather_jacket_sleeveless" + item_state = "leather_jacket_sleeveless" + icon_open = "leather_jacket_sleeveless_open" + icon_closed = "leather_jacket_sleeveless" + body_parts_covered = UPPER_TORSO + //This one has buttons for some reason /obj/item/clothing/suit/storage/toggle/brown_jacket name = "leather jacket" @@ -282,6 +294,15 @@ icon_closed = "brown_jacket" body_parts_covered = UPPER_TORSO|ARMS +/obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless + name = "brown vest" + desc = "A brown leather vest." + icon_state = "brown_jacket_sleeveless" + item_state = "brown_jacket_sleeveless" + icon_open = "brown_jacket_sleeveless_open" + icon_closed = "brown_jacket_sleeveless" + body_parts_covered = UPPER_TORSO + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen desc = "A brown leather coat. A corporate logo is proudly displayed on the back." icon_state = "brown_jacket_nt" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 3e99ef1ce9a..3976b5ede5c 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -225,14 +225,6 @@ item_state = "r_suit" worn_state = "red_suit" -/obj/item/clothing/under/blackskirt - name = "black skirt" - desc = "A black skirt, very fancy!" - icon_state = "blackskirt" - item_state = "bl_suit" - worn_state = "blackskirt" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - /obj/item/clothing/under/schoolgirl name = "schoolgirl uniform" desc = "It's just like one of my Japanese animes!" @@ -364,26 +356,6 @@ worn_state = "huresource" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/under/dress/plaid_blue - name = "blue plaid skirt" - desc = "A preppy blue skirt with a white blouse." - icon_state = "plaid_blue" - worn_state = "plaid_blue" - -/obj/item/clothing/under/dress/plaid_red - name = "red plaid skirt" - desc = "A preppy red skirt with a white blouse." - icon_state = "plaid_red" - item_state = "kilt" - worn_state = "plaid_red" - -/obj/item/clothing/under/dress/plaid_purple - name = "blue purple skirt" - desc = "A preppy purple skirt with a white blouse." - icon_state = "plaid_purple" - item_state = "kilt" - worn_state = "plaid_purple" - //wedding stuff /obj/item/clothing/under/wedding/ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS @@ -445,13 +417,6 @@ worn_state = "sundress_white" body_parts_covered = UPPER_TORSO|LOWER_TORSO -/obj/item/clothing/under/blackjumpskirt - name = "black jumpskirt" - desc = "A black jumpskirt, Sol size 0." - icon_state = "blackjumpskirt" - item_state = "bl_suit" - worn_state = "blackjumpskirt" - /obj/item/clothing/under/captainformal name = "captain's formal uniform" desc = "A captain's formal-wear, for special occasions." diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 0e017866a33..02deaf0ff79 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -7,27 +7,99 @@ /obj/item/clothing/under/shorts/red name = "red athletic shorts" icon_state = "redshorts" - worn_state = "redshorts" + item_state = "redshorts" /obj/item/clothing/under/shorts/green name = "green athletic shorts" icon_state = "greenshorts" - worn_state = "greenshorts" + item_state = "greenshorts" /obj/item/clothing/under/shorts/blue name = "blue athletic shorts" icon_state = "blueshorts" - worn_state = "blueshorts" + item_state = "blueshorts" /obj/item/clothing/under/shorts/black name = "black athletic shorts" icon_state = "blackshorts" - worn_state = "blackshorts" + item_state = "blackshorts" /obj/item/clothing/under/shorts/grey name = "grey athletic shorts" icon_state = "greyshorts" - worn_state = "greyshorts" + item_state = "greyshorts" + +/obj/item/clothing/under/shorts/jeans + name = "jeans shorts" + desc = "Some jeans! Just in short form!" + icon_state = "jeans_shorts" + item_state = "jeans_shorts" + +/obj/item/clothing/under/shorts/jeans/female + name = "jeans short shorts" + icon_state = "jeans_shorts_f" + item_state = "jeans_shorts_f" + +/obj/item/clothing/under/shorts/jeans/classic + name = "classic jeans shorts" + icon_state = "jeansclassic_shorts" + item_state = "jeansclassic_shorts" + +/obj/item/clothing/under/shorts/jeans/classic/female + name = "classic jeans short shorts" + icon_state = "jeansclassic_shorts_f" + item_state = "jeansclassic_shorts_f" + +/obj/item/clothing/under/shorts/jeans/mustang + name = "mustang jeans shorts" + icon_state = "jeansmustang_shorts" + item_state = "jeansmustang_shorts" + +/obj/item/clothing/under/shorts/jeans/mustang/female + name = "mustang jeans short shorts" + icon_state = "jeansmustang_shorts_f" + item_state = "jeansmustang_shorts_f" + +/obj/item/clothing/under/shorts/jeans/youngfolks + name = "young folks jeans shorts" + icon_state = "jeansyoungfolks_shorts" + item_state = "jeansyoungfolks_shorts" + +/obj/item/clothing/under/shorts/jeans/youngfolks/female + name = "young folks jeans short shorts" + icon_state = "jeansyoungfolks_shorts_f" + item_state = "jeansyoungfolks_shorts_f" + +/obj/item/clothing/under/shorts/jeans/black + name = "black jeans shorts" + icon_state = "blackpants_shorts" + item_state = "blackpants_shorts" + +/obj/item/clothing/under/shorts/jeans/black/female + name = "black jeans short shorts" + icon_state = "black_shorts_f" + item_state = "black_shorts_f" + +/obj/item/clothing/under/shorts/jeans/grey + name = "grey jeans shorts" + icon_state = "greypants_shorts" + item_state = "greypants_shorts" + +/obj/item/clothing/under/shorts/jeans/grey/female + name = "grey jeans short shorts" + icon_state = "grey_shorts_f" + item_state = "grey_shorts_f" + +/obj/item/clothing/under/shorts/khaki + name = "khaki shorts" + desc = "For that island getaway. It's five o'clock somewhere, right?" + icon_state = "tanpants_shorts" + item_state = "tanpants_shorts" + +/obj/item/clothing/under/shorts/khaki/female + name = "khaki short shorts" + icon_state = "khaki_shorts_f" + item_state = "khaki_shorts_f" //pants diff --git a/code/modules/clothing/under/skirts.dm b/code/modules/clothing/under/skirts.dm new file mode 100644 index 00000000000..cadb8d2638b --- /dev/null +++ b/code/modules/clothing/under/skirts.dm @@ -0,0 +1,67 @@ +//skirts + +/obj/item/clothing/under/skirt/ + name = "black skirt" + desc = "A black skirt, very fancy!" + icon_state = "blackskirt" + item_state = "bl_suit" + worn_state = "blackskirt" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + rolled_sleeves = -1 + +/obj/item/clothing/under/skirt/khaki + name = "khaki skirt" + desc = "A skirt that is a khaki color." + icon_state = "skirt_khaki" + worn_state = "skirt_khaki" + +/obj/item/clothing/under/skirt/short_black + name = "short black skirt" + desc = "A skirt that is a shiny black." + icon_state = "skirt_short_black" + worn_state = "skirt_short_black" + +/obj/item/clothing/under/skirt/blue + name = "short blue skirt" + desc = "A skirt that is a shiny blue." + icon_state = "skirt_short_blue" + worn_state = "skirt_short_blue" + +/obj/item/clothing/under/skirt/red + name = "short red skirt" + desc = "A skirt that is a shiny red." + icon_state = "skirt_short_red" + worn_state = "skirt_short_red" + +/obj/item/clothing/under/skirt/swept + name = "swept skirt" + desc = "A skirt that is swept to one side." + icon_state = "skirt_swept" + worn_state = "skirt_swept" + +/obj/item/clothing/under/skirt/plaid_blue + name = "blue plaid skirt" + desc = "A preppy blue skirt with a white blouse." + icon_state = "plaid_blue" + worn_state = "plaid_blue" + +/obj/item/clothing/under/skirt/plaid_red + name = "red plaid skirt" + desc = "A preppy red skirt with a white blouse." + icon_state = "plaid_red" + item_state = "kilt" + worn_state = "plaid_red" + +/obj/item/clothing/under/skirt/plaid_purple + name = "blue purple skirt" + desc = "A preppy purple skirt with a white blouse." + icon_state = "plaid_purple" + item_state = "kilt" + worn_state = "plaid_purple" + +/obj/item/clothing/under/skirt/blackjumpskirt + name = "black jumpskirt" + desc = "A black jumpskirt, Sol size 0." + icon_state = "blackjumpskirt" + item_state = "bl_suit" + worn_state = "blackjumpskirt" \ No newline at end of file diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 3a5f57cdd65..73b93c9f33c 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -618,11 +618,6 @@ icon_state = "hair_hightight" gender = MALE - regulationmohawk - name = "Shaved Mohawk" - icon_state = "hair_shavedmohawk" - gender = MALE - topknot name = "Topknot" icon_state = "hair_topknot" @@ -658,6 +653,46 @@ icon_state = "hair_manbun" gender = MALE + shavedbun + name = "Shaved Bun" + icon_state = "hair_shavedbun" + + halfshaved + name = "Half-Shaved" + icon_state = "hair_halfshaved" + + halfshavedemo + name = "Half-Shaved Emo" + icon_state = "hair_halfshavedemo" + + longsideemo + name = "Long Side Emo" + icon_state = "hair_longsideemo" + + sideswept + name = "Sideswept Hair" + icon_state = "hair_sideswept" + + mohawkshaved + name = "Shaved Mohawk" + icon_state = "hair_mohawkshaved" + + mohawkshaved2 + name = "Tight Shaved Mohawk" + icon_state = "hair_mohawkshaved2" + + mohawkshavednaomi + name = "Naomi Mohawk" + icon_state = "hair_mohawkshavednaomi" + + leftsidecut + name = "Left Sidecut" + icon_state = "hair_leftside" + + rightsidecut + name = "Right Sidecut" + icon_state = "hair_rightside" + // TG-format hair - uses ICON_MULTIPLY instead of ICON_ADD uniter icon = 'icons/mob/human_face/hair_multiply.dmi' diff --git a/html/changelogs/paradoxspace-50percentoff.yml b/html/changelogs/paradoxspace-50percentoff.yml new file mode 100644 index 00000000000..5322c2147b6 --- /dev/null +++ b/html/changelogs/paradoxspace-50percentoff.yml @@ -0,0 +1,39 @@ +################################ +# 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 +################################# + +# Your name. +author: ParadoxSpace + +# 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: + - rscadd: "Adds shorts, skirts, a leather coat, orange goggles, a colorable headband and leather vests to the loadout." + - rscadd: "Adds about 10 new cyberpunk themed hairstyles." + - rscdel: "Shaves half of your head." diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 0d5c298f3ca..fd77e51cf4d 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 84265353bd3..d3097a38f3f 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/human_face/hair.dmi b/icons/mob/human_face/hair.dmi index 0ab803b01d5..8d496c7a3cb 100644 Binary files a/icons/mob/human_face/hair.dmi and b/icons/mob/human_face/hair.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 33af57a43de..fb114a10610 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index e739af7219b..c5017f40f4f 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index dd9f3937afe..b7e78d70272 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 1d57a9d551f..839dcc80586 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 857b9578d21..0f024f1b025 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index e779776c5f2..4c6f944ea54 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ