Adds some shirts (#22489)

Adds clothing item versions of some existing shirts that were previously
only in the undershirt selection next to underwear.
Mostly graphic t-shirts.
Also adds a cropped tank top, modified from the existing tank top.

code/datums/underwear/undershirt.dm

@@ -38,11 +38,6 @@
 	icon_state = "tank_midriff"
 	has_color = TRUE
 
-/datum/category_item/underwear/undershirt/tank_top_midriff_short
-	name = "Tank Top, Midriff Short"
-	icon_state = "tank_midriff_short"
-	has_color = TRUE
-
 /datum/category_item/underwear/undershirt/tank_top_expedition
 	name = "Tank Top, Expedition"
 	icon_state = "tank_expedition"
@@ -59,14 +54,6 @@
 	name = "Tank Top, Fleet Feminine"
 	icon_state = "tank_fleet_fem"
 
-/datum/category_item/underwear/undershirt/tank_top_fire
-	name = "Tank Top, Fire"
-	icon_state = "tank_fire"
-
-/datum/category_item/underwear/undershirt/tank_top_fire_fem
-	name = "Tank Top, Fire Feminine"
-	icon_state = "tank_fire_fem"
-
 /datum/category_item/underwear/undershirt/tank_top_stripes
 	name = "Tank Top, Stripes"
 	icon_state = "tank_stripes"
@@ -83,22 +70,6 @@
 	name = "Tank Top, Stripes Alt Feminine"
 	icon_state = "tank_stripes_alt_fem"
 
-/datum/category_item/underwear/undershirt/tank_top_sun
-	name = "Tank Top, Sun"
-	icon_state = "tank_sun"
-
-/datum/category_item/underwear/undershirt/tank_top_sun_fem
-	name = "Tank Top, Sun Feminine"
-	icon_state = "tank_sun_fem"
-
-/datum/category_item/underwear/undershirt/tank_top_sun_alt
-	name = "Tank Top, Sun Alt"
-	icon_state = "tank_sun_alt"
-
-/datum/category_item/underwear/undershirt/tank_top_sun_alt_fem
-	name = "Tank Top, Sun Alt Feminine"
-	icon_state = "tank_sun_alt_fem"
-
 /datum/category_item/underwear/undershirt/tank_top_tight
 	name = "Tank Top, Tight"
 	icon_state = "tank_tight"
@@ -137,95 +108,11 @@
 	icon_state = "undershirt_fem"
 	has_color = TRUE
 
-/datum/category_item/underwear/undershirt/undershirt_heart
-	name = "Undershirt, Heart"
-	icon_state = "heart"
-
-/datum/category_item/underwear/undershirt/undershirt_heart_fem
-	name = "Undershirt, Heart Feminine"
-	icon_state = "heart_fem"
-
-/datum/category_item/underwear/undershirt/undershirt_heart_echelon
-	name = "Undershirt, Heart Echelon"
-	icon_state = "heart_echelon"
-
-/datum/category_item/underwear/undershirt/undershirt_heart_echelon_fem
-	name = "Undershirt, Heart Echelon Feminine"
-	icon_state = "heart_echelon_fem"
-
-/datum/category_item/underwear/undershirt/shirt_love_nt
-	name = "Undershirt, I<3NT"
-	icon_state = "ilovent"
-
-/datum/category_item/underwear/undershirt/shirt_love_nt_fem
-	name = "Undershirt, I<3NT Feminine"
-	icon_state = "ilovent_fem"
-
 /datum/category_item/underwear/undershirt/shirt
 	name = "Shirt"
 	icon_state = "shirt"
 	has_color = TRUE
 
-/datum/category_item/underwear/undershirt/shirt_alien
-	name = "Shirt, Alien"
-	icon_state = "shirt_alien"
-
-/datum/category_item/underwear/undershirt/shirt_band
-	name = "Shirt, Band"
-	icon_state = "shirt_band"
-
-/datum/category_item/underwear/undershirt/shirt_clown
-	name = "Shirt, Clown"
-	icon_state = "shirt_clown"
-
-/datum/category_item/underwear/undershirt/shirt_ian
-	name = "Shirt, Ian"
-	icon_state = "shirt_ian"
-
-/datum/category_item/underwear/undershirt/shirt_jersey
-	name = "Shirt, Blue Jersey"
-	icon_state = "shirt_jersey"
-
-/datum/category_item/underwear/undershirt/shirt_jersey_red
-	name = "Shirt, Red Jersey"
-	icon_state = "shirt_jersey_red"
-
-/datum/category_item/underwear/undershirt/shirt_meat
-	name = "Shirt, Meat"
-	icon_state = "shirt_meat"
-
-/datum/category_item/underwear/undershirt/shirt_scc
-	name = "Shirt, SCC"
-	icon_state = "shirt_scc"
-
-/datum/category_item/underwear/undershirt/shirt_scc_fem
-	name = "Shirt, SCC feminine"
-	icon_state = "shirt_scc_fem"
-
-/datum/category_item/underwear/undershirt/shirt_nt
-	name = "Shirt, NT"
-	icon_state = "shirt_nano"
-
-/datum/category_item/underwear/undershirt/shirt_nt_red
-	name = "Shirt, NT Red"
-	icon_state = "shirt_nano_red"
-
-/datum/category_item/underwear/undershirt/shirt_peace
-	name = "Shirt, Peace"
-	icon_state = "shirt_peace"
-
-/datum/category_item/underwear/undershirt/shirt_question
-	name = "Shirt, Question"
-	icon_state = "shirt_question"
-
-/datum/category_item/underwear/undershirt/shirt_skull
-	name = "Shirt, Skull"
-	icon_state = "shirt_skull"
-
-/datum/category_item/underwear/undershirt/shirt_ss13
-	name = "Shirt, SS13"
-	icon_state = "shirt_ss13"
-
 /datum/category_item/underwear/undershirt/shirt_blue_striped
 	name = "Shirt, Blue Stripes"
 	icon_state = "shirt_stripes"
@@ -234,34 +121,10 @@
 	name = "Shirt, Blue Stripes Alt"
 	icon_state = "shirt_stripes_alt"
 
-/datum/category_item/underwear/undershirt/shirt_tiedye
-	name = "Shirt, Tiedye"
-	icon_state = "shirt_tiedye"
-
 /datum/category_item/underwear/undershirt/shirt_tight
 	name = "Shirt, Tight"
 	icon_state = "tight"
 
-/datum/category_item/underwear/undershirt/shirt_wing
-	name = "Shirt, Wing"
-	icon_state = "wing_shirt"
-
-/datum/category_item/underwear/undershirt/shirt_pinkblack
-	name = "Shirt, Pink-Black"
-	icon_state = "pinkblack_tshirt"
-
-/datum/category_item/underwear/undershirt/sport_shirt_blue
-	name = "Sport Shirt, Blue"
-	icon_state = "sportblue"
-
-/datum/category_item/underwear/undershirt/sport_shirt_green
-	name = "Sport Shirt, Green"
-	icon_state = "sportgreen"
-
-/datum/category_item/underwear/undershirt/sport_shirt_red
-	name = "Sport Shirt, Red"
-	icon_state = "sportred"
-
 /datum/category_item/underwear/undershirt/shirt_army
 	name = "Shirt, Army"
 	icon_state = "shirt_army"
@@ -286,38 +149,6 @@
 	name = "Shirt, Fleet Feminine"
 	icon_state = "shirt_fleet_fem"
 
-/datum/category_item/underwear/undershirt/shirt_zavodskoi
-	name = "Shirt, Zavodskoi Interstellar"
-	icon_state = "shirt_necropolis"
-
-/datum/category_item/underwear/undershirt/shirt_zavodskoi_fem
-	name = "Shirt, Zavodskoi Interstellar Feminine"
-	icon_state = "shirt_necropolis_fem"
-
-/datum/category_item/underwear/undershirt/shirt_epmc
-	name = "Shirt, EPMC"
-	icon_state = "shirt_epmc"
-
-/datum/category_item/underwear/undershirt/shirt_epmc_fem
-	name = "Shirt, EPMC Feminine"
-	icon_state = "shirt_epmc_fem"
-
-/datum/category_item/underwear/undershirt/bowlinga
-	name = "Bowling Shirt, Aqua"
-	icon_state = "bowlinga"
-
-/datum/category_item/underwear/undershirt/bowlingp
-	name = "Bowling Shirt, Pink"
-	icon_state = "bowlingp"
-
-/datum/category_item/underwear/undershirt/bowlingr
-	name = "Bowling Shirt, Red"
-	icon_state = "bowlingr"
-
-/datum/category_item/underwear/undershirt/bowlingw
-	name = "Bowling Shirt, White"
-	icon_state = "bowlingw"
-
 /datum/category_item/underwear/undershirt/longjon
 	name = "Long John Shirt"
 	icon_state = "ljont"

code/modules/client/preference_setup/loadout/items/shirts.dm

@@ -46,6 +46,9 @@ ABSTRACT_TYPE(/datum/gear/shirts)
 	shirt["halter top"] = /obj/item/clothing/under/dressshirt/haltertop
 	shirt["tank top"] = /obj/item/clothing/under/dressshirt/tanktop
 	shirt["tank top, feminine"] = /obj/item/clothing/under/dressshirt/tanktop/feminine
+	shirt["tank top, cropped"] = /obj/item/clothing/under/dressshirt/tanktop/cropped
+	shirt["tank top, feminine cropped"] = /obj/item/clothing/under/dressshirt/tanktop/cropped/feminine
+	shirt["tank top, midriff"] = /obj/item/clothing/under/dressshirt/tanktop/midriff
 	gear_tweaks += new /datum/gear_tweak/path(shirt)
 
 /datum/gear/shirts/stripes
@@ -75,3 +78,40 @@ ABSTRACT_TYPE(/datum/gear/shirts)
 	shirts["red silversun shirt"] = /obj/item/clothing/under/dressshirt/silversun/red
 	shirts["random colored silversun shirt"] = /obj/item/clothing/under/dressshirt/silversun/random
 	gear_tweaks += new /datum/gear_tweak/path(shirts)
+
+/datum/gear/shirts/precoloured
+	display_name = "pre-coloured shirt selection"
+	description = "A selection of pre-coloured and graphic shirts."
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
+	path = /obj/item/clothing/under/dressshirt/corgi
+
+/datum/gear/shirts/precoloured/New()
+	..()
+	var/list/colouredshirts = list()
+	colouredshirts["corgi t-shirt"] = /obj/item/clothing/under/dressshirt/corgi
+	colouredshirts["heart t-shirt"] = /obj/item/clothing/under/dressshirt/heart
+	colouredshirts["heart t-shirt, alt"] = /obj/item/clothing/under/dressshirt/heart/alt
+	colouredshirts["I love NT t-shirt"] = /obj/item/clothing/under/dressshirt/lovent
+	colouredshirts["band t-shirt"] = /obj/item/clothing/under/dressshirt/band
+	colouredshirts["alien t-shirt"] = /obj/item/clothing/under/dressshirt/alien
+	colouredshirts["tie-dye t-shirt"] = /obj/item/clothing/under/dressshirt/tiedye
+	colouredshirts["skull t-shirt"] = /obj/item/clothing/under/dressshirt/skull
+	colouredshirts["sports t-shirt, blue"] = /obj/item/clothing/under/dressshirt/sport
+	colouredshirts["sports t-shirt, green"] = /obj/item/clothing/under/dressshirt/sport/green
+	colouredshirts["sports t-shirt, red"] = /obj/item/clothing/under/dressshirt/sport/red
+	colouredshirts["wing t-shirt"] = /obj/item/clothing/under/dressshirt/wing
+	colouredshirts["peace t-shirt"] = /obj/item/clothing/under/dressshirt/peace
+	colouredshirts["steak t-shirt"] = /obj/item/clothing/under/dressshirt/meat
+	colouredshirts["question mark t-shirt"] = /obj/item/clothing/under/dressshirt/questionmark
+	colouredshirts["white bowling t-shirt"] = /obj/item/clothing/under/dressshirt/bowling
+	colouredshirts["aqua bowling t-shirt"] = /obj/item/clothing/under/dressshirt/bowling/aqua
+	colouredshirts["purple bowling t-shirt"] = /obj/item/clothing/under/dressshirt/bowling/purple
+	colouredshirts["red bowling t-shirt"] = /obj/item/clothing/under/dressshirt/bowling/red
+	colouredshirts["blue jersey"] = /obj/item/clothing/under/dressshirt/jersey
+	colouredshirts["red jersey"] = /obj/item/clothing/under/dressshirt/jersey/red
+	colouredshirts["pink and black t-shirt"] = /obj/item/clothing/under/dressshirt/pinkblack
+	colouredshirts["blue NanoTrasen t-shirt"] = /obj/item/clothing/under/dressshirt/nanotrasen
+	colouredshirts["red NanoTrasen t-shirt"] = /obj/item/clothing/under/dressshirt/nanotrasen/red
+	colouredshirts["fire tank top"] = /obj/item/clothing/under/dressshirt/tanktop/fire
+	colouredshirts["sun tank top"] = /obj/item/clothing/under/dressshirt/tanktop/sun
+	gear_tweaks += new /datum/gear_tweak/path(colouredshirts)

code/modules/clothing/under/shirts/shirts.dm

@@ -175,6 +175,22 @@
 	icon_state = "tanktop_fem"
 	item_state = "tanktop_fem"
 
+/obj/item/clothing/under/dressshirt/tanktop/cropped
+	name = "cropped tank top"
+	desc = "A short, simple, cheap tank top."
+	icon_state = "tanktop_crop"
+	item_state = "tanktop_crop"
+
+/obj/item/clothing/under/dressshirt/tanktop/cropped/feminine
+	icon_state = "tanktop_crop_fem"
+	item_state = "tanktop_crop_fem"
+
+/obj/item/clothing/under/dressshirt/tanktop/midriff
+	name = "midriff tank top"
+	desc = "A very short tank top that only covers the chest."
+	icon_state = "tanktop_midriff"
+	item_state = "tanktop_midriff"
+
 
 // Polo Shirts
 /obj/item/clothing/under/dressshirt/polo
@@ -233,3 +249,153 @@
 	if(prob(50))
 		icon_state = "hawaii_red"
 	color = color_rotation(rand(-11,12)*15)
+
+
+//pre-coloured shirts
+
+/obj/item/clothing/under/dressshirt/corgi
+	name = "corgi t-shirt"
+	desc = "A t-shirt with a corgi on it, cute!"
+	icon_state = "tshirt_corgi"
+	item_state = "tshirt_corgi"
+
+/obj/item/clothing/under/dressshirt/heart
+	name = "heart t-shirt"
+	desc = "A t-shirt with a cartoon heart on it."
+	icon_state = "tshirt_heart"
+	item_state = "tshirt_heart"
+
+/obj/item/clothing/under/dressshirt/heart/alt
+	icon_state = "tshirt_heart_alt"
+	item_state = "tshirt_heart_alt"
+
+/obj/item/clothing/under/dressshirt/lovent
+	name = "\improper I love NT t-shirt"
+	desc = "A white t-shirt with the text \"I ❤ NT\" on it. Another way to show your love of NanoTrasen!"
+	icon_state = "tshirt_lovent"
+	item_state = "tshirt_lovent"
+
+/obj/item/clothing/under/dressshirt/band
+	name = "band t-shirt"
+	desc = "A t-shirt with the logo of a band on it."
+	icon_state = "tshirt_band"
+	item_state = "tshirt_band"
+
+/obj/item/clothing/under/dressshirt/alien
+	name = "alien t-shirt"
+	desc = "A t-shirt with a cartoon alien head on it. Doesn't really look like any known species."
+	icon_state = "tshirt_alien"
+	item_state = "tshirt_alien"
+
+/obj/item/clothing/under/dressshirt/tiedye
+	name = "tie-dye t-shirt"
+	desc = "A tie-dyed t-shirt with a rainbow swirl on it."
+	icon_state = "tshirt_tiedye"
+	item_state = "tshirt_tiedye"
+
+/obj/item/clothing/under/dressshirt/skull
+	name = "skull t-shirt"
+	desc = "A red t-shirt featuring a human skull, badass?"
+	icon_state = "tshirt_skull"
+	item_state = "tshirt_skull"
+
+/obj/item/clothing/under/dressshirt/sport
+	name = "blue sports t-shirt"
+	desc = "A t-shirt for sports. Takes you back to school PE days."
+	icon_state = "tshirt_sportblue"
+	item_state = "tshirt_sportblue"
+
+/obj/item/clothing/under/dressshirt/sport/green
+	name = "green sports t-shirt"
+	icon_state = "tshirt_sportgreen"
+	item_state = "tshirt_sportgreen"
+
+/obj/item/clothing/under/dressshirt/sport/red
+	name = "red sports t-shirt"
+	icon_state = "tshirt_sportred"
+	item_state = "tshirt_sportred"
+
+/obj/item/clothing/under/dressshirt/wing
+	name = "wing t-shirt"
+	desc = "A t-shirt with a cartoon wing printed on it."
+	icon_state = "tshirt_wing"
+	item_state = "tshirt_wing"
+
+/obj/item/clothing/under/dressshirt/peace
+	name = "peace t-shirt"
+	desc = "A white t-shirt with the symbol of peace on the front and back."
+	icon_state = "tshirt_peace"
+	item_state = "tshirt_peace"
+
+/obj/item/clothing/under/dressshirt/meat
+	name = "steak t-shirt"
+	desc = "A t-shirt with a cartoon steak on it. Tasty."
+	icon_state = "tshirt_meat"
+	item_state = "tshirt_meat"
+
+/obj/item/clothing/under/dressshirt/questionmark
+	name = "question mark t-shirt"
+	desc = "A t-shirt with a question mark on it? For some reason?"
+	icon_state = "tshirt_question"
+	item_state = "tshirt_question"
+
+/obj/item/clothing/under/dressshirt/bowling
+	name = "white bowling t-shirt"
+	desc = "A t-shirt for bowling."
+	icon_state = "tshirt_bowlingw"
+	item_state = "tshirt_bowlingw"
+
+/obj/item/clothing/under/dressshirt/bowling/aqua
+	name = "aqua bowling t-shirt"
+	icon_state = "tshirt_bowlinga"
+	item_state = "tshirt_bowlinga"
+
+/obj/item/clothing/under/dressshirt/bowling/purple
+	name = "purple bowling t-shirt"
+	icon_state = "tshirt_bowlingp"
+	item_state = "tshirt_bowlingp"
+
+/obj/item/clothing/under/dressshirt/bowling/red
+	name = "red bowling t-shirt"
+	icon_state = "tshirt_bowlingr"
+	item_state = "tshirt_bowlingr"
+
+/obj/item/clothing/under/dressshirt/jersey
+	name = "blue jersey"
+	desc = "A sports shirt with numbers on the back."
+	icon_state = "shirt_jersey"
+	item_state = "shirt_jersey"
+
+/obj/item/clothing/under/dressshirt/jersey/red
+	name = "red jersey"
+	icon_state = "shirt_jersey_red"
+	item_state = "shirt_jersey_red"
+
+/obj/item/clothing/under/dressshirt/pinkblack
+	name = "pink and black t-shirt"
+	desc = "A pink t-shirt with black sleeves."
+	icon_state = "tshirt_pinkblack"
+	item_state = "tshirt_pinkblack"
+
+/obj/item/clothing/under/dressshirt/nanotrasen
+	name = "blue NanoTrasen t-shirt"
+	desc = "A t-shirt with the letters \"NT\" printed on it."
+	icon_state = "tshirt_nt_blue"
+	item_state = "tshirt_nt_blue"
+
+/obj/item/clothing/under/dressshirt/nanotrasen/red
+	name = "red NanoTrasen t-shirt"
+	icon_state = "tshirt_nt_red"
+	item_state = "tshirt_nt_red"
+
+/obj/item/clothing/under/dressshirt/tanktop/fire
+	name = "fire tank top"
+	desc = "A tank top with a flame decal on it."
+	icon_state = "tanktop_fire"
+	item_state = "tanktop_fire"
+
+/obj/item/clothing/under/dressshirt/tanktop/sun
+	name = "sun tank top"
+	desc = "A tank top with a sun decal on it."
+	icon_state = "tanktop_sun"
+	item_state = "tanktop_sun"

html/changelogs/Greenjoe - newshirts.yml

@@ -0,0 +1,58 @@
+################################
+# 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
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Greenjoe
+
+# 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 clothing item versions of various undershirt items. They can be selected in the loadout. The undershirt versions of them are removed from the game. Some other undershirts are removed outright."