From a36511a3a88c5c6a4f9d5b65efe1a5e191d4bdc6 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sat, 7 Nov 2020 10:39:01 +0100 Subject: [PATCH] PR review request changes --- code/modules/reagents/chemistry/reagents/misc.dm | 2 +- .../reagents/chemistry/reagents/pyrotechnic.dm | 12 ++++++------ .../reagents/chemistry/recipes/pyrotechnics.dm | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm index 830db05a9bc..fba47ad52a3 100644 --- a/code/modules/reagents/chemistry/reagents/misc.dm +++ b/code/modules/reagents/chemistry/reagents/misc.dm @@ -215,7 +215,7 @@ var/turf/T = get_turf(holder.my_atom) holder.my_atom.visible_message("The oil burns!") fireflash(T, min(max(0, volume / 40), 8)) - fire_flash_log(holder, name = "oil") + fire_flash_log(holder, id) 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 cb8739fba55..fdc8e4ece15 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm @@ -16,7 +16,7 @@ return var/radius = min(max(0, volume / size_divisor), 8) fireflash_sm(T, radius, rand(temp_fire - temp_deviance, temp_fire + temp_deviance), 500) - fire_flash_log(holder, name = "phlogiston") + fire_flash_log(holder, id) /datum/reagent/phlogiston/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume) if(holder.chem_temp <= T0C - 50) @@ -57,7 +57,7 @@ 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) - fire_flash_log(holder, name = "napalm") + fire_flash_log(holder, id) if(holder) holder.del_reagent(id) @@ -150,7 +150,7 @@ /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)) - fire_flash_log(fire_flash_log(holder, name = "plasma")) + fire_flash_log(holder, id) if(holder) holder.del_reagent(id) @@ -193,7 +193,7 @@ var/datum/reagents/Holder = holder var/Id = id var/Volume = volume - fire_flash_log(holder, name = "thermite") + fire_flash_log(holder, id) Holder.del_reagent(Id) fireflash_sm(S, 0, rand(20000, 25000) + Volume * 2500, 0, 0, 1) @@ -244,7 +244,7 @@ return var/radius = min((volume - 3) * 0.15, 3) fireflash_sm(T, radius, 4500 + volume * 500, 350) - fire_flash_log(holder, name = "clf3") + fire_flash_log(holder, id) /datum/reagent/clf3/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume) if(method == REAGENT_TOUCH || method == REAGENT_INGEST) @@ -442,7 +442,7 @@ /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)) - fire_flash_log(holder, name = "plasma dust") + fire_flash_log(holder, id) 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 2a64f99643a..850cd0b922b 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -82,7 +82,7 @@ min_temp = T0C + 150 /datum/chemical_reaction/clf3/on_reaction(datum/reagents/holder, created_volume) - fire_flash_log(holder, name = "clf3") + fire_flash_log(holder, id) fireflash(holder.my_atom, 1, 7000) /datum/chemical_reaction/sorium @@ -231,7 +231,7 @@ mix_message = "The substance erupts into wild flames." /datum/chemical_reaction/phlogiston_fire/on_reaction(datum/reagents/holder, created_volume) - fire_flash_log(holder, name = "phlogiston fire") + fire_flash_log(holder, id) fireflash(get_turf(holder.my_atom), min(max(2, round(created_volume / 10)), 8)) /datum/chemical_reaction/napalm