cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fireman Carrying (#12183)

Browse Source
This commit is contained in:
Geeves
2021-07-21 13:58:42 +02:00
committed by GitHub
parent cd6a48502d
commit 225065e3c1
13 changed files with 156 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/portals.dm
+13 -4
View File
@@ -53,16 +53,25 @@
if(does_teleport)
teleport(user)
/obj/effect/portal/proc/teleport(atom/movable/M)
/obj/effect/portal/proc/teleport(atom/movable/movable)
if(!does_teleport) // just to be safe
return
if(istype(M, /obj/effect)) //sparks don't teleport
if(istype(movable, /obj/effect)) //sparks don't teleport
return
if(!target)
qdel(src)
return
var/has_teleported = FALSE
if(istype(M, /atom/movable))
var/list/things_to_teleport = list(movable)
if(ismob(movable))
var/mob/M = movable
if(M.pulling)
things_to_teleport += M.pulling
if(ishuman(movable))
var/mob/living/carbon/human/H = movable
for(var/obj/item/grab/G in list(H.l_hand, H.r_hand))
things_to_teleport += G.affecting
for(var/atom/movable/M in things_to_teleport)
if(has_failed) //oh dear a problem, put em in deep space
icon_state = "portal1" // only tell people the portal failed after a teleport has been done
desc = "A bluespace tear in space, reaching directly to another point within this region. Definitely unstable."
@@ -72,7 +81,7 @@
if(do_teleport(M, target, precision))
has_teleported = TRUE
if(!has_teleported)
visible_message(SPAN_WARNING("\The [src] oscillates violently as \the [M] comes into contact with it, and collapses! Seems like the rift was unstable..."))
visible_message(SPAN_WARNING("\The [src] oscillates violently as \the [movable] comes into contact with it, and collapses! Seems like the rift was unstable..."))
qdel(src)
/obj/effect/portal/Destroy()