Merge pull request #12466 from phil235/BugFixBoogalooH

Bugfixes: soulstone, reagent runtimes, etc
This commit is contained in:
Razharas
2015-10-19 10:02:42 +03:00
12 changed files with 80 additions and 64 deletions
@@ -429,8 +429,8 @@
id = "corn_syrup"
description = "Decays into sugar."
color = "#C8A5DC"
metabolization_rate = 3 * REAGENTS_METABOLISM
/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/M)
M.reagents.add_reagent("sugar", 3)
M.reagents.remove_reagent("corn_syrup", 1)
holder.add_reagent("sugar", 3)
..()
@@ -188,6 +188,7 @@
M.jitteriness = 0
M.stuttering = 0
M.confused = 0
return
holder.remove_reagent(src.id, 0.4) //fixed consumption to prevent balancing going out of whack
return
@@ -377,9 +377,10 @@
/datum/reagent/toxin/formaldehyde/on_mob_life(mob/living/M)
if(prob(5))
M.reagents.add_reagent("histamine",pick(5,15))
M.reagents.remove_reagent("formaldehyde",1)
..()
holder.add_reagent("histamine", pick(5,15))
holder.remove_reagent("formaldehyde", 1.2)
else
..()
/datum/reagent/toxin/venom
name = "Venom"
@@ -394,9 +395,10 @@
toxpwr = 0.2*volume
M.adjustBruteLoss((0.3*volume)*REM)
if(prob(15))
M.reagents.add_reagent("histamine",pick(5,10))
M.reagents.remove_reagent("venom",1)
..()
M.reagents.add_reagent("histamine", pick(5,10))
M.reagents.remove_reagent("venom", 1.1)
else
..()
/datum/reagent/toxin/neurotoxin2
name = "Neurotoxin"
@@ -467,7 +469,8 @@
M.adjustBruteLoss(0.2*REM)
if(prob(3))
M.reagents.add_reagent("histamine",rand(1,3))
M.reagents.remove_reagent("itching_powder",1)
M.reagents.remove_reagent("itching_powder",1.2)
return
..()
/datum/reagent/toxin/initropidril