Merge branch 'master' of https://github.com/tgstation/-tg-station into 1storydonuttweaks

This commit is contained in:
MMMiracles
2020-01-02 17:41:31 -05:00
80 changed files with 3429 additions and 6141 deletions
@@ -243,7 +243,7 @@
/obj/structure/closet/wardrobe/genetics_white/PopulateContents()
var/static/items_inside = list(
/obj/item/clothing/under/rank/medical/geneticist = 2,
/obj/item/clothing/under/rank/rnd/geneticist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
/obj/item/storage/backpack/genetics = 2,