An Abundance of Hats

code/modules/awaymissions/corpse.dm

@@ -357,6 +357,17 @@
 	corpseid = 1
 	corpseidjob = "Sif Defense Force Patrolman"
 
+/obj/effect/landmark/corpse/sifcop
+	name = "SGPD Officer"
+	corpseuniform = /obj/item/clothing/under/sifcop
+	corpsebelt = /obj/item/storage/belt/security/tactical
+	corpseglasses = /obj/item/clothing/glasses/sunglasses/sechud
+	corpsehelmet = /obj/item/clothing/head/helmet/riot/sifcop
+	corpsegloves = /obj/item/clothing/gloves/duty
+	corpseshoes = /obj/item/clothing/shoes/boots/jackboots
+	corpseid = 1
+	corpseidjob = "SifGuard Police Division Officer"
+
 /obj/effect/landmark/corpse/hedberg
 	name = "Hedberg-Hammarstrom Mercenary"
 	corpseuniform = /obj/item/clothing/under/solgov/utility/sifguard
@@ -372,7 +383,7 @@
 	name = "Hedberg-Hammarstrom Mercenary"
 	corpsebelt = /obj/item/storage/belt/security/tactical
 	corpseglasses = /obj/item/clothing/glasses/sunglasses/sechud
-	corpsehelmet = /obj/item/clothing/head/helmet/flexitac
+	corpsehelmet = /obj/item/clothing/head/helmet/space/void/hedberg
 	corpsegloves = /obj/item/clothing/gloves/combat
 	corpseshoes = /obj/item/clothing/shoes/boots/tactical
 	corpseid = 1

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

@@ -408,3 +408,32 @@
 /datum/gear/head/plaguedoctor2
 	display_name = "hat, golden plague doctor"
 	path = /obj/item/clothing/head/plaguedoctorhat/gold
+
+/datum/gear/head/nonla
+	display_name = "non la"
+	path = /obj/item/clothing/head/nonla
+
+/datum/gear/head/buckethat
+	display_name = "hat, bucket"
+	path = /obj/item/clothing/head/buckethat
+
+/datum/gear/head/buckethat/New()
+	..()
+	gear_tweaks += gear_tweak_free_color_choice
+
+/datum/gear/head/redcoat
+	display_name = "hat, tricorne"
+	path =/obj/item/clothing/head/redcoat
+
+/datum/gear/head/tanker
+	display_name = "tanker cap selection"
+	path = /obj/item/clothing/head/hardhat
+	cost = 2
+
+/datum/gear/head/tanker/New()
+	..()
+	var/list/tankercaps = list()
+	for(var/tankercap in typesof(/obj/item/clothing/head/helmet/tank))
+		var/obj/item/clothing/head/helmet/tank/cap_type = tankercap
+		tankercaps[initial(cap_type.name)] = cap_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(tankercaps))

code/modules/clothing/head/helmet.dm

@@ -71,12 +71,18 @@
 /obj/item/clothing/head/helmet/riot/attack_self(mob/user as mob)
 	if(src.icon_state == initial(icon_state))
 		src.icon_state = "[icon_state]up"
-		to_chat(user, "You raise the visor on the riot helmet.")
+		to_chat(user, "You raise the visor on the [src].")
 	else
 		src.icon_state = initial(icon_state)
-		to_chat(user, "You lower the visor on the riot helmet.")
+		to_chat(user, "You lower the visor on the [src].")
 	update_clothing_icon()	//so our mob-overlays update
 
+/obj/item/clothing/head/helmet/riot/sifcop
+	name = "\improper SifGuard police helmet"
+	desc = "A visored helmet printed with the livery of the SifGuard Police Division."
+	icon_state = "sifcop"
+	armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0)
+
 /obj/item/clothing/head/helmet/laserproof
 	name = "ablative helmet"
 	desc = "It's a helmet specifically designed to protect against energy projectiles."
@@ -136,6 +142,44 @@
 	min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
 	siemens_coefficient = 0.5
 
+/obj/item/clothing/head/helmet/heavy
+	name = "heavy combat helmet"
+	desc = "A heavily armoured helmet with built-in faceplate, built to withstand the rigours of modern combat."
+	description_fluff = "Though a darling of Proxima Centuari Risk Control operatives, this type of high-grade enclosed combat helmet has two key drawbacks: 1. A somewhat limited field of view, which is often compensated for with cybernetics, and 2. It costs more than most mercenaries make in a year."
+	icon_state = "heavy_combat"
+	armor = list(melee = 70, bullet = 80, laser = 60, energy = 25, bomb = 40, bio = 0, rad = 0)
+	siemens_coefficient = 0.5
+
+/obj/item/clothing/head/helmet/heavy/knight
+	desc = "An enclosed, heavily armoured ablative helmet modeled after a medieval greathelm."
+	description_fluff = "The early 23rd century saw a surge in popularity for faux-medieval combat fashions, which was soon abandoned due to practical concerns and a growing desire for unified corporate security brand identities."
+	flags_inv = HIDEEARS|HIDEEYES|BLOCKHEADHAIR
+	icon_state = "knight_grey"
+	armor = list(melee = 80, bullet = 50, laser = 40, energy = 20, bomb = 30, bio = 0, rad = 0)
+
+/obj/item/clothing/head/helmet/newkyoto
+	name = "\improper New Kyotan combat helmet"
+	desc = "An armoured helmet. Pride of New Kyoto lawmen, dread of foreign spies."
+	description_fluff = "Authentic examples of New Kyotan security gear are rare due to the independent nation's strict export restrictions. Fortunately, ubiquitous replicas are often equally effective."
+	icon_state = "nkyoto"
+	armor = list(melee = 50, bullet = 50, laser = 50, energy = 25, bomb = 20, bio = 0, rad = 0)
+	siemens_coefficient = 0.5
+
+/obj/item/clothing/head/helmet/tank
+	name = "black tanker cap"
+	desc = "A padded skullcup for those prone to bumping their heads against hard surfaces."
+	icon_state = "tank"
+	color = "#5f5f5f"
+	armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/head/helmet/tank/olive
+	name = "olive tanker cap"
+	color = "#727c58"
+
+/obj/item/clothing/head/helmet/tank/tan
+	name = "tan tanker cap"
+	color = "#ae9f79"
+
 /obj/item/clothing/head/helmet/alien
 	name = "alien helmet"
 	desc = "It's quite larger than your head, but it might still protect it."
@@ -175,7 +219,6 @@
 		SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi',
 		SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi',
 		)
-
 	armor = list(melee = 60, bullet = 60, laser = 60, energy = 40, bomb = 40, bio = 0, rad = 0)
 	flags_inv = HIDEEARS|BLOCKHAIR
 	siemens_coefficient = 0.7
@@ -224,3 +267,4 @@
 	name = "emergency response team medical helmet"
 	desc = "A set of armor worn by medical members of the NanoTrasen Emergency Response Team. Has red and white highlights."
 	icon_state = "erthelmet_med"
+

code/modules/clothing/head/misc.dm

@@ -109,10 +109,10 @@
 	desc = "Columbian Pure."
 
 /obj/item/clothing/head/redcoat
-	name = "redcoat's hat"
+	name = "tricorne hat"
 	icon_state = "redcoat"
 	item_state_slots = list(slot_r_hand_str = "pirate", slot_l_hand_str = "pirate")
-	desc = "<i>'I guess it's a redhead.'</i>"
+	desc = "Stand and deliver!"
 	body_parts_covered = 0
 
 /obj/item/clothing/head/mailman
@@ -463,6 +463,21 @@
 	flags_inv = HIDEEYES
 	body_parts_covered = HEAD|EYES
 
+/obj/item/clothing/head/nonla
+	name = "non la"
+	desc = "A conical straw hat, used by those in tropical climates to protect the head from sweltering suns and heavy rains."
+	icon_state = "nonla"
+	item_state = "nonla"
+
+/obj/item/clothing/head/buckethat
+	name = "bucket hat"
+	desc = "A hat with an all-around visor. Only slightly better than wearing an actual bucket."
+	icon_state = "buckethat"
+	icon_state = "buckethat"
+	sprite_sheets = list(
+		SPECIES_TAJARAN = 'icons/mob/species/tajaran/helmet.dmi'
+		)
+
 //Corporate Berets
 
 /obj/item/clothing/head/beret/corp/saare

code/modules/clothing/head/solgov.dm

@@ -265,6 +265,11 @@
 	desc = "An Sif Defense Force beret carrying insignia of the Anti-Piracy taskforce. For personnel that are more inclined towards style than safety."
 	icon_state = "beret_black_patrol"
 
+/obj/item/clothing/head/beret/solgov/sifguard/sifcop
+	name = "\improper SifGuard Police Division beret"
+	desc = "An Sif Defense Force beret carrying insignia of the civilian law enforcement division (SGPD). Standard issue."
+	icon_state = "beret_sifcop"
+
 /*
  * Fleet (Berets)
  */

code/modules/clothing/spacesuits/alien.dm

@@ -86,4 +86,4 @@
 /obj/item/clothing/suit/space/vox/medic
 	name = "alien armour"
 	icon_state = "vox-medic"
-	desc = "An almost organic looking nonhuman pressure suit."
+	desc = "An almost organic looking nonhuman pressure suit."

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -102,3 +102,17 @@
 	icon_state = "syndicate-orange"
 	desc = "A thin, ungainly softsuit colored in blaze orange for rescuers to easily locate, looks pretty fragile."
 	slowdown = 2
+
+//civilian recreational spacesuit
+
+/obj/item/clothing/head/helmet/space/sports
+	name = "performance sports space helmet"
+	icon_state = "sports_void"
+	desc = "A sleek space helmet for the civilian extra-vehicular extreme sports market. Please replace after any impact!"
+
+/obj/item/clothing/suit/space/sports
+	name = "performance sports spacesuit"
+	desc = "A high-dexterity spacesuit for the civilian extra-vehicular extreme sports market, for when zero-g sports in controlled environments are just too tame."
+	description_fluff = "Ward-Takahashi zero-gravity performance sportswear does not require an EVA certification to purchase, though user manuals do list it as 'recommended' on condition of a 2550 lawsuit."
+	icon_state = "sports_void"
+	slowdown = 0

code/modules/clothing/spacesuits/void/event.dm

@@ -147,7 +147,7 @@
 
 //Officer Crewsuit (GOLD, X)
 //The best of the bunch - at the time, this would have been almost cutting edge
-//Now it's good, but it's badly outclassed by the hot shit that the TSCs and such can get 
+//Now it's good, but it's badly outclassed by the hot shit that the TSCs and such can get
 /obj/item/clothing/head/helmet/space/void/refurb/officer
 	name = "vintage officer's voidsuit helmet"
 	desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. This variant appears to be an officer's, and has the best protection of all the old models."
@@ -214,7 +214,7 @@
 			/obj/item/gps,
 			/obj/item/radio/beacon,
 			)
-			
+
 //Scientist Crewsuit (PURPLE, O)
 //Baseline values are slightly worse than the gray crewsuit, but it has significantly better Energy protection and is the only other suit with 100% rad immunity besides the engi suit
 /obj/item/clothing/head/helmet/space/void/refurb/research

code/modules/clothing/spacesuits/void/merc.dm

@@ -43,4 +43,4 @@
 	allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs,/obj/item/material/twohanded/fireaxe,/obj/item/flamethrower)
 	siemens_coefficient = 0.7
 	breach_threshold = 18 //Super Extra Thicc
-	slowdown = 1
+	slowdown = 1

code/modules/clothing/spacesuits/void/misc.dm

