This PR moves unique do_after behavior under a flag system.

It also deletes do_mob & do_atom, and centralizes them under do_after
CeladonSS13 · Oct 6, 2024 · 28c46a8 · 28c46a8
1 parent 114c578
commit 28c46a8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
@@ -101,13 +101,13 @@
 	chassis.use_power(energy_drain)
 	addtimer(CALLBACK(src, PROC_REF(set_ready_state), 1), equip_cooldown)
 
-/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target)
+/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target, mob/user, interaction_key)
 	if(!chassis)
 		return
 	var/C = chassis.loc
 	set_ready_state(0)
 	chassis.use_power(energy_drain)
-	. = do_after(chassis.occupant, equip_cooldown, target=target)
+	. = do_after(user, equip_cooldown, target=target, interaction_key = interaction_key)
 	set_ready_state(1)
 	if(!chassis || 	chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir))
 		return 0

diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -100,7 +100,7 @@
 		for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo)
 			// [CELADON-EDIT] - CELADON_QOL
 			// if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 1 SECONDS, attacking_box))) // CELADON-EDIT - ORIGINAL
-			if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 0.6 SECONDS, attacking_box)))
+			if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 0.6 SECONDS, list(attacking_box))))
 			// [/CELADON-EDIT]
 				break
 			var/did_load = give_round(casing_to_insert, replace_spent)

diff --git a/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm b/code/modules/projectiles/boxes_magazines/internal/_cylinder.dm
@@ -66,7 +66,7 @@
 		var/list/ammo_list_no_empty = ammo_list(FALSE)
 		listclearnulls(ammo_list_no_empty)
 		for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo)
-			if(!((instant_load && attacking_box.instant_load) || (ammo_list_no_empty.len >= max_ammo) || do_after(user, 1 SECONDS, attacking_box))) //stupid work around for revolvers
+			if(!((instant_load && attacking_box.instant_load) || (ammo_list_no_empty.len >= max_ammo) || do_after(user, 1 SECONDS, list(attacking_box)))) //stupid work around for revolvers
 				break
 			var/did_load = give_round(casing_to_insert, replace_spent)
 			if(!did_load)

diff --git a/code/modules/projectiles/guns/ballistic/hmg.dm b/code/modules/projectiles/guns/ballistic/hmg.dm
@@ -91,7 +91,7 @@
 	if(!can_deploy)
 		to_chat(user, "<span class='warning'>You need to brace against something to deploy [src]'s bipod! Either lie on the floor or stand next to a waist high object like a table!</span>")
 		return
-	if(!do_after(user, deploy_time, src, NONE, TRUE, CALLBACK(src, PROC_REF(is_wielded))))
+	if(!do_after(user, deploy_time, src, FALSE, TRUE, CALLBACK(src, PROC_REF(is_wielded))))
 		to_chat(user, "<span class='warning'>You need to hold still to deploy [src]'s bipod!</span>")
 		return
 	playsound(src, 'sound/machines/click.ogg', 75, TRUE)