From a0394c94edca2e9ae1fdeb73dddb510165f0cf46 Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Tue, 1 Dec 2015 11:00:02 +0000 Subject: [PATCH 1/6] Adds summon_backup() to hostile animals --- code/modules/mob/living/simple_animal/hostile/hostile.dm | 6 ++++++ .../mob/living/simple_animal/hostile/syndicate.dm | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 1e08aa370a3..e286071d883 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -218,6 +218,12 @@ LoseTarget() ..(gibbed) +/mob/living/simple_animal/hostile/proc/summon_backup(distance) + for (var/mob/living/simple_animal/hostile/M in oview(distance, src)) + for (var/element in src.faction) + if (element in M.faction) + M.Goto(src,M.move_to_delay,M.minimum_distance) + /mob/living/simple_animal/hostile/proc/OpenFire(atom/A) visible_message("[src] [ranged_message] at [A]!") diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 8fe9be967e8..b1857c762d0 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -102,6 +102,15 @@ return +/mob/living/simple_animal/hostile/syndicate/civilian + minimum_distance = 6 + environment_smash = 0 + +/mob/living/simple_animal/hostile/syndicate/civilian/Aggro() + ..() + summon_backup(15) + say("GUARDS!!") + /mob/living/simple_animal/hostile/viscerator name = "viscerator" From f3b0847042602c0cf5a29ad123adfdb9e6dc3d77 Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Tue, 1 Dec 2015 14:32:10 +0000 Subject: [PATCH 2/6] ! --- code/modules/mob/living/simple_animal/hostile/hostile.dm | 1 + code/modules/mob/living/simple_animal/hostile/syndicate.dm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index e286071d883..78ddb28f836 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -219,6 +219,7 @@ ..(gibbed) /mob/living/simple_animal/hostile/proc/summon_backup(distance) + do_alert_animation(src) for (var/mob/living/simple_animal/hostile/M in oview(distance, src)) for (var/element in src.faction) if (element in M.faction) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index b1857c762d0..b959c3c1ecc 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -103,7 +103,8 @@ /mob/living/simple_animal/hostile/syndicate/civilian - minimum_distance = 6 + minimum_distance = 10 + retreat_distance = 10 environment_smash = 0 /mob/living/simple_animal/hostile/syndicate/civilian/Aggro() From e628f4869b72ce12326d49d90bac5cb46460577a Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Tue, 1 Dec 2015 17:15:46 +0000 Subject: [PATCH 3/6] Makes faction checking more efficient. Adds a chime to go with the exclamation mark. --- code/modules/mob/living/simple_animal/hostile/hostile.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 78ddb28f836..982ec670226 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -220,10 +220,12 @@ /mob/living/simple_animal/hostile/proc/summon_backup(distance) do_alert_animation(src) + playsound(loc, 'sound/machines/chime.ogg', 50, 1, -1) for (var/mob/living/simple_animal/hostile/M in oview(distance, src)) for (var/element in src.faction) if (element in M.faction) M.Goto(src,M.move_to_delay,M.minimum_distance) + continue /mob/living/simple_animal/hostile/proc/OpenFire(atom/A) From 07a9aa65b8aa039814e2887aed3f724e8dcfa44e Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Tue, 1 Dec 2015 17:32:33 +0000 Subject: [PATCH 4/6] More efficiency things --- .../mob/living/simple_animal/hostile/hostile.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 982ec670226..1c2b8bcbe2b 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -221,11 +221,12 @@ /mob/living/simple_animal/hostile/proc/summon_backup(distance) do_alert_animation(src) playsound(loc, 'sound/machines/chime.ogg', 50, 1, -1) - for (var/mob/living/simple_animal/hostile/M in oview(distance, src)) - for (var/element in src.faction) - if (element in M.faction) - M.Goto(src,M.move_to_delay,M.minimum_distance) - continue + mob_loop: + for (var/mob/living/simple_animal/hostile/M in oview(distance, src)) + for (var/element in src.faction) + if (element in M.faction) + M.Goto(src,M.move_to_delay,M.minimum_distance) + continue mob_loop /mob/living/simple_animal/hostile/proc/OpenFire(atom/A) From eb2e935100ab8e61a9c5ecb0aa01bc043b59c8c1 Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Thu, 3 Dec 2015 18:22:03 +0000 Subject: [PATCH 5/6] Changed faction check --- code/modules/mob/living/simple_animal/hostile/hostile.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 1c2b8bcbe2b..89f419357f1 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -223,10 +223,9 @@ playsound(loc, 'sound/machines/chime.ogg', 50, 1, -1) mob_loop: for (var/mob/living/simple_animal/hostile/M in oview(distance, src)) - for (var/element in src.faction) - if (element in M.faction) - M.Goto(src,M.move_to_delay,M.minimum_distance) - continue mob_loop + var/list/L = M.faction&faction + if(L.len) + M.Goto(src,M.move_to_delay,M.minimum_distance) /mob/living/simple_animal/hostile/proc/OpenFire(atom/A) From 9ea8530133d517df76196b3de5b38262ef15b865 Mon Sep 17 00:00:00 2001 From: Thunder12345 Date: Thu, 3 Dec 2015 18:38:56 +0000 Subject: [PATCH 6/6] Typos plssssss --- code/modules/mob/living/simple_animal/hostile/hostile.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 89f419357f1..2b11da4eda2 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -221,11 +221,10 @@ /mob/living/simple_animal/hostile/proc/summon_backup(distance) do_alert_animation(src) playsound(loc, 'sound/machines/chime.ogg', 50, 1, -1) - mob_loop: - for (var/mob/living/simple_animal/hostile/M in oview(distance, src)) - var/list/L = M.faction&faction - if(L.len) - M.Goto(src,M.move_to_delay,M.minimum_distance) + for (var/mob/living/simple_animal/hostile/M in oview(distance, src)) + var/list/L = M.faction&faction + if(L.len) + M.Goto(src,M.move_to_delay,M.minimum_distance) /mob/living/simple_animal/hostile/proc/OpenFire(atom/A)