From 972e4d8214a116e6568090f6fb9e227a3f987816 Mon Sep 17 00:00:00 2001 From: Bob Date: Thu, 5 Sep 2019 20:09:20 -0400 Subject: [PATCH 1/3] A new Poi What it says on the tin --- .../submaps/underdark_pois/Corridor.dmm | 26 +++++++++++++++++++ .../submaps/underdark_pois/_templates.dm | 6 +++++ 2 files changed, 32 insertions(+) create mode 100644 maps/tether/submaps/underdark_pois/Corridor.dmm diff --git a/maps/tether/submaps/underdark_pois/Corridor.dmm b/maps/tether/submaps/underdark_pois/Corridor.dmm new file mode 100644 index 00000000000..afa36829c36 --- /dev/null +++ b/maps/tether/submaps/underdark_pois/Corridor.dmm @@ -0,0 +1,26 @@ +"a" = (/turf/template_noop,/area/mine/explored/underdark) +"b" = (/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,/area/mine/explored/underdark) +"c" = (/obj/tether_away_spawner/underdark_normal,/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,/area/mine/explored/underdark) + +(1,1,1) = {" +aaabbbbbbbbbbbbbaaaa +aaabbbbbbbbbbbbbaaaa +aaabbbbbbbbbbbbbaaaa +bbbbbbbbbbbbbbbbbbbb +bbbbbbbbbbbbbbbbbbbb +bbbbbbbbbbbbbbbbbbbb +bbbbcbbbaaaabbbbbbbb +bbbbbbbbaaaabbbbbbbb +bbbbbbbbaaaabbbbbbbb +aabbbbbbaaaabbbbbbbb +aabbbbbbbbbbbbbbbbbb +aabbbbbbbbbbbbbbbbbb +aabbbbbbbbbbbbbbbbbb +aaaabbbbbbbbbbbbbbbb +aaaabbbbbbbbbbbbbbbb +aaaabbbbbbbbbbbbbbbb +aaaabbbbbbbbbbbbbbbb +aaaabbbbbbbbbbbbbaaa +aaaabbbbbbbbbbbbbaaa +aaaabbbbbbbbbbbbbaaa +"} diff --git a/maps/tether/submaps/underdark_pois/_templates.dm b/maps/tether/submaps/underdark_pois/_templates.dm index 03a2e05e2d3..8cd18a96840 100644 --- a/maps/tether/submaps/underdark_pois/_templates.dm +++ b/maps/tether/submaps/underdark_pois/_templates.dm @@ -79,6 +79,12 @@ cost = 20 allow_duplicates = FALSE +/datum/map_template/underdark/corridor // Bob was a derp + name = "Underdark Corridor" + mappath = 'Corridor.dmm' + cost = 6 + allow_duplicates = TRUE + /* /datum/map_template/underdark/boss_mob name = "Underdark Boss Mob Spawn" From b5b3a1862fdaf40605e355e168566ae420e504fa Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 9 Sep 2019 20:58:54 -0400 Subject: [PATCH 2/3] Minor change to make mapmerge run --- .../submaps/underdark_pois/Corridor.dmm | 478 +++++++++++++++++- 1 file changed, 452 insertions(+), 26 deletions(-) diff --git a/maps/tether/submaps/underdark_pois/Corridor.dmm b/maps/tether/submaps/underdark_pois/Corridor.dmm index afa36829c36..41e757dd98d 100644 --- a/maps/tether/submaps/underdark_pois/Corridor.dmm +++ b/maps/tether/submaps/underdark_pois/Corridor.dmm @@ -1,26 +1,452 @@ -"a" = (/turf/template_noop,/area/mine/explored/underdark) -"b" = (/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,/area/mine/explored/underdark) -"c" = (/obj/tether_away_spawner/underdark_normal,/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,/area/mine/explored/underdark) - -(1,1,1) = {" -aaabbbbbbbbbbbbbaaaa -aaabbbbbbbbbbbbbaaaa -aaabbbbbbbbbbbbbaaaa -bbbbbbbbbbbbbbbbbbbb -bbbbbbbbbbbbbbbbbbbb -bbbbbbbbbbbbbbbbbbbb -bbbbcbbbaaaabbbbbbbb -bbbbbbbbaaaabbbbbbbb -bbbbbbbbaaaabbbbbbbb -aabbbbbbaaaabbbbbbbb -aabbbbbbbbbbbbbbbbbb -aabbbbbbbbbbbbbbbbbb -aabbbbbbbbbbbbbbbbbb -aaaabbbbbbbbbbbbbbbb -aaaabbbbbbbbbbbbbbbb -aaaabbbbbbbbbbbbbbbb -aaaabbbbbbbbbbbbbbbb -aaaabbbbbbbbbbbbbaaa -aaaabbbbbbbbbbbbbaaa -aaaabbbbbbbbbbbbbaaa -"} +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/mine/explored/underdark) +"b" = ( +/turf/simulated/mineral/floor/ignore_cavegen/virgo3b, +/area/mine/explored/underdark) +"c" = ( +/obj/tether_away_spawner/underdark_normal, +/turf/simulated/mineral/floor/ignore_cavegen/virgo3b, +/area/mine/explored/underdark) + +(1,1,1) = {" +a +a +a +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +"} +(4,1,1) = {" +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +"} +(5,1,1) = {" +b +b +b +b +b +b +c +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(6,1,1) = {" +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(7,1,1) = {" +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(8,1,1) = {" +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(9,1,1) = {" +b +b +b +b +b +b +a +a +a +a +b +b +b +b +b +b +b +b +b +b +"} +(10,1,1) = {" +b +b +b +b +b +b +a +a +a +a +b +b +b +b +b +b +b +b +b +b +"} +(11,1,1) = {" +b +b +b +b +b +b +a +a +a +a +b +b +b +b +b +b +b +b +b +b +"} +(12,1,1) = {" +b +b +b +b +b +b +a +a +a +a +b +b +b +b +b +b +b +b +b +b +"} +(13,1,1) = {" +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(14,1,1) = {" +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(15,1,1) = {" +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(16,1,1) = {" +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(17,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(18,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +"} +(19,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +"} +(20,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +"} From 52bbd73df563244dc8068caa031c83b123937817 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Mon, 9 Sep 2019 21:00:11 -0400 Subject: [PATCH 3/3] Update _templates.dm --- maps/tether/submaps/underdark_pois/_templates.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maps/tether/submaps/underdark_pois/_templates.dm b/maps/tether/submaps/underdark_pois/_templates.dm index 8cd18a96840..cb81bb6b1f3 100644 --- a/maps/tether/submaps/underdark_pois/_templates.dm +++ b/maps/tether/submaps/underdark_pois/_templates.dm @@ -82,8 +82,8 @@ /datum/map_template/underdark/corridor // Bob was a derp name = "Underdark Corridor" mappath = 'Corridor.dmm' - cost = 6 - allow_duplicates = TRUE + cost = 5 + allow_duplicates = FALSE /* /datum/map_template/underdark/boss_mob @@ -96,4 +96,4 @@ name = "Some Kinda Treasure" //A name, only visible to admins mappath = 'hard_mob.dmm' //The .dmm file for this template (in this folder) cost = 10 //How 'valuable' this template is -*/ \ No newline at end of file +*/