From dc1328d93c53751a3adff868d4cd49d87047e03e Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Mon, 19 Jul 2021 15:12:30 +0000 Subject: [PATCH] Fixes Talon being referred to as if ITV is a company --- .../items/weapons/storage/backpack_vr.dm | 8 +++---- .../loadout/loadout_accessories_vr.dm | 10 +++++++++ .../loadout/loadout_head_vr.dm | 4 ++-- .../loadout/loadout_suit_vr.dm | 8 +++++++ .../loadout/loadout_uniform_vr.dm | 4 ++-- .../loadout/loadout_utility_vr.dm | 2 +- code/modules/clothing/head/hood_vr.dm | 2 +- code/modules/clothing/head/misc_vr.dm | 16 +++++++------- code/modules/clothing/head/pilot_helmet_vr.dm | 4 ++-- code/modules/clothing/suits/hooded_vr.dm | 4 ++-- .../clothing/suits/miscellaneous_vr.dm | 17 +++++++++----- .../under/accessories/accessory_vr.dm | 4 ++-- .../clothing/under/miscellaneous_vr.dm | 22 +++++++++---------- maps/southern_cross/loadout/loadout_vr.dm | 2 +- 14 files changed, 65 insertions(+), 42 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index c84272a603..a3c1e34619 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -118,14 +118,14 @@ ///Talon Bags/// /obj/item/weapon/storage/backpack/talon - name = "ITV backpack" + name = "Talon backpack" desc = "A backpack for carrying a large number of supplies easily." icon = 'icons/inventory/back/item_vr.dmi' icon_override = 'icons/inventory/back/mob_vr.dmi' icon_state = "talon" /obj/item/weapon/storage/backpack/satchel/talon - name = "ITV satchel" + name = "Talon satchel" desc = "A satchel for carrying a large number of supplies easily." icon = 'icons/inventory/back/item_vr.dmi' icon_override = 'icons/inventory/back/mob_vr.dmi' @@ -133,7 +133,7 @@ item_state_slots = null /obj/item/weapon/storage/backpack/messenger/talon - name = "ITV messenger bag" + name = "Talon messenger bag" desc = "A sturdy backpack worn over one shoulder." icon = 'icons/inventory/back/item_vr.dmi' icon_override = 'icons/inventory/back/mob_vr.dmi' @@ -141,7 +141,7 @@ item_state_slots = null /obj/item/weapon/storage/backpack/dufflebag/talon - name = "ITV dufflebag" + name = "Talon dufflebag" desc = "A large dufflebag for holding extra supplies." icon = 'icons/inventory/back/item_vr.dmi' icon_override = 'icons/inventory/back/mob_vr.dmi' diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index a53c896826..ed40f96099 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -117,6 +117,16 @@ Talon pin */ /datum/gear/accessory/talonpin +<<<<<<< HEAD display_name = "ITV pin" description = "A small enamel pin of the ITV logo." path = /obj/item/clothing/accessory/talon +||||||| parent of 982d88145d... Merge pull request #11142 from Heroman3003/Talonflufffix + display_name = "ITV pin" + description = "A small enamel pin of the ITV logo." + path = /obj/item/clothing/accessory/talon +======= + display_name = "Talon pin" + description = "A small enamel pin of the Talon logo." + path = /obj/item/clothing/accessory/talon +>>>>>>> 982d88145d... Merge pull request #11142 from Heroman3003/Talonflufffix diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm index 47f2d0f308..c41474a68e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm @@ -53,9 +53,9 @@ Talon hats */ /datum/gear/head/cap/talon - display_name = "cap, ITV" + display_name = "cap, Talon" path = /obj/item/clothing/head/soft/talon /datum/gear/head/beret/talon - display_name = "beret, ITV" + display_name = "beret, Talon" path = /obj/item/clothing/head/beret diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index f33118bce0..838cec7cf0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -82,5 +82,13 @@ Talon winter coat */ /datum/gear/suit/wintercoat/talon +<<<<<<< HEAD display_name = "winter coat, ITV" path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon +||||||| parent of 982d88145d... Merge pull request #11142 from Heroman3003/Talonflufffix + display_name = "winter coat, ITV" + path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon +======= + display_name = "winter coat, Talon" + path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon +>>>>>>> 982d88145d... Merge pull request #11142 from Heroman3003/Talonflufffix diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 7c6e9ca629..a165232e1a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -233,8 +233,8 @@ Bluespace jumpsuit 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." + display_name = "Talon Jumpsuit" + description = "A jumpsuit that is usually issued to ITV Talon contractors, however others can purchase it to show their support towards the ship." path = /obj/item/clothing/under/rank/talon/basic // Summer dresses diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index d8746ee4ec..e405ce974e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -62,7 +62,7 @@ allowed_roles = list("Pathfinder","Explorer") /datum/gear/utility/dufflebag/talon - display_name = "ITV dufflebag" + display_name = "Talon dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/explorer /datum/gear/utility/ID diff --git a/code/modules/clothing/head/hood_vr.dm b/code/modules/clothing/head/hood_vr.dm index 906bc98b02..5483c461af 100644 --- a/code/modules/clothing/head/hood_vr.dm +++ b/code/modules/clothing/head/hood_vr.dm @@ -30,7 +30,7 @@ // Talon Winter Hood /obj/item/clothing/head/hood/winter/talon - name = "ITV winter hood" + name = "Talon winter hood" desc = "A cozy winter hood attached to a heavy winter jacket." icon_override = 'icons/inventory/head/mob_vr.dmi' icon_state = "winterhood_talon" \ No newline at end of file diff --git a/code/modules/clothing/head/misc_vr.dm b/code/modules/clothing/head/misc_vr.dm index 8cde8bac5c..a243216c4d 100644 --- a/code/modules/clothing/head/misc_vr.dm +++ b/code/modules/clothing/head/misc_vr.dm @@ -98,8 +98,8 @@ //////////TALON HATS////////// /obj/item/clothing/head/soft/talon - name = "ITV baseball cap" - desc = "It's a ballcap bearing the colors of ITV." + name = "Talon baseball cap" + desc = "It's a ballcap bearing the colors of ITV Talon." icon = 'icons/inventory/head/item_vr.dmi' icon_override = 'icons/inventory/head/mob_vr.dmi' icon_state = "talonsoft" @@ -107,24 +107,24 @@ 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." + name = "Talon nautical hat" + desc = "It's a classic nautical hat bearing the colors of ITV Talon. Perfect for commanding the ship." icon = 'icons/inventory/head/item_vr.dmi' icon_override = 'icons/inventory/head/mob_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." + name = "Talon beret" + desc = "It's a basic baret colored to match ITV Talon's uniforms." icon = 'icons/inventory/head/item_vr.dmi' icon_override = 'icons/inventory/head/mob_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." + name = "Talon officer beret" + desc = "It's a basic baret colored to match ITV Talon's uniforms with a badge pinned on the front. Perfect for commanders." icon = 'icons/inventory/head/item_vr.dmi' icon_override = 'icons/inventory/head/mob_vr.dmi' icon_state = "beret_talon_officer" diff --git a/code/modules/clothing/head/pilot_helmet_vr.dm b/code/modules/clothing/head/pilot_helmet_vr.dm index 26557b2ca3..de4d52b622 100644 --- a/code/modules/clothing/head/pilot_helmet_vr.dm +++ b/code/modules/clothing/head/pilot_helmet_vr.dm @@ -48,8 +48,8 @@ //////////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" + name = "Talon pilot helmet" + desc = "An ITV Talon 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/inventory/head/mob_vr.dmi') sprite_sheets = list( diff --git a/code/modules/clothing/suits/hooded_vr.dm b/code/modules/clothing/suits/hooded_vr.dm index 47d0bb1274..cb279936aa 100644 --- a/code/modules/clothing/suits/hooded_vr.dm +++ b/code/modules/clothing/suits/hooded_vr.dm @@ -71,8 +71,8 @@ // 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." + name = "Talon winter coat" + desc = "A cozy winter coat, covered in thick fur and baring the colors of ITV Talon." icon = 'icons/inventory/suit/item_vr.dmi' icon_override = 'icons/inventory/suit/mob_vr.dmi' icon_state = "taloncoat" diff --git a/code/modules/clothing/suits/miscellaneous_vr.dm b/code/modules/clothing/suits/miscellaneous_vr.dm index 8febb11143..c075c7a288 100644 --- a/code/modules/clothing/suits/miscellaneous_vr.dm +++ b/code/modules/clothing/suits/miscellaneous_vr.dm @@ -88,7 +88,7 @@ /obj/item/clothing/suit/storage/det_trench/alt name = "sleek modern coat" desc = "A sleek overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside." - + icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "cyberpunksleek" @@ -96,7 +96,7 @@ /obj/item/clothing/suit/storage/det_trench/alt2 name = "sleek modern coat (long)" desc = "A sleek long overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside." - + icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "cyberpunksleek_long" @@ -109,8 +109,8 @@ //Talon Hoodie /obj/item/clothing/suit/storage/toggle/hoodie/talon - name = "ITV hoodie" - desc = "A warm, blue sweatshirt bearing ITV markings." + name = "Talon hoodie" + desc = "A warm, blue sweatshirt bearing ITV Talon markings." icon = 'icons/inventory/suit/item_vr.dmi' icon_override = 'icons/inventory/suit/mob_vr.dmi' icon_state = "talonhoodie" @@ -120,7 +120,7 @@ /obj/item/clothing/suit/storage/bladerunner name = "leather coat" desc = "An old leather coat. Has probably seen things you wouldn't believe." - + icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "bladerunner_coat" @@ -129,9 +129,14 @@ /obj/item/clothing/suit/cyberpunk name = "cyberpunk vest" desc = "A red vest with golden streaks. It's made out of tough materials, and can protect fairly well against bullets. Wake the fuck up, Samurai." - + icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "cyberpunk" armor = list("melee" = 10, "bullet" = 20, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0) +<<<<<<< HEAD +||||||| parent of 982d88145d... Merge pull request #11142 from Heroman3003/Talonflufffix + +======= +>>>>>>> 982d88145d... Merge pull request #11142 from Heroman3003/Talonflufffix diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 68a0598f13..f476fa417a 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -388,8 +388,8 @@ 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." + name = "Talon pin" + desc = "A collectable enamel pin that resembles ITV Talon's ship logo." icon = 'icons/inventory/accessory/item_vr.dmi' icon_override = 'icons/inventory/accessory/mob_vr.dmi' icon_state = "talon_pin" diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 3281c5f5a8..3fdac04a82 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -149,8 +149,8 @@ //////////////////////TALON JUMPSUITS////////////////////// /obj/item/clothing/under/rank/talon/basic - name = "ITV jumpsuit" - desc = "A basic jumpsuit that bares the ITV logo on the breast." + name = "Talon jumpsuit" + desc = "A basic jumpsuit that bares the ITV Talon logo on the breast." icon = 'icons/inventory/uniform/item_vr.dmi' rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' icon_override = 'icons/inventory/uniform/mob_vr.dmi' @@ -159,8 +159,8 @@ rolled_sleeves = 0 /obj/item/clothing/under/rank/talon/proper - name = "ITV proper jumpsuit" - desc = "A neat and proper uniform for a proper company." + name = "Talon proper jumpsuit" + desc = "A neat and proper uniform for a proper private ship." icon = 'icons/inventory/uniform/item_vr.dmi' rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' icon_override = 'icons/inventory/uniform/mob_vr.dmi' @@ -169,8 +169,8 @@ 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." + name = "Talon security jumpsuit" + desc = "A sleek, streamlined version of ITV Talon's standard jumpsuit that bares security markings." icon = 'icons/inventory/uniform/item_vr.dmi' rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' icon_override = 'icons/inventory/uniform/mob_vr.dmi' @@ -179,8 +179,8 @@ 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." + name = "Talon pilot jumpsuit" + desc = "A sleek, streamlined version of ITV Talon's standard jumpsuit. Made from cushioned fabric to handle intense flight." icon = 'icons/inventory/uniform/item_vr.dmi' rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' icon_override = 'icons/inventory/uniform/mob_vr.dmi' @@ -189,7 +189,7 @@ rolled_sleeves = 0 /obj/item/clothing/under/rank/talon/command - name = "ITV command jumpsuit" + name = "Talon command jumpsuit" desc = "A commanding jumpsuit fit for a commanding officer." icon = 'icons/inventory/uniform/item_vr.dmi' rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' @@ -202,7 +202,7 @@ /obj/item/clothing/under/excelsior name = "\improper Excelsior uniform" desc = "A uniform from a particular spaceship: Excelsior." - + icon = 'icons/inventory/uniform/item_vr.dmi' default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "excelsior_white" @@ -216,7 +216,7 @@ /obj/item/clothing/under/summerdress name = "summer dress" desc = "A nice summer dress." - + icon = 'icons/inventory/uniform/item_vr.dmi' default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi' icon_state = "summerdress" diff --git a/maps/southern_cross/loadout/loadout_vr.dm b/maps/southern_cross/loadout/loadout_vr.dm index 613095be30..db62b7394b 100644 --- a/maps/southern_cross/loadout/loadout_vr.dm +++ b/maps/southern_cross/loadout/loadout_vr.dm @@ -9,6 +9,6 @@ allowed_roles = list("Pilot") /datum/gear/head/pilot/talon - display_name = "helmet, ITV pilot (Pilot)" + display_name = "helmet, Talon pilot (Pilot)" path = /obj/item/clothing/head/pilot_vr/talon allowed_roles = list("Pilot") \ No newline at end of file