From aad78ffb78d6b6fb215c5a292cc536e02a647e8b Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 12 Feb 2020 17:53:42 -0700
Subject: [PATCH 1/2] Update teleportation.dm
---
code/game/objects/items/teleportation.dm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm
index 8c0f315ca3..14ba93a60c 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -141,11 +141,15 @@
return FALSE
return ..()
-/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user)
- if(is_parent_of_portal(target))
+/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 30)
+ if(delay)
+ var/datum/beam/B = user.Beam(target)
+ if(is_parent_of_portal(target) && (!delay || do_after(user, delay, target = target)))
qdel(target)
to_chat(user, "You dispel [target] with \the [src]!")
+ qdel(B)
return TRUE
+ qdel(B)
return FALSE
/obj/item/hand_tele/afterattack(atom/target, mob/user)
From 73e782a4deadc99dcc00756f7685ac93566b60a9 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Wed, 12 Feb 2020 20:56:09 -0700
Subject: [PATCH 2/2] Update teleportation.dm
---
code/game/objects/items/teleportation.dm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm
index 14ba93a60c..4439e7c170 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -142,8 +142,7 @@
return ..()
/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 30)
- if(delay)
- var/datum/beam/B = user.Beam(target)
+ var/datum/beam/B = user.Beam(target)
if(is_parent_of_portal(target) && (!delay || do_after(user, delay, target = target)))
qdel(target)
to_chat(user, "You dispel [target] with \the [src]!")