Merge pull request #12977 from Very-Soft/backtogb

It's time for fun it's time to run around in the sun!
This commit is contained in:
Casey
2022-05-15 17:01:12 -04:00
committed by GitHub
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -115,7 +115,7 @@
/obj/effect/shuttle_landmark{
base_area = /area/groundbase/level3/escapepad;
base_turf = /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c;
docking_controller = "escape_dock";
docking_controller = null;
landmark_tag = "escape_station";
name = "Ship Arrivals"
},
+1 -1
View File
@@ -4124,6 +4124,7 @@
#include "maps\expedition_vr\beach\submaps\mountains.dm"
#include "maps\expedition_vr\beach\submaps\mountains_areas.dm"
#include "maps\gateway_archive_vr\blackmarketpackers.dm"
#include "maps\groundbase\groundbase.dm"
#include "maps\offmap_vr\om_ships\abductor.dm"
#include "maps\southern_cross\items\clothing\sc_accessory.dm"
#include "maps\southern_cross\items\clothing\sc_suit.dm"
@@ -4131,7 +4132,6 @@
#include "maps\southern_cross\loadout\loadout_suit.dm"
#include "maps\southern_cross\loadout\loadout_uniform.dm"
#include "maps\southern_cross\loadout\loadout_vr.dm"
#include "maps\stellardelight\stellar_delight.dm"
#include "maps\submaps\_helpers.dm"
#include "maps\submaps\_readme.dm"
#include "maps\submaps\engine_submaps\engine.dm"