BayMerge DLC Pack (#1355)

Ports totally;
https://github.com/Baystation12/Baystation12/pull/12389/files
Baystation12#14599
Ports partially;
Baystation12#14216 (only blob-related functions)

All the failure messages have been replaced with failure events in industrial drills, that range from probably lethal to certainly lethal and in one case just moderately annoying.

code/modules/blob/blob.dm

@@ -4,23 +4,87 @@
 	icon = 'icons/mob/blob.dmi'
 	icon_state = "blob"
 	light_range = 3
+	light_color = "#b5ff5b"
 	desc = "Some blob creature thingy"
 	density = 1
 	opacity = 0
 	anchored = 1
 	mouse_opacity = 2
+	layer = 4
 
 	var/maxHealth = 30
 	var/health
+	var/regen_rate = 5
 	var/brute_resist = 4
+	var/laser_resist = 4 // Special resist for laser based weapons - Emitters or handheld energy weaponry. Damage is divided by this and THEN by fire_resist.
 	var/fire_resist = 1
+	var/secondary_core_growth_chance = 10.0 //% chance to grow a secondary blob core instead of whatever was suposed to grown. Secondary cores are considerably weaker, but still nasty.
 	var/expandType = /obj/effect/blob
+	var/obj/effect/blob/core/parent_core = null
+	var/growth_range = 0
+	var/blob_may_process = 1
+	var/hangry = 0 //if the blob will attack or not.
 
 /obj/effect/blob/New(loc)
+	processing_objects.Add(src)
 	health = maxHealth
 	update_icon()
 	return ..(loc)
 
+/obj/effect/blob/Destroy()
+	processing_objects.Remove(src)
+	..()
+
+/obj/effect/blob/process()
+	if(!parent_core)
+		src.take_damage(5)
+		src.regen_rate = -5
+		src.growth_range = 0
+		playsound(loc, 'sound/effects/splat.ogg', 50, 1)
+		return
+
+	if(prob(70))
+		for(var/mob/living/L in src.loc)
+			if(L.stat == DEAD)
+				if(prob(10))
+					L.gib()
+					if(health < maxHealth)
+						health += rand(10,30)
+						if(health > maxHealth)
+							health = maxHealth
+				continue
+			L.visible_message("<span class='danger'>The blob absorbs \the [L]!</span>", "<span class='danger'>The blob absorbs you!</span>")
+			playsound(loc, 'sound/effects/attackblob.ogg', 50, 1)
+			L.take_organ_damage(rand(5, 10))
+			if(health < maxHealth)
+				health += rand(1,10)
+				if(health > maxHealth)
+					health = maxHealth
+			hangry += 16
+
+		for(var/mob/living/L in range(src,"3x3"))
+			if(!hangry)
+				if(L.stat == DEAD)
+					continue
+				if(prob(40))
+					L.visible_message("<span class='danger'>The blob sucks \the [L] into itself!</span>", "<span class='danger'>The blob sucks you in!</span>")
+					playsound(loc, 'sound/effects/attackblob.ogg', 50, 1)
+					L.take_organ_damage(rand(5, 10))
+					L.forceMove(src.loc)
+				else
+					L.visible_message("<span class='danger'>The blob glomps \the [L]!</span>", "<span class='danger'>The blob glomps you!</span>")
+					playsound(loc, 'sound/effects/attackblob.ogg', 50, 1)
+					L.take_organ_damage(rand(5, 20))
+					if(health < maxHealth)
+						health += rand(1,10)
+						if(health > maxHealth)
+							health = maxHealth
+				hangry += 4
+
+	hangry -= 1
+	if(hangry < 0)
+		hangry = 0
+
 /obj/effect/blob/CanPass(var/atom/movable/mover, vra/turf/target, var/height = 0, var/air_group = 0)
 	if(air_group || height == 0)
 		return 1
@@ -50,7 +114,7 @@
 		update_icon()
 
 /obj/effect/blob/proc/regen()
-	health = min(health + 1, maxHealth)
+	health = min(health + regen_rate, maxHealth)
 	update_icon()
 
 /obj/effect/blob/proc/expand(var/turf/T)
@@ -58,66 +122,51 @@
 		return
 	if(istype(T, /turf/simulated/wall))
 		var/turf/simulated/wall/SW = T
-		SW.take_damage(80)
-		return
-	var/obj/structure/girder/G = locate() in T
-	if(G)
-		if(prob(40))
-			G.dismantle()
-		return
-	var/obj/structure/window/W = locate() in T
-	if(W)
-		W.shatter()
-		return
-	var/obj/structure/grille/GR = locate() in T
-	if(GR)
-		qdel(GR)
-		return
-	for(var/obj/machinery/door/D in T) // There can be several - and some of them can be open, locate() is not suitable
-		if(D.density)
-			D.ex_act(2)
-			return
-	var/obj/structure/foamedmetal/F = locate() in T
-	if(F)
-		qdel(F)
-		return
-	var/obj/structure/inflatable/I = locate() in T
-	if(I)
-		I.deflate(1)
+		SW.ex_act(2)
 		return
 
-	var/obj/vehicle/V = locate() in T
-	if(V)
-		V.ex_act(2)
-		return
-	var/obj/machinery/bot/B = locate() in T
-	if(B)
-		B.ex_act(2)
-		return
-	var/obj/mecha/M = locate() in T
-	if(M)
-		M.visible_message("<span class='danger'>The blob attacks \the [M]!</span>")
-		M.take_damage(40)
-		return
+	for(var/obj/O in T)
+		if(O.density)
+			O.ex_act(2)
+			return
 
 	// Above things, we destroy completely and thus can use locate. Mobs are different.
 	for(var/mob/living/L in T)
 		if(L.stat == DEAD)
 			continue
-		L.visible_message("<span class='danger'>The blob attacks \the [L]!</span>", "<span class='danger'>The blob attacks you!</span>")
-		playsound(loc, 'sound/effects/attackblob.ogg', 50, 1)
-		L.take_organ_damage(rand(30, 40))
+		if(prob(30))
+			L.visible_message("<span class='danger'>The blob sucks \the [L] into itself!</span>", "<span class='danger'>The blob sucks you in!</span>")
+			playsound(loc, 'sound/effects/attackblob.ogg', 50, 1)
+			L.take_organ_damage(rand(5, 10))
+			L.forceMove(src.loc)
+		else
+			L.visible_message("<span class='danger'>The blob pulverizes \the [L]!</span>", "<span class='danger'>The blob pulverizes you!</span>")
+			playsound(loc, 'sound/effects/attackblob.ogg', 50, 1)
+			L.take_organ_damage(rand(30, 40))
+			if(health < maxHealth)
+				health += rand(1,10)
+				if(health > maxHealth)
+					health = maxHealth
 		return
-	new expandType(T, min(health, 30))
+
+	if(parent_core)
+		if(get_dist(T,src) <= parent_core.growth_range)
+			if(!(locate(/obj/effect/blob/core/) in range(T, 2)) && prob(secondary_core_growth_chance) && (parent_core.core_count < parent_core.core_limit))
+				var/obj/effect/blob/core/secondary/S = new /obj/effect/blob/core/secondary(T)
+				S.parent_core = src.parent_core
+				src.parent_core.core_count += 1
+			else
+				var/obj/effect/blob/C = new expandType(T)
+				C.parent_core = src.parent_core
 
 /obj/effect/blob/proc/pulse(var/forceLeft, var/list/dirs)
 	regen()
-	sleep(5)
+	sleep(4)
 	var/pushDir = pick(dirs)
 	var/turf/T = get_step(src, pushDir)
 	var/obj/effect/blob/B = (locate() in T)
 	if(!B)
-		if(prob(health))
+		if(prob(health+60))
 			expand(T)
 		return
 	if(forceLeft)
@@ -131,11 +180,12 @@
 		if(BRUTE)
 			take_damage(Proj.damage / brute_resist)
 		if(BURN)
-			take_damage(Proj.damage / fire_resist)
+			take_damage((Proj.damage / laser_resist) / fire_resist)
 	return 0
 
 /obj/effect/blob/attackby(var/obj/item/weapon/W, var/mob/user)
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	user.do_attack_animation(src)
 	playsound(loc, 'sound/effects/attackblob.ogg', 50, 1)
 	visible_message("<span class='danger'>\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]</span>")
 	var/damage = 0
@@ -145,6 +195,11 @@
 			if(istype(W, /obj/item/weapon/weldingtool))
 				playsound(loc, 'sound/items/Welder.ogg', 100, 1)
 		if("brute")
+			if(prob(30))
+				visible_message("<span class='danger'>\The [W] gets caught in the gelatinous folds of \the [src]</span>")
+				user.drop_from_inventory(W)
+				W.forceMove(src.loc)
+				return
 			damage = (W.force / brute_resist)
 
 	take_damage(damage)
@@ -154,26 +209,38 @@
 	name = "blob core"
 	icon = 'icons/mob/blob.dmi'
 	icon_state = "blob_core"
+	light_range = 1
+	light_power = 2
+	light_color = "#F3D203"
 	maxHealth = 200
 	brute_resist = 2
+	laser_resist = 7
+	regen_rate = 2
 	fire_resist = 2
+	var/core_count //amount of secondary cores
+	var/core_limit = 4 //for if a badmin ever wants the station to die, they can set this higher
 
 	expandType = /obj/effect/blob/shield
-	var/blob_may_process = 1
+	growth_range = 10 // Maximal distance for new blob pieces from this core.
+
+/obj/effect/blob/core/New()
+	if(!parent_core)
+		parent_core = src
+	..()
 
 /obj/effect/blob/core/update_icon()
-	return
-
-/obj/effect/blob/core/New(loc)
-	processing_objects.Add(src)
-	return ..(loc)
-
-/obj/effect/blob/core/Destroy()
-	processing_objects.Remove(src)
-	return ..()
+	var/health_percent = (health / maxHealth) * 100
+	switch(health_percent)
+		if(66 to INFINITY)
+			icon_state = "blob_core"
+		if(33 to 66)
+			icon_state = "blob_node"
+		if(-INFINITY to 33)
+			icon_state = "blob_factory"
 
 /obj/effect/blob/core/process()
 	set waitfor = 0
+	..()
 	if(!blob_may_process)
 		return
 	blob_may_process = 0
@@ -184,18 +251,42 @@
 	pulse(20, list(SOUTH, WEST))
 	blob_may_process = 1
 
+// Half the stats of a normal core. Blob has a very small probability of growing these when spreading. These will spread the blob further.
+/obj/effect/blob/core/secondary
+	name = "small blob core"
+	icon = 'icons/mob/blob.dmi'
+	icon_state = "blob_core"
+	maxHealth = 100
+	brute_resist = 1
+	fire_resist = 1
+	laser_resist = 4
+	regen_rate = 1
+	growth_range = 3
+
+/obj/effect/blob/core/secondary/New()
+	processing_objects.Add(src)
+	health = maxHealth
+	update_icon()
+	return ..(loc)
+
+/obj/effect/blob/core/secondary/Destroy()
+	if(parent_core)
+		parent_core.core_count -= 1
+	..()
+
 /obj/effect/blob/shield
 	name = "strong blob"
 	icon = 'icons/mob/blob.dmi'
 	icon_state = "blob_idle"
-	desc = "Some blob creature thingy"
+	opacity = 1
 	maxHealth = 60
 	brute_resist = 1
 	fire_resist = 2
+	laser_resist = 5
 
 /obj/effect/blob/shield/New()
-	..()
 	update_nearby_tiles()
+	..()
 
 /obj/effect/blob/shield/Destroy()
 	density = 0