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.

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

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

merged 2 commits into from Mar 21, 2016

Conversation

JJRcop
Copy link
Contributor

@JJRcop JJRcop commented Mar 19, 2016

Steals @PKPenguin321's work

It's a little less embarrassing to set up travis for your own repo then wait for the build to complete 馃槃
Probably even better to just do it on your local repo but I digress

馃啈 PKPenguin321 && !JJRcop
rscadd: Milk, which is good for your bones, is now extra beneficial to species that are mostly comprised of bones.
/:cl:

@JJRcop JJRcop changed the title buffs milk for skeletons and plasmamen buffs milk for skeletons and plasmamen (not stolen) Mar 19, 2016
@PKPenguin321
Copy link
Contributor

Nice, thanks for figuring this out 馃憤

@@ -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

@WJohn WJohn added the Feature Exposes new bugs in interesting ways label Mar 19, 2016
@JJRcop
Copy link
Contributor Author

JJRcop commented Mar 20, 2016

Oh right, it actually works now because of testing locally instead of risking it with the web editor

@PKPenguin321
Copy link
Contributor

i feel your pain

Cheridan added a commit that referenced this pull request Mar 21, 2016
buffs milk for skeletons and plasmamen (not stolen)
@Cheridan Cheridan merged commit a29aba9 into tgstation:master Mar 21, 2016
@JJRcop JJRcop deleted the JJRcop-patch-1-1 branch June 18, 2016 06:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Exposes new bugs in interesting ways
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants