Merge remote-tracking branch 'upstream/master'

code/modules/antagonists/_common/antag_datum.dm

@@ -96,6 +96,7 @@ GLOBAL_LIST_EMPTY(antagonists)
 
 //Proc called when the datum is given to a mind.
 /datum/antagonist/proc/on_gain()
+	set waitfor = FALSE
 	if(!(owner?.current))
 		return
 	if(!silent)

code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm

@@ -225,18 +225,22 @@
 	return ..()
 
 /obj/effect/clockwork/sigil/transmission/process()
-    var/power_drained = 0
-    var/power_mod = 0.005
-    for(var/t in spiral_range_turfs(SIGIL_ACCESS_RANGE, src))
-        var/turf/T = t
-        for(var/M in T)
-            var/atom/movable/A = M
-            power_drained += A.power_drain(TRUE)
+	do_process()
 
-        CHECK_TICK
+/obj/effect/clockwork/sigil/transmission/proc/do_process()
+	set waitfor = FALSE
+	var/power_drained = 0
+	var/power_mod = 0.005
+	for(var/t in spiral_range_turfs(SIGIL_ACCESS_RANGE, src))
+		var/turf/T = t
+		for(var/M in T)
+			var/atom/movable/A = M
+			power_drained += A.power_drain(TRUE)
 
-    adjust_clockwork_power(power_drained * power_mod * 15)
-    new /obj/effect/temp_visual/ratvar/sigil/transmission(loc, 1 + (power_drained * 0.0035))
+		CHECK_TICK
+
+	adjust_clockwork_power(power_drained * power_mod * 15)
+	new /obj/effect/temp_visual/ratvar/sigil/transmission(loc, 1 + (power_drained * 0.0035))
 
 /obj/effect/clockwork/sigil/transmission/proc/charge_cyborg(mob/living/silicon/robot/cyborg)
 	if(!cyborg_checks(cyborg))

code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm

@@ -246,6 +246,36 @@
 				if(GATEWAY_RATVAR_COMING to INFINITY)
 					. += "<span class='boldwarning'>The anomaly is stable! Something is coming through!</span>"
 
