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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

buffs milk for skeletons and plasmamen (not stolen) #16206

Merged
merged 2 commits into from Mar 21, 2016
Merged

buffs milk for skeletons and plasmamen (not stolen) #16206

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2c4501
buffs milk for skeletons and plasmamen
JJRcop Mar 19, 2016
7336988
maybe this will work
Mar 19, 2016
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
6 changes: 6 additions & 0 deletions code/modules/reagents/chemistry/reagents/drink_reagents.dm
View file
Open in desktop
Expand Up @@ -135,6 +135,12 @@
. = 1
if(holder.has_reagent("capsaicin"))
holder.remove_reagent("capsaicin", 2)
var/datum/dna/Mdna = M.has_dna()
if(Mdna && Mdna.species)
var/datum/species/Mspecies
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice null variable buddy.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't species already typecast properly anyway

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

y'know, it actually is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops

if(Mspecies.id == "plasmaman" || Mspecies.id == "skeleton")
M.heal_organ_damage(1,0, 0)
. = 1
..()

/datum/reagent/consumable/soymilk
Expand Down