Merge remote-tracking branch 'upstream/master' into clothing

This commit is contained in:
Detective Google
2020-10-01 14:06:21 -05:00
189 changed files with 167220 additions and 84230 deletions
@@ -86,3 +86,7 @@
/datum/gear/neck/polycloak
name = "Polychromatic Cloak"
path = /obj/item/clothing/neck/cloak/polychromic
/datum/gear/neck/altpolycloak
name = "Alternate Cloak"
path = /obj/item/clothing/neck/cloak/alt/polychromic
@@ -669,3 +669,9 @@
/datum/gear/uniform/kimono/sakura
name = "Sakura kimono"
path = /obj/item/clothing/under/costume/kimono/sakura
/datum/gear/uniform/ctlong
name = "cargo tech's jumpsuit (long pants)"
path = /obj/item/clothing/under/rank/cargo/tech/long
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_roles = list("Cargo Technician")