From c8445c76dae0ac6ea95877cbec0e30dd8374d134 Mon Sep 17 00:00:00 2001 From: unid15 Date: Thu, 6 Aug 2015 11:27:09 +0200 Subject: [PATCH] nothing gamebreaking anymore --- code/datums/shuttle.dm | 11 ++++++----- code/game/shuttles/emergency.dm | 2 ++ code/modules/admin/admin.dm | 2 +- vgstation13.dme | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/datums/shuttle.dm b/code/datums/shuttle.dm index 18285b99a4c..10ea790ca24 100644 --- a/code/datums/shuttle.dm +++ b/code/datums/shuttle.dm @@ -453,7 +453,7 @@ coordinates += "[T.x];[T.y];[T.z]" //Remove all stuff from the area - linked_area.contents = list() + //linked_area.contents = list() //Calculate new coordinates var/list/new_turfs = list() //Coordinates of turfs that WILL be created @@ -515,15 +515,14 @@ //****Add the new turf to shuttle's area**** - linked_area.contents += new_turf + linked_area.contents.Add(new_turf) new_turf.change_area(old_area,linked_area) new_turf.ChangeTurf(old_turf.type) new_turfs[C] = new_turf //***Remove old turf from shuttle's area**** - space.contents += old_turf - linked_area.contents -= old_turf + space.contents.Add(old_turf) old_turf.change_area(linked_area,space) //All objects which aren't going to be moved by the shuttle have their area changed to space! @@ -535,7 +534,9 @@ //****Move all variables from the old turf over to the new turf**** for(var/key in old_turf.vars) - if(key in ignored_keys) continue //ignored_keys: code/game/area/areas.dm, 526 (above the move_contents_to proc) + if(key in ignored_keys) continue + //ignored_keys: code/game/area/areas.dm, 526 (above the move_contents_to proc) + //as of 06/08/2015: list("loc", "locs", "parent_type", "vars", "verbs", "type", "x", "y", "z","group","contents","air","light","areaMaster","underlays","lighting_overlay") if(istype(old_turf.vars[key],/list)) var/list/L = old_turf.vars[key] new_turf.vars[key] = L.Copy() diff --git a/code/game/shuttles/emergency.dm b/code/game/shuttles/emergency.dm index 4e855c56d6b..e26d5bcc7a0 100644 --- a/code/game/shuttles/emergency.dm +++ b/code/game/shuttles/emergency.dm @@ -9,6 +9,8 @@ var/global/datum/shuttle/escape/escape_shuttle = new(starting_area=/area/shuttle transit_delay = 100 //This has NO effect outside of adminbus pre_flight_delay = 30 //This has NO effect outside of adminbus + stable = 0 + var/obj/structure/docking_port/destination/dock_centcom var/obj/structure/docking_port/destination/dock_station diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 76d2af1a6c2..1af8e76adcb 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -847,7 +847,7 @@ var/global/floorIsLava = 0 This will allow the shuttle to move to it.
Set a destination docking port to be a shuttle's transit area
- Use the \"Edit a shuttle's parameters\" option belo to change how the transit area is used + Use the \"Edit a shuttle's parameters\" option belo to change how the transit area is used
Create a shuttle docking port
This will create a shuttle docking port at your location, facing the direction you are currently facing. Shuttle docking ports are used by shuttles to dock to destination docking ports.
diff --git a/vgstation13.dme b/vgstation13.dme index 0090767249d..2ed1e6e5a77 100644 --- a/vgstation13.dme +++ b/vgstation13.dme @@ -1789,7 +1789,7 @@ #include "interface\interface.dm" #include "interface\skin.dmf" #include "maps\_map.dm" -#include "maps\tgstation.dm" +#include "maps\metaclub.dm" #include "maps\RandomZLevels\Academy.dm" #include "maps\RandomZLevels\challenge.dm" #include "maps\RandomZLevels\stationCollision.dm"