cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-20 04:34:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-06-19 21:00:46 -04:00
committed by GitHub
parent bfd8b22c39
commit b3ccdb22a9
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
-6
View File
@@ -72,11 +72,6 @@
/datum/gear/suit/oversize/New()
..()
<<<<<<< HEAD
gear_tweaks += gear_tweak_free_color_choice
||||||| parent of 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch
gear_tweaks += gear_tweak_free_color_choice
=======
gear_tweaks += gear_tweak_free_color_choice
/*
@@ -85,4 +80,3 @@ Talon winter coat
/datum/gear/suit/wintercoat/talon
display_name = "winter coat, ITV"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon
>>>>>>> 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch