shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11051 from Citadel-Station-13/kevinz000-patch-2

Browse Source 
nerfs hand teleporters to have a dispel delay
This commit is contained in:
Ghom
2020-02-14 19:17:59 +01:00
committed by GitHub
parent 57113a4146 73e782a4de
commit b9ab0cebb3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/teleportation.dm
+5 -2
View File
@@ -141,11 +141,14 @@
return TRUE return TRUE
return ..() return ..()
/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user) /obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 30)
if(is_parent_of_portal(target)) var/datum/beam/B = user.Beam(target)
if(is_parent_of_portal(target) && (!delay || do_after(user, delay, target = target)))
qdel(target) qdel(target)
to_chat(user, "<span class='notice'>You dispel [target] with \the [src]!</span>") to_chat(user, "<span class='notice'>You dispel [target] with \the [src]!</span>")
qdel(B)
return TRUE return TRUE
qdel(B)
return FALSE return FALSE
/obj/item/hand_tele/afterattack(atom/target, mob/user) /obj/item/hand_tele/afterattack(atom/target, mob/user)