Merge remote-tracking branch 'upstream/dev' into xenomorphs

Conflicts:
	code/game/objects/effects/aliens.dm
	code/game/objects/structures/lamarr_cage.dm

code/game/objects/structures/alien/alien.dm

@@ -30,11 +30,6 @@
 	healthcheck()
 	return
 
-/obj/structure/alien/blob_act()
-	health-=50
-	healthcheck()
-	return
-
 /obj/structure/alien/hitby(AM as mob|obj)
 	..()
 	visible_message("<span class='danger'>\The [src] was hit by \the [AM].</span>")

code/game/objects/structures/crates_lockers/closets.dm

@@ -196,13 +196,6 @@
 
 	return
 
-// this should probably use dump_contents()
-/obj/structure/closet/blob_act()
-	if(prob(75))
-		for(var/atom/movable/A as mob|obj in src)
-			A.forceMove(src.loc)
-		qdel(src)
-
 /obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(src.opened)
 		if(istype(W, /obj/item/weapon/grab))

code/game/objects/structures/crates_lockers/closets/statue.dm

@@ -96,10 +96,6 @@
 		for(var/mob/M in src)
 			shatter(M)
 
-/obj/structure/closet/statue/blob_act()
-	for(var/mob/M in src)
-		shatter(M)
-
 /obj/structure/closet/statue/ex_act(severity)
 	for(var/mob/M in src)
 		M.ex_act(severity)

code/game/objects/structures/displaycase.dm

@@ -34,15 +34,6 @@
 	src.healthcheck()
 	return
 
-
-/obj/structure/displaycase/blob_act()
-	if (prob(75))
-		new /obj/item/weapon/material/shard( src.loc )
-		if (occupied)
-			new /obj/item/weapon/gun/energy/captain( src.loc )
-			occupied = 0
-		qdel(src)
-
 /obj/structure/displaycase/proc/healthcheck()
 	if (src.health <= 0)
 		if (!( src.destroyed ))

code/game/objects/structures/girders.dm

@@ -202,10 +202,6 @@
 		return
 	return ..()
 
-/obj/structure/girder/blob_act()
-	if(prob(40))
-		qdel(src)
-
 
 /obj/structure/girder/ex_act(severity)
 	switch(severity)

code/game/objects/structures/grille.dm

@@ -16,9 +16,6 @@
 /obj/structure/grille/ex_act(severity)
 	qdel(src)
 
-/obj/structure/grille/blob_act()
-	qdel(src)
-
 /obj/structure/grille/update_icon()
 	if(destroyed)
 		icon_state = "[initial(icon_state)]-b"

code/game/objects/structures/inflatable.dm

@@ -60,9 +60,6 @@
 				deflate(1)
 				return
 
-/obj/structure/inflatable/blob_act()
-	deflate(1)
-
 /obj/structure/inflatable/attack_hand(mob/user as mob)
 		add_fingerprint(user)
 		return

code/game/objects/structures/lattice.dm

@@ -34,10 +34,6 @@
 			L.updateOverlays(src.loc)
 	..()
 
-/obj/structure/lattice/blob_act()
-	qdel(src)
-	return
-
 /obj/structure/lattice/ex_act(severity)
 	switch(severity)
 		if(1.0)

code/game/objects/structures/safe.dm

@@ -160,10 +160,6 @@ FLOOR SAFES
 			return
 
 
-obj/structure/safe/blob_act()
-	return
-
-
 obj/structure/safe/ex_act(severity)
 	return
 

code/game/objects/structures/signs.dm

@@ -19,10 +19,6 @@
 		else
 	return
 
-/obj/structure/sign/blob_act()
-	qdel(src)
-	return
-
 /obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob)	//deconstruction
 	if(istype(tool, /obj/item/weapon/screwdriver) && !istype(src, /obj/structure/sign/double))
 		user << "You unfasten the sign with your [tool]."

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

@@ -86,11 +86,6 @@
 				qdel(src)
 				return
 
-/obj/structure/bed/blob_act()
-	if(prob(75))
-		material.place_sheet(get_turf(src))
-		qdel(src)
-
 /obj/structure/bed/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/wrench))
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)

code/game/objects/structures/stool_bed_chair_nest/stools.dm

@@ -95,11 +95,6 @@ var/global/list/stool_cache = list() //haha stool
 				qdel(src)
 				return
 
-/obj/item/weapon/stool/blob_act()
-	if(prob(75))
-		material.place_sheet(get_turf(src))
-		qdel(src)
-
 /obj/item/weapon/stool/proc/dismantle()
 	if(material)
 		material.place_sheet(get_turf(src))

code/game/objects/structures/window.dm

@@ -122,10 +122,6 @@
 				shatter(0)
 				return
 
-
-/obj/structure/window/blob_act()
-	shatter()
-
 //TODO: Make full windows a separate type of window.
 //Once a full window, it will always be a full window, so there's no point
 //having the same type for both.