diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm index 2b3681172dd..8dbc0e609d7 100644 --- a/code/game/objects/structures/crates_lockers/closets/fitness.dm +++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm @@ -16,6 +16,7 @@ new /obj/item/clothing/under/swimsuit/blue(src) new /obj/item/clothing/under/swimsuit/green(src) new /obj/item/clothing/under/swimsuit/purple(src) + new /obj/item/clothing/under/swimsuit/striped(src) new /obj/item/clothing/mask/snorkel(src) new /obj/item/clothing/mask/snorkel(src) new /obj/item/clothing/shoes/swimmingfins(src) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 6a50570a2f4..2901bd1115e 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -324,7 +324,7 @@ name = "maid uniform" desc = "A simple maid uniform for housekeeping." icon_state = "janimaid" - + /obj/item/clothing/under/dress/sexymaid name = "sexy maid uniform" desc = "You must be a bit risque teasing all of them in a maid uniform!" @@ -636,32 +636,31 @@ name = "black swimsuit" desc = "An oldfashioned black swimsuit." icon_state = "swim_black" - siemens_coefficient = 1 /obj/item/clothing/under/swimsuit/blue name = "blue swimsuit" desc = "An oldfashioned blue swimsuit." icon_state = "swim_blue" - siemens_coefficient = 1 /obj/item/clothing/under/swimsuit/purple name = "purple swimsuit" desc = "An oldfashioned purple swimsuit." icon_state = "swim_purp" - siemens_coefficient = 1 /obj/item/clothing/under/swimsuit/green name = "green swimsuit" desc = "An oldfashioned green swimsuit." icon_state = "swim_green" - siemens_coefficient = 1 /obj/item/clothing/under/swimsuit/red name = "red swimsuit" desc = "An oldfashioned red swimsuit." icon_state = "swim_red" - siemens_coefficient = 1 +/obj/item/clothing/under/swimsuit/striped + name = "striped swimsuit" + desc = "A more revealing striped swimsuit." + icon_state = "swim_striped" /* * pyjamas */ diff --git a/html/changelogs/Belsima-Swimsuits.yml b/html/changelogs/Belsima-Swimsuits.yml new file mode 100644 index 00000000000..629cdbf1e29 --- /dev/null +++ b/html/changelogs/Belsima-Swimsuits.yml @@ -0,0 +1,36 @@ +################################ +# 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 +################################# + +# Your name. +author: Belsima + +# 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: "Added a new swimsuit to the pool." \ No newline at end of file diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 3aef9384f41..cd9c1f16cc5 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 7c33803ebc1..eaa76026880 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