Merge pull request #2847 from Woodratt/1.6.6_shoes_n_gloves

1.6.6 shoes and gloves

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

@@ -57,3 +57,13 @@
 /datum/gear/gloves/evening/New()
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/gloves/duty
+	display_name = "gloves, work"
+	path = /obj/item/clothing/gloves/duty
+	cost = 3
+
+/datum/gear/gloves/forensic
+	display_name = "gloves, forensic"
+	path = /obj/item/clothing/gloves/forensic
+	allowed_roles = list("Detective")

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

@@ -131,4 +131,26 @@
 
 /datum/gear/shoes/flats/color/New()
 	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
+	gear_tweaks = list(gear_tweak_free_color_choice)
+
+/datum/gear/shoes/cowboy
+	display_name = "cowboy boots"
+	path = /obj/item/clothing/shoes/cowboy
+
+/datum/gear/shoes/jungle
+	display_name = "jungle boots"
+	path = /obj/item/clothing/shoes/jungleboots
+	cost = 2
+
+/datum/gear/shoes/duty
+	display_name = "duty boots"
+	path = 	/obj/item/clothing/shoes/dutyboots
+	cost = 2
+
+/datum/gear/shoes/dress
+	display_name = "shoes, dress"
+	path = 	/obj/item/clothing/shoes/dress
+
+/datum/gear/shoes/dress/white
+	display_name = "shoes, dress white"
+	path = 	/obj/item/clothing/shoes/dress/white

code/modules/clothing/gloves/miscellaneous.dm

@@ -11,6 +11,19 @@
 	item_state = "r_hands"
 	siemens_coefficient = 1.0
 
+/obj/item/clothing/gloves/forensic
+	desc = "Specially made gloves for forensic technicians. The luminescent threads woven into the material stand out under scrutiny."
+	name = "forensic gloves"
+	icon_state = "forensic"
+	item_state = "black"
+	siemens_coefficient = 0.50
+	permeability_coefficient = 0.05
+
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
+
 /obj/item/clothing/gloves/swat
 	desc = "These tactical gloves are somewhat fire and impact-resistant."
 	name = "\improper SWAT Gloves"
@@ -51,3 +64,21 @@
 	item_state_slots = list(slot_r_hand_str = "lightbrown", slot_l_hand_str = "lightbrown")
 	permeability_coefficient = 0.05
 	siemens_coefficient = 0.50 //thick work gloves
+
+/obj/item/clothing/gloves/duty
+	desc = "These brown duty gloves are made from a durable synthetic."
+	name = "work gloves"
+	icon_state = "work"
+	item_state = "wgloves"
+	siemens_coefficient = 0.50
+	armor = list(melee = 10, bullet = 10, laser = 10, energy = 5, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/gloves/tactical
+	desc = "These brown tactical gloves are made from a durable synthetic, and have hardened knuckles."
+	name = "tactical gloves"
+	icon_state = "work"
+	item_state = "wgloves"
+	force = 5
+	siemens_coefficient = 0.50
+	permeability_coefficient = 0.05
+	armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0)

code/modules/clothing/head/jobs.dm

@@ -137,7 +137,7 @@
 /obj/item/clothing/head/beret/purple
 	name = "purple beret"
 	desc = "A stylish, if purple, beret."
-	icon_state = "beret_purple"
+	icon_state = "beret_purpleyellow"
 
 /obj/item/clothing/head/beret/centcom/officer
 	name = "officers beret"

code/modules/clothing/shoes/miscellaneous.dm

@@ -9,6 +9,11 @@
 	siemens_coefficient = 0.8
 	species_restricted = null
 
+/obj/item/clothing/shoes/cowboy
+	name = "cowboy boots"
+	desc = "Lacking a durasteel horse to ride."
+	icon_state = "cowboy"
+
 /obj/item/clothing/shoes/mime
 	name = "mime shoes"
 	icon_state = "white"
@@ -106,6 +111,39 @@
 	heat_protection = FEET
 	max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
 
+/obj/item/clothing/shoes/jungleboots
+	name = "jungle boots"
+	desc = "A pair of durable brown boots. Waterproofed for use planetside."
+	icon_state = "jungle"
+	force = 3
+	armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 10, rad = 0)
+	siemens_coefficient = 0.7
+
+/obj/item/clothing/shoes/dutyboots
+	name = "duty boots"
+	desc = "A pair of steel-toed synthleather boots with a mirror shine."
+	icon_state = "duty"
+	armor = list(melee = 40, bullet = 0, laser = 0, energy = 15, bomb = 20, bio = 0, rad = 20)
+	siemens_coefficient = 0.7
+
+/obj/item/clothing/shoes/tactical
+	name = "tactical boots"
+	desc = "Tan boots with extra padding and armor."
+	icon_state = "jungle"
+	force = 3
+	armor = list(melee = 40, bullet = 30, laser = 40,energy = 25, bomb = 50, bio = 0, rad = 0)
+	siemens_coefficient = 0.7
+
+/obj/item/clothing/shoes/dress
+	name = "dress shoes"
+	desc = "Sharp looking low quarters, perfect for a formal uniform."
+	icon_state = "laceups"
+
+/obj/item/clothing/shoes/dress/white
+	name = "white dress shoes"
+	desc = "Brilliantly white low quarters, not a spot on them."
+	icon_state = "whitedress"
+
 /obj/item/clothing/shoes/sandal
 	desc = "A pair of rather plain, wooden sandals."
 	name = "sandals"