diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 1a411b55d70..35cefee8f9c 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -1081,6 +1081,11 @@ icon_state = "male_grey" gender = MALE + male_grey + name = "Mens Grey Alt" + icon_state = "male_greyalt" + gender = MALE + male_green name = "Mens Green" icon_state = "male_green" @@ -1091,11 +1096,36 @@ icon_state = "male_blue" gender = MALE + male_red + name = "Mens Red" + icon_state = "male_red" + gender = MALE + male_black name = "Mens Black" icon_state = "male_black" gender = MALE + male_black_alt + name = "Mens Black Alt" + icon_state = "male_blackalt" + gender = MALE + + male_striped + name = "Mens Striped" + icon_state = "male_stripe" + gender = MALE + + male_heart + name = "Mens Hearts" + icon_state = "male_hearts" + gender = MALE + + male_kinky + name = "Kinky" + icon_state = "male_kinky" + gender = MALE + male_mankini name = "Mankini" icon_state = "male_mankini" @@ -1106,11 +1136,26 @@ icon_state = "female_red" gender = FEMALE + female_green + name = "Ladies Green" + icon_state = "female_green" + gender = FEMALE + female_white name = "Ladies White" icon_state = "female_white" gender = FEMALE + female_whiter + name = "Ladies Whiter" + icon_state = "female_whiter" + gender = FEMALE + + female_whitealt + name = "Ladies White Alt" + icon_state = "female_whitealt" + gender = FEMALE + female_yellow name = "Ladies Yellow" icon_state = "female_yellow" @@ -1121,16 +1166,46 @@ icon_state = "female_blue" gender = FEMALE + female_babyblue + name = "Ladies Baby Blue" + icon_state = "female_babyblue" + gender = FEMALE + female_black name = "Ladies Black" icon_state = "female_black" gender = FEMALE + female_blacker + name = "Ladies Blacker" + icon_state = "female_blacker" + gender = FEMALE + + female_blackalt + name = "Ladies Black Alt" + icon_state = "female_blackalt" + gender = FEMALE + female_kinky name = "Ladies Kinky" icon_state = "female_kinky" gender = FEMALE + female_babydoll + name = "Ladies Full Grey" + icon_state = "female_babydoll" + gender = FEMALE + + female_pink + name = "Ladies Pink" + icon_state = "female_pink" + gender = FEMALE + + female_thong + name = "Ladies Thong" + icon_state = "female_thong" + gender = FEMALE + //////////////////////////// // Undershirt Definitions // //////////////////////////// @@ -1155,6 +1230,11 @@ icon_state = "shirt_black" gender = NEUTER +/datum/sprite_accessory/undershirt/shirt_blacker + name = "Blacker Shirt" + icon_state = "shirt_blacker" + gender = NEUTER + /datum/sprite_accessory/undershirt/shirt_grey name = "Grey Shirt" icon_state = "shirt_grey" @@ -1206,6 +1286,16 @@ icon_state = "shirt_corgi" gender = NEUTER +/datum/sprite_accessory/undershirt/shirt_clown + name = "Clown Shirt" + icon_state = "shirt_clown" + gender = NEUTER + +/datum/sprite_accessory/undershirt/shirt_alien + name = "Alien Shirt" + icon_state = "shirt_alien" + gender = NEUTER + /datum/sprite_accessory/undershirt/shirt_jack name = "Union Jack Shirt" icon_state = "shirt_jack" @@ -1350,6 +1440,21 @@ //tanktops +/datum/sprite_accessory/undershirt/tank_redtop + name = "Red Crop-top" + icon_state = "tank_redtop" + gender = FEMALE + +/datum/sprite_accessory/undershirt/tank_whitetop + name = "White Crop-Top" + icon_state = "tank_whitetop" + gender = FEMALE + +/datum/sprite_accessory/undershirt/tank_midriff + name = "White Mid Tank-Top" + icon_state = "tank_midriff" + gender = FEMALE + /datum/sprite_accessory/undershirt/tank_white name = "White Tank-Top" icon_state = "tank_white" @@ -1360,15 +1465,32 @@ icon_state = "tank_black" gender = NEUTER +/datum/sprite_accessory/undershirt/tank_blacker + name = "Blacker Tank-Top" + icon_state = "tank_blacker" + gender = NEUTER + /datum/sprite_accessory/undershirt/tank_grey name = "Grey Tank-Top" icon_state = "tank_grey" gender = NEUTER +/datum/sprite_accessory/undershirt/tank_red + name = "Red Tank-Top" + icon_state = "tank_red" + gender = NEUTER + /datum/sprite_accessory/undershirt/tank_fire name = "Fire Tank-Top" icon_state = "tank_fire" gender = NEUTER + +/datum/sprite_accessory/undershirt/tank_stripes + name = "Striped Tank-Top" + icon_state = "tank_stripes" + gender = NEUTER + + //end tanktops /////////////////////// diff --git a/html/changelogs/KasparoVy-PR-TBD.yml b/html/changelogs/KasparoVy-PR-TBD.yml new file mode 100644 index 00000000000..ea305084681 --- /dev/null +++ b/html/changelogs/KasparoVy-PR-TBD.yml @@ -0,0 +1,38 @@ +################################ +# 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 +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog. +author: KasparoVy + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds some TG underwear." + - rscadd: "Adds an NV science goggles worn sprite." + - tweak: "Adjusts beret sprite, recolours strange orange pixels." + - tweak: "Adjusts NV science goggles object icon. Removed strange border and centered it." \ No newline at end of file diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 1ddea3482f5..d7cfb2d1889 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 240314dbb85..f06ba7d4a09 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi index 1f22d1f159b..ad2327aab2d 100644 Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index bce4c3851a8..894d49a9adf 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