diff --git a/code/modules/ai/say_list.dm b/code/modules/ai/say_list.dm index 9eba02b9b1..313913ac73 100644 --- a/code/modules/ai/say_list.dm +++ b/code/modules/ai/say_list.dm @@ -71,6 +71,9 @@ say_threaten = list("Get out of here!", "Hey! Private Property!") say_stand_down = list("Good.") say_escalate = list("Your funeral!", "Bring it!") + + threaten_sound = 'sound/weapons/TargetOn.ogg' + stand_down_sound = 'sound/weapons/TargetOff.ogg' /datum/say_list/malf_drone speak = list("ALERT.","Hostile-ile-ile entities dee-twhoooo-wected.","Threat parameterszzzz- szzet.","Bring sub-sub-sub-systems uuuup to combat alert alpha-a-a.") diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm index 5bdddb9542..c24d932a72 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm @@ -83,6 +83,8 @@ threaten = TRUE returns_home = TRUE // Stay close to the base... wander = TRUE // ... but "patrol" a little. + intelligence_level = AI_SMART // Also knows not to walk while confused if it risks death. + threaten_delay = 30 SECONDS // Mercs will give you 30 seconds to leave or get shot. /datum/ai_holder/simple_mob/merc/ranged pointblank = TRUE // They get close? Just shoot 'em! diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm index 6215cf9b2a..67e396fb4d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm @@ -23,6 +23,3 @@ min_n2 = 0 max_n2 = 0 minbodytemp = 0 - -/datum/ai_holder/simple_mob/merc - intelligence_level = AI_SMART // Also knows not to walk while confused if it risks death.