Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml

This commit is contained in:
kevinz000
2020-04-30 01:00:08 -07:00
565 changed files with 10267 additions and 10442 deletions
+1 -1
View File
@@ -142,7 +142,7 @@
uniform = /obj/item/clothing/under/syndicate
suit = /obj/item/clothing/suit/toggle/labcoat
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
ears = /obj/item/radio/headset/syndicate/alt
back = /obj/item/storage/backpack
r_pocket = /obj/item/gun/ballistic/automatic/pistol