Merge pull request #7023 from Citadel-Station-13/lmao
Telebatons/policebatons buffed to be a viable stun weapon (but not as good as stunbatons/prods), secways nerfed to non-sprint movespeed with sprint buffer (but this time they're actually responsive instead of being laggy and the buffer is weaker)
This commit is contained in:
@@ -1,11 +1,13 @@
|
||||
/datum/status_effect/incapacitating/knockdown/on_creation(mob/living/new_owner, set_duration, updating_canmove)
|
||||
if(iscarbon(new_owner) && isnum(set_duration))
|
||||
/datum/status_effect/incapacitating/knockdown/on_creation(mob/living/new_owner, set_duration, updating_canmove, override_duration, override_stam)
|
||||
if(iscarbon(new_owner) && (isnum(set_duration) || isnum(override_duration)))
|
||||
new_owner.resting = TRUE
|
||||
new_owner.adjustStaminaLoss(set_duration*0.25)
|
||||
if(set_duration > 80)
|
||||
new_owner.adjustStaminaLoss(isnull(override_stam)? set_duration*0.25 : override_stam)
|
||||
if(isnull(override_duration) && (set_duration > 80))
|
||||
set_duration = set_duration*0.15
|
||||
. = ..()
|
||||
return
|
||||
return ..()
|
||||
else if(!isnull(override_duration))
|
||||
set_duration = override_duration
|
||||
return ..()
|
||||
else if(updating_canmove)
|
||||
new_owner.update_canmove()
|
||||
qdel(src)
|
||||
|
||||
Reference in New Issue
Block a user