cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-21 13:13:29 +01: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:41:48 -04:00
committed by GitHub
parent dc1328d93c
commit e1e4c98723
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+1 -10
View File
@@ -117,16 +117,7 @@
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