Using DNA2 files from master.

code/modules/clothing/spacesuits/ninja.dm

@@ -13,7 +13,7 @@
 	desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins."
 	icon_state = "s-ninja"
 	item_state = "s-ninja_suit"
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/cell)
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank,/obj/item/weapon/cell)
 	slowdown = 0
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
 	siemens_coefficient = 0.2

code/modules/mining/abandonedcrates.dm

@@ -24,65 +24,46 @@
 		if(2)
 			new/obj/item/weapon/pickaxe/drill(src)
 			new/obj/item/device/taperecorder(src)
-			new/obj/item/clothing/suit/space/rig(src)
-			new/obj/item/clothing/head/helmet/space/rig(src)
+			new/obj/item/clothing/suit/space(src)
+			new/obj/item/clothing/head/helmet/space(src)
 		if(3)
-			for(var/i = 0, i < 12, i++)
-				new/obj/item/weapon/coin/diamond(src)
+			return
 		if(4)
-			new/obj/item/weapon/bananapeel(src)
-		if(5)
-			for(var/i = 0, i < 6, i++)
-				new/obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake(src)
-			new/obj/item/weapon/lighter/zippo(src)
-		if(7)
 			new/obj/item/weapon/reagent_containers/glass/beaker/bluespace(src)
-		if(9 to 10)
+		if(5 to 6)
 			for(var/i = 0, i < 10, i++)
 				new/obj/item/weapon/ore/diamond(src)
-		if(11)
+		if(7)
 			return
-		if(12)
-			new/obj/item/seeds/deathberryseed(src)
-			new/obj/item/seeds/deathnettleseed(src)
-		if(13)
-			new/obj/machinery/hydroponics(src)
-		if(14)
-			new/obj/item/seeds/cashseed(src)
-		if(15)
+		if(8)
+			return
+		if(9)
+			for(var/i = 0, i < 3, i++)
+				new/obj/machinery/hydroponics(src)
+		if(10)
 			for(var/i = 0, i < 3, i++)
 				new/obj/item/weapon/reagent_containers/glass/beaker/noreact(src)
-		if(16 to 17)
+		if(11 to 12)
 			for(var/i = 0, i < 9, i++)
 				new/obj/item/bluespace_crystal(src)
-		if(19)
-			for(var/i = 0, i < 4, i++)
-				new/obj/item/weapon/melee/classic_baton(src)
-		if(20)
-			new/obj/item/weapon/storage/lockbox/clusterbang(src)
-		if(21)
-			new/obj/item/weapon/aiModule/robocop(src)
-		if(22)
+		if(13)
+			new/obj/item/weapon/melee/classic_baton(src)
+		if(14)
+			return
+		if(15)
 			new/obj/item/clothing/under/chameleon(src)
 			for(var/i = 0, i < 7, i++)
 				new/obj/item/clothing/tie/horrible(src)
-		if(23)
+		if(16)
 			new/obj/item/clothing/under/shorts(src)
 			new/obj/item/clothing/under/shorts/red(src)
 			new/obj/item/clothing/under/shorts/blue(src)
 		//Dummy crates start here.
-		if(24 to 29)
-			return
-		if(8)
-			return
-		if(6)
-			return
-		if(18)
+		if(17 to 29)
 			return
 		//Dummy crates end here.
 		if(30)
-			for(var/i = 0, i < 4, i++)
-				new/obj/item/weapon/melee/baton(src)
+			new/obj/item/weapon/melee/baton(src)
 
 /obj/structure/closet/crate/secure/loot/attack_hand(mob/user as mob)
 	if(locked)
@@ -102,7 +83,7 @@
 				if (attempts == 0)
 					user << "<span class='danger'>The crate's anti-tamper system activates!</span>"
 					var/turf/T = get_turf(src.loc)
-					explosion(T, 0, 1, 2, 1)
+					explosion(T, 0, 0, 0, 1)
 					del(src)
 					return
 		else

code/modules/mining/mine_turfs.dm

@@ -487,7 +487,7 @@ commented out in r5061, I left it because of the shroom thingies
 
 	var/turf/simulated/floor/plating/airless/asteroid/N = ChangeTurf(/turf/simulated/floor/plating/airless/asteroid)
 	N.fullUpdateMineralOverlays()
-	var/crate = rand(1,30)
+	var/crate = rand(1,500)
 	switch(crate)
 		if(1)
 			visible_message("<span class='notice'>After digging, you find an old dusty crate buried within!</span>")

code/modules/research/designs.dm

@@ -1773,6 +1773,8 @@ datum/design/cart_janitor
 	build_type = PROTOLATHE
 	materials = list("$metal" = 50, "$glass" = 50)
 	build_path = "/obj/item/weapon/cartridge/janitor"
+
+/*
 datum/design/cart_clown
 	name = "Honkworks 5.0 Cartridge"
 	desc = "A data cartridge for portable microcomputers."
@@ -1789,6 +1791,8 @@ datum/design/cart_mime
 	build_type = PROTOLATHE
 	materials = list("$metal" = 50, "$glass" = 50)
 	build_path = "/obj/item/weapon/cartridge/mime"
+*/
+
 datum/design/cart_toxins
 	name = "Signal Ace 2 Cartridge"
 	desc = "A data cartridge for portable microcomputers."