cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 02:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-03-28 20:44:59 -04:00
parent 15e3c04ca3
commit 4792fc1693
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/misc.dm
-4
View File
@@ -413,9 +413,6 @@
name = "maid headband"
desc = "Keeps hair out of the way for important... jobs."
icon_state = "maid"
<<<<<<< HEAD
body_parts_covered = 0
=======
body_parts_covered = 0
/obj/item/clothing/head/maangtikka
@@ -442,4 +439,3 @@
desc = "A gold-lined white cowl. It gives off uncomfortable cult vibes, but fancy."
icon_state = "whitecowl"
body_parts_covered = 0
>>>>>>> 8735e70... Merge pull request #5956 from kartagrafi/nockk