Merge branch 'pr/14'

2019-06-14 21:29:04 +01:00
parent aa1cb22edc 7433293a3e
commit 6b9becce71
506 changed files with 10079 additions and 6600 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")