Merge remote-tracking branch 'upstream/dev-freeze' into dev

This commit is contained in:
PsiOmega
2015-05-26 08:35:32 +02:00
46 changed files with 395 additions and 3149 deletions

View File

@@ -897,6 +897,12 @@ var/global/list/gear_datums = list()
cost = 1
slot = slot_shoes
/datum/gear/workboots
display_name = "workboots"
path = /obj/item/clothing/shoes/workboots
cost = 1
slot = slot_shoes
/datum/gear/sandal
display_name = "sandals"
path = /obj/item/clothing/shoes/sandal