From 6e02f61b3722f8c7bfce0b2233cc866ed091b282 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Tue, 27 Mar 2018 20:52:03 +0300 Subject: [PATCH 1/2] Merge pull request #36734 from Robustin/colossusfix Colossus projectile runtime removal --- .../mob/living/simple_animal/hostile/megafauna/colossus.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 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 1cf031b0cc..b7015972fd 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -143,6 +143,7 @@ Difficulty: Very Hard INVOKE_ASYNC(src, .proc/spiral_shoot, TRUE) /mob/living/simple_animal/hostile/megafauna/colossus/proc/spiral_shoot(negative = FALSE, counter_start = 8) + var/turf/start_turf = get_step(src, pick(GLOB.alldirs)) var/counter = counter_start for(var/i in 1 to 80) if(negative) @@ -153,7 +154,7 @@ Difficulty: Very Hard counter = 1 if(counter < 1) counter = 16 - shoot_projectile(null, counter * 22.5) + shoot_projectile(start_turf, counter * 22.5) playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, 1) sleep(1) @@ -184,7 +185,7 @@ Difficulty: Very Hard angle_to_target = set_angle var/static/list/colossus_shotgun_shot_angles = list(12.5, 7.5, 2.5, -2.5, -7.5, -12.5) for(var/i in colossus_shotgun_shot_angles) - shoot_projectile(null, angle_to_target + i) + shoot_projectile(target_turf, angle_to_target + i) /mob/living/simple_animal/hostile/megafauna/colossus/proc/dir_shots(list/dirs) if(!islist(dirs))