Merge pull request #3237 from KasparoVy/Spritefixes-And-Underwear

Spritefixes, Underwear and Berets

code/modules/clothing/head/jobs.dm

@@ -76,7 +76,7 @@
 /obj/item/clothing/head/HoS/beret
 	name = "head of security beret"
 	desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection."
-	icon_state = "hosberetblack"
+	icon_state = "beret_hos_black"
 
 /obj/item/clothing/head/warden
 	name = "warden's police hat"
@@ -95,25 +95,25 @@
 /obj/item/clothing/head/beret/sec
 	name = "security beret"
 	desc = "A beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety."
-	icon_state = "beret_badge"
+	icon_state = "beret_officer"
 	armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 	strip_delay = 60
 
 /obj/item/clothing/head/beret/sec/warden
 	name = "warden's beret"
 	desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
-	icon_state = "wardenberet"
+	icon_state = "beret_warden"
 	armor = list(melee = 60, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
 
 /obj/item/clothing/head/beret/eng
 	name = "engineering beret"
 	desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."
-	icon_state = "e_beret_badge"
+	icon_state = "beret_engineering"
 
 /obj/item/clothing/head/beret/atmos
 	name = "atmospherics beret"
 	desc = "A beret for those who have shown immaculate proficienty in piping. Or plumbing."
-	icon_state = "a_beret_badge"
+	icon_state = "beret_atmospherics"
 
 //Medical
 /obj/item/clothing/head/surgery

code/modules/clothing/head/misc.dm

@@ -277,18 +277,18 @@
 /obj/item/clothing/head/beret/purple
 	name = "Pierson Family Beret"
 	desc = " A purple beret, with a small golden crescent moon sewn onto it."
-	icon_state = "purpleberet"
+	icon_state = "beret_purple"
 	item_state = "purpleberet"
 
 /obj/item/clothing/head/beret/centcom/officer
 	name = "officers beret"
 	desc = "A black beret adorned with the shield—a silver kite shield with an engraved sword—of the Nanotrasen security forces, announcing to the world that the wearer is a defender of Nanotrasen."
-	icon_state = "centcomofficerberet"
+	icon_state = "beret_centcom_officer"
 
 /obj/item/clothing/head/beret/centcom/captain
 	name = "captains beret"
 	desc = "A white beret adorned with the shield—a cobalt kite shield with an engraved sword—of the Nanotrasen security forces, worn only by those captaining a vessel of the Nanotrasen Navy."
-	icon_state = "centcomcaptain"
+	icon_state = "beret_centcom_captain"
 
 /obj/item/clothing/head/sombrero
 	name = "sombrero"

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -63,7 +63,7 @@
 /obj/item/clothing/head/helmet/space/deathsquad/beret
 	name = "officer's beret"
 	desc = "An armored beret commonly used by special operations officers."
-	icon_state = "beret_badge"
+	icon_state = "beret_officer"
 	armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30)
 
 /obj/item/clothing/suit/space/deathsquad/officer

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 = "Mens 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
 
 ///////////////////////

html/changelogs/KasparoVy-PR-3237.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
+#   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."
+  - rscadd: "Ports Bay/TG berets."
+  - tweak: "Adjusts beret sprite, recolours strange orange pixels."
+  - tweak: "Adjusts NV science goggles object icon. Removed strange border and centered it."