Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into space-ruin-number-one

This commit is contained in:
Purpose
2018-10-19 10:47:57 +01:00
165 changed files with 1115 additions and 768 deletions
@@ -155,10 +155,8 @@
call(src,triggerproc)(M)
/obj/effect/meatgrinder/proc/triggerrad1(mob)
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
for(var/mob/O in viewers(world.view, src.loc))
s.set_up(3, 1, src)
s.start()
do_sparks(3, 1, src)
explosion(mob, 1, 0, 0, 0)
qdel(src)