Merge branch 'MrSky12:master' into nutribot

code/datums/components/crafting/recipes/recipes_misc.dm

@@ -20,6 +20,28 @@
 	tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_WELDER)
 	category = CAT_MISC
 
+/datum/crafting_recipe/weightmachine/stacklifter
+	name ="Stack Lifter"
+	result = /obj/structure/weightmachine/stacklifter
+	time = 50
+	reqs = list(/obj/item/stack/sheet/metal = 10)
+	category = CAT_MISC
+
+/datum/crafting_recipe/weightmachine/weightlifter
+	name ="Weight Lifter"
+	result = /obj/structure/weightmachine/weightlifter
+	time = 50
+	reqs = list(/obj/item/stack/sheet/metal = 8,
+				/obj/item/stack/rods = 4)
+	category = CAT_MISC
+
+/datum/crafting_recipe/punching_bag
+	name ="Punching Bag"
+	result = /obj/structure/punching_bag
+	time = 35
+	reqs = list(/obj/item/storage/backpack = 1,
+				/obj/item/stack/cable_coil = 2)
+	category = CAT_MISC
 ///////////////////
 //Tools & Storage//
 ///////////////////

code/datums/diseases/advance/presets.dm

@@ -71,19 +71,3 @@
 	name = "Blueberry virus bottle"
 	desc = "A small bottle. Contains blueberry virus in synthblood medium."
 	spawned_disease = /datum/disease/advance/berry_virus
-
-
-//admin variant of berry virus
-
-/datum/disease/advance/berry_virus_extreme
-	copy_type = /datum/disease/advance
-
-/datum/disease/advance/berry_virus_extreme/New(make_typecache = TRUE)
-	name = "Blueberry Virus"
-	symptoms = list(new/datum/symptom/berry/extreme)
-	..()
-
-/obj/item/reagent_containers/glass/bottle/berry_extreme
-	name = "Blueberry virus bottle"
-	desc = "A small bottle. Contains blueberry virus in synthblood medium."
-	spawned_disease = /datum/disease/advance/berry_virus_extreme