Merge pull request #10660 from klaasjared/Talon_Merch

ITV Merchandise (Talon Gear)

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

@@ -115,6 +115,38 @@
 	icon_override = 'icons/mob/back_vr.dmi'
 	icon_state = "explorer_duffle"
 
+///Talon Bags///
+
+/obj/item/weapon/storage/backpack/talon
+	name = "ITV backpack"
+	desc = "A backpack for carrying a large number of supplies easily."
+	icon = 'icons/obj/clothing/backpack_vr.dmi'
+	icon_override = 'icons/mob/back_vr.dmi'
+	icon_state = "talon"
+
+/obj/item/weapon/storage/backpack/satchel/talon
+	name = "ITV satchel"
+	desc = "A satchel for carrying a large number of supplies easily."
+	icon = 'icons/obj/clothing/backpack_vr.dmi'
+	icon_override = 'icons/mob/back_vr.dmi'
+	icon_state = "talon_satchel"
+	item_state_slots = null
+
+/obj/item/weapon/storage/backpack/messenger/talon
+	name = "ITV messenger bag"
+	desc = "A sturdy backpack worn over one shoulder."
+	icon = 'icons/obj/clothing/backpack_vr.dmi'
+	icon_override = 'icons/mob/back_vr.dmi'
+	icon_state = "talon_courier"
+	item_state_slots = null
+
+/obj/item/weapon/storage/backpack/dufflebag/talon
+	name = "ITV dufflebag"
+	desc = "A large dufflebag for holding extra supplies."
+	icon = 'icons/obj/clothing/backpack_vr.dmi'
+	icon_override = 'icons/mob/back_vr.dmi'
+	icon_state = "talon_duffle"
+
 ///Roboticist Bags///
 
 /obj/item/weapon/storage/backpack/satchel/roboticist

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

@@ -102,7 +102,7 @@
 	display_name = "pilot qualification pin"
 	description = "An iron pin denoting the qualification to fly SCG spacecraft."
 	path = /obj/item/clothing/accessory/solgov/specialty/pilot
-	allowed_roles = list("Pathfinder","Pilot","Field Medic","Talon Pilot")	
+	allowed_roles = list("Pathfinder","Pilot","Field Medic","Talon Pilot")
 
 /datum/gear/accessory/flops
 	display_name = "drop straps"
@@ -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

code/modules/clothing/head/hood_vr.dm

@@ -2,17 +2,17 @@
 	name = "techpriest hood"
 	armor = list(melee = 20, bullet = 10, laser = 10, energy = 10, bomb = 25, bio = 50, rad = 25)
 
