Merge branch 'master' into Wheelchairs

2019-06-16 17:33:57 +01:00
parent e607cd3c7d 89dd3d4e87
commit 98fc55e9f8
559 changed files with 11346 additions and 7161 deletions
@@ -60,7 +60,7 @@
 		if("Scientist")
 			heirloom_type = /obj/item/toy/plush/slimeplushie
 		if("Assistant")
-			heirloom_type = /obj/item/storage/toolbox/mechanical/old/heirloom
+			heirloom_type = /obj/item/clothing/gloves/cut/family
 		if("Chaplain")
 			heirloom_type = /obj/item/camera/spooky/family
 		if("Captain")