Merge branch 'master' into upstream-merge-36442

2018-04-01 19:50:37 -05:00
parent 6d117d18a3 28e188cbbe
commit f7be23e78a
132 changed files with 1560 additions and 536 deletions
@@ -78,6 +78,15 @@
 	icon_state = "toolbox_blue_old"
 	has_latches = FALSE

+/obj/item/storage/toolbox/mechanical/old/heirloom
+	name = "toolbox" //this will be named "X family toolbox"
+	desc = "It's seen better days."
+	force = 5
+	w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/storage/toolbox/mechanical/old/heirloom/PopulateContents()
+	return
+
 /obj/item/storage/toolbox/electrical
 	name = "electrical toolbox"
 	icon_state = "yellow"