A round of sprite improvments/additions. (#6363)

This pr aims to implement a bunch of the work done by Amoryblaine (found in this thread https://forums.aurorastation.org/topic/11698-amorys-sprites/)

    Adds new sprites for the tactical gear available in cargo.
    Adds new, green, sprite for the military belt, the old red one is added as a specific syndicate variant.
    Improves the sprite of the ushanka, adds the old one as a variant by request.
    Adds rolled down sleeves states for two sol uniforms, adds sol tactical helmet and heavy armor vest.
    Adds a TCFL jacket to the loadout.
    Changes the flipped sprites of most caps to be leaning rather than straight.
    Makes the visors of biosuits transparent.
    Recolours the security biosuit from orange to pale blue.
    Recolors the hip holster to be black.
    Makes the tactical gas masks eyes transparent.
    Tweaks the red and blue bandanas to be less bright.
    Adds some missing balaclava sprites, Improves the look of rolled up balaclavas.
    Makes the security berets more fitting with the standard blue one.

code/datums/outfits/outfit_admin.dm

@@ -47,7 +47,7 @@
 	name = "Syndicate Operative"
 
 	suit = /obj/item/clothing/suit/space/void/merc
-	belt = /obj/item/weapon/storage/belt/military
+	belt = /obj/item/weapon/storage/belt/military/syndicate
 	head = /obj/item/clothing/head/helmet/space/void/merc
 	mask = /obj/item/clothing/mask/gas/syndicate
 	l_ear = /obj/item/device/radio/headset/syndicate
@@ -240,7 +240,7 @@
 
 /datum/outfit/admin/pirate
 	name = "Pirate"
-	
+
 	uniform = /obj/item/clothing/under/pirate
 	shoes = /obj/item/clothing/shoes/brown
 	head = /obj/item/clothing/head/bandana
@@ -250,7 +250,7 @@
 
 /datum/outfit/admin/spacepirate
 	name = "Space Pirate"
-	
+
 	uniform = /obj/item/clothing/under/pirate
 	suit = /obj/item/clothing/suit/space/pirate
 	shoes = /obj/item/clothing/shoes/brown
@@ -341,7 +341,7 @@
 
 /datum/outfit/admin/random_employee
 	name = "Random Employee"
-	
+
 /datum/outfit/admin/random_employee/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	. = ..()
 	if(!visualsOnly)
@@ -399,7 +399,7 @@
 				/datum/gear/eyes/glasses/fakesun
 			))
 			H.equip_or_collect(new path(), slot_glasses)
-		
+
 		if(prob(20)) //Equip some gloves
 			var/datum/gear/G = gear_datums["gloves selection"]
 			H.equip_or_collect(G.spawn_random(), slot_gloves)

code/game/objects/items/weapons/storage/belt.dm

@@ -192,7 +192,7 @@
 
 /obj/item/weapon/storage/belt/military
 	name = "military belt"
-	desc = "A syndicate belt designed to be used by boarding parties. Its style is modeled after the hardsuits they wear."
+	desc = "A lightweight, quick to use, military belt. Designed to be comfortably worn even during lengthy military operations."
 	icon_state = "militarybelt"
 	item_state = "militarybelt"
 	storage_slots = 9 //same as a combat belt now
@@ -224,6 +224,11 @@
 		/obj/item/stack/telecrystal
 		)
 
+/obj/item/weapon/storage/belt/military/syndicate
+	desc = "A syndicate belt designed to be used by boarding parties. Its style is modeled after the hardsuits they wear."
+	icon_state = "militarybelt_syndie"
+	item_state = "militarybelt_syndie"
+
 /obj/item/weapon/storage/belt/janitor
 	name = "janibelt"
 	desc = "A belt used to hold most janitorial supplies."

code/modules/antag_contest/sol_items.dm

@@ -39,6 +39,27 @@
 	item_state = "marine_fatigue"
 	contained_sprite = 1
 
