Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-05-23 22:46:42 +01:00
32 changed files with 1786 additions and 27 deletions

View File

@@ -26,13 +26,14 @@
..()
/obj/item/projectile/energy/blob/on_impact(var/atom/A)
var/turf/location = get_turf(src)
var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
S.attach(location)
S.set_up(reagents, splatter_volume, 0, location)
playsound(location, 'sound/effects/slime_squish.ogg', 30, 1, -3)
spawn(0)
S.start()
if(splatter)
var/turf/location = get_turf(src)
var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
S.attach(location)
S.set_up(reagents, splatter_volume, 0, location)
playsound(location, 'sound/effects/slime_squish.ogg', 30, 1, -3)
spawn(0)
S.start()
..()
/obj/item/projectile/energy/blob/proc/ready_chemicals()
@@ -61,3 +62,11 @@
splatter = TRUE
flammability = 0.25
my_chems = list("fuel", "mold")
/obj/item/projectile/energy/blob/freezing
my_chems = list("frostoil")
modifier_type_to_apply = /datum/modifier/chilled
modifier_duration = 1 MINUTE
/obj/item/projectile/energy/blob/freezing/splattering
splatter = TRUE