continue pulling on map edges / map portals

This commit is contained in:
Kashargul
2023-12-17 01:03:43 +01:00
committed by GitHub
parent ebf8450637
commit 727ed8f024
3 changed files with 36 additions and 5 deletions
+21 -1
View File
@@ -70,7 +70,7 @@
to_chat(src, "<span class='filter_notice'><I>... You can almost hear someone talking ...</I></span>")
else
if(client && client.prefs.chat_timestamp)
msg = replacetext(msg, new/regex("^(<span(?: \[^>]*)?>)((?:.|\\n)*</span>)", ""), "$1[time] $2")
msg = replacetext(msg, new/regex("^(<span(?: \[^>]*)?>)((?:.|\\n)*</span>)", ""), "$1[time] $2")
to_chat(src,msg)
else if(teleop)
to_chat(teleop, create_text_tag("body", "BODY:", teleop.client) + "[msg]")
@@ -616,6 +616,26 @@
var/mob/pulled = AM
pulled.inertia_dir = 0
// We have pulled something before, so we should be able to safely continue pulling it. This proc is only for portals!
/mob/proc/continue_pulling(var/atom/movable/AM)
if ( !AM || 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 (AM.anchored)
return
src.pulling = AM
AM.pulledby = src
if(pullin)
pullin.icon_state = "pull1"
//Attempted fix for people flying away through space when cuffed and dragged.
if(ismob(AM))
var/mob/pulled = AM
pulled.inertia_dir = 0
/mob/proc/can_use_hands()
return