Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor

# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm

code/modules/power/apc.dm

@@ -1095,7 +1095,7 @@
 				if(prob(25))
 					set_broken()
 
-/obj/machinery/power/apc/blob_act(obj/effect/blob/B)
+/obj/machinery/power/apc/blob_act(obj/structure/blob/B)
 	set_broken()
 
 /obj/machinery/power/apc/disconnect_terminal()

code/modules/power/cable.dm

@@ -93,7 +93,7 @@ By design, d1 is the smallest direction and d2 is the highest
 	cable_list -= src							//remove it from global cable list
 	return ..()									// then go ahead and delete the cable
 
-/obj/structure/cable/blob_act(obj/effect/blob/B)
+/obj/structure/cable/blob_act(obj/structure/blob/B)
 	if(invisibility != INVISIBILITY_MAXIMUM)
 		qdel(src)
 

code/modules/power/cell.dm

@@ -146,7 +146,7 @@
 					corrupt()
 
 
-/obj/item/weapon/stock_parts/cell/blob_act(obj/effect/blob/B)
+/obj/item/weapon/stock_parts/cell/blob_act(obj/structure/blob/B)
 	ex_act(1)
 
 /obj/item/weapon/stock_parts/cell/proc/get_electrocute_damage()

code/modules/power/gravitygenerator.dm

@@ -32,7 +32,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
 	if(severity == 1) // Very sturdy.
 		set_broken()
 
-/obj/machinery/gravity_generator/blob_act(obj/effect/blob/B)
+/obj/machinery/gravity_generator/blob_act(obj/structure/blob/B)
 	if(prob(20))
 		set_broken()
 

code/modules/power/lighting.dm

@@ -116,7 +116,7 @@
 				return
 	return ..()
 
-/obj/machinery/light_construct/blob_act(obj/effect/blob/B)
+/obj/machinery/light_construct/blob_act(obj/structure/blob/B)
 	if(B && B.loc == loc)
 		qdel(src)
 
@@ -529,7 +529,7 @@
 				if(prob(25))
 					broken()
 
-/obj/machinery/light/blob_act(obj/effect/blob/B)
+/obj/machinery/light/blob_act(obj/structure/blob/B)
 	if(B && B.loc == loc)
 		broken()
 		qdel(src)

code/modules/power/rtg.dm

@@ -133,7 +133,7 @@
 		log_game("[key_name(Proj.firer)] triggered an Abductor Core explosion via projectile.")
 		overload()
 
-/obj/machinery/power/rtg/abductor/blob_act(obj/effect/blob/B)
+/obj/machinery/power/rtg/abductor/blob_act(obj/structure/blob/B)
 	overload()
 
 /obj/machinery/power/rtg/abductor/ex_act()

code/modules/power/singularity/containment_field.dm

@@ -27,7 +27,7 @@
 		return 1
 
 
-/obj/machinery/field/containment/blob_act(obj/effect/blob/B)
+/obj/machinery/field/containment/blob_act(obj/structure/blob/B)
 	return 0
 
 

code/modules/power/singularity/field_generator.dm

@@ -147,7 +147,7 @@ field_generator power level display
 	return 0
 
 
-/obj/machinery/field/generator/blob_act(obj/effect/blob/B)
+/obj/machinery/field/generator/blob_act(obj/structure/blob/B)
 	if(active)
 		return 0
 	else

code/modules/power/singularity/particle_accelerator/particle_accelerator.dm

@@ -149,7 +149,7 @@
 		master.toggle_power()
 		investigate_log("was moved whilst active; it <font color='red'>powered down</font>.","singulo")
 
-/obj/structure/particle_accelerator/blob_act(obj/effect/blob/B)
+/obj/structure/particle_accelerator/blob_act(obj/structure/blob/B)
 	if(prob(50))
 		qdel(src)
 

code/modules/power/singularity/particle_accelerator/particle_control.dm

@@ -320,7 +320,7 @@
 
 	..()
 
-/obj/machinery/particle_accelerator/control_box/blob_act(obj/effect/blob/B)
+/obj/machinery/particle_accelerator/control_box/blob_act(obj/structure/blob/B)
 	if(prob(50))
 		qdel(src)
 

code/modules/power/singularity/singularity.dm

@@ -63,7 +63,7 @@
 /obj/singularity/Process_Spacemove() //The singularity stops drifting for no man!
 	return 0
 
-/obj/singularity/blob_act(obj/effect/blob/B)
+/obj/singularity/blob_act(obj/structure/blob/B)
 	return
 
 /obj/singularity/ex_act(severity, target)

code/modules/power/smes.dm

@@ -177,7 +177,7 @@
 
 	return ..()
 
-/obj/machinery/power/smes/deconstruction()
+/obj/machinery/power/smes/on_deconstruction()
 	for(var/obj/item/weapon/stock_parts/cell/cell in component_parts)
 		cell.charge = (charge / capacity) * cell.maxcharge
 

code/modules/power/solar.dm

@@ -537,7 +537,7 @@
 			if(3)
 				take_damage(rand(10,20), BRUTE, 0)
 
-/obj/machinery/power/solar_control/blob_act(obj/effect/blob/B)
+/obj/machinery/power/solar_control/blob_act(obj/structure/blob/B)
 	if (prob(75))
 		set_broken()
 		src.density = 0

code/modules/power/supermatter/supermatter.dm

@@ -242,7 +242,7 @@
 	qdel(src)
 	return(gain)
 
-/obj/machinery/power/supermatter_shard/blob_act(obj/effect/blob/B)
+/obj/machinery/power/supermatter_shard/blob_act(obj/structure/blob/B)
 	if(B && !istype(loc, /turf/open/space)) //does nothing in space
 		playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
 		damage += B.health * 0.5 //take damage equal to 50% of remaining blob health before it tried to eat us
@@ -321,7 +321,7 @@
 		investigate_log("has consumed [key_name(user)].", "supermatter")
 		user.dust()
 		power += 200
-	else if(isobj(AM) && (!istype(AM, /obj/effect) || istype(AM, /obj/effect/blob)))
+	else if(isobj(AM) && !istype(AM, /obj/effect))
 		investigate_log("has consumed [AM].", "supermatter")
 		qdel(AM)
 

code/modules/power/tesla/energy_ball.dm

@@ -166,7 +166,7 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
 	var/mob/living/closest_mob
 	var/obj/machinery/closest_machine
 	var/obj/structure/closest_structure
-	var/obj/effect/blob/closest_blob
+	var/obj/structure/blob/closest_blob
 
 	for(var/A in oview(source, zap_range+2))
 		if(istype(A, /obj/machinery/power/tesla_coil))
@@ -216,8 +216,8 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
 		else if(closest_mob)
 			continue
 
-		else if(istype(A, /obj/effect/blob))
-			var/obj/effect/blob/B = A
+		else if(istype(A, /obj/structure/blob))
+			var/obj/structure/blob/B = A
 			var/dist = get_dist(source, A)
 			if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !B.being_shocked)
 				closest_blob = B