Loadout, clothing fixes and additions (#2467)

-adds turbans at some people's request
-adds the forensic technician's allowed roles to sec related custom loadout
-fixes shoes having two species_restricted vars
-add species restrictions to galoshes and the like
-changed how the force var works on the shoes, regular shoes have 0, boots have 3 and combat boots/magboots have 5
-adds nitrile gloves after a forum request

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

@@ -114,8 +114,8 @@
 		thing.autodrobe_no_remove = 1
 
 /obj/item/weapon/storage/box/gloves
-	name = "box of latex gloves"
-	desc = "Contains white gloves."
+	name = "box of sterile gloves"
+	desc = "Contains sterile gloves."
 	icon_state = "latex"
 
 	New()
@@ -124,9 +124,9 @@
 		new /obj/item/clothing/gloves/latex(src)
 		new /obj/item/clothing/gloves/latex(src)
 		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
+		new /obj/item/clothing/gloves/latex/nitrile(src)
+		new /obj/item/clothing/gloves/latex/nitrile(src)
+		new /obj/item/clothing/gloves/latex/nitrile(src)
 
 /obj/item/weapon/storage/box/masks
 	name = "box of sterile masks"
@@ -827,4 +827,4 @@
 /obj/item/weapon/storage/box/stims/New()
 	..()
 	for(var/i in 1 to 4)
-		new /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack(src)
+		new /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack(src)

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

@@ -30,7 +30,7 @@
 /datum/gear/accessory/holster
 	display_name = "holster selection"
 	path = /obj/item/clothing/accessory/holster/armpit
-	allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective", "Security Cadet")
+	allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective", "Forensic Technician", "Security Cadet")
 
 /datum/gear/accessory/holster/New()
 	..()
@@ -61,7 +61,7 @@
 /datum/gear/accessory/black_vest
 	display_name = "webbing, security"
 	path = /obj/item/clothing/accessory/storage/black_vest
-	allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective")
+	allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective", "Forensic Technician")
 
 /datum/gear/accessory/white_vest
 	display_name = "webbing, medical"
@@ -81,7 +81,7 @@
 /datum/gear/accessory/black_pouches
 	display_name = "drop pouches, security"
 	path = /obj/item/clothing/accessory/storage/black_pouches
-	allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective")
+	allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective", "Forensic Technician")
 
 /datum/gear/accessory/white_pouches
 	display_name = "drop pouches, medical"

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

@@ -37,17 +37,17 @@
 /datum/gear/eyes/security
 	display_name = "security HUD"
 	path = /obj/item/clothing/glasses/hud/security
-	allowed_roles = list("Security Officer","Head of Security","Warden")
+	allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician")
 
 /datum/gear/eyes/medical
 	display_name = "medical HUD"
 	path = /obj/item/clothing/glasses/hud/health
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist")
+	allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Nursing Intern")
 
 /datum/gear/eyes/shades
 	display_name = "sunglasses, fat"
 	path = /obj/item/clothing/glasses/sunglasses/big
-	allowed_roles = list("Security Officer","Head of Security","Warden","Captain","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective")
+	allowed_roles = list("Security Officer", "Head of Security", "Warden", "Captain", "Head of Personnel", "Quartermaster", "Internal Affairs Agent", "Detective", "Forensic Technician")
 
 /datum/gear/eyes/shades/prescriptionsun
 	display_name = "sunglasses, presciption"

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

@@ -52,12 +52,12 @@
 /datum/gear/head/beret/sec
 	display_name = "beret,security"
 	path = /obj/item/clothing/head/beret/sec
-	allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet","Detective")
+	allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician")
 
 /datum/gear/head/beret/warden
 	display_name = "beret,security (warden)"
 	path = /obj/item/clothing/head/beret/sec/warden
-	allowed_roles = list("Head of Security","Warden")
+	allowed_roles = list("Head of Security", "Warden")
 
 /datum/gear/head/beret/hos
 	display_name = "beret,security (head of security)"
@@ -67,12 +67,12 @@
 /datum/gear/head/corp
 	display_name = "cap, corporate (security)"
 	path = /obj/item/clothing/head/soft/sec/corp
-	allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet","Detective")
+	allowed_roles = list("Security Officer","Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician",)
 
 /datum/gear/head/sec
 	display_name = "cap, security"
 	path = /obj/item/clothing/head/soft/sec
-	allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet","Detective")
+	allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician",)
 
 /datum/gear/head/hardhat
 	display_name = "hardhat selection"
@@ -128,13 +128,33 @@
 	hijab["brown hijab"] = /obj/item/clothing/head/hijab/brown
 	hijab["green hijab"] = /obj/item/clothing/head/hijab/green
 	hijab["blue hijab"] = /obj/item/clothing/head/hijab/blue
+	hijab["white hijab"] = /obj/item/clothing/head/hijab/white
 
 	gear_tweaks += new/datum/gear_tweak/path(hijab)
+	
+/datum/gear/head/turban
+	display_name = "turban selection"
+	path = /obj/item/clothing/head/turban
+
+/datum/gear/head/turban/New()
+	..()
+	var/turbans = list()
+	turbans["black turban"] = /obj/item/clothing/head/turban
+	turbans["blue turban"] = /obj/item/clothing/head/turban/blue
+	turbans["green turban"] = /obj/item/clothing/head/turban/green
+	turbans["grey turban"] = /obj/item/clothing/head/turban/grey
+	turbans["orange turban"] = /obj/item/clothing/head/turban/orange
+	turbans["purple turban"] = /obj/item/clothing/head/turban/purple
+	turbans["red turban"] = /obj/item/clothing/head/turban/red
+	turbans["white turban"] = /obj/item/clothing/head/turban/white
+	turbans["yellow turban"] = /obj/item/clothing/head/turban/yellow
+	
+	gear_tweaks += new/datum/gear_tweak/path(turbans)
 
 /datum/gear/head/surgical
 	display_name = "surgical cap selection"
 	path = /obj/item/clothing/head/surgery/blue
-	allowed_roles = list("Scientist","Chief Medical Officer","Medical Doctor","Geneticist","Chemist","Paramedic","Nursing Intern","Xenobiologist","Roboticist","Research Director","Detective")
+	allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Geneticist", "Chemist", "Paramedic", "Nursing Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
 
 /datum/gear/head/surgical/New()
 	..()

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

@@ -98,39 +98,39 @@
 /datum/gear/suit/winter/security
 	display_name = "winter coat, security"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/security
-	allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet","Detective")
+	allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician")
 
 /datum/gear/suit/winter/science
 	display_name = "winter coat, science"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/science
-	allowed_roles = list("Research Director","Scientist","Xenobiologist","Roboticist","Lab Assistant","Geneticist")
+	allowed_roles = list("Research Director", "Scientist", "Xenobiologist", "Roboticist", "Lab Assistant", "Geneticist")
 
 /datum/gear/suit/winter/medical
 	display_name = "winter coat, medical"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
-	allowed_roles = list("Chief Medical Officer","Medical Doctor","Paramedic","Nursing Intern","Psychiatrist","Chemist")
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Nursing Intern", "Psychiatrist", "Chemist")
 
 /datum/gear/suit/winter/engineering
 	display_name = "winter coat, engineering"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering
-	allowed_roles = list("Station Engineer","Chief Engineer","Engineering Apprentice")
+	allowed_roles = list("Station Engineer", "Chief Engineer", "Engineering Apprentice")
 
 /datum/gear/suit/winter/atmos
 	display_name = "winter coat, atmospherics"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos
-	allowed_roles = list("Atmospheric Technician","Chief Engineer")
+	allowed_roles = list("Atmospheric Technician", "Chief Engineer")
 
 /datum/gear/suit/winter/hydro
 	display_name = "winter coat, hydroponics"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/hydro
-	allowed_roles = list("Head of Personnel","Gardener")
+	allowed_roles = list("Head of Personnel", "Gardener")
 
 /datum/gear/suit/winter/cargo
 	display_name = "winter coat, cargo"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
-	allowed_roles = list("Cargo Technician","Quartermaster","Head of Personnel")
+	allowed_roles = list("Cargo Technician", "Quartermaster", "Head of Personnel")
 
 /datum/gear/suit/winter/mining
 	display_name = "winter coat, mining"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/miner
-	allowed_roles = list("Quartermaster","Head of Personnel","Shaft Miner")
+	allowed_roles = list("Quartermaster", "Head of Personnel", "Shaft Miner")

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

@@ -82,7 +82,7 @@
 /datum/gear/uniform/scrubs
 	display_name = "scrubs selection"
 	path = /obj/item/clothing/under/rank/medical/black
-	allowed_roles = list("Scientist","Chief Medical Officer","Medical Doctor","Chemist","Geneticist","Paramedic","Nursing Intern","Xenobiologist","Roboticist","Research Director","Detective")
+	allowed_roles = list("Scientist","Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
 
 /datum/gear/uniform/scrubs/New()
 	..()
@@ -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","Security Cadet")
+	allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet")
 
 /datum/gear/uniform/uniform_hop
 	display_name = "uniform, HoP dress"
@@ -133,7 +133,7 @@
 /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","Security Cadet")
+	allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet")
 
 /datum/gear/uniform/gearharness
 	display_name = "gear harness"

code/modules/clothing/clothing.dm

@@ -410,12 +410,11 @@ BLIND     // can't see anything
 
 	permeability_coefficient = 0.50
 	slowdown = SHOES_SLOWDOWN
-	force = 2
+	force = 0
 	var/overshoes = 0
-	species_restricted = list("exclude","Unathi","Tajara","Vaurca","Vaurca Breeder")
+	species_restricted = list("exclude","Unathi","Tajara","Vox","Vaurca","Vaurca Breeder")
 	sprite_sheets = list("Vox" = 'icons/mob/species/vox/shoes.dmi')
 	var/silent = 0
-	species_restricted = list("exclude","Unathi","Tajara","Vox", "Vaurca")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/shoes.dmi',
 		"Resomi" = 'icons/mob/species/resomi/shoes.dmi'

code/modules/clothing/gloves/color.dm

@@ -111,12 +111,12 @@
 
 /obj/item/clothing/gloves/black/unathi
 	name = "black gloves"
-	desc = "black gloves made for Unathi use."
+	desc = "Black gloves made for Unathi use."
 	species_restricted = list("Unathi")
 
 /obj/item/clothing/gloves/black/tajara
 	name = "black gloves"
-	desc = "black gloves made for Tajara use."
+	desc = "Black gloves made for Tajara use."
 	species_restricted = list("Tajara")
 
 //more snowflake gloves for the custom loadout

code/modules/clothing/gloves/miscellaneous.dm

@@ -44,6 +44,12 @@
 	siemens_coefficient = 1.0 //thin latex gloves, much more conductive than fabric gloves (basically a capacitor for AC)
 	permeability_coefficient = 0.01
 	germ_level = 0
+	
+/obj/item/clothing/gloves/latex/nitrile
+	name = "nitrile gloves"
+	desc = "Sterile nitrile gloves."
+	icon_state = "nitrile"
+	item_state = "ngloves"
 
 /obj/item/clothing/gloves/latex/unathi
 	name = "unathi latex gloves"

code/modules/clothing/head/misc.dm

@@ -218,7 +218,7 @@
 	name = "bear pelt hat"
 	desc = "Fuzzy."
 	icon_state = "bearpelt"
-	flags_inv = BLOCKHAIR
+	flags_inv = BLOCKHEADHAIR
 	siemens_coefficient = 0.7
 
 /obj/item/clothing/head/xenos
@@ -263,34 +263,34 @@
 
 /obj/item/clothing/head/hijab/grey
 	name = "grey hijab"
-	icon = 'icons/obj/clothing/hijabs.dmi'
 	icon_state = "hijab_grey"
 	item_state = "hijab_grey"
 
 /obj/item/clothing/head/hijab/red
 	name = "red hijab"
-	icon = 'icons/obj/clothing/hijabs.dmi'
 	icon_state = "hijab_red"
 	item_state = "hijab_red"
 
 /obj/item/clothing/head/hijab/brown
 	name = "brown hijab"
-	icon = 'icons/obj/clothing/hijabs.dmi'
 	icon_state = "hijab_brown"
 	item_state = "hijab_brown"
 
 /obj/item/clothing/head/hijab/green
 	name = "green hijab"
-	icon = 'icons/obj/clothing/hijabs.dmi'
 	icon_state = "hijab_green"
 	item_state = "hijab_green"
 
 /obj/item/clothing/head/hijab/blue
 	name = "blue hijab"
-	icon = 'icons/obj/clothing/hijabs.dmi'
 	icon_state = "hijab_blue"
 	item_state = "hijab_blue"
-	
+
+/obj/item/clothing/head/hijab/white
+	name = "white hijab"
+	icon_state = "hijab_white"
+	item_state = "hijab_white"
+
 /obj/item/clothing/head/cowboy
 	name = "cowboy hat"
 	desc = "A wide-brimmed hat, in the prevalent style of the frontier."
@@ -306,3 +306,49 @@
 	desc = "You can practically taste the fiesta."
 	icon_state = "sombrero"
 	body_parts_covered = 0
+
+/obj/item/clothing/head/turban
+	name = "turban"
+	desc = "A sturdy cloth, worn around the head."
+	icon = 'icons/obj/clothing/hijabs.dmi'
+	icon_state = "turban_black"
+	item_state = "turban_black"
+	flags_inv = BLOCKHEADHAIR
+	body_parts_covered = 0
+	contained_sprite = 1
+	
+/obj/item/clothing/head/turban/blue
+	icon_state = "turban_blue"
+	item_state = "turban_blue"
+	
+/obj/item/clothing/head/turban/brown
+	icon_state = "turban_brown"
+	item_state = "turban_brown"
+	
+/obj/item/clothing/head/turban/green
+	icon_state = "turban_green"
+	item_state = "turban_green"
+	
+/obj/item/clothing/head/turban/grey
+	icon_state = "turban_grey"
+	item_state = "turban_grey"
+	
+/obj/item/clothing/head/turban/orange
+	icon_state = "turban_orange"
+	item_state = "turban_orange"
+	
+/obj/item/clothing/head/turban/purple
+	icon_state = "turban_purple"
+	item_state = "turban_purple"
+	
+/obj/item/clothing/head/turban/red
+	icon_state = "turban_red"
+	item_state = "turban_red"
+	
+/obj/item/clothing/head/turban/white
+	icon_state = "turban_white"
+	item_state = "turban_white"
+	
+/obj/item/clothing/head/turban/yellow
+	icon_state = "turban_yellow"
+	item_state = "turban_yellow"

code/modules/clothing/shoes/jobs.dm

@@ -5,7 +5,6 @@
 	permeability_coefficient = 0.05
 	item_flags = NOSLIP
 	slowdown = SHOES_SLOWDOWN+1
-	species_restricted = null
 
 /obj/item/clothing/shoes/jackboots
 	name = "jackboots"
@@ -29,6 +28,7 @@
 	desc = "A pair of steel-toed work boots designed for use in industrial settings. Safety first."
 	icon_state = "workboots"
 	item_state = "workboots"
+	force = 3
 	armor = list(melee = 40, bullet = 0, laser = 0, energy = 15, bomb = 20, bio = 0, rad = 20)
 	siemens_coefficient = 0.7
 	can_hold_knife = 1

code/modules/clothing/shoes/magboots.dm

@@ -3,7 +3,7 @@
 	name = "magboots"
 	icon_state = "magboots0"
 	species_restricted = null
-	force = 3
+	force = 5
 	overshoes = 1
 	var/magpulse = 0
 	var/icon_base = "magboots"

code/modules/clothing/shoes/miscellaneous.dm

@@ -18,7 +18,7 @@
 	name = "\improper SWAT shoes"
 	desc = "When you want to turn up the heat."
 	icon_state = "swat"
-	force = 3
+	force = 5
 	armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
 	item_flags = NOSLIP
 	siemens_coefficient = 0.5
@@ -26,8 +26,8 @@
 
 /obj/item/clothing/shoes/combat //Basically SWAT shoes combined with galoshes.
 	name = "combat boots"
-	desc = "When you REALLY want to turn up the heat"
-	icon_state = "swat"
+	desc = "When you REALLY want to turn up the heat."
+	icon_state = "jungle"
 	force = 5
 	armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
 	item_flags = NOSLIP
@@ -60,7 +60,6 @@
 	icon_state = "clown"
 	item_state = "clown_shoes"
 	slowdown = SHOES_SLOWDOWN+1
-	force = 0
 	var/footstep = 1	//used for squeeks whilst walking
 	species_restricted = null
 
@@ -79,8 +78,8 @@
 	desc = "A pair of boots worn by the followers of Nar-Sie."
 	icon_state = "cult"
 	item_state = "cult"
-	force = 2
-	siemens_coefficient = 0.7
+	force = 5
+	siemens_coefficient = 0
 
 	cold_protection = FEET
 	min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE
@@ -124,4 +123,3 @@
 	icon_state = "flippers"
 	item_flags = NOSLIP
 	slowdown = SHOES_SLOWDOWN+1
-	species_restricted = null