diff --git a/code/modules/mob/living/carbon/human/exercise.dm b/code/modules/mob/living/carbon/human/exercise.dm index 1d4c73e236d..9484524f70e 100644 --- a/code/modules/mob/living/carbon/human/exercise.dm +++ b/code/modules/mob/living/carbon/human/exercise.dm @@ -41,13 +41,13 @@ Exercise Verbs stop_pushups() return animate(src, pixel_y = target_y, time = 0.8 SECONDS, easing = QUAD_EASING) //down to the floor - if(!lying || !do_after(src, 0.6 SECONDS, do_flags = DO_EXERCISE)) + if(!lying || !do_after(src, 0.6 SECONDS, do_flags = DO_EXERCISE, incapacitation_flags = (INCAPACITATION_RESTRAINED|INCAPACITATION_BUCKLED_PARTIALLY|INCAPACITATION_BUCKLED_FULLY|INCAPACITATION_KNOCKOUT))) visible_message(SPAN_NOTICE("[src] stops doing pushups."), SPAN_NOTICE("You stop doing pushups."), SPAN_NOTICE("You hear movements.")) animate(src, pixel_y = 0, time = 0.2 SECONDS, easing = QUAD_EASING) stop_pushups() return animate(src, pixel_y = 0, time = 0.8 SECONDS, easing = QUAD_EASING) //back up - if(!lying || !do_after(src, 0.6 SECONDS, do_flags = DO_EXERCISE)) + if(!lying || !do_after(src, 0.6 SECONDS, do_flags = DO_EXERCISE, incapacitation_flags = (INCAPACITATION_RESTRAINED|INCAPACITATION_BUCKLED_PARTIALLY|INCAPACITATION_BUCKLED_FULLY|INCAPACITATION_KNOCKOUT))) visible_message(SPAN_NOTICE("[src] stops doing pushups."), SPAN_NOTICE("You stop doing pushups."), SPAN_NOTICE("You hear movements.")) animate(src, pixel_y = 0, time = 0.2 SECONDS, easing = QUAD_EASING) stop_pushups() diff --git a/html/changelogs/fluffyghost-fixpushups.yml b/html/changelogs/fluffyghost-fixpushups.yml new file mode 100644 index 00000000000..b119fee1f9a --- /dev/null +++ b/html/changelogs/fluffyghost-fixpushups.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: FluffyGhost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed pushups."