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

Merge remote-tracking branch 'citadel/master' into combat_v7

Browse Source
This commit is contained in:
silicons
2021-03-15 14:39:16 -07:00
parent 5d1cda26dc c32f3644a6
commit 5d51025ad6
870 changed files with 32914 additions and 23755 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/movespeed/_movespeed_modifier.dm
+4 -2
View File
@@ -161,8 +161,10 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache)
/// Handles the special case of editing the movement var
/mob/vv_edit_var(var_name, var_value)
if(var_name == NAMEOF(src, control_object))
var/obj/O = var_name
if(!istype(O) || (O.obj_flags & DANGEROUS_POSSESSION))
var/obj/O = var_value
if(!istype(O) && (var_value != null))
return FALSE
if(O.obj_flags & DANGEROUS_POSSESSION)
return FALSE
var/slowdown_edit = (var_name == NAMEOF(src, cached_multiplicative_slowdown))
var/diff