From d29fcdbe2b60f3bafb56e94a09f8c0eeaab4ead7 Mon Sep 17 00:00:00 2001 From: Dennok Date: Thu, 5 Mar 2020 13:21:47 +0200 Subject: [PATCH 1/3] Hand Tele try place portal ahead of user. --- code/game/objects/items/teleportation.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index 9242f52270c..31b0dee6b11 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -203,7 +203,7 @@ return RegisterSignal(created[1], COMSIG_PARENT_QDELETING, .proc/on_portal_destroy) //Gosh darn it kevinz. RegisterSignal(created[2], COMSIG_PARENT_QDELETING, .proc/on_portal_destroy) - try_move_adjacent(created[1]) + try_move_adjacent(created[1], user.dir) active_portal_pairs[created[1]] = created[2] var/obj/effect/portal/c1 = created[1] var/obj/effect/portal/c2 = created[2] From 90724d8140ba0b81e22f85f4aea630621af2e236 Mon Sep 17 00:00:00 2001 From: Dennok Date: Thu, 5 Mar 2020 13:51:59 +0200 Subject: [PATCH 2/3] tweak try_move_adjacent try_move_adjacent can take desirable dir --- code/__HELPERS/game.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index f3ff9dcf1ae..b07f8c2e523 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -276,12 +276,15 @@ else return 0 - -/proc/try_move_adjacent(atom/movable/AM) +/proc/try_move_adjacent(atom/movable/AM, trydir) var/turf/T = get_turf(AM) + if(trydir) + if(AM.Move(get_step(T, trydir))) + return TRUE for(var/direction in GLOB.cardinals) if(AM.Move(get_step(T, direction))) - break + return TRUE + return FALSE /proc/get_mob_by_key(key) var/ckey = ckey(key) From d0ffd7a12bead069985715e8b262abceeeb17c97 Mon Sep 17 00:00:00 2001 From: Dennok Date: Thu, 5 Mar 2020 14:56:04 +0200 Subject: [PATCH 3/3] drip of unload --- code/__HELPERS/game.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index b07f8c2e523..130ea772dd3 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -281,7 +281,7 @@ if(trydir) if(AM.Move(get_step(T, trydir))) return TRUE - for(var/direction in GLOB.cardinals) + for(var/direction in (GLOB.cardinals-trydir)) if(AM.Move(get_step(T, direction))) return TRUE return FALSE