Merge pull request #14823 from Qwertytoforty/fuck-off-with-the-chems

Adds some flaming hot logging
This commit is contained in:
AffectedArc07
2020-11-07 09:31:37 +00:00
committed by GitHub
5 changed files with 27 additions and 0 deletions
@@ -97,6 +97,23 @@
/datum/reagent/proc/on_mob_death(mob/living/M) //use this to have chems have a "death-triggered" effect
return
/**
* Flashfire is a proc used to log fire causing chemical reactions.
*
* Call this whenever you have a chemical reaction that makes fire flashes.
* Arguments:
* * holder: the beaker that the reagent is in
* * name: name of the reagent / reaction
*/
/proc/fire_flash_log(datum/reagents/holder, name)
if(!holder.my_atom)
return
if(holder.my_atom.fingerprintslast)
var/mob/M = get_mob_by_key(holder.my_atom.fingerprintslast)
add_attack_logs(M, COORD(holder.my_atom.loc), "Caused a flashfire reaction of [name]. Last associated key is [holder.my_atom.fingerprintslast]", ATKLOG_FEW)
log_game("Flashfire reaction ([holder.my_atom], reagent type: [name]) at [COORD(holder.my_atom.loc)]. Last touched by: [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"].")
holder.my_atom.investigate_log("A Flashfire reaction, (reagent type [name]) last touched by [holder.my_atom.fingerprintslast ? "[holder.my_atom.fingerprintslast]" : "*null*"], triggered at [COORD(holder.my_atom.loc)].", INVESTIGATE_BOMB)
// Called when this reagent is first added to a mob
/datum/reagent/proc/on_mob_add(mob/living/L)
return
@@ -215,6 +215,7 @@
var/turf/T = get_turf(holder.my_atom)
holder.my_atom.visible_message("<b>The oil burns!</b>")
fireflash(T, min(max(0, volume / 40), 8))
fire_flash_log(holder, name = "oil")
var/datum/effect_system/smoke_spread/bad/BS = new
BS.set_up(1, 0, T)
BS.start()
@@ -16,6 +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")
/datum/reagent/phlogiston/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume)
if(holder.chem_temp <= T0C - 50)
@@ -56,6 +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")
if(holder)
holder.del_reagent(id)
@@ -148,6 +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"))
if(holder)
holder.del_reagent(id)
@@ -190,6 +193,7 @@
var/datum/reagents/Holder = holder
var/Id = id
var/Volume = volume
fire_flash_log(holder, name = "thermite")
Holder.del_reagent(Id)
fireflash_sm(S, 0, rand(20000, 25000) + Volume * 2500, 0, 0, 1)
@@ -240,6 +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")
/datum/reagent/clf3/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume)
if(method == REAGENT_TOUCH || method == REAGENT_INGEST)
@@ -437,6 +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")
if(holder)
holder.del_reagent(id)
@@ -20,6 +20,7 @@
/datum/chemical_reaction/proc/on_reaction(datum/reagents/holder, created_volume)
return
/datum/chemical_reaction/proc/chemical_mob_spawn(datum/reagents/holder, amount_to_spawn, reaction_name, mob_class = HOSTILE_SPAWN, mob_faction = "chemicalsummon", random = TRUE)
if(holder && holder.my_atom)
var/atom/A = holder.my_atom
@@ -82,6 +82,7 @@
min_temp = T0C + 150
/datum/chemical_reaction/clf3/on_reaction(datum/reagents/holder, created_volume)
fire_flash_log(holder, name = "clf3")
fireflash(holder.my_atom, 1, 7000)
/datum/chemical_reaction/sorium
@@ -230,6 +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")
fireflash(get_turf(holder.my_atom), min(max(2, round(created_volume / 10)), 8))
/datum/chemical_reaction/napalm