+/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/fulfill_purpose()
+	set waitfor = FALSE
+	countdown.stop()
+	resistance_flags |= INDESTRUCTIBLE
+	purpose_fulfilled = TRUE
+	make_glow()
+	animate(glow, transform = matrix() * 1.5, alpha = 255, time = 125)
+	sound_to_playing_players(volume = 100, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/ratvar_rises.ogg')) //End the sounds
+	sleep(125)
+	make_glow()
+	animate(glow, transform = matrix() * 3, alpha = 0, time = 5)
+	QDEL_IN(src, 3)
+	sleep(3)
+	GLOB.clockwork_gateway_activated = TRUE
+	var/turf/T = SSmapping.get_station_center()
+	new /obj/structure/destructible/clockwork/massive/ratvar(T)
+	var/x0 = T.x
+	var/y0 = T.y
+	for(var/I in spiral_range_turfs(255, T, tick_checked = TRUE))
+		var/turf/T2 = I
+		if(!T2)
+			continue
+		var/dist = cheap_hypotenuse(T2.x, T2.y, x0, y0)
+		if(dist < 100)
+			dist = TRUE
+		else
+			dist = FALSE
+		T.ratvar_act(dist)
+		CHECK_TICK
+
 /obj/structure/destructible/clockwork/massive/celestial_gateway/process()
 	adjust_clockwork_power(2.5) //Provides weak power generation on its own
 	if(seconds_until_activation)
@@ -306,33 +336,7 @@
 			glow.icon_state = "clockwork_gateway_closing"
 		if(GATEWAY_RATVAR_ARRIVAL to INFINITY)
 			if(!purpose_fulfilled)
-				countdown.stop()
-				resistance_flags |= INDESTRUCTIBLE
-				purpose_fulfilled = TRUE
-				make_glow()
-				animate(glow, transform = matrix() * 1.5, alpha = 255, time = 125)
-				sound_to_playing_players(volume = 100, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/ratvar_rises.ogg')) //End the sounds
-				sleep(125)
-				make_glow()
-				animate(glow, transform = matrix() * 3, alpha = 0, time = 5)
-				QDEL_IN(src, 3)
-				sleep(3)
-				GLOB.clockwork_gateway_activated = TRUE
-				var/turf/T = SSmapping.get_station_center()
-				new /obj/structure/destructible/clockwork/massive/ratvar(T)
-				var/x0 = T.x
-				var/y0 = T.y
-				for(var/I in spiral_range_turfs(255, T, tick_checked = TRUE))
-					var/turf/T2 = I
-					if(!T2)
-						continue
-					var/dist = cheap_hypotenuse(T2.x, T2.y, x0, y0)
-					if(dist < 100)
-						dist = TRUE
-					else
-						dist = FALSE
-					T.ratvar_act(dist)
-					CHECK_TICK
+				fulfill_purpose()
 
 //Converts nearby turfs into their clockwork equivalent, with ever-increasing range the closer the ark is to summoning Ratvar
 /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/conversion_pulse()

code/modules/antagonists/clockcult/clock_structures/prolonging_prism.dm

@@ -60,12 +60,8 @@
 		delay_remaining += PRISM_DELAY_DURATION
 		toggle(0, user)
 
-/obj/structure/destructible/clockwork/powered/prolonging_prism/process()
-	var/turf/own_turf = get_turf(src)
-	if(SSshuttle.emergency.mode != SHUTTLE_CALL || delay_remaining <= 0 || !own_turf || !is_station_level(own_turf.z))
-		forced_disable(FALSE)
-		return
-	. = ..()
+/obj/structure/destructible/clockwork/powered/prolonging_prism/proc/do_process()
+	set waitfor = FALSE
 	var/delay_amount = 40
 	delay_remaining -= delay_amount
 	var/efficiency = get_efficiency_mod()
@@ -114,6 +110,14 @@
 				new /obj/effect/temp_visual/ratvar/prolonging_prism(T)
 		CHECK_TICK //we may be going over a hell of a lot of turfs
 
+/obj/structure/destructible/clockwork/powered/prolonging_prism/process()
+	var/turf/own_turf = get_turf(src)
+	if(SSshuttle.emergency.mode != SHUTTLE_CALL || delay_remaining <= 0 || !own_turf || !is_station_level(own_turf.z))
+		forced_disable(FALSE)
+		return
+	. = ..()
+	do_process()
+
 /obj/structure/destructible/clockwork/powered/prolonging_prism/proc/get_delay_cost()
 	return FLOOR(delay_cost, MIN_CLOCKCULT_POWER)
 

code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm

@@ -110,6 +110,7 @@
 
 //Put me in Reebe, will you? Ratvar has found and is going to do a hecking murder on Nar'Sie
 /obj/structure/destructible/clockwork/massive/ratvar/proc/clash_of_the_titans(obj/singularity/narsie/narsie)
+	set waitfor = FALSE
 	var/winner = "Undeclared"
 	var/base_victory_chance = 1
 	while(src && narsie)

code/modules/antagonists/cult/cult_structures.dm

@@ -204,26 +204,31 @@
 	STOP_PROCESSING(SSfastprocess, src)
 	return ..()
 
+/obj/structure/destructible/cult/pylon/proc/heal_friends()
+	set waitfor = FALSE
+	for(var/mob/living/L in range(5, src))
+		if(iscultist(L) || isshade(L) || isconstruct(L))
+			if(L.health != L.maxHealth)
+				new /obj/effect/temp_visual/heal(get_turf(src), "#960000")
+				if(ishuman(L))
+					L.adjustBruteLoss(-1, 0, only_organic = FALSE)
+					L.adjustFireLoss(-1, 0, only_organic = FALSE)
+					L.updatehealth()
+				if(isshade(L) || isconstruct(L))
+					var/mob/living/simple_animal/M = L
+					if(M.health < M.maxHealth)
+						M.adjustHealth(-3)
+			if(ishuman(L) && L.blood_volume < (BLOOD_VOLUME_NORMAL * L.blood_ratio))
+				L.blood_volume += 1.0
+		CHECK_TICK
+
+
 /obj/structure/destructible/cult/pylon/process()
 	if(!anchored)
 		return
 	if(last_heal <= world.time)
 		last_heal = world.time + heal_delay
-		for(var/mob/living/L in range(5, src))
-			if(iscultist(L) || isshade(L) || isconstruct(L))
-				if(L.health != L.maxHealth)
-					new /obj/effect/temp_visual/heal(get_turf(src), "#960000")
-					if(ishuman(L))
-						L.adjustBruteLoss(-1, 0, only_organic = FALSE)
-						L.adjustFireLoss(-1, 0, only_organic = FALSE)
-						L.updatehealth()
-					if(isshade(L) || isconstruct(L))
-						var/mob/living/simple_animal/M = L
-						if(M.health < M.maxHealth)
-							M.adjustHealth(-3)
-				if(ishuman(L) && L.blood_volume < (BLOOD_VOLUME_NORMAL * L.blood_ratio))
-					L.blood_volume += 1.0
-			CHECK_TICK
+		heal_friends()
 	if(last_corrupt <= world.time)
 		var/list/validturfs = list()
 		var/list/cultturfs = list()

code/modules/antagonists/devil/devil.dm

@@ -515,7 +515,6 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
 		var/mob/living/silicon/robot_devil = owner.current
 		var/laws = list("You may not use violence to coerce someone into selling their soul.", "You may not directly and knowingly physically harm a devil, other than yourself.", GLOB.lawlorify[LAW][ban], GLOB.lawlorify[LAW][obligation], "Accomplish your objectives at all costs.")
 		robot_devil.set_law_sixsixsix(laws)
-	sleep(10)
 	if(owner.assigned_role == "Clown" && ishuman(owner.current))
 		var/mob/living/carbon/human/S = owner.current
 		to_chat(S, "<span class='notice'>Your infernal nature has allowed you to overcome your clownishness.</span>")

code/modules/antagonists/traitor/equipment/Malf_Modules.dm

@@ -401,6 +401,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 		next_announce += DOOMSDAY_ANNOUNCE_INTERVAL
 
 /obj/machinery/doomsday_device/proc/detonate()
+	set waitfor = FALSE
 	sound_to_playing_players('sound/machines/alarm.ogg')
 	sleep(100)
 	for(var/i in GLOB.mob_living_list)

code/modules/arousal/arousal.dm

@@ -197,6 +197,7 @@
 
 //Here's the main proc itself
 /mob/living/carbon/human/proc/mob_climax(forced_climax=FALSE,cause = "") //Forced is instead of the other proc, makes you cum if you have the tools for it, ignoring restraints
+	set waitfor = FALSE
 	if(mb_cd_timer > world.time)
 		if(!forced_climax) //Don't spam the message to the victim if forced to come too fast
 			to_chat(src, "<span class='warning'>You need to wait [DisplayTimeText((mb_cd_timer - world.time), TRUE)] before you can do that again!</span>")

code/modules/assembly/infrared.dm

@@ -81,6 +81,7 @@
 		return
 
 /obj/item/assembly/infra/proc/refreshBeam()
+	set waitfor = FALSE
 	QDEL_LIST(beams)
 	if(throwing || !on || !secured)
 		return

code/modules/events/portal_storm.dm

@@ -56,7 +56,10 @@
 	next_boss_spawn = startWhen + CEILING(2 * number_of_hostiles / number_of_bosses, 1)
 
 /datum/round_event/portal_storm/announce(fake)
-	set waitfor = 0
+	do_announce()
+
+/datum/round_event/portal_storm/proc/do_announce()
+	set waitfor = FALSE
 	sound_to_playing_players('sound/magic/lightning_chargeup.ogg')
 	sleep(80)
 	priority_announce("Massive bluespace anomaly detected en route to [station_name()]. Brace for impact.")

code/modules/events/wizard/fakeexplosion.dm

@@ -7,5 +7,4 @@
 
 /datum/round_event/wizard/fake_explosion/start()
 	sound_to_playing_players('sound/machines/alarm.ogg')
-	sleep(100)
-	Cinematic(CINEMATIC_NUKE_FAKE,world)
+	addtimer(CALLBACK(GLOBAL_PROC,.proc/Cinematic, CINEMATIC_NUKE_FAKE, world), 100)

code/modules/fields/fields.dm

@@ -64,7 +64,8 @@
 		pass = FALSE
 	return pass
 
-/datum/proximity_monitor/advanced/process()
+/datum/proximity_monitor/advanced/proc/lag_checked_process()
+	set waitfor = FALSE
 	if(process_inner_turfs)
 		for(var/turf/T in field_turfs)
 			process_inner_turf(T)
@@ -72,7 +73,10 @@
 	if(process_edge_turfs)
 		for(var/turf/T in edge_turfs)
 			process_edge_turf(T)
-			CHECK_TICK	//Same here.
+			CHECK_TICK		//Same here.
+
+/datum/proximity_monitor/advanced/process()
+	lag_checked_process()
 
 /datum/proximity_monitor/advanced/proc/process_inner_turf(turf/T)
 

code/modules/hydroponics/hydroponics.dm

@@ -391,6 +391,7 @@
 	mutate(4, 10, 2, 4, 50, 4, 10, 3)
 
 /obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant!
+	set waitfor = FALSE
 	if(!myseed || dead)
 		return
 

code/modules/mining/machine_redemption.dm

@@ -145,8 +145,11 @@
 			D.createmessage("Ore Redemption Machine", "New minerals available!", msg, 1, 0)
 
 /obj/machinery/mineral/ore_redemption/process()
-	if(!materials.mat_container || panel_open || !powered())
-		return
+	if(materials.mat_container && !panel_open && powered())
+		process_all_ores()
+
+/obj/machinery/mineral/ore_redemption/proc/process_all_ores()
+	set waitfor = FALSE
 	var/atom/input = get_step(src, input_dir)
 	var/obj/structure/ore_box/OB = locate() in input
 	if(OB)
@@ -165,6 +168,7 @@
 	else if(!message_sent)
 		send_console_message()
 
+
 /obj/machinery/mineral/ore_redemption/attackby(obj/item/W, mob/user, params)
 	if(default_unfasten_wrench(user, W))
 		return

code/modules/mining/machine_unloading.dm

@@ -10,22 +10,25 @@
 	output_dir = EAST
 	speed_process = TRUE
 
-/obj/machinery/mineral/unloading_machine/process()
-	var/turf/T = get_step(src,input_dir)
-	if(T)
-		var/limit
-		for(var/obj/structure/ore_box/B in T)
-			for (var/obj/item/stack/ore/O in B)
-				B.contents -= O
-				unload_mineral(O)
-				limit++
-				if (limit>=10)
-					return
-				CHECK_TICK
-			CHECK_TICK
-		for(var/obj/item/I in T)
-			unload_mineral(I)
+/obj/machinery/mineral/unloading_machine/proc/horrible_quadratic_monster(var/turf/T)
+	set waitfor = FALSE
+	var/limit = 0
+	for(var/obj/structure/ore_box/B in T)
+		for (var/obj/item/stack/ore/O in B)
+			B.contents -= O
+			unload_mineral(O)
 			limit++
 			if (limit>=10)
 				return
 			CHECK_TICK
+	for(var/obj/item/I in T)
+		unload_mineral(I)
+		limit++
+		if (limit>=10)
+			return
+		CHECK_TICK
+
+/obj/machinery/mineral/unloading_machine/process()
+	var/turf/T = get_step(src,input_dir)
+	if(T)
+		horrible_quadratic_monster(T)

code/modules/mining/mint.dm

@@ -64,8 +64,6 @@
 			if(materials.use_amount_mat(coin_mat, chosen))
 				for(var/coin_to_make in 1 to 5)
 					create_coins()
-					produced_coins++
-					CHECK_TICK
 			else
 				var/found_new = FALSE
 				for(var/datum/material/inserted_material in materials.materials)
@@ -131,6 +129,7 @@
 		return TRUE
 
 /obj/machinery/mineral/mint/proc/create_coins()
+	set waitfor = FALSE
 	var/turf/T = get_step(src,output_dir)
 	var/temp_list = list()
 	temp_list[chosen] = 400
@@ -143,3 +142,5 @@
 			O.forceMove(bag_to_use) //don't bother sending the signal, the new bag is empty and all that.
 
 		SSblackbox.record_feedback("amount", "coins_minted", 1)
+	produced_coins++
+	CHECK_TICK

code/modules/mob/living/silicon/ai/ai.dm

@@ -182,6 +182,7 @@
 	. = ..()
 
 /mob/living/silicon/ai/proc/set_core_display_icon(input, client/C)
+	set waitfor = FALSE
 	if(client && !C)
 		C = client
 	if(!input && !C?.prefs?.preferred_ai_core_display)

code/modules/mob/living/simple_animal/hostile/bosses/boss.dm

@@ -133,6 +133,10 @@
 	chance_to_hold_onto_points = highest_cost*0.5
 	if(points != max_points && prob(chance_to_hold_onto_points))
 		return //Let's save our points for a better ability (unless we're at max points, in which case we can't save anymore!)
+	do_ability()
+
+/datum/boss_active_timed_battle/proc/do_ability()
+	set waitfor = FALSE
 	if(!boss.client)
 		abilities = shuffle(abilities)
 	for(var/ab in abilities)

code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm

@@ -102,23 +102,13 @@
 		consume_bait()
 
 /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/proc/consume_bait()
-	var/list/L = list()
-	for(var/obj/O in view(src, 9))
-		L += O
-	var/obj/item/stack/ore/diamond/diamonds = locate(/obj/item/stack/ore/diamond) in L
-	if(diamonds)
-		var/distanced = 0
-		distanced = get_dist(loc,diamonds.loc)
-		if(distanced <= 1 && diamonds)
-			qdel(diamonds)
-			src.visible_message("<span class='notice'>[src] consumes [diamonds], and it disappears! ...At least, you think.</span>")
-	var/obj/item/pen/survival/bait = locate(/obj/item/pen/survival) in L
-	if(bait)
-		var/distanceb = 0
-		distanceb = get_dist(loc,bait.loc)
-		if(distanceb <= 1 && bait)
-			qdel(bait)
-			visible_message("<span class='notice'>[src] examines [bait] closer, and telekinetically shatters the pen.</span>")
+	for(var/obj/O in view(1, src))
+		if(istype(O, /obj/item/stack/ore/diamond))
+			qdel(O)
+			src.visible_message("<span class='notice'>[src] consumes [O], and it disappears! ...At least, you think.</span>")
+		else if(istype(O, /obj/item/pen/survival))
+			qdel(O)
+			src.visible_message("<span class='notice'>[src] examines [O] closer, and telekinetically shatters the pen.</span>")
 
 /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random/Initialize()
 	. = ..()

code/modules/mob/mob_movement.dm

@@ -95,7 +95,7 @@
 	. = ..()
 
 	if((direction & (direction - 1)) && mob.loc == n) //moved diagonally successfully
-		add_delay *= 2
+		add_delay *= SQRT_2
 	mob.set_glide_size(DELAY_TO_GLIDE_SIZE(add_delay), FALSE)
 	move_delay += add_delay
 	if(.) // If mob is null here, we deserve the runtime

code/modules/modular_computers/computers/item/computer.dm

@@ -349,6 +349,7 @@
 
 // Relays kill program request to currently active program. Use this to quit current program.
 /obj/item/modular_computer/proc/kill_program(forced = FALSE)
+	set waitfor = FALSE
 	if(active_program)
 		active_program.kill_program(forced)
 		active_program = null

code/modules/reagents/chemistry/recipes.dm

@@ -40,6 +40,7 @@
 
 
 /datum/chemical_reaction/proc/on_reaction(datum/reagents/holder, multiplier, specialreact)
+	set waitfor = FALSE
 	return
 	//I recommend you set the result amount to the total volume of all components.
 

code/modules/reagents/reagent_containers/spray.dm

@@ -16,7 +16,7 @@
 	var/stream_mode = 0 //whether we use the more focused mode
 	var/current_range = 3 //the range of tiles the sprayer will reach.
 	var/spray_range = 3 //the range of tiles the sprayer will reach when in spray mode.
-	var/stream_range = 1 //the range of tiles the sprayer will reach when in stream mode.
+	var/stream_range = 3 //the range of tiles the sprayer will reach when in stream mode.
 	var/stream_amount = 10 //the amount of reagents transfered when in stream mode.
 	/// Amount of time it takes for a spray to completely travel.
 	var/spray_delay = 8
@@ -74,19 +74,18 @@
 		return
 	var/range = clamp(get_dist(src, A), 1, current_range)
 	var/wait_step = CEILING(spray_delay * INVERSE(range), world.tick_lag)
-	var/obj/effect/decal/chempuff/D = new /obj/effect/decal/chempuff(get_turf(src), stream_mode, wait_step, range, stream_mode? 1 : range)
+	var/obj/effect/decal/chempuff/D = new /obj/effect/decal/chempuff(get_turf(src), stream_mode, wait_step, range, stream_mode? 1 : range, amount_per_transfer_from_this)
 	var/turf/T = get_turf(src)
 	if(!T)
 		return
 	log_reagent("SPRAY: [key_name(usr)] fired [src] ([REF(src)]) [COORD(T)] at [A] ([REF(A)]) [COORD(A)] (chempuff: [D.reagents.log_list()])")
-	D.create_reagents(amount_per_transfer_from_this, NONE, NO_REAGENTS_VALUE)
 	if(stream_mode)
 		reagents.trans_to(D, amount_per_transfer_from_this)
 	else
 		reagents.trans_to(D, amount_per_transfer_from_this, 1/range)
-	D.color = mix_color_from_reagents(D.reagents.reagent_list)
+	D.add_atom_colour(mix_color_from_reagents(D.reagents.reagent_list), TEMPORARY_COLOUR_PRIORITY)
 	last_spray = world.time
-	D.run_puff(A)
+	INVOKE_ASYNC(D, /obj/effect/decal/chempuff/proc/run_puff, A)
 
 /obj/item/reagent_containers/spray/attack_self(mob/user)
 	stream_mode = !stream_mode

code/modules/recycling/conveyor2.dm

@@ -268,16 +268,19 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 // timed process
 // if the switch changed, update the linked conveyors
 
-/obj/machinery/conveyor_switch/process()
-	if(!operated)
-		return
-	operated = 0
-
+/obj/machinery/conveyor_switch/proc/do_process()
+	set waitfor = FALSE
 	for(var/obj/machinery/conveyor/C in GLOB.conveyors_by_id[id])
 		C.operating = position
 		C.update_move_direction()
 		CHECK_TICK
 
+/obj/machinery/conveyor_switch/process()
+	if(!operated)
+		return
+	operated = 0
+	do_process()
+
 // attack with hand, switch position
 /obj/machinery/conveyor_switch/interact(mob/user)
 	add_fingerprint(user)

code/modules/ruins/spaceruin_code/caravanambush.dm

@@ -1,27 +1,27 @@
 //caravan ambush
 
 /obj/item/wrench/caravan
-	color = "#ff0000"
+	icon_state = "wrench_caravan"
 	desc = "A prototype of a new wrench design, allegedly the red color scheme makes it go faster."
 	name = "experimental wrench"
 	toolspeed = 0.3
 
 /obj/item/screwdriver/caravan
-	color = "#ff0000"
+	icon_state = "screwdriver_caravan"
 	desc = "A prototype of a new screwdriver design, allegedly the red color scheme makes it go faster."
 	name = "experimental screwdriver"
 	toolspeed = 0.3
 	random_color = FALSE
 
 /obj/item/wirecutters/caravan
-	color = "#ff0000"
+	icon_state = "cutters_caravan"
 	desc = "A prototype of a new wirecutter design, allegedly the red color scheme makes it go faster."
 	name = "experimental wirecutters"
 	toolspeed = 0.3
 	random_color = FALSE
 
 /obj/item/crowbar/red/caravan
-	color = "#ff0000"
+	icon_state = "crowbar_caravan"
 	desc = "A prototype of a new crowbar design, allegedly the red color scheme makes it go faster."
 	name = "experimental crowbar"
 	toolspeed = 0.3

code/modules/vore/eating/living.dm

@@ -59,13 +59,14 @@
 			// Critical adjustments due to TG grab changes - Poojawa
 
 /mob/living/proc/vore_attack(var/mob/living/user, var/mob/living/prey, var/mob/living/pred)
-	lazy_init_belly()
+	set waitfor = FALSE
 	if(!user || !prey || !pred)
 		return
 
 	if(!isliving(pred)) //no badmin, you can't feed people to ghosts or objects.
 		return
 
+	lazy_init_belly()
 	if(pred == prey) //you click your target
 		if(!CHECK_BITFIELD(pred.vore_flags,FEEDING))
 			to_chat(user, "<span class='notice'>They aren't able to be fed.</span>")

code/modules/zombie/organs.dm

@@ -45,7 +45,7 @@
 	if(!owner)
 		return
 	if(!(src in owner.internal_organs))
-		Remove(owner)
+		INVOKE_ASYNC(src,.proc/Remove,owner)
 	if(owner.mob_biotypes & MOB_MINERAL)//does not process in inorganic things
 		return
 	if (causes_damage && !iszombie(owner) && owner.stat != DEAD)