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

Arena shuttle teleport fix (#33777)

Browse Source
This commit is contained in:
Emmett Gaines
2017-12-25 20:11:40 -05:00
committed by CitadelStationBot
parent 6205268f7e
commit a1ec5538a6
3 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/generic/CentCom.dmm
+11 -11
View File
@@ -13769,11 +13769,11 @@
/area/tdome/tdomeadmin)
"JV" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
/area/shuttle/escape/backup)
"JW" = (
/obj/machinery/status_display,
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
/area/shuttle/escape/backup)
"JX" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/line{
@@ -13816,16 +13816,16 @@
/area/tdome/tdomeadmin)
"Kd" = (
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
/area/shuttle/escape/backup)
"Ke" = (
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
/area/shuttle/escape/backup)
"Kf" = (
/obj/machinery/computer/emergency_shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
/area/shuttle/escape/backup)
"Kg" = (
/turf/closed/indestructible/fakedoor{
name = "Thunderdome Admin"
@@ -13865,18 +13865,18 @@
},
/obj/docking_port/mobile/emergency/backup,
/turf/open/floor/plating,
/area/shuttle/escape)
/area/shuttle/escape/backup)
"Kl" = (
/obj/structure/chair/office/light{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
/area/shuttle/escape/backup)
"Km" = (
/obj/structure/table/wood,
/obj/item/paper/fluff/stations/centcom/broken_evac,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
/area/shuttle/escape/backup)
"Kn" = (
/obj/structure/bookcase/random,
/turf/open/floor/plasteel/vault{
@@ -14012,7 +14012,7 @@
/obj/structure/table/wood,
/obj/item/book/manual/random,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
/area/shuttle/escape/backup)
"KA" = (
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/sparsegrass,
@@ -14044,13 +14044,13 @@
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
/area/shuttle/escape/backup)
"KF" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
/area/shuttle/escape/backup)
"KG" = (
/obj/structure/flora/ausbushes/lavendergrass,
/obj/structure/flora/ausbushes/sparsegrass,
code/game/area/areas/shuttles.dm
+3
View File
@@ -76,6 +76,9 @@
/area/shuttle/escape
name = "Emergency Shuttle"
/area/shuttle/escape/backup
name = "Backup Emergency Shuttle"
/area/shuttle/escape/luxury
name = "Luxurious Emergency Shuttle"
noteleport = TRUE
code/modules/admin/fun_balloon.dm
+14 -8
View File
@@ -117,19 +117,25 @@
/obj/effect/forcefield/arena_shuttle
name = "portal"
var/list/warp_points = list()
var/list/warp_points
/obj/effect/forcefield/arena_shuttle/Initialize()
. = ..()
warp_points = get_area_turfs(/area/shuttle/escape)
for(var/thing in warp_points)
CHECK_TICK
var/turf/T = thing
if(istype(T.loc, /area/shuttle/escape/backup))
warp_points -= T
continue
for(var/atom/movable/TAM in T)
if(TAM.density && TAM.anchored)
warp_points -= T
break
/obj/effect/forcefield/arena_shuttle/CollidedWith(atom/movable/AM)
if(!isliving(AM))
return
if(!warp_points.len)
warp_points = get_area_turfs(/area/shuttle/escape)
for(var/turf/T in warp_points)
for(var/atom/movable/TAM in T)
if(TAM.density && TAM.anchored)
warp_points -= T
break
var/mob/living/L = AM
if(L.pulling && istype(L.pulling, /obj/item/bodypart/head))