cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 13:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-5744

Browse Source
This commit is contained in:
Spades
2019-02-23 11:51:40 -05:00
committed by GitHub
parent 0be6662dc5 190ead1dfd
commit 14fad52791
701 changed files with 30284 additions and 33230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_head.dm
+1 -6
View File
@@ -370,9 +370,6 @@
/datum/gear/head/circuitry
display_name = "headwear, circuitry (empty)"
<<<<<<< HEAD
path = /obj/item/clothing/head/circuitry
=======
path = /obj/item/clothing/head/circuitry
/datum/gear/head/maangtikka
@@ -381,6 +378,4 @@
/datum/gear/head/jingasa
display_name = "jingasa"
path = /obj/item/clothing/head/jingasa
>>>>>>> 799ba7c... Adds 12 new futuristic loadout clothing items + colour variants (#5744)
path = /obj/item/clothing/head/jingasa