From 4373f116e0147318fd1e0339130a28ceec89bfc7 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 19 Feb 2020 22:07:03 -0700 Subject: [PATCH 1/3] Update teleportation.dm --- code/game/objects/items/teleportation.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index 347717dd63..e95668e1f3 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -141,8 +141,8 @@ return TRUE return ..() -/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 30) - var/datum/beam/B = user.Beam(target) +/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 20) + var/datum/beam/B = user.Beam(target, beam_icon_state = "rped_upgrade", maxdistance = 50) if(is_parent_of_portal(target) && (!delay || do_after(user, delay, target = target))) qdel(target) to_chat(user, "You dispel [target] with \the [src]!") From fd410963a90c5eab6ca23da52a0d890cc3e1a51d Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 19 Feb 2020 22:23:54 -0700 Subject: [PATCH 2/3] Update teleportation.dm --- 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 e95668e1f3..bb860101ac 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -142,7 +142,7 @@ return ..() /obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 20) - var/datum/beam/B = user.Beam(target, beam_icon_state = "rped_upgrade", maxdistance = 50) + var/datum/beam/B = user.Beam(target, icon_state = "rped_upgrade", maxdistance = 50) if(is_parent_of_portal(target) && (!delay || do_after(user, delay, target = target))) qdel(target) to_chat(user, "You dispel [target] with \the [src]!") From 0cfa6699b1063b872735f78f77de44b92a74e16c Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 24 Feb 2020 02:31:14 -0700 Subject: [PATCH 3/3] yeah ok fine --- 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 bb860101ac..7d59da0089 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -141,7 +141,7 @@ return TRUE return ..() -/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 20) +/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 30) var/datum/beam/B = user.Beam(target, icon_state = "rped_upgrade", maxdistance = 50) if(is_parent_of_portal(target) && (!delay || do_after(user, delay, target = target))) qdel(target)