From 91fbd27e4efe5bb1e8cb2b19c94c0bd5137662d0 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Fri, 3 Feb 2017 01:30:42 +0000 Subject: [PATCH] The Rod Form spell does not notify deadchat :cl: coiax del: The wizard spell "Rod Form" does not produce a message in deadchat everytime it is used. /:cl: Because it gets spammy, and the joy of following a rod is being able to watch its devestation. If you're following a wizard, you're already following and need no notification. --- code/modules/events/immovable_rod.dm | 8 +++++--- code/modules/spells/spell_types/rod_form.dm | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index da6990ae978..a7f2ec62c8a 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -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="(Click to orbit)", - source=src, action=NOTIFY_ORBIT) + if(notify) + notify_ghosts("\A [src] is inbound!", + enter_link="(Click to orbit)", + source=src, action=NOTIFY_ORBIT) poi_list += src if(end && end.z==z_original) walk_towards(src, destination, 1) diff --git a/code/modules/spells/spell_types/rod_form.dm b/code/modules/spells/spell_types/rod_form.dm index 1e8545f76f9..5046da7c34d 100644 --- a/code/modules/spells/spell_types/rod_form.dm +++ b/code/modules/spells/spell_types/rod_form.dm @@ -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 ..() \ No newline at end of file + return ..()