[MIRROR] Fixes placing mobs in mounted sleepers

SierraBay · Oct 17, 2023 · a577fcc · a577fcc
1 parent 4261cbd
commit a577fcc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
@@ -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

diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
@@ -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)