diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 97180266446..06f4e31b016 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -349,6 +349,9 @@ returnToPool(F.floor_tile) F.floor_tile = null F = null + + var/atom/movable/overlay/transfer_animation = c_animation + if(ispath(N, /turf/simulated/floor)) //if the old turf had a zone, connect the new turf to it as well - Cael //Adjusted by SkyMarshal 5/10/13 - The air master will handle the addition of the new turf. @@ -370,6 +373,10 @@ if(air_master) air_master.mark_for_update(src) + if(transfer_animation) + W.c_animation = transfer_animation + transfer_animation.master = W + W.levelupdate() . = W @@ -388,6 +395,10 @@ if(air_master) air_master.mark_for_update(src) + if(transfer_animation) + W.c_animation = c_animation + transfer_animation.master = W + W.levelupdate() . = W diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index 43c71557d19..44be0f03784 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -107,6 +107,7 @@ /obj/machinery/power/supermatter/shard/explode() explosion(get_turf(src), explosion_power, explosion_power * 2, explosion_power * 3, explosion_power * 4, 1) + empulse(get_turf(src), 100, 200, 1) qdel(src) return