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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-07-19 19:42:26 -04:00
committed by GitHub
parent e1e4c98723
commit 2705a86682
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,13 +82,5 @@
Talon winter coat Talon winter coat
*/ */
/datum/gear/suit/wintercoat/talon /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" display_name = "winter coat, Talon"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon
>>>>>>> 982d88145d... Merge pull request #11142 from Heroman3003/Talonflufffix