cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-19 12:13:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-03-21 14:16:11 -04:00
committed by GitHub
parent 4f457c2dc0
commit ba62732d25
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
-3
View File
@@ -307,8 +307,6 @@
"Grey Vest" = /obj/item/clothing/accessory/cowboy_vest/grey
)
gear_tweaks += new/datum/gear_tweak/path(cowboy_vests)
<<<<<<< HEAD
=======
/datum/gear/accessory/pride
display_name = "pride pin selection"
@@ -321,4 +319,3 @@
var/obj/item/clothing/accessory/pridepin_type = pridepin
pridepins[initial(pridepin_type.name)] = pridepin_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pridepins))
>>>>>>> e1f20bae13... Merge pull request #12500 from GhostActual/pride_pins