mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-19 11:58:39 +01:00
Portal Fix (#21158)
* Fixes telescience portals not working correctly, causing an infinite loop.
This commit is contained in:
@@ -146,6 +146,14 @@
|
||||
|
||||
playSpecials(curturf,effectin,soundin)
|
||||
|
||||
// we don't want a teleportation loop, if we teleport to a destination that already has a portal
|
||||
// disable it for just a moment until we get there
|
||||
var/has_active_destination_portal = FALSE
|
||||
var/obj/effect/portal/destination_portal = locate() in destturf
|
||||
if(destination_portal?.does_teleport)
|
||||
has_active_destination_portal = TRUE
|
||||
destination_portal.does_teleport = FALSE
|
||||
|
||||
var/obj/structure/bed/stool/chair/C = null
|
||||
if(isliving(teleatom))
|
||||
var/mob/living/L = teleatom
|
||||
@@ -270,6 +278,9 @@
|
||||
|
||||
destarea.Entered(teleatom)
|
||||
|
||||
if(has_active_destination_portal)
|
||||
destination_portal.does_teleport = TRUE
|
||||
|
||||
return TRUE
|
||||
|
||||
/datum/teleport/proc/teleport()
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
author: Geeves
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- bugfix: "Fixes telescience portals not working correctly, causing an infinite loop."
|
||||
Reference in New Issue
Block a user