Merge pull request #23648 from coiax/notify-wizard-rod

The Rod Form spell does not notify deadchat
This commit is contained in:
oranges
2017-02-05 00:09:12 +13:00
committed by GitHub
2 changed files with 7 additions and 4 deletions
+5 -3
View File
@@ -35,6 +35,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
anchored = 1
var/z_original = 0
var/destination
var/notify = TRUE
/obj/effect/immovablerod/New(atom/start, atom/end)
..()
@@ -42,9 +43,10 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
SSaugury.register_doom(src, 2000)
z_original = z
destination = end
notify_ghosts("\A [src] is inbound!",
enter_link="<a href=?src=\ref[src];orbit=1>(Click to orbit)</a>",
source=src, action=NOTIFY_ORBIT)
if(notify)
notify_ghosts("\A [src] is inbound!",
enter_link="<a href=?src=\ref[src];orbit=1>(Click to orbit)</a>",
source=src, action=NOTIFY_ORBIT)
poi_list += src
if(end && end.z==z_original)
walk_towards(src, destination, 1)
+2 -1
View File
@@ -28,6 +28,7 @@
var/max_distance = 13
var/mob/living/wizard
var/turf/start_turf
notify = FALSE
/obj/effect/immovablerod/wizard/Move()
if(get_dist(start_turf, get_turf(src)) >= max_distance)
@@ -39,4 +40,4 @@
wizard.status_flags &= ~GODMODE
wizard.notransform = 0
wizard.forceMove(get_turf(src))
return ..()
return ..()