Merge branch 'master' into development

# Conflicts:
#	maps/aurora/aurora-4_mainlevel.dmm
This commit is contained in:
skull132
2018-06-17 23:19:10 +03:00
11 changed files with 159 additions and 97 deletions
-1
View File
@@ -676,7 +676,6 @@
/obj/item/clothing/under/overalls = 1,
/obj/item/clothing/under/redcoat = 0.5,
/obj/item/clothing/under/serviceoveralls = 1,
/obj/item/clothing/under/psyche = 0.5,
/obj/item/clothing/under/rank/dispatch = 0.8,
/obj/item/clothing/under/syndicate/tacticool = 1,
/obj/item/clothing/under/syndicate/tracksuit = 0.2,