From 57f0cc35b5cc3f68d055534420db54a62f3284f8 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 6 Apr 2018 20:54:12 -0400 Subject: [PATCH] Update mapping.dm --- code/controllers/subsystem/mapping.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index dcd314cbd8..5cc8318348 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -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)