cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Talon being referred to as if ITV is a company

Browse Source
This commit is contained in:
Chompstation Bot
2021-07-19 15:12:30 +00:00
parent 5ce4add0c9
commit dc1328d93c
14 changed files with 65 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/items/weapons/storage/backpack_vr.dm
View File

@@ -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'

10
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
View File

@@ -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

4
code/modules/client/preference_setup/loadout/loadout_head_vr.dm
View File

@@ -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

8
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
View File

@@ -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

4
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
View File

@@ -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

2
code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
View File

@@ -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

2
code/modules/clothing/head/hood_vr.dm
View File

@@ -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"

16
code/modules/clothing/head/misc_vr.dm
View File

@@ -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"

4
code/modules/clothing/head/pilot_helmet_vr.dm
View File

@@ -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(

4
code/modules/clothing/suits/hooded_vr.dm
View File

@@ -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"

9
code/modules/clothing/suits/miscellaneous_vr.dm
View File

@@ -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"
@@ -134,4 +134,9 @@
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

4
code/modules/clothing/under/accessories/accessory_vr.dm
View File

@@ -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"

18
code/modules/clothing/under/miscellaneous_vr.dm
View File

@@ -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'

2
maps/southern_cross/loadout/loadout_vr.dm
View File

@@ -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")