-// Armor versions here	
+// Armor versions here
 /obj/item/clothing/head/hood/galahad
 	name = "galahad hood"
 	armor = list(melee = 80, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 2
-	
+
 /obj/item/clothing/head/hood/lancelot
 	name = "lancelot hood"
 	armor = list(melee = 80, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
 	siemens_coefficient = 2
-	
+
 /obj/item/clothing/head/hood/robin
 	name = "robin hood"
 	armor = list(melee = 80, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -21,9 +21,16 @@
 // Costume Versions Here
 /obj/item/clothing/head/hood/galahad_costume
 	name = "galahad costume hood"
-	
+
 /obj/item/clothing/head/hood/lancelot_costume
 	name = "lancelot costume hood"
-	
+
 /obj/item/clothing/head/hood/robin_costume
-	name = "robin costume hood"
+	name = "robin costume hood"
+
+// Talon Winter Hood
+/obj/item/clothing/head/hood/winter/talon
+	name = "ITV winter hood"
+	desc = "A cozy winter hood attached to a heavy winter jacket."
+	icon_override = 'icons/mob/head_vr.dmi'
+	icon_state = "winterhood_talon"

code/modules/clothing/head/misc_vr.dm

@@ -93,4 +93,39 @@
 	desc = "A fancy visor showing alignment to pizza delivery service. Extremely risky career choice."
 	icon_state = "pizzadelivery"
 	icon = 'icons/obj/clothing/hats_vr.dmi'
-	icon_override = 'icons/mob/head_vr.dmi'
+	icon_override = 'icons/mob/head_vr.dmi'
+
+//////////TALON HATS//////////
+
+/obj/item/clothing/head/soft/talon
+	name = "ITV baseball cap"
+	desc = "It's a ballcap bearing the colors of ITV."
+	icon = 'icons/obj/clothing/hats_vr.dmi'
+	icon_override = 'icons/mob/head_vr.dmi'
+	icon_state = "talonsoft"
+	item_state = "talonsoft"
+	item_state_slots = list(slot_r_hand_str = "blacksoft", slot_l_hand_str = "blacksoft")
+
+/obj/item/clothing/head/caphat/talon
+	name = "ITV nautical hat"
+	desc = "It's a classic nautical hat bearing the colors of ITV. Perfect for commanding the Talon."
+	icon = 'icons/obj/clothing/hats_vr.dmi'
+	icon_override = 'icons/mob/head_vr.dmi'
+	icon_state = "talon_captain_cap"
+	item_state = "taloncaptaincap"
+
+obj/item/clothing/head/beret/talon
+	name = "ITV beret"
+	desc = "It's a basic baret colored to match ITV's uniforms."
+	icon = 'icons/obj/clothing/hats_vr.dmi'
+	icon_override = 'icons/mob/head_vr.dmi'
+	icon_state = "beret_talon"
+	item_state = "baret_talon"
+
+obj/item/clothing/head/beret/talon/command
+	name = "ITV officer beret"
+	desc = "It's a basic baret colored to match ITV's uniforms with a badge pinned on the front. Perfect for commanders."
+	icon = 'icons/obj/clothing/hats_vr.dmi'
+	icon_override = 'icons/mob/head_vr.dmi'
+	icon_state = "beret_talon_officer"
+	item_state = "baret_talon_command"

code/modules/clothing/head/pilot_helmet_vr.dm

@@ -44,3 +44,24 @@
 		src.icon_state = initial(icon_state)
 		to_chat(user, "You lower the visor on the pilot helmet.")
 	update_clothing_icon() //so our mob-overlays update
+
+//////////Talon Pilot Headgear//////////
+
+/obj/item/clothing/head/pilot_vr/talon
+	name = "ITV pilot helmet"
+	desc = "An ITV version of the standard pilot helmet. Protects the head from impacts. This one has a retractable visor"
+	icon_state = "pilot3"
+	item_icons = list(slot_head_str = 'icons/mob/head_vr.dmi')
+	sprite_sheets = list(
+		SPECIES_TESHARI = 'icons/mob/species/teshari/helmet_vr.dmi'
+		)
+	action_button_name = "Toggle Visor"
+
+/obj/item/clothing/head/pilot_vr/alt/attack_self(mob/user as mob)
+	if(src.icon_state == initial(icon_state))
+		src.icon_state = "[icon_state]up"
+		to_chat(user, "You raise the visor on the pilot helmet.")
+	else
+		src.icon_state = initial(icon_state)
+		to_chat(user, "You lower the visor on the pilot helmet.")
+	update_clothing_icon() //so our mob-overlays update

code/modules/clothing/suits/hooded_vr.dm

@@ -67,4 +67,14 @@
 	name = "crusader's armor"
 	desc = "ye olde knight, risen again. This one seems slightly faster than the rest, but weaker."
 	icon_state = "robin"
-	hoodtype = /obj/item/clothing/head/hood/robin_costume
+	hoodtype = /obj/item/clothing/head/hood/robin_costume
+
+// Talon Winter Coat
+/obj/item/clothing/suit/storage/hooded/wintercoat/talon
+	name = "ITV winter coat"
+	desc = "A cozy winter coat, covered in thick fur and baring the colors of ITV."
+	icon = 'icons/obj/clothing/suits_vr.dmi'
+	icon_override = 'icons/mob/suit_vr.dmi'
+	icon_state = "taloncoat"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	hoodtype = /obj/item/clothing/head/hood/winter/talon

code/modules/clothing/suits/miscellaneous_vr.dm

@@ -100,3 +100,12 @@
 	icon_override = 'icons/mob/suit_vr.dmi'
 	icon_state = "cyberpunksleek_long"
 	item_state = "cyberpunksleek_long"
+
+//Talon Hoodie
+/obj/item/clothing/suit/storage/toggle/hoodie/talon
+	name = "ITV hoodie"
+	desc = "A warm, blue sweatshirt bearing ITV markings."
+	icon = 'icons/obj/clothing/suits_vr.dmi'
+	icon_override = 'icons/mob/suit_vr.dmi'
+	icon_state = "talonhoodie"
+	item_state_slots = list(slot_r_hand_str = "suit_blue", slot_l_hand_str = "suit_blue")

code/modules/clothing/under/accessories/accessory_vr.dm

@@ -366,3 +366,12 @@
 	item_state = "silverthree"
 	overlay_state = "silverthree"
 	desc = "A silver medal awarded to a group which has demonstrated exceptional teamwork to achieve a notable feat. This one has three bronze service stars, denoting that it has been awarded four times."
+
+/obj/item/clothing/accessory/talon
+	name = "ITV pin"
+	desc = "A collectable enamel pin that resembles ITV's company logo."
+	icon = 'icons/obj/clothing/ties_vr.dmi'
+	icon_override = 'icons/mob/ties_vr.dmi'
+	icon_state = "talon_pin"
+	item_state = "talonpin"
+	overlay_state = "talonpin"

code/modules/clothing/under/miscellaneous_vr.dm

@@ -146,3 +146,60 @@
 	icon_state = "pizzadelivery"
 	item_state = "pizzadelivery"
 	rolled_down = 0
+
+//////////////////////TALON JUMPSUITS//////////////////////
+
+/obj/item/clothing/under/rank/talon/basic
+	name = "ITV jumpsuit"
+	desc = "A basic jumpsuit that bares the ITV logo on the breast."
+	icon = 'icons/obj/clothing/uniforms_vr.dmi'
+	index = "vr"
+	rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi'
+	icon_override = 'icons/mob/uniform_vr.dmi'
+	icon_state = "talon_basic"
+	item_state = "talon_basic"
+	rolled_sleeves = 0
+
+/obj/item/clothing/under/rank/talon/proper
+	name = "ITV proper jumpsuit"
+	desc = "A neat and proper uniform for a proper company."
+	icon = 'icons/obj/clothing/uniforms_vr.dmi'
+	index = "vr"
+	rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi'
+	icon_override = 'icons/mob/uniform_vr.dmi'
+	icon_state = "talon_jumpsuit"
+	item_state = "talon_jumpsuit"
+	rolled_sleeves = 0
+
+/obj/item/clothing/under/rank/talon/security
+	name = "ITV security jumpsuit"
+	desc = "A sleek, streamlined version of ITV's standard jumpsuit that bares security markings."
+	icon = 'icons/obj/clothing/uniforms_vr.dmi'
+	index = "vr"
+	rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi'
+	icon_override = 'icons/mob/uniform_vr.dmi'
+	icon_state = "talon_security"
+	item_state = "talon_security"
+	rolled_sleeves = 0
+
+/obj/item/clothing/under/rank/talon/pilot
+	name = "ITV pilot jumpsuit"
+	desc = "A sleek, streamlined version of ITV's standard jumpsuit. Made from cushioned fabric to handle intense flight."
+	icon = 'icons/obj/clothing/uniforms_vr.dmi'
+	index = "vr"
+	rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi'
+	icon_override = 'icons/mob/uniform_vr.dmi'
+	icon_state = "talon_pilot"
+	item_state = "talon_pilot"
+	rolled_sleeves = 0
+
+/obj/item/clothing/under/rank/talon/command
+	name = "ITV command jumpsuit"
+	desc = "A commanding jumpsuit fit for a commanding officer."
+	icon = 'icons/obj/clothing/uniforms_vr.dmi'
+	index = "vr"
+	rolled_down_icon = 'icons/mob/uniform_rolled_down_vr.dmi'
+	icon_override = 'icons/mob/uniform_vr.dmi'
+	icon_state = "talon_captain"
+	item_state = "talon_captain"
+	rolled_sleeves = 0

maps/offmap_vr/talon/talon_v2.dmm

@@ -1894,7 +1894,14 @@
 /area/talon_v2/engineering/star_store)
 "fd" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/head/beret/talon,
+/obj/item/clothing/head/beret/talon,
+/obj/item/clothing/head/beret/talon,
+/obj/item/clothing/head/beret/talon,
+/obj/item/clothing/suit/storage/hooded/wintercoat/talon,
+/obj/item/clothing/suit/storage/hooded/wintercoat/talon,
+/obj/item/clothing/suit/storage/hooded/wintercoat/talon,
+/obj/item/clothing/suit/storage/hooded/wintercoat/talon,
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/secure_storage)
 "ff" = (
@@ -5937,6 +5944,15 @@
 /obj/structure/lattice,
 /turf/space,
 /area/space)
+"tn" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 5;
+	pixel_y = 24
+	},
+/obj/item/weapon/storage/backpack/dufflebag/talon,
+/turf/simulated/floor/tiled/techfloor,
+/area/talon_v2/armory)
 "to" = (
 /obj/machinery/light{
 	dir = 4
@@ -10567,6 +10583,13 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/talon_v2/central_hallway/fore)
+"IX" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/shoes/magboots,
+/turf/simulated/floor/tiled/techfloor,
+/area/talon_v2/secure_storage)
 "IY" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -14442,6 +14465,17 @@
 "WJ" = (
 /turf/simulated/wall/shull,
 /area/talon_v2/crew_quarters/eng_room)
