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

[MIRROR] Fixes placing mobs in mounted sleepers #1144

Merged
merged 1 commit into from
Oct 17, 2023
Merged

[MIRROR] Fixes placing mobs in mounted sleepers #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion code/_onclick/item_attack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
return FALSE

// Target checks
if (!Adjacent(target))
if (isturf(target.loc) && !Adjacent(target))
if (!silent)
FEEDBACK_FAILURE(src, "You must remain next to \the [target].")
return FALSE
Expand Down
6 changes: 5 additions & 1 deletion code/modules/mob/mob.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,11 @@

/mob/proc/start_pulling(atom/movable/AM)

if ( !AM || !usr || src==AM || !isturf(src.loc) ) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
if ( !AM || !usr || src==AM || !isturf(src.loc)) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
return

if (!Adjacent(AM))
to_chat(src, SPAN_WARNING("You must remain next to \the [AM]."))
return

if (AM.anchored)
Expand Down