cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +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

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