Merge branch 'master' into master

2019-07-15 21:23:04 +01:00
parent 67510809ef 8c1b7c4f22
commit 9c7b1dee97
130 changed files with 707 additions and 291 deletions
@@ -407,8 +407,8 @@ datum/gear/darksabresheath

 /datum/gear/mw2_russian_para
 	name = "Russian Paratrooper Jumper"
-	category = SLOT_WEAR_SUIT
-	path = /obj/item/clothing/suit/mw2_russian_para
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/mw2_russian_para
 	ckeywhitelist = list("investigator77")

 /datum/gear/longblackgloves
@@ -434,4 +434,3 @@ datum/gear/darksabresheath
 	category = SLOT_NECK
 	path = /obj/item/bedsheet/captain
 	ckeywhitelist = list("tikibomb")
-