From d7b86dca8ec4066684ad37e57e0d3a897e88d121 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Fri, 22 Mar 2019 02:55:15 +0100
Subject: [PATCH 1/2] X patch 3

Attack text fix
---
 .../modules/mob/living/simple_animal/animals/tarrasque.dm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm
index cb45b37000..939ac53c85 100644
--- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm
+++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm
@@ -111,7 +111,7 @@
 	icon_dead = "arachnid_stunned" //Same as dead but no blood
 	icon_rest = "arachnid_sleeping"
 	tt_desc = "Unknown Specimen"
-	attacktext = list("whacks","slashes","smashes")
+	attacktext = list("whacked","slashed","smashed")
 	melee_damage_lower = 0 
 	melee_damage_upper = 50
 	universal_speak = 0
@@ -159,7 +159,7 @@
 	if (anchored)
 		melee_damage_upper = 0 //hacky way to stop attacks
 		set_light(l_range = 10, l_power = 5, l_color = COLOR_RED) //RUN BITCHES
-	if(!anchored && !melee_damage_upper)
+	if(!anchored)
 		melee_damage_upper = 50
 	if(!client)
 		opensesame()
@@ -189,9 +189,11 @@
 			L.Weaken(5)
 			stop_automated_movement = 1
 			anchored = 1
-			spawn(300)
+			melee_damage_upper = 0
+			spawn(150)
 				stop_automated_movement = 0
 				anchored = 0
+				melee_damage_upper = 50
 
 /mob/living/simple_animal/hostile/tarrasque/mrx/handle_regular_hud_updates()
 	..()

From a1560207bf42f2c4052de45829f04a067674fb2a Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Fri, 22 Mar 2019 07:24:43 +0100
Subject: [PATCH 2/2] Travis failed for no reason, rerun

---
 code/modules/mob/living/simple_animal/animals/tarrasque.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm
index 939ac53c85..b84025628d 100644
--- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm
+++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm
@@ -31,7 +31,7 @@
 	turns_per_move = 7
 	follow_dist = 999
 	speed = 4
-	
+
 	//Mob interaction
 	response_help   = "Sacrifices self to"
 	response_harm   = "Weakly flails at"