Merge branch 'Paradise-clean' into buffs_duffs

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

@@ -1,5 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
 /obj/item/weapon/storage/lockbox
 	name = "lockbox"
 	desc = "A locked box."

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

@@ -216,6 +216,14 @@
 	for(var/i = 0, i < storage_slots - 2, i++)
 		handle_item_insertion(new /obj/item/stack/spacecash/c1000, 1)
 
+/obj/item/weapon/storage/secure/briefcase/reaper/New()
+	..()
+	handle_item_insertion(new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow, 1)
+	handle_item_insertion(new /obj/item/weapon/gun/projectile/revolver/mateba, 1)
+	handle_item_insertion(new /obj/item/ammo_box/a357, 1)
+	handle_item_insertion(new /obj/item/weapon/grenade/plastic/c4, 1)
+
+
 // -----------------------------
 //        Secure Safe
 // -----------------------------

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

@@ -568,6 +568,8 @@
 	for(var/thing in data["content"])
 		if(islist(thing))
 			list_to_object(thing, src)
+		else if(thing == null)
+			log_runtime(EXCEPTION("Null entry found in storage/deserialize."), src)
 		else
 			log_runtime(EXCEPTION("Non-list thing found in storage/deserialize."), src, list("Thing: [thing]"))
 	..()