Merge pull request #782 from Fox-McCloud/smoke-fix

[Goonchem] Smoke Fix
This commit is contained in:
ZomgPonies
2015-04-12 05:38:26 -04:00
+2 -1
View File
@@ -271,9 +271,9 @@
required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1)
result_amount = 1
mix_message = "The mixture quickly turns into a pall of smoke!"
var/forbidden_reagents = list("sugar", "phosphorus", "potassium") //Do not transfer this stuff through smoke.
/datum/chemical_reaction/smoke/on_reaction(var/datum/reagents/holder, var/created_volume)
var/forbidden_reagents = list(id, "sugar", "phosphorus", "potassium") //Do not transfer this stuff through smoke.
for(var/f_reagent in forbidden_reagents)
if(holder.has_reagent(f_reagent))
holder.remove_reagent(f_reagent, holder.get_reagent_amount(f_reagent))
@@ -296,6 +296,7 @@
required_temp = 374
secondary = 1
result_amount = 1
forbidden_reagents = list()
/datum/reagent/sonic_powder
name = "Sonic Powder"