@@ -0,0 +1,104 @@
+//Misc voidsuits
+
+//Boarding ops.
+/obj/item/clothing/head/helmet/space/void/boarding_ops
+	name = "boarding operations voidsuit helmet"
+	desc = "A first generation armoured voidsuit helmet designed for variable-gravity boarding operations where heavier combat suits would leave the user vulnerable once within a pressurized environment."
+	icon_state = "light_ops"
+	armor = list(melee = 30, bullet = 35, laser = 35, energy = 5, bomb = 30, bio = 100, rad = 50)
+	siemens_coefficient = 0.8
+
+/obj/item/clothing/head/helmet/space/void/boarding_ops/mk2
+	desc = "A second generation armoured voidsuit helmet designed for variable-gravity boarding operations where heavier combat suits would leave the user vulnerable once within a pressurized environment. This one has improved visibility at the cost of some plating."
+	icon_state = "light_ops_mk2"
+	armor = list(melee = 20, bullet = 30, laser = 40, energy = 5, bomb = 30, bio = 100, rad = 50)
+
+/obj/item/clothing/suit/space/void/boarding_ops
+	name = "boarding operations voidsuit"
+	desc = "A moderately armoured voidsuit designed for variable-gravity boarding operations where heavier combat suits would leave the user vulnerable once within a pressurized environment."
+	description_fluff = "Originally an Aether Atmospherics design intended for hazardous environment EVA, these lightweight armoured suits were adapted for combat use and for easy re-fabrication, making them a hit with pirates of both varieties."
+	icon_state = "light_ops"
+	armor = list(melee = 30, bullet = 35, laser = 35, energy = 5, bomb = 30, bio = 100, rad = 50)
+	breach_threshold = 14 //These are kinda thicc
+	resilience = 0.15 //Armored
+	siemens_coefficient = 0.8
+	allowed = list(/obj/item/gun,
+			/obj/item/flashlight,
+			/obj/item/tank,
+			/obj/item/suit_cooling_unit,
+			/obj/item/melee,
+			/obj/item/grenade,
+			/obj/item/flash,
+			/obj/item/gps,
+			/obj/item/radio/beacon,
+			/obj/item/handcuffs,
+			/obj/item/hailer,
+			/obj/item/holowarrant,
+			/obj/item/megaphone,
+			/obj/item/ammo_magazine,
+			/obj/item/cell
+			)
+
+//Tajaran Pearlshield Coalition Spacesuit
+/obj/item/clothing/head/helmet/space/void/pearlshield
+	name = "Pearlshield Coalition space helmet"
+	desc = "A rugged, utilitarian space helmet designed for the Pearlshield Coalition military by PCA."
+	description_fluff = "Pearlshield Consolidated Armories is a collaborative organization of Tajaran arms manufacturers tasked with producing equipment for the intergovernmental Pearlshield Coalition, the Tajaran representative body on the galactic stage."
+	icon_state = "pearlshield_void"
+	armor = list(melee = 30, bullet = 40, laser = 40, energy = 20, bomb = 30, bio = 100, rad = 50)
+	species_restricted = list(SPECIES_TAJ)
+
+/obj/item/clothing/suit/space/void/pearlshield
+	name = "Pearlshield Coalition voidsuit"
+	desc = "A rugged, utilitarian spacesuit designed for the Pearlshield Coalition military by PCA."
+	description_fluff = "Pearlshield Consolidated Armories is a collaborative organization of Tajaran arms manufacturers tasked with producing equipment for the intergovernmental Pearlshield Coalition, the Tajaran representative body on the galactic stage."
+	icon_state = "pearlshield_void"
+	armor = list(melee = 20, bullet = 20, laser = 20, energy = 50, bomb = 50, bio = 100, rad = 50)
+	allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
+	species_restricted = list(SPECIES_TAJ)
+
+//SCG Fleet Voidsuit(s)
+
+/obj/item/clothing/head/helmet/space/void/scg
+	name = "Fleet voidsuit helmet"
+	desc = "A standard issue SCG Marine armoured voidsuit helmet for use in hazardous environment combat scenarios."
+	icon_state = "scg_void"
+	armor = list(melee = 50, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 70)
+	siemens_coefficient = 0.6
+
+/obj/item/clothing/head/helmet/space/void/scg/heavy
+	name = "heavy Fleet voidsuit helmet"
+	desc = "A heavier version of the standard issue SCG Marine armoured voidsuit helmet for use in hazardous environment combat scenarios."
+	icon_state = "scg_void"
+	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 70)
+	siemens_coefficient = 0.6
+
+/obj/item/clothing/suit/space/void/scg
+	name = "Fleet voidsuit"
+	desc = "A standard issue SCG Marine armoured voidsuit for use in hazardous environment combat scenarios."
+	icon_state = "scg_void"
+	w_class = ITEMSIZE_NORMAL
+	armor = list(melee = 50, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 70)
+	allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
+	siemens_coefficient = 0.6
+	breach_threshold = 16 //Extra Thicc
+	resilience = 0.05 //Military Armor
+
+//Misc Armoured Space helmets
+
+/obj/item/clothing/head/helmet/space/void/grayson
+	name = "heavy mining helmet"
+	desc =  "An older model heavy-duty atmosphere-controlled mining helmet."
+	description_fluff = "This armoured mining helmet was one of Grayson's best selling models before the advent rigsuit technology, and due to its relatively simple construction the design has remained in use for well over a century and is often adapted to function with the latest suits."
+	icon_state = "grayson_helm"
+	armor = list(melee = 60, bullet = 20, laser = 25, energy = 15, bomb = 55, bio = 100, rad = 50)
+	siemens_coefficient = 0.8
+
+/obj/item/clothing/head/helmet/space/void/hedberg
+	name = "Hedberg-Hammarstrom combat helmet"
+	desc =  "A heavily armoured helmet with built-in faceplate, built to withstand the rigours of modern combat and equipped for space use."
+	description_fluff = "The Hedberg-Hammarstrom company has operated Vir's military forces privately since 2566, but retains many of its unique armour designs exclusively for use in the private sector."
+	icon_state = "hedberg_helmet"
+	armor = list(melee = 70, bullet = 80, laser = 60, energy = 25, bomb = 40, bio = 100, rad = 0)
+	siemens_coefficient = 0.8
+	no_cycle = TRUE

code/modules/clothing/under/miscellaneous.dm

@@ -1190,7 +1190,7 @@ Uniforms and such
 	rolled_sleeves = 0
 
 /obj/item/clothing/under/sifcop
-	name = "\improper SifGuard law enforcement uniform"
+	name = "\improper SifGuard Police Division uniform"
 	desc = "A sturdy law enforcement uniform typical of Vir's civilian law enforcement officers."
 	icon_state = "sifcop"
 	worn_state = "sifcop"

polaris.dme

@@ -1692,6 +1692,7 @@
 #include "code\modules\clothing\spacesuits\rig\suits\station.dm"
 #include "code\modules\clothing\spacesuits\void\event.dm"
 #include "code\modules\clothing\spacesuits\void\merc.dm"
+#include "code\modules\clothing\spacesuits\void\misc.dm"
 #include "code\modules\clothing\spacesuits\void\station.dm"
 #include "code\modules\clothing\spacesuits\void\void.dm"
 #include "code\modules\clothing\spacesuits\void\wizard.dm"