Beastmen claws, armor changes and fashion update (#1699)

-return claws to their old damage
-added ballistic, ablative and mercenary helmets, placing them in the armoy and merc base
-tweaked some things with some clothing items, like name and pockets
-added scarfs as an accessory, available in the loadout
-added pants, also available in the loadout
-moved some things out of the armor.dmi to where they belong
-move all hats and armor from the security jumpsuit dmi file to the their right places
-moved the tunnel cloak to the xenowear section
-fixed missing heavy vests at the merc base and the missing book scanner at the library

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

@@ -67,3 +67,22 @@
 	path = /obj/item/clothing/accessory/storage/webbing
 	cost = 2
 
+/datum/gear/accessory/scarf
+	display_name = "scarf selection"
+	path = /obj/item/clothing/accessory/scarf
+
+/datum/gear/accessory/scarf/New()
+	..()
+	var/scarfs = list()
+	scarfs["white scarf"] = /obj/item/clothing/accessory/scarf
+	scarfs["yellow scarf"] = /obj/item/clothing/accessory/scarf/yellow
+	scarfs["green scarf"] = /obj/item/clothing/accessory/scarf/green
+	scarfs["purple scarf"] = /obj/item/clothing/accessory/scarf/purple
+	scarfs["black scarf"] = /obj/item/clothing/accessory/scarf/black
+	scarfs["red scarf"] = /obj/item/clothing/accessory/scarf/red
+	scarfs["orange scarf"] = /obj/item/clothing/accessory/scarf/orange
+	scarfs["light blue scarf"] = /obj/item/clothing/accessory/scarf/light_blue
+	scarfs["dark blue scarf"] = /obj/item/clothing/accessory/scarf/dark_blue
+	scarfs["zebra scarf"] = /obj/item/clothing/accessory/scarf/zebra
+	gear_tweaks += new/datum/gear_tweak/path(scarfs)
+	

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

@@ -47,11 +47,6 @@
 	path = /obj/item/weapon/material/kitchen/utensil/knife/boot
 	cost = 3
 
-/datum/gear/cape
-	display_name = "tunnel cloak"
-	path = /obj/item/weapon/storage/backpack/cloak
-	cost = 1
-
 /datum/gear/lunchbox
 	display_name = "lunchbox"
 	description = "A little lunchbox."
@@ -66,4 +61,4 @@
 		if(!initial(lunchbox.filled))
 			lunchboxes[initial(lunchbox.name)] = lunchbox_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(lunchboxes))
-	gear_tweaks += new/datum/gear_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks())
+	gear_tweaks += new/datum/gear_tweak/contents(lunchables_lunches(), lunchables_snacks(), lunchables_drinks())

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

@@ -75,7 +75,7 @@
 	allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet","Detective")
 
 /datum/gear/head/hardhat
-	display_name = "hardhat, yellow"
+	display_name = "hardhat selection"
 	path = /obj/item/clothing/head/hardhat
 	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice")
 

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

@@ -118,7 +118,7 @@
 /datum/gear/uniform/corpsecsuit
 	display_name = "uniform, corporate (Security)"
 	path = /obj/item/clothing/under/rank/security/corp
-	allowed_roles = list("Security Officer","Head of Security","Warden")
+	allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet")
 
 /datum/gear/uniform/uniform_hop
 	display_name = "uniform, HoP's dress"
@@ -133,16 +133,32 @@
 /datum/gear/uniform/navysecsuit
 	display_name = "uniform, navyblue (Security)"
 	path = /obj/item/clothing/under/rank/security/navyblue
-	allowed_roles = list("Security Officer","Head of Security","Warden")
+	allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet")
 
 /datum/gear/uniform/gearharness
 	display_name = "gear harness"
 	path = /obj/item/clothing/under/gearharness
 	cost = 2
 
-/datum/gear/uniform/track_pants
-	display_name = "track pants"
-	path = /obj/item/clothing/under/track
+/datum/gear/uniform/pants
+	display_name = "pants selection"
+	path = /obj/item/clothing/under/pants
+	
+/datum/gear/uniform/pants/New()
+	..()
+	var/pants = list()
+	pants["jeans"] = /obj/item/clothing/under/pants
+	pants["classic jeans"] = /obj/item/clothing/under/pants/classic
+	pants["must hang jeans"] = /obj/item/clothing/under/pants/musthang
+	pants["black jeans"] = /obj/item/clothing/under/pants/jeansblack
+	pants["young folks jeans"] = /obj/item/clothing/under/pants/youngfolksjeans
+	pants["white pants"] = /obj/item/clothing/under/pants/white
+	pants["black pants"] = /obj/item/clothing/under/pants/black
+	pants["red pants"] = /obj/item/clothing/under/pants/red
+	pants["tan pants"] = /obj/item/clothing/under/pants/tan
+	pants["khaki pants"] = /obj/item/clothing/under/pants/khaki
+	pants["track pants"] = /obj/item/clothing/under/pants/track
+	gear_tweaks += new/datum/gear_tweak/path(pants)
 	
 /datum/gear/uniform/turtleneck
 	display_name = "tacticool turtleneck"	

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

@@ -67,6 +67,13 @@
 	cost = 1
 	whitelisted = "Vaurca"
 	sort_category = "Xenowear"
+	
+/datum/gear/cape
+	display_name = "tunnel cloak (Vaurca)"
+	path = /obj/item/weapon/storage/backpack/cloak
+	cost = 1
+	whitelisted = "Vaurca"
+	sort_category = "Xenowear"
 
 //beastmen gloves
 
@@ -104,5 +111,6 @@
 	taj_gloves["orange gloves"] = /obj/item/clothing/gloves/orange/tajara
 	taj_gloves["purple gloves"] = /obj/item/clothing/gloves/purple/tajara
 	taj_gloves["brown gloves"] = /obj/item/clothing/gloves/brown/tajara
-	taj_gloves["white gloves"] = /obj/item/clothing/gloves/green/tajara
+	taj_gloves["green gloves"] = /obj/item/clothing/gloves/green/tajara
+	taj_gloves["white gloves"] = /obj/item/clothing/gloves/white/tajara
 	gear_tweaks += new/datum/gear_tweak/path(taj_gloves)