+/obj/item/clothing/under/rank/fatigues/Initialize()
+	.=..()
+	rolled_sleeves = 0
+
+/obj/item/clothing/under/rank/fatigues/rollsleeves()
+	set name = "Roll Up Sleeves"
+	set category = "Object"
+	set src in usr
+
+	if (use_check(usr, USE_DISALLOW_SILICONS))
+		return
+
+	rolled_sleeves = !rolled_sleeves
+	if(rolled_sleeves)
+		body_parts_covered &= ~(ARMS|HANDS)
+		item_state = "[item_state]_r_s"
+	else
+		body_parts_covered = initial(body_parts_covered)
+		item_state = initial(item_state)
+	update_clothing_icon()
+
 /obj/item/clothing/under/rank/service //navy personnel service unniform
 	name = "sol navy service uniform"
 	desc = "Military looking service uniform issued to Sol Alliance navy members."
@@ -183,6 +204,26 @@
 	item_state = "marineofficersword"
 	contained_sprite = 1
 
+//vest and helmet
+
+/obj/item/clothing/head/helmet/sol
+	name = "sol combat helmet"
+	desc = "A woodland colored helmet made from advanced ceramic."
+	icon = 'icons/obj/sol_uniform.dmi'
+	icon_state = "helmet_tac_sol"
+	item_state = "helmet_tac_sol"
+	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
+	contained_sprite = 1
+
+/obj/item/clothing/suit/storage/vest/sol
+	name = "sol heavy armor vest"
+	desc = "A high-quality armor vest in a deep green. It is surprisingly flexible and light, even with the added webbing and armor plating."
+	icon = 'icons/obj/sol_uniform.dmi'
+	icon_state = "solwebvest"
+	item_state = "solwebvest"
+	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
+	contained_sprite = 1
+
 //closet uniform
 
 /obj/structure/closet/sol

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -4,6 +4,10 @@
 	slot = slot_head
 	sort_category = "Hats and Headwear"
 
+/datum/gear/head/ushanka_grey
+	display_name = "ushanka, grey"
+	path = /obj/item/clothing/head/ushanka/grey
+
 /datum/gear/head/bandana
 	display_name = "bandana selection"
 	path = /obj/item/clothing/head/bandana

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -231,6 +231,10 @@
 	coat["military jacket, green"] = /obj/item/clothing/suit/storage/miljacket/green
 	gear_tweaks += new/datum/gear_tweak/path(coat)
 
+/datum/gear/suit/legion_jacket
+	display_name = "Tau Ceti Foreign Legion jacket"
+	path = /obj/item/clothing/suit/storage/legion
+
 /datum/gear/suit/miscellaneous/engi_dep_jacket
 	display_name = "department jacket, engineering"
 	path = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket

code/modules/clothing/glasses/glasses.dm

@@ -178,7 +178,6 @@ BLIND     // can't see anything
 	item_flags = AIRTIGHT
 	unacidable = 1
 
-
 /obj/item/clothing/glasses/eyepatch
 	name = "eyepatch"
 	desc = "Yarr."

code/modules/clothing/head/helmet.dm

@@ -159,13 +159,13 @@
 	name = "tactical helmet"
 	desc = "An armored helmet capable of being fitted with a multitude of attachments."
 	icon_state = "swathelm"
+	flags_inv = HIDEEARS|BLOCKHAIR
 	sprite_sheets = list(
 		"Tajara" = 'icons/mob/species/tajaran/helmet.dmi',
 		"Unathi" = 'icons/mob/species/unathi/helmet.dmi'
 		)
-
 	armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0)
-	flags_inv = HIDEEARS
+
 
 /obj/item/clothing/head/helmet/augment
 	name = "augment array"

code/modules/clothing/head/misc_special.dm

@@ -116,17 +116,25 @@
  */
 /obj/item/clothing/head/ushanka
 	name = "ushanka"
-	desc = "Perfect for winter in Siberia, da?"
-	icon_state = "ushankadown"
+	desc = "A warm fur hat with ear flaps that can be raised and tied to be out of the way."
+	icon_state = "ushanka"
 	flags_inv = HIDEEARS
+	var/earsup = 0
+
+/obj/item/clothing/head/ushanka/grey
+	name = "grey ushanka"
+	desc = "Perfect for winter in Siberia, da?"
+	icon_state = "greyushanka"
 
 /obj/item/clothing/head/ushanka/attack_self(mob/user as mob)
-	if(src.icon_state == "ushankadown")
-		src.icon_state = "ushankaup"
+	src.earsup = !src.earsup
+	if(src.earsup)
+		icon_state = "[icon_state]_up"
 		to_chat(user, "You raise the ear flaps on the ushanka.")
 	else
