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

Conflict Resolution

Browse Source 
Also fixes a compiling error with previous PR
This commit is contained in:
Unknown
2019-03-28 17:24:03 -04:00
parent 9d056decda
commit ad181e797a
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -243,9 +243,6 @@
/datum/gear/accessory/locket
display_name = "locket"
<<<<<<< HEAD
path = /obj/item/clothing/accessory/locket
=======
path = /obj/item/clothing/accessory/locket
/datum/gear/accessory/halfcape
@@ -280,4 +277,3 @@
/datum/gear/accessory/cowledvest
display_name = "cowled vest"
path = /obj/item/clothing/accessory/cowledvest
>>>>>>> 3e9624c... Adds the Zaddat Race + Modifies pressure damage calculations (#5869)