Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into greytide-standard-uniform

This commit is contained in:
Hatterhat
2020-01-12 12:39:57 -06:00
1057 changed files with 194047 additions and 195760 deletions
@@ -101,4 +101,34 @@
/datum/gear/santahatg
name = "Green Santa Hat"
category = SLOT_HEAD
path = /obj/item/clothing/head/christmashatg
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")
@@ -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