-		src.icon_state = "ushankadown"
+		src.icon_state = initial(icon_state)
 		to_chat(user, "You lower the ear flaps on the ushanka.")
+	update_clothing_icon()
 
 /*
  * Pumpkin head

code/modules/clothing/masks/boxing.dm

@@ -26,10 +26,15 @@
 	update_clothing_icon()
 
 /obj/item/clothing/mask/balaclava/tactical
-	name = "green balaclava"
+	name = "white balaclava"
 	desc = "Designed to both hide identities and keep your face comfy and warm."
 	icon_state = "swatclava"
 
+/obj/item/clothing/mask/balaclava/military
+	name = "green balaclava"
+	desc = "Designed to both hide identities and keep your face comfy and warm."
+	icon_state = "milclava"
+
 /obj/item/clothing/mask/balaclava/iacmask
 	name = "IAC balaclava"
 	desc = "Designed to keep the user warm and sterile in hostile enviroments."

code/modules/clothing/suits/miscellaneous.dm

@@ -484,6 +484,12 @@
 	icon_state = "militaryjacket_green"
 	item_state = "militaryjacket_green"
 
+/obj/item/clothing/suit/storage/legion
+	name = "tcfl jacket"
+	desc = "A pale blue canvas jacket embossed with the insignia of the Tau Ceti Foreign Legion."
+	icon_state = "tcfljacket"
+	item_state = "tcfljacket"
+
 /obj/item/clothing/suit/jacket/puffer
 	name = "puffer jacket"
 	desc = "A thick jacket with a rubbery, water-resistant shell. Oddly enough, you don't feel any heat."

html/changelogs/[Ferner]-[280419-sprites_amory].yml

@@ -0,0 +1,43 @@
+################################
+# 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
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: AmoryBlaine, Ferner
+
+# 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: 
+  - imageadd: "Added new sprites for the tactical gear available in cargo. Added new green sprite fro the military belt. Improved the sprite of the ushanka, the old one is available as a variant. Adds a TCFL jacket to the loadout. Made the sleeves rollable on two sol uniforms, added sol tactical helmet, sol heavy armor vest."
+  - imageadd: "Changed the look of most flipped caps, Made the visors of biosuits and eyes of tactical gasmasks transparent. Hip holster was made black. Tweaked the red and blue bandanas to be less bright. Changed the look of rolled up balaclavas. Changed the look of some security berets."
+  - maptweak: "Replaced the armoury from a generic to a security specific one. Replaced the armoury gas masks with the transparent ones."

maps/aurora/aurora-4_mainlevel.dmm

@@ -946,6 +946,10 @@
 /obj/item/weapon/book/manual/ntsl2,
 /turf/simulated/floor/wood,
 /area/library)
+"abY" = (
+/obj/structure/closet/l3closet/security,
+/turf/simulated/floor/tiled/dark,
+/area/security/armoury)
 "abZ" = (
 /obj/structure/cable/green{
 	d2 = 4;
@@ -6034,10 +6038,6 @@
 /obj/structure/closet/bombclosetsecurity,
 /turf/simulated/floor/tiled/dark,
 /area/security/armoury)
-"alE" = (
-/obj/structure/closet/l3closet/general,
-/turf/simulated/floor/tiled/dark,
-/area/security/armoury)
 "alF" = (
 /obj/machinery/light{
 	dir = 1
@@ -7859,21 +7859,21 @@
 /area/maintenance/engineering)
 "apb" = (
 /obj/structure/table/rack,
-/obj/item/clothing/mask/gas{
+/obj/item/clothing/mask/gas/alt{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/clothing/mask/gas{
+/obj/item/clothing/mask/gas/alt{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas{
+/obj/item/clothing/mask/gas/alt,
+/obj/item/clothing/mask/gas/alt,
+/obj/item/clothing/mask/gas/alt{
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/clothing/mask/gas{
+/obj/item/clothing/mask/gas/alt{
 	pixel_x = 3;
 	pixel_y = -3
 	},
@@ -93784,7 +93784,7 @@ afo
 aab
 ajR
 ajR
-alE
+abY
 amO
 anT
 apc