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

Merge branch 'master' into xantholne-christmas03

Browse Source
This commit is contained in:
Xantholne
2020-01-12 22:29:59 -07:00
committed by GitHub
parent 0b02439b08 d233a14d91
commit 903e59d6ed
1530 changed files with 215077 additions and 210977 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/loadout/head.dm
+28 -1
View File
@@ -103,4 +103,31 @@
name = "Green Santa Hat"
category = SLOT_HEAD
path = /obj/item/clothing/head/christmashatg
*/
*/
/datum/gear/cowboyhat
name = "Cowboy Hat, Brown"
category = SLOT_HEAD
path = /obj/item/clothing/head/cowboyhat
/datum/gear/cowboyhat/black
name = "Cowboy Hat, Black"
category = SLOT_HEAD
path = /obj/item/clothing/head/cowboyhat/black
/datum/gear/cowboyhat/white
name = "Cowboy Hat, White"
category = SLOT_HEAD
path = /obj/item/clothing/head/cowboyhat/white
/datum/gear/cowboyhat/pink
name = "Cowboy Hat, Pink"
category = SLOT_HEAD
path = /obj/item/clothing/head/cowboyhat/pink
/datum/gear/cowboyhat/sec
name = "Cowboy Hat, Security"
category = SLOT_HEAD
path = /obj/item/clothing/head/cowboyhat/sec
restricted_desc = "Security"
restricted_roles = list("Warden","Detective","Security Officer","Head of Security")
modular_citadel/code/modules/client/loadout/shoes.dm
+11 -1
View File
@@ -71,4 +71,14 @@
/datum/gear/santaboots
name = "Santa Boots"
category = SLOT_SHOES
path= /obj/item/clothing/shoes/winterboots/santaboots
path= /obj/item/clothing/shoes/winterboots/santaboots
/datum/gear/cowboyboots
name = "Cowboy Boots, Brown"
category = SLOT_SHOES
path = /obj/item/clothing/shoes/cowboyboots
/datum/gear/cowboyboots/black
name = "Cowboy Boots, Black"
category = SLOT_SHOES
path = /obj/item/clothing/shoes/cowboyboots/black