Merge branch 'master' into template-checking

code/game/objects/effects/landmarks.dm

@@ -273,3 +273,17 @@
 /obj/effect/landmark/event_spawn/Destroy()
 	generic_event_spawns -= src
 	return ..()
+
+/obj/effect/landmark/ruin
+	var/datum/map_template/ruin/ruin_template
+
+/obj/effect/landmark/ruin/New(loc, my_ruin_template)
+	name = "ruin_[ruin_landmarks.len + 1]"
+	..(loc)
+	ruin_template = my_ruin_template
+	ruin_landmarks |= src
+
+/obj/effect/landmark/ruin/Destroy()
+	ruin_landmarks -= src
+	ruin_template = null
+	. = ..()

code/game/objects/items/weapons/storage/boxes.dm

@@ -829,36 +829,3 @@
 	new /obj/item/weapon/circuitboard/machine/destructive_analyzer(src)
 	new /obj/item/weapon/circuitboard/machine/circuit_imprinter(src)
 	new /obj/item/weapon/circuitboard/computer/rdconsole(src)
-
-/obj/item/weapon/storage/box/brass
-	name = "brass box"
-	desc = "A huge brass box with several indentations in its surface."
-	icon_state = "brassbox"
-	w_class = 5
-	max_w_class = 3
-	max_combined_w_class = 28
-	storage_slots = 28
-	slowdown = 1
-	flags = HANDSLOW
-	var/proselytizer_type = /obj/item/clockwork/clockwork_proselytizer/scarab
-
-/obj/item/weapon/storage/box/brass/prefilled/New()
-	..()
-	new proselytizer_type(src)
-	new /obj/item/weapon/screwdriver/brass(src)
-	new /obj/item/weapon/wirecutters/brass(src)
-	new /obj/item/weapon/wrench/brass(src)
-	new /obj/item/weapon/crowbar/brass(src)
-	new /obj/item/weapon/weldingtool/experimental/brass(src)
-
-/obj/item/weapon/storage/box/brass/prefilled/ratvar
-	var/slab_type = /obj/item/clockwork/slab/scarab
-
-/obj/item/weapon/storage/box/brass/prefilled/ratvar/New()
-	..()
-	new slab_type(src)
-
-/obj/item/weapon/storage/box/brass/prefilled/ratvar/admin
-	slab_type = /obj/item/clockwork/slab/debug
-	proselytizer_type = /obj/item/clockwork/clockwork_proselytizer/scarab/debug
-

code/game/objects/items/weapons/storage/toolbox.dm

@@ -1,7 +1,6 @@
 /obj/item/weapon/storage/toolbox
 	name = "toolbox"
 	desc = "Danger. Very robust."
-	icon = 'icons/obj/storage.dmi'
 	icon_state = "red"
 	item_state = "toolbox_red"
 	flags = CONDUCT
@@ -15,8 +14,9 @@
 	attack_verb = list("robusted")
 	hitsound = 'sound/weapons/smash.ogg'
 
-/obj/item/weapon/storage/toolbox/New()
-	..()
+/obj/item/weapon/storage/toolbox/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] robusts \himself with [src]! It looks like \he's trying to commit suicide..</span>")
+	return (BRUTELOSS)
 
 /obj/item/weapon/storage/toolbox/emergency
 	name = "emergency toolbox"
@@ -102,6 +102,35 @@
 	new /obj/item/weapon/wirecutters(src)
 	new /obj/item/device/multitool(src)
 
-/obj/item/weapon/storage/toolbox/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] robusts \himself with the toolbox! It looks like \he's trying to commit suicide..</span>")
-	return (BRUTELOSS)
+/obj/item/weapon/storage/toolbox/brass
+	name = "brass box"
+	desc = "A huge brass box with several indentations in its surface."
+	icon_state = "brassbox"
+	w_class = 5
+	max_w_class = 3
+	max_combined_w_class = 28
+	storage_slots = 28
+	slowdown = 1
+	flags = HANDSLOW
+	attack_verb = list("robusted", "crushed", "smashed")
+	var/proselytizer_type = /obj/item/clockwork/clockwork_proselytizer/scarab
+
+/obj/item/weapon/storage/toolbox/brass/prefilled/New()
+	..()
+	new proselytizer_type(src)
+	new /obj/item/weapon/screwdriver/brass(src)
+	new /obj/item/weapon/wirecutters/brass(src)
+	new /obj/item/weapon/wrench/brass(src)
+	new /obj/item/weapon/crowbar/brass(src)
+	new /obj/item/weapon/weldingtool/experimental/brass(src)
+
+/obj/item/weapon/storage/toolbox/brass/prefilled/ratvar
+	var/slab_type = /obj/item/clockwork/slab/scarab
+
+/obj/item/weapon/storage/toolbox/brass/prefilled/ratvar/New()
+	..()
+	new slab_type(src)
+
+/obj/item/weapon/storage/toolbox/brass/prefilled/ratvar/admin
+	slab_type = /obj/item/clockwork/slab/debug
+	proselytizer_type = /obj/item/clockwork/clockwork_proselytizer/scarab/debug