ITV Merchandise (Talon Gear)

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

@@ -102,7 +102,13 @@
 	display_name = "pilot qualification pin"
 	description = "An iron pin denoting the qualification to fly USG spacecraft."
 	path = /obj/item/clothing/accessory/solgov/specialty/pilot
+<<<<<<< HEAD
 	allowed_roles = list("Pathfinder", "Pilot", "Field Medic","Security Pilot") //YW ADDITIONS
+||||||| parent of 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch
+	allowed_roles = list("Pathfinder","Pilot","Field Medic","Talon Pilot")	
+=======
+	allowed_roles = list("Pathfinder","Pilot","Field Medic","Talon Pilot")
+>>>>>>> 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch
 
 /datum/gear/accessory/flops
 	display_name = "drop straps"
@@ -112,3 +118,11 @@
 /datum/gear/accessory/flops/New()
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
+
+/*
+Talon pin
+*/
+/datum/gear/accessory/talonpin
+	display_name = "ITV pin"
+	description = "A small enamel pin of the ITV logo."
+	path = /obj/item/clothing/accessory/talon

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

@@ -23,4 +23,70 @@
 /datum/gear/head/detective_alt
 	display_name = "cyberscope headgear, detective"
 	path = /obj/item/clothing/head/helmet/detective_alt
-	allowed_roles = list("Head of Security", "Detective")
+<<<<<<< HEAD
+	allowed_roles = list("Head of Security", "Detective")
+||||||| parent of 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch
+	allowed_roles = list("Head of Security", "Detective")
+
+/datum/gear/head/bearpelt
+	display_name = "brown bear pelt"
+	path = /obj/item/clothing/head/pelt
+
+/datum/gear/head/wolfpelt
+	display_name = "brown wolf pelt"
+	path = /obj/item/clothing/head/pelt/wolfpelt
+
+/datum/gear/head/wolfpeltblack
+	display_name = "black wolf pelt"
+	path = /obj/item/clothing/head/pelt/wolfpeltblack
+
+/datum/gear/head/tigerpelt
+	display_name = "shiny tiger pelt"
+	path = /obj/item/clothing/head/pelt/tigerpelt
+
+/datum/gear/head/tigerpeltsnow
+	display_name = "snow tiger pelt"
+	path = /obj/item/clothing/head/pelt/tigerpeltsnow
+
+/datum/gear/head/tigerpeltpink
+	display_name = "pink tiger pelt"
+	path = /obj/item/clothing/head/pelt/tigerpeltpink
+=======
+	allowed_roles = list("Head of Security", "Detective")
+
+/datum/gear/head/bearpelt
+	display_name = "brown bear pelt"
+	path = /obj/item/clothing/head/pelt
+
+/datum/gear/head/wolfpelt
+	display_name = "brown wolf pelt"
+	path = /obj/item/clothing/head/pelt/wolfpelt
+
+/datum/gear/head/wolfpeltblack
+	display_name = "black wolf pelt"
+	path = /obj/item/clothing/head/pelt/wolfpeltblack
+
+/datum/gear/head/tigerpelt
+	display_name = "shiny tiger pelt"
+	path = /obj/item/clothing/head/pelt/tigerpelt
+
+/datum/gear/head/tigerpeltsnow
+	display_name = "snow tiger pelt"
+	path = /obj/item/clothing/head/pelt/tigerpeltsnow
+
+/datum/gear/head/tigerpeltpink
+	display_name = "pink tiger pelt"
+	path = /obj/item/clothing/head/pelt/tigerpeltpink
+
+/*
+Talon hats
+*/
+/datum/gear/head/cap/talon
+	display_name = "cap, ITV"
+	path = /obj/item/clothing/head/soft/talon
+
+/datum/gear/head/beret/talon
+	display_name = "beret, ITV"
+	path = /obj/item/clothing/head/beret
+
+>>>>>>> 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch

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

@@ -72,4 +72,17 @@
 
 /datum/gear/suit/oversize/New()
 	..()
+<<<<<<< HEAD
 	gear_tweaks += gear_tweak_free_color_choice
+||||||| parent of 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch
+	gear_tweaks += gear_tweak_free_color_choice
+=======
+	gear_tweaks += gear_tweak_free_color_choice
+
+/*
+Talon winter coat
+*/
+/datum/gear/suit/wintercoat/talon
+	display_name = "winter coat, ITV"
+	path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon
+>>>>>>> 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch

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

@@ -227,4 +227,12 @@ Bluespace jumpsuit
 /datum/gear/uniform/hfjumpsuit
 	display_name = "HYPER jumpsuit"
 	path = /obj/item/clothing/under/hyperfiber
-	cost = 2
+	cost = 2
+
+/*
+Talon jumpsuit
+*/
+/datum/gear/uniform/talonbasic
+	display_name = "ITV Jumpsuit"
+	description = "A jumpsuit that is usually issued to ITV contractors, however others can purchase it to show their support towards ITV."
+	path = /obj/item/clothing/under/rank/talon/basic

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

@@ -61,6 +61,10 @@
 	path = /obj/item/weapon/storage/backpack/dufflebag/explorer
 	allowed_roles = list("Pathfinder","Explorer")
 
+/datum/gear/utility/dufflebag/talon
+	display_name = "ITV dufflebag"
+	path = /obj/item/weapon/storage/backpack/dufflebag/explorer
+
 /datum/gear/utility/ID
 	display_name = "contractor identification card"
 	path = /obj/item/weapon/card/id/event/polymorphic/altcard