diff --git a/code/_helpers/mobs.dm b/code/_helpers/mobs.dm index 79476fa89a..c3ea7946a4 100644 --- a/code/_helpers/mobs.dm +++ b/code/_helpers/mobs.dm @@ -110,7 +110,7 @@ Proc for attack log creation, because really why not 6 is additional information, anything that needs to be added */ -/proc/add_attack_logs(mob/user, mob/target, what_done, var/admin_notify = TRUE) +/proc/add_attack_logs(mob/user, mob/target, what_done, var/admin_notify = TRUE, var/use_async = TRUE) //CHOMPEdit if(islist(target)) //Multi-victim adding var/list/targets = target for(var/mob/M in targets) @@ -123,13 +123,14 @@ Proc for attack log creation, because really why not if(ismob(user)) //CHOMPEdit Begin //user.attack_log += text("\[[time_stamp()]\] Attacked [target_str]: [what_done]") var/DBQuery/query_insert = SSdbcore.NewQuery("INSERT INTO erro_attacklog (id, time, ckey, mob, message) VALUES (null, NOW(), :t_ckey, :t_mob, :t_content)", list("t_ckey" = user.ckey, "t_mob" = user.real_name, "t_content" = "Attacked [target_str]: [what_done]")) - query_insert.Execute() + query_insert.Execute(async=use_async) qdel(query_insert) if(ismob(target)) //target.attack_log += text("\[[time_stamp()]\] Attacked by [user_str]: [what_done]") var/DBQuery/query_insert = SSdbcore.NewQuery("INSERT INTO erro_attacklog (id, time, ckey, mob, message) VALUES (null, NOW(), :t_ckey, :t_mob, :t_content)", list("t_ckey" = target.ckey, "t_mob" = target.real_name, "t_content" = "Attacked by [user_str]: [what_done]")) - query_insert.Execute() + query_insert.Execute(async=use_async) qdel(query_insert) + //CHOMPEdit End log_attack(user_str,target_str,what_done) if(admin_notify) msg_admin_attack("[key_name_admin(user)] vs [target_str]: [what_done]") diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index b1b7a240ab..4966e9e160 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -690,7 +690,7 @@ //admin logs if(!no_attack_log) if(istype(firer, /mob) && istype(target_mob)) - add_attack_logs(firer,target_mob,"Shot with \a [src.type] projectile") + add_attack_logs(firer,target_mob,"Shot with \a [src.type] projectile",use_async=FALSE) //CHOMPEdit //sometimes bullet_act() will want the projectile to continue flying if (result == PROJECTILE_CONTINUE)