shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yelling works

Browse Source
This commit is contained in:
silicons
2021-06-13 00:50:00 -07:00
parent 2f9492945d
commit b6bb20842f
7 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living_blocking_parrying.dm
+1 -1
View File
@@ -114,7 +114,7 @@ GLOBAL_LIST_EMPTY(block_parry_data)
/// Attack types we can block
var/parry_attack_types = ALL
/// Parry flags
var/parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK | PARRY_LOCK_ATTACKING
var/parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK
/// Parry windup duration in deciseconds. 0 to this is windup, afterwards is main stage.
var/parry_time_windup = 0
code/modules/mob/living/say.dm
+1 -1
View File
@@ -311,7 +311,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
/atom/movable/proc/process_yelling(list/already_heard, rendered, atom/movable/speaker, datum/language/message_language, message, list/spans, message_mode, obj/source)
var/list/overhearing = list()
overhearing = yelling_wavefill(src, 35)
overhearing = yelling_wavefill(src, yell_power)
// overhearing = get_hearers_in_view(35, src) | get_hearers_in_range(5, src)
overhearing -= already_heard
for(var/_AM in overhearing)