Adds heart attacks properly.

This commit is contained in:
Iamgoofball
2015-03-02 20:50:48 -08:00
parent 01b733b2a2
commit 3964cb3126
10 changed files with 70 additions and 18 deletions
@@ -102,10 +102,11 @@
///////////////////////////////////////////////
//FOAM EFFECT DATUM
/datum/effect/effect/system/foam_spread
var/amount = 5 // the size of the foam spread.
var/amount = 10 // the size of the foam spread.
var/obj/chemholder
var/obj/effect/effect/foam/foamtype = /obj/effect/effect/foam
var/metal = 0
var/foam_color
/datum/effect/effect/system/foam_spread/metal
@@ -126,8 +127,9 @@
else
location = get_turf(loca)
amount = round(sqrt(amt / 3), 1)
amount = round(sqrt(amt / 2), 1)
carry.copy_to(chemholder, carry.total_volume)
foam_color = mix_color_from_reagents(carry.reagent_list)
/datum/effect/effect/system/foam_spread/metal/set_up(amt=5, loca, var/datum/reagents/carry = null, var/metaltype)
@@ -140,9 +142,8 @@
foundfoam.amount += amount
else
var/obj/effect/effect/foam/F = new foamtype(src.location)
var/foamcolor = mix_color_from_reagents(chemholder.reagents.reagent_list)
chemholder.reagents.copy_to(F, chemholder.reagents.total_volume)
F.color = foamcolor
F.color = foam_color
F.amount = amount
F.metal = metal