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

Update loadout_head.dm

Browse Source
This commit is contained in:
Novacat
2020-07-31 16:47:36 -04:00
committed by GitHub
parent f9c3cf616e
commit 8e79488e0c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,9 +366,6 @@
/datum/gear/head/jingasa
display_name = "jingasa"
<<<<<<< HEAD
path = /obj/item/clothing/head/jingasa
=======
path = /obj/item/clothing/head/jingasa
/datum/gear/head/sunflower_crown
@@ -386,4 +383,3 @@
/datum/gear/head/rose_crown
display_name = "rose crown"
path = /obj/item/clothing/head/rose_crown
>>>>>>> 7a84236... Adds 2 uniforms, 1 accessory, and flower crowns to loadout (#7385)