From 50284e96839769254b7aade9ebd83e859bb63365 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Fri, 1 Jan 2016 19:55:25 -0600 Subject: [PATCH 1/3] Fixes goliath icon --- code/modules/mob/living/simple_animal/hostile/mining_mobs.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 0842a2062af..8aff0315115 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -378,7 +378,10 @@ visible_message("The [src.name] digs its tentacles under [target.name]!") new /obj/effect/goliath_tentacle/original(tturf) ranged_cooldown = ranged_cooldown_cap - icon_state = icon_aggro + if(stat) + icon_state = icon_dead + else + icon_state = icon_aggro pre_attack = 0 return From fc0ab5d7b0c21e9e01a109da3f8d3ab0138863c6 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Fri, 1 Jan 2016 20:02:03 -0600 Subject: [PATCH 2/3] Turfs --- code/modules/mob/living/simple_animal/hostile/mining_mobs.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 8aff0315115..56f6b13e69d 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -374,6 +374,8 @@ /mob/living/simple_animal/hostile/asteroid/goliath/OpenFire() var/tturf = get_turf(target) + if(!(istype(tturf, /turf/simulated))) + return if(get_dist(src, target) <= 7)//Screen range check, so you can't get tentacle'd offscreen visible_message("The [src.name] digs its tentacles under [target.name]!") new /obj/effect/goliath_tentacle/original(tturf) From 9ce8c0d62980f8821e165c0e3c1b6da68858cd4c Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sat, 2 Jan 2016 19:29:13 -0600 Subject: [PATCH 3/3] Goliath --- code/modules/mob/living/simple_animal/hostile/mining_mobs.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 56f6b13e69d..bfd17bc69db 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -380,10 +380,7 @@ visible_message("The [src.name] digs its tentacles under [target.name]!") new /obj/effect/goliath_tentacle/original(tturf) ranged_cooldown = ranged_cooldown_cap - if(stat) - icon_state = icon_dead - else - icon_state = icon_aggro + icon_state = icon_aggro pre_attack = 0 return