Merge pull request #13143 from Anonus/blobactors

Fixes up blob_act()

code/game/machinery/camera/camera.dm

@@ -1,4 +1,4 @@
-#define CAMERA_UPGRADE_XRAY 1 
+#define CAMERA_UPGRADE_XRAY 1
 #define CAMERA_UPGRADE_EMP_PROOF 2
 #define CAMERA_UPGRADE_MOTION 4
 
@@ -107,10 +107,6 @@
 		..()
 	return
 
-/obj/machinery/camera/blob_act()
-	qdel(src)
-	return
-
 /obj/machinery/camera/proc/setViewRange(num = 7)
 	src.view_range = num
 	cameranet.updateVisibility(src, 0)

code/game/machinery/computer/computer.dm

@@ -64,13 +64,6 @@
 			set_broken()
 	..()
 
-
-/obj/machinery/computer/blob_act()
-	if (prob(75))
-		verbs.Cut()
-		set_broken()
-		density = 0
-
 /obj/machinery/computer/update_icon()
 	overlays.Cut()
 	if(stat & NOPOWER)

code/game/machinery/dna_scanner.dm

@@ -110,7 +110,7 @@
 			|| locate(/obj/machinery/computer/cloning, get_step(src, WEST)))
 
 			occupant.notify_ghost_cloning("Your corpse has been placed into a cloning scanner. Re-enter your corpse if you want to be cloned!", source = src)
-		
+
 		var/obj/machinery/computer/scan_consolenew/console
 		for(dir in list(NORTH,EAST,SOUTH,WEST))
 			console = locate(/obj/machinery/computer/scan_consolenew, get_step(src, dir))
@@ -167,8 +167,4 @@
 	if(..(user,1,0)) //don't set the machine, since there's no dialog
 		return
 
-	toggle_open(user)
-
-/obj/machinery/dna_scannernew/blob_act()
-	if(prob(75))
-		qdel(src)
+	toggle_open(user)

code/game/machinery/hologram.dm

@@ -230,10 +230,6 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 				qdel(src)
 	return
 
-/obj/machinery/hologram/blob_act()
-	qdel(src)
-	return
-
 /obj/machinery/hologram/holopad/Destroy()
 	for (var/mob/living/silicon/ai/master in masters)
 		clear_holo(master)

code/game/machinery/machinery.dm

@@ -188,7 +188,9 @@ Class Procs:
 	update_icon()
 
 /obj/machinery/blob_act()
-	if(prob(50))
+	if(!density)
+		qdel(src)
+	if(prob(75))
 		qdel(src)
 
 /obj/machinery/proc/auto_use_power()

code/game/machinery/vending.dm

@@ -113,10 +113,8 @@
 			malfunction()
 
 /obj/machinery/vending/blob_act()
-	if(prob(75))
-		malfunction()
-	else
-		qdel(src)
+	malfunction()
+	..()
 
 
 /obj/machinery/vending/proc/build_inventory(list/productlist, hidden=0, req_coin=0, start_empty = null)

code/game/objects/structures.dm

@@ -12,6 +12,8 @@
 		cameranet.updateVisibility(src)
 
 /obj/structure/blob_act()
+	if(!density)
+		qdel(src)
 	if(prob(50))
 		qdel(src)
 

code/game/objects/structures/beds_chairs/bed.dm

@@ -53,10 +53,9 @@
 				return
 
 /obj/structure/bed/blob_act()
-	if(prob(75))
-		if(buildstacktype)
-			new buildstacktype(loc, buildstackamount)
-		qdel(src)
+	if(buildstacktype)
+		new buildstacktype(loc, buildstackamount)
+	qdel(src)
 
 /obj/structure/bed/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/wrench))

code/game/objects/structures/fireaxe.dm

@@ -69,9 +69,9 @@
 		update_icon()
 
 /obj/structure/fireaxecabinet/blob_act()
-	if(prob(75) && fireaxe)
+	if(fireaxe)
 		fireaxe.loc = src.loc
-		qdel(src)
+	qdel(src)
 
 /obj/structure/fireaxecabinet/attack_hand(mob/user)
 	if(open || glass_hp <= 0)

code/game/objects/structures/lattice.dm

@@ -24,7 +24,6 @@
 	stored = new/obj/item/stack/rods(src)
 
 /obj/structure/lattice/blob_act()
-	qdel(src)
 	return
 
 /obj/structure/lattice/ex_act(severity, target)

code/modules/power/apc.dm

@@ -1167,10 +1167,7 @@
 					set_broken()
 
 /obj/machinery/power/apc/blob_act()
-	if (prob(75))
-		set_broken()
-		if (cell && prob(5))
-			cell.blob_act()
+	set_broken()
 
 /obj/machinery/power/apc/disconnect_terminal()
 	if(terminal)

code/modules/power/engine.dm

@@ -13,11 +13,4 @@
 			if(prob(50))
 				ChangeTurf(src.baseturf)
 		else
-			return
-
-/turf/simulated/floor/engine/blob_act()
-	if (prob(25))
-		ChangeTurf(src.baseturf)
-		qdel(src)
-		return
-	return
+			return

code/modules/power/lighting.dm

@@ -524,14 +524,6 @@
 				if(prob(25))
 					broken()
 
-//blob effect
-
-/obj/machinery/light/blob_act()
-	if(prob(75))
-		broken()
-
-
-
 // called when area power state changes
 /obj/machinery/light/power_change()
 	var/area/A = get_area(src)

code/modules/power/solar.dm

@@ -75,13 +75,6 @@
 		src.healthcheck()
 	..()
 
-
-/obj/machinery/power/solar/blob_act()
-	src.health--
-	src.healthcheck()
-	return
-
-
 /obj/machinery/power/solar/proc/healthcheck()
 	if (src.health <= 0)
 		if(!(stat & BROKEN))
@@ -155,12 +148,6 @@
 				if(prob(25) && broken())
 					new /obj/item/weapon/shard(src.loc)
 
-/obj/machinery/power/solar/blob_act()
-	if(prob(75))
-		broken()
-		src.density = 0
-
-
 /obj/machinery/power/solar/fake/New(var/turf/loc, var/obj/item/solar_assembly/S)
 	..(loc, S, 0)