Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: firemanned people are can no longer be teleported when buckled #6058

Merged
merged 3 commits into from
Oct 23, 2024
Merged

bugfix: firemanned people are can no longer be teleported when buckled #6058

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d4b718
Update ridable.dm
NightDawnFox Oct 21, 2024
1c67601
ммм
NightDawnFox Oct 21, 2024
b76b718
Update code/datums/elements/ridable.dm
NightDawnFox Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/datums/elements/ridable.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@
return
return rider

/obj/item/riding_offhand/afterattack(atom/movable/interacting_with, mob/living/user, list/modifiers)
if(!istype(interacting_with) || !interacting_with.can_buckle)
/obj/item/riding_offhand/afterattack(atom/movable/interacting_with, mob/living/user, proximity, list/modifiers, status)
if(!istype(interacting_with) || !interacting_with.can_buckle || !proximity)
return NONE
if(rider == user) // Piggyback user
return
Expand Down