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

2020-10-01 14:06:21 -05:00
parent c4480afc09 ef311cd1ec
commit 57132d0b32
189 changed files with 167220 additions and 84230 deletions
@@ -188,6 +188,7 @@
 					/obj/item/clothing/under/rank/cargo/tech/skirt = 5,
 					/obj/item/clothing/under/rank/cargo/util = 5,
 					/obj/item/clothing/suit/toggle/labcoat/depjacket/sup = 5,
+					/obj/item/clothing/under/rank/cargo/tech/long = 5,
 					/obj/item/clothing/shoes/sneakers/black = 5,
 					/obj/item/clothing/gloves/fingerless = 5,
 					/obj/item/clothing/head/soft = 5,