Softcap inhand and consistency fixes (#8869)

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -16,7 +16,7 @@
 	new /obj/item/device/radio/headset/headset_cargo(src)
 	new /obj/item/device/radio/headset/headset_cargo/alt(src)
 	new /obj/item/clothing/gloves/black(src)
-	new /obj/item/clothing/head/soft(src)
+	new /obj/item/clothing/head/soft/yellow(src)
 	new /obj/item/modular_computer/tablet/preset/custom_loadout/advanced/cargo_delivery(src)
 	new /obj/item/export_scanner(src)
 
@@ -41,11 +41,11 @@
 	new /obj/item/tank/emergency_oxygen(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/glasses/meson(src)
-	new /obj/item/clothing/head/soft(src)
+	new /obj/item/clothing/head/soft/yellow(src)
 	new /obj/item/modular_computer/tablet/preset/custom_loadout/advanced/cargo_delivery(src)
 	new /obj/item/export_scanner(src)
 	new /obj/item/device/orbital_dropper/drill(src)
 
 /obj/structure/closet/secure_closet/merchant
 	name = "merchant locker"
-	req_access = list(access_merchant)
+	req_access = list(access_merchant)

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

@@ -28,16 +28,17 @@
 /datum/gear/head/cap/New()
 	..()
 	var/caps = list()
-	caps["blue cap"] = /obj/item/clothing/head/soft/blue
-	caps["flat cap"] = /obj/item/clothing/head/flatcap
-	caps["green cap"] = /obj/item/clothing/head/soft/green
-	caps["grey cap"] = /obj/item/clothing/head/soft/grey
+	caps["red cap"] = /obj/item/clothing/head/soft
 	caps["orange cap"] = /obj/item/clothing/head/soft/orange
+	caps["yellow cap"] = /obj/item/clothing/head/soft/yellow
+	caps["green cap"] = /obj/item/clothing/head/soft/green
+	caps["blue cap"] = /obj/item/clothing/head/soft/blue
 	caps["purple cap"] = /obj/item/clothing/head/soft/purple
 	caps["rainbow cap"] = /obj/item/clothing/head/soft/rainbow
-	caps["red cap"] = /obj/item/clothing/head/soft/red
-	caps["white cap"] = /obj/item/clothing/head/soft/mime
-	caps["yellow cap"] = /obj/item/clothing/head/soft/yellow
+	caps["black cap"] = /obj/item/clothing/head/soft/black
+	caps["grey cap"] = /obj/item/clothing/head/soft/grey
+	caps["white cap"] = /obj/item/clothing/head/soft/white
+	caps["flat cap"] = /obj/item/clothing/head/flatcap
 	caps["mailman cap"] = /obj/item/clothing/head/mailman
 	gear_tweaks += new/datum/gear_tweak/path(caps)
 

code/modules/clothing/head/misc.dm

@@ -202,10 +202,6 @@
 	name = "flat cap"
 	desc = "A working man's cap."
 	icon_state = "flat_cap"
-	item_state_slots = list(
-		slot_l_hand_str = "det_hat",
-		slot_r_hand_str = "det_hat"
-		)
 	siemens_coefficient = 0.9
 
 /obj/item/clothing/head/pirate
@@ -700,4 +696,4 @@
 	name = "padded cap"
 	desc = "A padded skullcap for those prone to bumping their heads against hard surfaces."
 	icon_state = "tank"
-	flags_inv = BLOCKHEADHAIR
+	flags_inv = BLOCKHEADHAIR

code/modules/clothing/head/soft_caps.dm

@@ -1,11 +1,7 @@
 /obj/item/clothing/head/soft
-	name = "cargo cap"
-	desc = "It's a peaked cap in a tasteless yellow color."
-	icon_state = "cargosoft"
-	item_state_slots = list(
-		slot_l_hand_str = "helmet", //probably a placeholder
-		slot_r_hand_str = "helmet"
-		)
+	name = "red cap"
+	desc = "It's a baseball hat in a tasteless red color."
+	icon_state = "redsoft"
 	var/flipped = 0
 	siemens_coefficient = 0.9
 
@@ -24,46 +20,46 @@
 		to_chat(user, "You flip the hat back in normal position.")
 	update_clothing_icon()	//so our mob-overlays update
 
-/obj/item/clothing/head/soft/red
-	name = "red cap"
-	desc = "It's a baseball hat in a tasteless red color."
-	icon_state = "redsoft"
-
-/obj/item/clothing/head/soft/blue
-	name = "blue cap"
-	desc = "It's a peaked cap in a tasteless blue color."
-	icon_state = "bluesoft"
-
-/obj/item/clothing/head/soft/green
-	name = "green cap"
-	desc = "It's a peaked cap in a tasteless green color."
-	icon_state = "greensoft"
+/obj/item/clothing/head/soft/orange
+	name = "orange cap"
+	desc = "It's a peaked cap in a tasteless orange color."
+	icon_state = "orangesoft"
 
 /obj/item/clothing/head/soft/yellow
 	name = "yellow cap"
 	desc = "It's a peaked cap in a tasteless yellow color."
 	icon_state = "yellowsoft"
 
-/obj/item/clothing/head/soft/grey
-	name = "grey cap"
-	desc = "It's a peaked cap in a tasteful grey color."
-	icon_state = "greysoft"
+/obj/item/clothing/head/soft/green
+	name = "green cap"
+	desc = "It's a peaked cap in a tasteless green color."
+	icon_state = "greensoft"
 
-/obj/item/clothing/head/soft/orange
-	name = "orange cap"
-	desc = "It's a peaked cap in a tasteless orange color."
-	icon_state = "orangesoft"
-
-/obj/item/clothing/head/soft/mime
-	name = "white cap"
-	desc = "It's a peaked cap in a tasteless white color."
-	icon_state = "mimesoft"
+/obj/item/clothing/head/soft/blue
+	name = "blue cap"
+	desc = "It's a peaked cap in a tasteless blue color."
+	icon_state = "bluesoft"
 
 /obj/item/clothing/head/soft/purple
 	name = "purple cap"
 	desc = "It's a peaked cap in a tasteless purple color."
 	icon_state = "purplesoft"
 
+/obj/item/clothing/head/soft/black
+	name = "black cap"
+	desc = "It's a peaked cap in a tasteless black color."
+	icon_state = "blacksoft"
+
+/obj/item/clothing/head/soft/grey
+	name = "grey cap"
+	desc = "It's a peaked cap in a tasteful grey color."
+	icon_state = "greysoft"
+
+/obj/item/clothing/head/soft/white
+	name = "white cap"
+	desc = "It's a peaked cap in a tasteless white color."
+	icon_state = "whitesoft"
+
 /obj/item/clothing/head/soft/rainbow
 	name = "rainbow cap"
 	desc = "It's a peaked cap in a bright rainbow of colors."
@@ -87,4 +83,4 @@
 /obj/item/clothing/head/soft/iacberet
 	name = "IAC soft cap"
 	desc = "It's field cap in IAC colors."
-	icon_state = "iachat"
+	icon_state = "iachat"

html/changelogs/wezzy_cap_inhands.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: Wowzewow (Wezzy)
+
+# 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: 
+  - bugfix: "Adds missing inhands for softcaps."
+  - bugfix: "Adds missing inhands and directionals for flatcaps."
+  - rscadd: "Adds black cap to the loadout."

maps/aurora/aurora-4_mainlevel.dmm

@@ -64114,7 +64114,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/medbay)
 "hqT" = (
-/obj/item/clothing/head/soft/mime,
+/obj/item/clothing/head/soft/white,
 /obj/item/clothing/mask/gas/mime,
 /obj/item/clothing/shoes/mime,
 /obj/item/clothing/under/mime,

maps/aurora/aurora-6_surface.dmm

@@ -16806,12 +16806,12 @@
 /area/quartermaster/loading)
 "En" = (
 /obj/structure/table/standard,
-/obj/item/clothing/head/soft,
+/obj/item/clothing/head/soft/yellow,
 /obj/item/stamp{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/clothing/head/soft,
+/obj/item/clothing/head/soft/yellow,
 /obj/effect/floor_decal/corner/brown/full{
 	icon_state = "corner_white_full";
 	dir = 8

maps/exodus/exodus-1_station.dmm

@@ -36761,12 +36761,12 @@
 /area/maintenance/locker)
 "bqe" = (
 /obj/structure/table/standard,
-/obj/item/clothing/head/soft,
+/obj/item/clothing/head/soft/yellow,
 /obj/item/stamp{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/clothing/head/soft,
+/obj/item/clothing/head/soft/yellow,
 /turf/simulated/floor/tiled,
 /area/quartermaster/loading)
 "bqf" = (