From 8b2fa719889ac13c78c5b4dbf3f9f9038033f012 Mon Sep 17 00:00:00 2001
From: TDSSS <32099540+TDSSS@users.noreply.github.com>
Date: Wed, 26 Dec 2018 21:39:27 +0100
Subject: [PATCH] initial commit

---
 .../gamemodes/miniantags/guardian/guardian.dm     | 15 +++++++++++++--
 .../miniantags/guardian/types/standard.dm         |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index d4f57e7b7f4..f95a22402e9 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -161,8 +161,12 @@
 	buckled = null
 	cooldown = world.time + 30
 
-/mob/living/simple_animal/hostile/guardian/proc/Communicate()
-	var/input = stripped_input(src, "Please enter a message to tell your summoner.", "Guardian", "")
+/mob/living/simple_animal/hostile/guardian/proc/Communicate(message)
+	var/input
+	if(!message)
+		input = stripped_input(src, "Please enter a message to tell your summoner.", "Guardian", "")
+	else
+		input = message
 	if(!input) return
 
 	for(var/mob/M in GLOB.mob_list)
@@ -173,6 +177,13 @@
 			to_chat(M, "<span class='changeling'><i>Guardian Communication from <b>[src]</b> ([ghost_follow_link(src, ghost=M)]): [input]</i>")
 	to_chat(src, "<span class='changeling'><i>[src]:</i> [input]</span>")
 
+//override set to true if message should be passed through instead of going to host communication
+/mob/living/simple_animal/hostile/guardian/say(message, override = FALSE)
+	if(adminseal || override)//if it's an admin-spawned guardian without a host it can still talk normally
+		return ..(message)
+	Communicate(message)
+	
+
 /mob/living/simple_animal/hostile/guardian/proc/ToggleMode()
 	to_chat(src, "<span class='danger'>You dont have another mode!</span>")
 
diff --git a/code/game/gamemodes/miniantags/guardian/types/standard.dm b/code/game/gamemodes/miniantags/guardian/types/standard.dm
index 8dfc3d39796..1380c4a2e95 100644
--- a/code/game/gamemodes/miniantags/guardian/types/standard.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/standard.dm
@@ -24,7 +24,7 @@
 		if(length(battlecry) > 11)//no more then 11 letters in a battle cry.
 			visible_message("<span class='danger'>[src] punches [target]!</span>")
 		else
-			say("[battlecry][battlecry][battlecry][battlecry][battlecry]")
+			say("[battlecry][battlecry][battlecry][battlecry][battlecry]", TRUE)
 		playsound(loc, attack_sound, 50, 1, 1)
 		playsound(loc, attack_sound, 50, 1, 1)
 		playsound(loc, attack_sound, 50, 1, 1)