From a2fd190af8ab2e5bb256266a64c804330c17fd2a Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Sat, 23 Jul 2011 01:04:06 +0000 Subject: [PATCH] The map is now "included" into the .dme file. This caused the two maps under maps/ to merge together, causing some very very wacky things to happen. I also fixed a bug where QM #1 was not broadcasting the proper frequency, and Mulebots could not path to QM #1 at all. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1907 316c924e-a436-60f5-8080-3fe189b3f50e --- maps/tgstation.2.0.7.dmm | 2 +- tgstation.dme | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm index 164b9b15458..3e4f9ada474 100644 --- a/maps/tgstation.2.0.7.dmm +++ b/maps/tgstation.2.0.7.dmm @@ -3165,7 +3165,7 @@ "biS" = (/obj/crate/internals,/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/quartermaster/storage) "biT" = (/obj/crate/freezer,/turf/simulated/floor,/area/quartermaster/storage) "biU" = (/turf/simulated/floor{icon_state = "delivery"},/area/quartermaster/storage) -"biV" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; location = "QM #1"},/obj/machinery/bot/mulebot{beacon_freq = 1400; home_destination = "QM #1"; suffix = "#1"},/turf/simulated/floor{icon_state = "bot"},/area/quartermaster/storage) +"biV" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "QM #1"},/obj/machinery/bot/mulebot{beacon_freq = 1400; home_destination = "QM #1"; suffix = "#1"},/turf/simulated/floor{icon_state = "bot"},/area/quartermaster/storage) "biW" = (/obj/grille,/obj/disposalpipe/segment,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage) "biX" = (/obj/table,/obj/item/device/radio,/turf/simulated/floor,/area/quartermaster/office) "biY" = (/obj/machinery/camera{c_tag = "Cargo Office"},/turf/simulated/floor,/area/quartermaster/office) diff --git a/tgstation.dme b/tgstation.dme index ac189f6b913..25df1e8c8a4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -204,7 +204,6 @@ #include "code\datums\diseases\gbs.dm" #include "code\datums\diseases\jungle_fever.dm" #include "code\datums\diseases\magnitis.dm" -#include "code\datums\diseases\metroid_transformation.dm" #include "code\datums\diseases\pierrot_throat.dm" #include "code\datums\diseases\plasmatoid.dm" #include "code\datums\diseases\rhumba_beat.dm" @@ -859,5 +858,6 @@ #include "code\WorkInProgress\recycling\scrap.dm" #include "code\WorkInProgress\recycling\sortingmachinery.dm" #include "interface\skin.dmf" -#include "maps\Ttgstation.2.0.7.dmm" +#include "maps\TestingMap.dmm" +#include "maps\tgstation.2.0.7.dmm" // END_INCLUDE