+"WK" = (
+/obj/structure/table/woodentable,
+/obj/item/clothing/accessory/talon{
+	pixel_x = 4;
+	pixel_y = 7
+	},
+/obj/item/clothing/head/caphat/talon{
+	pixel_x = -5
+	},
+/turf/simulated/floor/wood,
+/area/talon_v2/crew_quarters/cap_room)
 "WM" = (
 /obj/machinery/atmospherics/unary/engine/bigger{
 	dir = 1
@@ -23051,7 +23085,7 @@ Dd
 ZF
 KC
 Oj
-Pm
+tn
 nK
 gg
 SX
@@ -23188,7 +23222,7 @@ AR
 XG
 zv
 XG
-ln
+IX
 Dd
 lW
 KC
@@ -24156,7 +24190,7 @@ NV
 oC
 oC
 NV
-gm
+WK
 gm
 Nq
 Ht

maps/southern_cross/loadout/loadout_vr.dm

@@ -7,3 +7,8 @@
 	display_name = "helmet, colored pilot (Pilot)"
 	path = /obj/item/clothing/head/pilot_vr/alt
 	allowed_roles = list("Pilot")
+
+/datum/gear/head/pilot/talon
+	display_name = "helmet, ITV pilot (Pilot)"
+	path = /obj/item/clothing/head/pilot_vr/talon
+	allowed_roles = list("Pilot")

maps/tether/tether_jobs.dm

@@ -132,6 +132,7 @@
 /datum/alt_title/talon_security
 	title = "Talon Security"
 
+//////////////////////TALON OUTFITS//////////////////////
 
 /decl/hierarchy/outfit/job/talon_captain
 	name = OUTFIT_JOB_NAME("Talon Captain")
@@ -142,11 +143,11 @@
 
 	l_ear = /obj/item/device/radio/headset/talon
 	glasses = /obj/item/clothing/glasses/sunglasses
-	uniform = /obj/item/clothing/under/rank/captain
+	uniform = /obj/item/clothing/under/rank/talon/command
 	shoes = /obj/item/clothing/shoes/brown
-	backpack = /obj/item/weapon/storage/backpack/captain
-	satchel_one = /obj/item/weapon/storage/backpack/satchel/cap
-	messenger_bag = /obj/item/weapon/storage/backpack/messenger/com
+	backpack = /obj/item/weapon/storage/backpack/talon
+	satchel_one = /obj/item/weapon/storage/backpack/satchel/talon
+	messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon
 
 /decl/hierarchy/outfit/job/talon_pilot
 	name = OUTFIT_JOB_NAME("Talon Pilot")
@@ -158,11 +159,15 @@
 
 	l_ear = /obj/item/device/radio/headset/talon
 	shoes = /obj/item/clothing/shoes/black
-	uniform = /obj/item/clothing/under/rank/pilot1/no_webbing
+	head = /obj/item/clothing/head/pilot_vr/talon
+	uniform = /obj/item/clothing/under/rank/talon/pilot
 	suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
 	gloves = /obj/item/clothing/gloves/fingerless
 	glasses = /obj/item/clothing/glasses/fakesunglasses/aviator
 	uniform_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1 = 1)
+	backpack = /obj/item/weapon/storage/backpack/talon
+	satchel_one = /obj/item/weapon/storage/backpack/satchel/talon
+	messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon
 
 /decl/hierarchy/outfit/job/talon_doctor
 	name = OUTFIT_JOB_NAME("Talon Doctor")
@@ -177,10 +182,13 @@
 	backpack = /obj/item/weapon/storage/backpack/medic
 	satchel_one = /obj/item/weapon/storage/backpack/satchel/med
 	messenger_bag = /obj/item/weapon/storage/backpack/messenger/med
-	uniform = /obj/item/clothing/under/rank/medical
+	uniform = /obj/item/clothing/under/rank/talon/proper
 	suit = /obj/item/clothing/suit/storage/toggle/labcoat
 	l_hand = /obj/item/weapon/storage/firstaid/regular
 	r_pocket = /obj/item/device/flashlight/pen
+	backpack = /obj/item/weapon/storage/backpack/talon
+	satchel_one = /obj/item/weapon/storage/backpack/satchel/talon
+	messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon
 
 /decl/hierarchy/outfit/job/talon_security
 	name = OUTFIT_JOB_NAME("Talon Security")
@@ -197,8 +205,11 @@
 	backpack = /obj/item/weapon/storage/backpack/security
 	satchel_one = /obj/item/weapon/storage/backpack/satchel/sec
 	messenger_bag = /obj/item/weapon/storage/backpack/messenger/sec
-	uniform = /obj/item/clothing/under/rank/security
+	uniform = /obj/item/clothing/under/rank/talon/security
 	l_pocket = /obj/item/device/flash
+	backpack = /obj/item/weapon/storage/backpack/talon
+	satchel_one = /obj/item/weapon/storage/backpack/satchel/talon
+	messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon
 
 /decl/hierarchy/outfit/job/talon_engineer
 	name = OUTFIT_JOB_NAME("Talon Engineer")
@@ -216,5 +227,9 @@
 	backpack = /obj/item/weapon/storage/backpack/industrial
 	satchel_one = /obj/item/weapon/storage/backpack/satchel/eng
 	messenger_bag = /obj/item/weapon/storage/backpack/messenger/engi
-	uniform = /obj/item/clothing/under/rank/atmospheric_technician
+	uniform = /obj/item/clothing/under/rank/talon/basic
 	belt = /obj/item/weapon/storage/belt/utility/atmostech
+	backpack = /obj/item/weapon/storage/backpack/talon
+	satchel_one = /obj/item/weapon/storage/backpack/satchel/talon
+	messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon
+