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

Update mapping.dm

Browse Source
This commit is contained in:
deathride58
2018-04-06 20:54:12 -04:00
committed by GitHub
parent 0efb82be90
commit 57f0cc35b5
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/mapping.dm
-3
View File
@@ -329,8 +329,6 @@ GLOBAL_LIST_EMPTY(the_station_areas)
shelter_templates[S.shelter_id] = S
map_templates[S.shelter_id] = S
<<<<<<< HEAD
=======
//Manual loading of away missions.
@@ -386,4 +384,3 @@ GLOBAL_LIST_EMPTY(the_station_areas)
//Link station gate with away gate and remove wait time.
GLOB.the_gateway.awaygate = new_gate
GLOB.the_gateway.wait = world.time
>>>>>>> 414fdc9... Logs the load away mission verb. (#36989)