From 1fb96b3d6aa5a0567bde7f92c763976b086bdf5d Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 3 May 2020 09:57:18 -0400 Subject: [PATCH] More Compatability --- maps/submaps/surface_submaps/plains/plains.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/maps/submaps/surface_submaps/plains/plains.dm b/maps/submaps/surface_submaps/plains/plains.dm index 6c8293c3253..cf05e432230 100644 --- a/maps/submaps/surface_submaps/plains/plains.dm +++ b/maps/submaps/surface_submaps/plains/plains.dm @@ -217,12 +217,8 @@ /datum/map_template/surface/plains/ChemSpill1 name = "Ruptured Canister" desc = "A dumped chemical canister. Looks dangerous." -<<<<<<< HEAD mappath = 'maps/submaps/surface_submaps/plains/chemspill1_vr.dmm' //VOREStation Edit cost = 10 -======= - mappath = 'maps/submaps/surface_submaps/plains/chemspill1.dmm' - cost = 10 /datum/map_template/surface/plains/PlainsKururak name = "Lone Kururak" @@ -250,4 +246,3 @@ mappath = 'maps/submaps/surface_submaps/plains/BuriedTreasure3.dmm' cost = 10 template_group = "Shallow Grave" ->>>>>>> aafd4b4... Explorer Expansion: New Horizons (#6960)