cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Napalm as a reagent and merges old napalm into Phlog. Fixes some foam stuff.

Browse Source
This commit is contained in:
Iamgoofball
2015-03-08 19:43:17 -07:00
parent 4338a3f4ca
commit e5a3694c0f
4 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/effect_system/effects_foam.dm
+2 -3
View File
@@ -106,7 +106,6 @@
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
@@ -129,7 +128,6 @@
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)
@@ -142,8 +140,9 @@
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 = foam_color
F.color = foamcolor
F.amount = amount
F.metal = metal