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

ripping off my own code

Browse Source
This commit is contained in:
silicons
2021-04-26 23:29:37 -07:00
parent eb2c12ceee
commit a415453540
6 changed files with 155 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/living_active_parry.dm
View File

@@ -46,7 +46,7 @@
// Point of no return, make sure everything is set.
parrying = method
if(method == ITEM_PARRY)
active_parry_item = using_item
active_parry_item = tool
if(!UseStaminaBuffer(data.parry_stamina_cost, TRUE))
return FALSE
parry_start_time = world.time

2
code/modules/mob/living/say.dm
View File

@@ -312,7 +312,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 = get_hearers_in_view(35, src) | get_hearers_in_range(5, src)
// overhearing = get_hearers_in_view(35, src) | get_hearers_in_range(5, src)
overhearing -= already_heard
for(var/_AM in overhearing)
var/atom/movable/AM = _AM