From f091f5c4d8558fe1976808514965f97c65376147 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Wed, 4 Nov 2020 18:32:47 -0500 Subject: [PATCH] Adds some flaming hot logging --- .../reagents/chemistry/reagents/misc.dm | 10 ++++ .../chemistry/reagents/pyrotechnic.dm | 58 +++++++++++++++++++ .../chemistry/recipes/pyrotechnics.dm | 20 +++++++ 3 files changed, 88 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm index f7cdfa11404..ab95625b7ea 100644 --- a/code/modules/reagents/chemistry/reagents/misc.dm +++ b/code/modules/reagents/chemistry/reagents/misc.dm @@ -215,6 +215,16 @@ var/turf/T = get_turf(holder.my_atom) holder.my_atom.visible_message("The oil burns!") fireflash(T, min(max(0, volume / 40), 8)) + if(holder.my_atom) + if(holder.my_atom.fingerprintslast) + var/mob/M = get_mob_by_key(holder.my_atom.fingerprintslast) + var/more = "" + if(M) + more = " " + add_attack_logs(M, COORD(holder.my_atom.loc), "Caused a flashfire reaction of [id]. Last associated key is [holder.my_atom.fingerprintslast][more]", ATKLOG_FEW) + log_game("Flashfire reaction ([holder.my_atom], reagent type: [id]) at [COORD(holder.my_atom.loc)]. Last touched by: [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"].") + holder.my_atom.investigate_log("A fuel explosion, last touched by [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"], triggered at [COORD(holder.my_atom.loc)].", INVESTIGATE_BOMB) + var/datum/effect_system/smoke_spread/bad/BS = new BS.set_up(1, 0, T) BS.start() diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm index 9d85459f465..dfd2c3be0d1 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm @@ -16,6 +16,15 @@ return var/radius = min(max(0, volume / size_divisor), 8) fireflash_sm(T, radius, rand(temp_fire - temp_deviance, temp_fire + temp_deviance), 500) + if(holder.my_atom) + if(holder.my_atom.fingerprintslast) + var/mob/M = get_mob_by_key(holder.my_atom.fingerprintslast) + var/more = "" + if(M) + more = " " + add_attack_logs(M, COORD(holder.my_atom.loc), "Caused a flashfire reaction of [id]. Last associated key is [holder.my_atom.fingerprintslast][more]", ATKLOG_FEW) + log_game("Flashfire reaction ([holder.my_atom], reagent type: [id]) at [COORD(holder.my_atom.loc)]. Last touched by: [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"].") + holder.my_atom.investigate_log("A fuel explosion, last touched by [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"], triggered at [COORD(holder.my_atom.loc)].", INVESTIGATE_BOMB) /datum/reagent/phlogiston/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume) if(holder.chem_temp <= T0C - 50) @@ -56,6 +65,16 @@ if(exposed_temperature > T0C + 100) var/radius = min(max(0, volume * 0.15), 8) fireflash_sm(get_turf(holder.my_atom), radius, rand(3000, 6000), 500) + if(holder.my_atom) + if(holder.my_atom.fingerprintslast) + var/mob/M = get_mob_by_key(holder.my_atom.fingerprintslast) + var/more = "" + if(M) + more = " " + add_attack_logs(M, COORD(holder.my_atom.loc), "Caused a flashfire reaction of [id]. Last associated key is [holder.my_atom.fingerprintslast][more]", ATKLOG_FEW) + log_game("Flashfire reaction ([holder.my_atom], reagent type: [id]) at [COORD(holder.my_atom.loc)]. Last touched by: [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"].") + holder.my_atom.investigate_log("A fuel explosion, last touched by [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"], triggered at [COORD(holder.my_atom.loc)].", INVESTIGATE_BOMB) + if(holder) holder.del_reagent(id) @@ -148,6 +167,16 @@ /datum/reagent/plasma/reaction_temperature(exposed_temperature, exposed_volume) if(exposed_temperature >= T0C + 100) fireflash(get_turf(holder.my_atom), min(max(0, volume / 10), 8)) + if(holder.my_atom) + if(holder.my_atom.fingerprintslast) + var/mob/M = get_mob_by_key(holder.my_atom.fingerprintslast) + var/more = "" + if(M) + more = " " + add_attack_logs(M, COORD(holder.my_atom.loc), "Caused a flashfire reaction of [id]. Last associated key is [holder.my_atom.fingerprintslast][more]", ATKLOG_FEW) + log_game("Flashfire reaction ([holder.my_atom], reagent type: [id]) at [COORD(holder.my_atom.loc)]. Last touched by: [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"].") + holder.my_atom.investigate_log("A fuel explosion, last touched by [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"], triggered at [COORD(holder.my_atom.loc)].", INVESTIGATE_BOMB) + if(holder) holder.del_reagent(id) @@ -190,6 +219,16 @@ var/datum/reagents/Holder = holder var/Id = id var/Volume = volume + if(holder.my_atom) + if(holder.my_atom.fingerprintslast) + var/mob/M = get_mob_by_key(holder.my_atom.fingerprintslast) + var/more = "" + if(M) + more = " " + add_attack_logs(M, COORD(holder.my_atom.loc), "Caused a flashfire reaction of [id]. Last associated key is [holder.my_atom.fingerprintslast][more]", ATKLOG_FEW) + log_game("Flashfire reaction ([holder.my_atom], reagent type: [id]) at [COORD(holder.my_atom.loc)]. Last touched by: [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"].") + holder.my_atom.investigate_log("A fuel explosion, last touched by [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"], triggered at [COORD(holder.my_atom.loc)].", INVESTIGATE_BOMB) + Holder.del_reagent(Id) fireflash_sm(S, 0, rand(20000, 25000) + Volume * 2500, 0, 0, 1) @@ -240,6 +279,15 @@ return var/radius = min((volume - 3) * 0.15, 3) fireflash_sm(T, radius, 4500 + volume * 500, 350) + if(holder.my_atom) + if(holder.my_atom.fingerprintslast) + var/mob/M = get_mob_by_key(holder.my_atom.fingerprintslast) + var/more = "" + if(M) + more = " " + add_attack_logs(M, COORD(holder.my_atom.loc), "Caused a flashfire reaction of [id]. Last associated key is [holder.my_atom.fingerprintslast][more]", ATKLOG_FEW) + log_game("Flashfire reaction ([holder.my_atom], reagent type: [id]) at [COORD(holder.my_atom.loc)]. Last touched by: [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"].") + holder.my_atom.investigate_log("A fuel explosion, last touched by [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"], triggered at [COORD(holder.my_atom.loc)].", INVESTIGATE_BOMB) /datum/reagent/clf3/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume) if(method == REAGENT_TOUCH || method == REAGENT_INGEST) @@ -437,6 +485,16 @@ /datum/reagent/plasma_dust/reaction_temperature(exposed_temperature, exposed_volume) if(exposed_temperature >= T0C + 100) fireflash(get_turf(holder.my_atom), min(max(0, volume / 10), 8)) + if(holder.my_atom) + if(holder.my_atom.fingerprintslast) + var/mob/M = get_mob_by_key(holder.my_atom.fingerprintslast) + var/more = "" + if(M) + more = " " + add_attack_logs(M, COORD(holder.my_atom.loc), "Caused a flashfire reaction of [id]. Last associated key is [holder.my_atom.fingerprintslast][more]", ATKLOG_FEW) + log_game("Flashfire reaction ([holder.my_atom], reagent type: [id]) at [COORD(holder.my_atom.loc)]. Last touched by: [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"].") + holder.my_atom.investigate_log("A fuel explosion, last touched by [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"], triggered at [COORD(holder.my_atom.loc)].", INVESTIGATE_BOMB) + if(holder) holder.del_reagent(id) diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 4be84e21d2c..9506caf0c8e 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -82,6 +82,16 @@ min_temp = T0C + 150 /datum/chemical_reaction/clf3/on_reaction(datum/reagents/holder, created_volume) + if(holder.my_atom) + if(holder.my_atom.fingerprintslast) + var/mob/M = get_mob_by_key(holder.my_atom.fingerprintslast) + var/more = "" + if(M) + more = " " + add_attack_logs(M, COORD(holder.my_atom.loc), "Caused a flashfire reaction of [id]. Last associated key is [holder.my_atom.fingerprintslast][more]", ATKLOG_FEW) + log_game("Flashfire reaction ([holder.my_atom], reagent type: [id]) at [COORD(holder.my_atom.loc)]. Last touched by: [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"].") + holder.my_atom.investigate_log("A fuel explosion, last touched by [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"], triggered at [COORD(holder.my_atom.loc)].", INVESTIGATE_BOMB) + fireflash(holder.my_atom, 1, 7000) /datum/chemical_reaction/sorium @@ -230,6 +240,16 @@ mix_message = "The substance erupts into wild flames." /datum/chemical_reaction/phlogiston_fire/on_reaction(datum/reagents/holder, created_volume) + if(holder.my_atom) + if(holder.my_atom.fingerprintslast) + var/mob/M = get_mob_by_key(holder.my_atom.fingerprintslast) + var/more = "" + if(M) + more = " " + add_attack_logs(M, COORD(holder.my_atom.loc), "Caused a flashfire reaction of [id]. Last associated key is [holder.my_atom.fingerprintslast][more]", ATKLOG_FEW) + log_game("Flashfire reaction ([holder.my_atom], reagent type: [id]) at [COORD(holder.my_atom.loc)]. Last touched by: [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"].") + holder.my_atom.investigate_log("A fuel explosion, last touched by [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"], triggered at [COORD(holder.my_atom.loc)].", INVESTIGATE_BOMB) + fireflash(get_turf(holder.my_atom), min(max(2, round(created_volume / 10)), 8)) /datum/chemical_reaction/napalm