diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index 5acf61d6813..d8c6fabb5fe 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"
@@ -314,6 +316,7 @@
var/turf/simulated/floor/beacon
var/beacon_cooldown = 0
var/toggle = FALSE
+ var/heal_cooldown = 0
/mob/living/simple_animal/hostile/guardian/healer/sealhealer
name = "Seal Sprit"
@@ -347,11 +350,14 @@
src << "You must be manifested to heal!"
return
if(iscarbon(target))
- var/mob/living/carbon/C = target
- C.adjustBruteLoss(-5)
- C.adjustFireLoss(-5)
- C.adjustOxyLoss(-5)
- C.adjustToxLoss(-5)
+ src.changeNext_move(CLICK_CD_MELEE)
+ if(heal_cooldown <= world.time && !stat)
+ var/mob/living/carbon/C = target
+ C.adjustBruteLoss(-5)
+ C.adjustFireLoss(-5)
+ C.adjustOxyLoss(-5)
+ C.adjustToxLoss(-5)
+ heal_cooldown = world.time + 20
/mob/living/simple_animal/hostile/guardian/healer/ToggleMode()
if(src.loc == summoner)
@@ -452,7 +458,7 @@
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
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index ba76739718d..33e1e3dcaa4 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