Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

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

@@ -112,3 +112,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

@@ -47,4 +47,16 @@
 
 /datum/gear/head/tigerpeltpink
 	display_name = "pink tiger pelt"
-	path = /obj/item/clothing/head/pelt/tigerpeltpink
+	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
+

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

@@ -72,4 +72,11 @@
 
 /datum/gear/suit/oversize/New()
 	..()
-	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

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

@@ -215,4 +215,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