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

2021-01-13 15:41:28 -07:00
parent 343ef7db2c 1fd9bc8a50
commit ea07ad6e48
63 changed files with 303 additions and 252 deletions
@@ -146,6 +146,8 @@
 		var/mob/living/L = target
 		if(!(L.mobility_flags & MOBILITY_STAND))
 			return
+	if(iscyborg(target))
+		return max(1, existing - 1)
 	var/static/datum/config_entry/number/movedelay/sprint_max_tiles_increase/SMTI
 	if(!SMTI)
 		SMTI = CONFIG_GET_ENTRY(number/movedelay/sprint_max_tiles_increase)