From 4e7dcb1bc5d8ccd2ec77f0c330814cbeafc143e1 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 24 Feb 2019 16:14:24 -0600 Subject: [PATCH 1/2] Moves crashed medical shuttle PoI to deep caves --- .../surface_submaps/mountains/mountains.dm | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/maps/submaps/surface_submaps/mountains/mountains.dm b/maps/submaps/surface_submaps/mountains/mountains.dm index 56a267c4756..f98c58a8744 100644 --- a/maps/submaps/surface_submaps/mountains/mountains.dm +++ b/maps/submaps/surface_submaps/mountains/mountains.dm @@ -124,12 +124,6 @@ mappath = 'maps/submaps/surface_submaps/mountains/temple.dmm' cost = 20 -/datum/map_template/surface/mountains/normal/crashedmedshuttle - name = "Crashed Med Shuttle" - desc = "A medical response shuttle that went missing some time ago. So this is where they went." - mappath = 'maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm' - cost = 20 - /datum/map_template/surface/mountains/normal/digsite name = "Dig Site" desc = "A small abandoned dig site." @@ -272,3 +266,19 @@ desc = "An abandoned blast mining site, seems that local wildlife has moved in." mappath = 'maps/submaps/surface_submaps/mountains/BlastMine1.dmm' cost = 20 +<<<<<<< HEAD +======= + +/datum/map_template/surface/mountains/deep/lava_trench + name = "lava trench" + desc = "A long stretch of lava underground, almost river-like, with a small crystal research outpost on the side." + mappath = 'maps/submaps/surface_submaps/mountains/lava_trench.dmm' + cost = 20 + fixed_orientation = TRUE + +/datum/map_template/surface/mountains/deep/crashedmedshuttle + name = "Crashed Med Shuttle" + desc = "A medical response shuttle that went missing some time ago. So this is where they went." + mappath = 'maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm' + cost = 20 +>>>>>>> 17578e0... Merge pull request #5970 from Neerti/spider_poi_move From 2afb977fed7df1b358fba55c301aafdc3c4245b2 Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 25 Feb 2019 07:43:45 -0500 Subject: [PATCH 2/2] Update mountains.dm --- maps/submaps/surface_submaps/mountains/mountains.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/maps/submaps/surface_submaps/mountains/mountains.dm b/maps/submaps/surface_submaps/mountains/mountains.dm index f98c58a8744..57fd6e29121 100644 --- a/maps/submaps/surface_submaps/mountains/mountains.dm +++ b/maps/submaps/surface_submaps/mountains/mountains.dm @@ -266,8 +266,6 @@ desc = "An abandoned blast mining site, seems that local wildlife has moved in." mappath = 'maps/submaps/surface_submaps/mountains/BlastMine1.dmm' cost = 20 -<<<<<<< HEAD -======= /datum/map_template/surface/mountains/deep/lava_trench name = "lava trench" @@ -281,4 +279,3 @@ desc = "A medical response shuttle that went missing some time ago. So this is where they went." mappath = 'maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm' cost = 20 ->>>>>>> 17578e0... Merge pull request #5970 from Neerti/spider_poi_move