Skip to content

Commit

Permalink
Fixes resist while bucklecuffed to bed (#6960)
Browse files Browse the repository at this point in the history
# About the pull request

Fixes #6347 (interrupt_all
includes interrupt_knocked_down and you're considered knocked down when
lying down on bed, so you can't resist when bucklecuffed to bed atm)

# Explain why it's good for the game

Fixes #6347


# Testing Photographs and Procedure
Tested it on local, it worked
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
fix: lets you resist when bucklecuffed to bed
/:cl:
  • Loading branch information
zzzmike authored Aug 18, 2024
1 parent 8119344 commit 8e15f17
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
#define INTERRUPT_ALL_OUT_OF_RANGE (INTERRUPT_ALL & (~INTERRUPT_DIFF_TURF)|INTERRUPT_OUT_OF_RANGE)
#define INTERRUPT_MOVED (INTERRUPT_DIFF_LOC|INTERRUPT_DIFF_TURF|INTERRUPT_RESIST)
#define INTERRUPT_NO_NEEDHAND (INTERRUPT_ALL & (~INTERRUPT_NEEDHAND))
#define INTERRUPT_NO_FLOORED (INTERRUPT_ALL & (~INTERRUPT_KNOCKED_DOWN))
#define INTERRUPT_INCAPACITATED (INTERRUPT_UNCONSCIOUS|INTERRUPT_KNOCKED_DOWN|INTERRUPT_STUNNED|INTERRUPT_RESIST)
#define INTERRUPT_CLICK (INTERRUPT_LCLICK|INTERRUPT_RCLICK|INTERRUPT_SHIFTCLICK|INTERRUPT_ALTCLICK|INTERRUPT_CTRLCLICK|INTERRUPT_MIDDLECLICK|INTERRUPT_RESIST)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/carbon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@
last_special = world.time + 100
visible_message(SPAN_DANGER("<B>[src] attempts to unbuckle themself!</B>"),\
SPAN_DANGER("You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stand still)"))
if(do_after(src, 1200, INTERRUPT_ALL^INTERRUPT_RESIST, BUSY_ICON_HOSTILE))
if(do_after(src, 1200, INTERRUPT_NO_FLOORED^INTERRUPT_RESIST, BUSY_ICON_HOSTILE))
if(!buckled)
return
visible_message(SPAN_DANGER("<B>[src] manages to unbuckle themself!</B>"),\
Expand Down

0 comments on commit 8e15f17

Please sign in to comment.