shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into xantholne-christmas01

Browse Source
This commit is contained in:
Unknown
2019-12-14 17:15:00 -07:00
parent 825f553a5d 0921c3541a
commit 73abc2ae40
456 changed files with 3828 additions and 3209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/misc.dm
+4 -3
View File
@@ -370,9 +370,9 @@
/obj/item/clothing/head/hotel
name = "Telegram cap"
desc = "A bright red cap warn by hotel staff. Or people who want to be a singing telegram"
icon_state = "telegramhat"
item_color = "telegramhat"
dog_fashion = null
icon_state = "telegram"
item_color = "telegram"
dog_fashion = /datum/dog_fashion/head/telegram
/obj/item/clothing/head/colour
name = "Singer cap"
@@ -380,6 +380,7 @@
icon_state = "colour"
item_color = "colour"
dog_fashion = /datum/dog_fashion/head/colour
/obj/item/clothing/head/christmashat
name = "red santa hat"
desc = "A red Christmas Hat! How festive!"