Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

change amanitin to on_remove instead of moblifecomplete #15732

Merged
merged 2 commits into from
Sep 11, 2023
Merged

change amanitin to on_remove instead of moblifecomplete #15732

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c378b6
change amanitin to on_remove instead of moblifeend
MRLinew Sep 7, 2023
0350d00
0 out dmg counter
MRLinew Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions code/modules/chemistry/Reagents-PoisonEtc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,12 @@ datum
M = holder.my_atom
damage_counter += rand(2, 4) * mult * min(1, volume)
..()

on_mob_life_complete(mob/living/M)
if(M)
M.take_toxin_damage(damage_counter)
logTheThing(LOG_COMBAT, M, "took [damage_counter] TOX damage from amanitin.")
on_remove()
..()
var/mob/living/carbon/human/M = holder.my_atom
if (!istype(M)) return
M.take_toxin_damage(damage_counter)
logTheThing(LOG_COMBAT, M, "took [damage_counter] TOX damage from amanitin.")

MRLinew marked this conversation as resolved.
Show resolved Hide resolved

harmful/chemilin
Expand Down