From dfc5ea906a0e93f8a11cd328239d027278501cbd Mon Sep 17 00:00:00 2001
From: Joan Lung <duorabbit2@gmail.com>
Date: Sat, 6 Aug 2016 23:21:54 -0400
Subject: [PATCH] Colossuses hate sleeping carp (#19727)

* Colossuses hate sleeping carp take.... two?

* you are going to get fucked up

* it'd be nice to not ever trap this thing but someone could probably do it, so....

* todo get off T

* too much T

* it punctuates attempts to kill you with screaming, death bolts, and moving at high speed towards your ass

* is this even needed will it make kor merge it

* a blob could probably kill a colossus if it was smart but it'd have trouble

* as funny as that'd be...
---
 .../hostile/megafauna/colossus.dm             | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 2e33dc9b766..e60cfc4bfb0 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -69,6 +69,17 @@ Difficulty: Very Hard
 	anger_modifier = Clamp(((maxHealth - health)/50),0,20)
 	ranged_cooldown = world.time + 120
 
+	if(enrage(target))
+		if(move_to_delay == initial(move_to_delay))
+			visible_message("<span class='colossus'>\"<b>You can't dodge.</b>\"</span>")
+		ranged_cooldown = world.time + 30
+		telegraph()
+		dir_shots(alldirs)
+		move_to_delay = 3
+		return
+	else
+		move_to_delay = initial(move_to_delay)
+
 	if(prob(20+anger_modifier)) //Major attack
 		telegraph()
 
@@ -123,6 +134,15 @@ Difficulty: Very Hard
 		AT.pixel_y += random_y
 	..()
 
+/mob/living/simple_animal/hostile/megafauna/colossus/proc/enrage(mob/living/L)
+	var/enraged = FALSE
+	if(ishuman(L))
+		var/mob/living/carbon/human/H = L
+		if(H.martial_art && prob(H.martial_art.deflection_chance))
+			enraged = TRUE
+
+	return enraged
+
 /mob/living/simple_animal/hostile/megafauna/colossus/proc/alternating_dir_shots()
 	dir_shots(diagonals)
 	sleep(10)
@@ -206,10 +226,11 @@ Difficulty: Very Hard
 	P.fire()
 
 /mob/living/simple_animal/hostile/megafauna/colossus/proc/random_shots()
-	playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 300, 1, 5)
-	for(var/turf/turf in range(12,get_turf(src)))
+	var/turf/U = get_turf(src)
+	playsound(U, 'sound/magic/clockwork/invoke_general.ogg', 300, 1, 5)
+	for(var/T in RANGE_TURFS(12, U) - U)
 		if(prob(5))
-			shoot_projectile(turf)
+			shoot_projectile(T)
 
 /mob/living/simple_animal/hostile/megafauna/colossus/proc/blast()
 	playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 200, 1, 2)
@@ -299,7 +320,7 @@ Difficulty: Very Hard
 
 	for(var/obj/O in (contents-component_parts))
 		stored_items += O.type
-	
+
 	S["stored_items"]				<< stored_items
 	memory_saved = TRUE
 
@@ -314,7 +335,7 @@ Difficulty: Very Hard
 		create_item(item)
 
 //in it's own proc to avoid issues with items that nolonger exist in the code base.
-//try catch doesn't always prevent byond runtimes from halting a proc, 
+//try catch doesn't always prevent byond runtimes from halting a proc,
 /obj/machinery/smartfridge/black_box/proc/create_item(item_type)
 	new item_type(src)