cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 05:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7556 from Rykka-Stormheart/shep-dev-merc-fixes

Browse Source 
Fixes Mercs threaten timers, and threaten sounds
This commit is contained in:
Atermonera
2020-08-27 16:57:39 -07:00
committed by GitHub
parent cfbf5d10b4 0f9cf07d7c
commit f3f77d9c1f
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/ai/say_list.dm
View File

@@ -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.")

2
code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
View File

@@ -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!