Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2

Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm

code/modules/reagents/Chemistry-Machinery.dm

@@ -44,10 +44,6 @@
 				qdel(src)
 				return
 
-/obj/machinery/chem_master/blob_act()
-	if (prob(50))
-		qdel(src)
-
 /obj/machinery/chem_master/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob)
 
 	if(istype(B, /obj/item/weapon/reagent_containers/glass))

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm

@@ -175,11 +175,7 @@
 			W.visible_message("<span class='notice'>The fungi are completely dissolved by the solution!</span>")
 
 /datum/reagent/toxin/plantbgone/touch_obj(var/obj/O, var/volume)
-	if(istype(O, /obj/effect/alien/weeds/))
-		var/obj/effect/alien/weeds/alien_weeds = O
-		alien_weeds.health -= rand(15, 35)
-		alien_weeds.healthcheck()
-	else if(istype(O, /obj/effect/plant))
+	if(istype(O, /obj/effect/plant))
 		qdel(O)
 
 /datum/reagent/toxin/plantbgone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)

code/modules/reagents/reagent_dispenser.dm

@@ -59,11 +59,6 @@
 			else
 		return
 
-	blob_act()
-		if(prob(50))
-			new /obj/effect/effect/water(src.loc)
-			qdel(src)
-
 
 
 
@@ -154,9 +149,6 @@
 		if(!istype(Proj ,/obj/item/projectile/beam/lastertag) && !istype(Proj ,/obj/item/projectile/beam/practice) )
 			explode()
 
-/obj/structure/reagent_dispensers/fueltank/blob_act()
-	explode()
-
 /obj/structure/reagent_dispensers/fueltank/ex_act()
 	explode()
 
@@ -223,10 +215,6 @@
 		..()
 		reagents.add_reagent("beer",1000)
 
-/obj/structure/reagent_dispensers/beerkeg/blob_act()
-	explosion(src.loc,0,3,5,7,10)
-	qdel(src)
-
 /obj/structure/reagent_dispensers/virusfood
 	name = "Virus Food Dispenser"
 	desc = "A dispenser of virus food."