From 16cdea3a2bb1b5b1a35246651a073c1b4d721c7e Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 5 Dec 2015 08:14:28 -0500 Subject: [PATCH] Changes underpred projectile cap Adds communication changes based on Ponies feedback --- .../living/simple_animal/guardian/guardian.dm | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index f640f90fa93..d7ee81f49c7 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -130,10 +130,12 @@ if(!input) return for(var/mob/M in mob_list) - if(M == summoner || (M in dead_mob_list)) - M << "[src]: [input]" - src << "[src]: [input]" - log_say("[src.real_name]/[src.key] : [input]") + if(M == summoner) + M << "[src]: [input]" + else if (M in dead_mob_list) + M << "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]" + src << "[src]: [input]" + log_say("Guardian Communication: [src.real_name]/[src.key] : [input]") /mob/living/simple_animal/hostile/guardian/proc/ToggleMode() src << "You dont have another mode!" @@ -150,11 +152,11 @@ if(istype (M, /mob/living/simple_animal/hostile/guardian)) var/mob/living/simple_animal/hostile/guardian/G = M if(G.summoner == src) - G << "[src]: [input]" + G << "[src]: [input]" else if (M in dead_mob_list) - M << "[src]: [input]" - src << "[src]: [input]" - log_say("[src.real_name]/[src.key] : [text]") + M << "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]" + src << "[src]: [input]" + log_say("Guardian Communication: [src.real_name]/[src.key] : [text]") /mob/living/proc/guardian_recall() set name = "Recall Guardian" @@ -452,11 +454,10 @@ melee_damage_upper = 10 damage_transfer = 0.9 projectiletype = /obj/item/projectile/guardian - ranged_cooldown_cap = 0 + ranged_cooldown_cap = 1 projectilesound = 'sound/effects/hit_on_shattered_glass.ogg' ranged = 1 range = 13 - ranged_cooldown_cap = 1 playstyle_string = "As a ranged type, you have only light damage resistance, but are capable of spraying shards of crystal at incredibly high speed. You can also deploy surveillance snares to monitor enemy movement. Finally, you can switch to scout mode, in which you can't attack, but can move without limit." magic_fluff_string = "..And draw the Sentinel, an alien master of ranged combat." tech_fluff_string = "Boot sequence complete. Ranged combat modules active. Holoparasite swarm online."