From f1a3ee05ca61adc080de05c444840799fdedcadb Mon Sep 17 00:00:00 2001 From: Kilakk Date: Wed, 18 Sep 2013 20:14:05 -0400 Subject: [PATCH] Put the fax machines on top of tables on the map --- maps/tgstation2.dmm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index 84ce811804..3e574f3a7d 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -992,7 +992,7 @@ "atd" = (/turf/simulated/floor/wood{icon_state = "wood-broken6"},/area/security/vacantoffice2) "ate" = (/obj/machinery/hologram/holopad,/obj/machinery/newscaster{pixel_x = -28; pixel_y = 1},/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "atf" = (/obj/structure/stool/bed/chair/comfy/black,/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) -"atg" = (/obj/machinery/faxmachine,/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) +"atg" = (/obj/machinery/faxmachine,/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "cult"; dir = 2},/area/lawoffice) "ath" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/hallway/primary/fore) "ati" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/fsmaint) "atj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/crew_quarters/sleep) @@ -3108,7 +3108,7 @@ "bhN" = (/obj/machinery/door/window/eastright{dir = 1; name = "Bridge Delivery"; req_access_txt = "19"},/turf/simulated/floor{icon_state = "delivery"},/area/bridge/meeting_room) "bhO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/bridge/meeting_room) "bhP" = (/obj/structure/reagent_dispensers/water_cooler,/turf/simulated/floor/wood,/area/bridge/meeting_room) -"bhQ" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 0; pixel_y = -32},/obj/machinery/faxmachine,/turf/simulated/floor/wood,/area/bridge/meeting_room) +"bhQ" = (/obj/machinery/faxmachine,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bhR" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/hologram/holopad,/turf/simulated/floor/wood,/area/bridge/meeting_room) "bhS" = (/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/wood,/area/bridge/meeting_room) "bhT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/bridge/meeting_room) @@ -3203,7 +3203,7 @@ "bjE" = (/obj/machinery/computer/card,/obj/item/weapon/card/id/captains_spare,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bjF" = (/obj/structure/table/woodentable,/obj/item/weapon/book/manual/security_space_law,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bjG" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bjH" = (/obj/machinery/faxmachine,/turf/simulated/floor/wood,/area/crew_quarters/captain) +"bjH" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 0; pixel_y = -32},/obj/machinery/faxmachine,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/bridge/meeting_room) "bjI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/wall/r_wall,/area/crew_quarters/captain) "bjJ" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/central) "bjK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/hallway/primary/central) @@ -10304,8 +10304,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdHbdHbdHbdHbdHbdHbdHbdHbdHbdHaaaaafbdIazWayabdJbdKbdLbdLbdLbdLbdLbdLbdMbdNaPyaXeaRbaYpaYqaYraYrbdObdPaYraPBaPBbdQaPBaZYbdRbcFbdSaPBbbwbadbaebdTbdUbbybcHbdVbaebbAbdWbcJbcJbcJbdXbdYbakbdZaIRaYObeabebbecbedbeebefbegbcTbehbatbaubeibejbekbekbekbelbembaubenbeobccbccbdgbepbdibccbeqbawberaIRaIRaNsbdlbdmaZyaZyaZyaZyaZyaZyaZybesaZyaZyaZyaZyaZyaZybetbdtbdtbdtbdtbdtbdtbeubdtbdtbdtbdtbdtbdtbdtbevbewbexbeyaZyaZyaZyaZyaZyaZxaZyaZyaZyaZyaZyaZyaZyaZyaZyaZyaZyaZybezbdqbeAaTIaTIbctaTIaTIbeBaWyaQSaQSaTLaJJaJJaJJaJJaJJaJJaJJaJJaJJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdHbdHbdHbdHbdHbdHbdHbdHbdHbdHbdHaWAaWBaWCazabeCbeDbeEbeEbeFbeEbeEbeEbeGaPyaPyaPyaPyaYpaYqaZRbeHbeIbeJaYrbeKbeLbeMaPBaPBaPBaPBbeNaPBbbwbadbaebeObbybcHbePbeQbaebbAbakbeRbcJbcJbeSbeTbakbeUaIRaYObeVbeWbecbedbeXbeYbegbcTbeZbatbfabfbbfcbekbfdbekbcWbfebffbenbfgbfhbfibfjbfjbfkbccbflbawaZhbfmaIRaNsbdlbdmaZybfnaZybfobfpbfpbfpbfqbfpbfpbfpbfraZyaZyaZyaZybfsaZybfnbftbfubfvaZyaZyaZybfwbfxbfybfzbfAbfBbfCaZyaZyaZyaZyaZybfDbfEbfsaZyaZyaZyaZyaZyaZyaZyaZyaZyaZyaZyaZybdqbfFbfGbfHbfIbfJbfKbfLbfMaafaaaaafaJJaJJaJJaJJaJJaJJaJJaJJaJJaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdHbdHbdHbdHbdHbdHbdHbdHbdHbdHbdHaYgavtaYgaxYbfNbeEbfObfPbfQbfQbfRbfSbfTbfUbfUbfUbfUbfVbfWbfXbfXbfYbfZbfXbgabgabgbbgabgcbgdbgdbgebgdbgfbggbghbgibgjbgjbgkbglbghbgmbgnbgobcJbcJbeSbgpbgqbeUaIRaYObgrbgsbgtbcRbcRbcRbcRbcTbgubatbaubgvbgwbgxbgybgzbgwbgAbaubenbgBbgCbgDbgEbgFbgGbgHbgIbawbgJaHiaHibgKbgKbgKbgKbgKbgKbgKbgLbgMbgMbgNbgObgPbgLbgQbgQbgQbgQbgQbgQbgRbgRbgRbgSbgRbgRbgRbgTbgUbfDbgVbgWbgXbgYbgZaZyaZybhabhabhbbhbbhbbhbbhbbhcbhdbhdbhebhdaZybhdbhebhdbhdbhfbhgbhgbhgbhgbhhbgWaPtaPtaPtaaaaaaaaaaJJaJJaJJaJJaJJaJJaJJaJJaJJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdHbdHbdHbdHbdHbdHbdHbdHbdHbdHbdHaZEaZFaWCazabhibeEbhjbeEbhkbhlbeEbeEbeEaRbbhmbhnbhnbhoaYraZRbhpbcAbhqaYrbhrbhsbhtbhubhvbhwbhxbhybhzbhxbhAbhBbhCbhDbhCbhCbhEbhFbhGbhHbhIbcJbcJbhJbhKbhLbeUaIRbhMbgrbhNbhObhPbhQbhRbhSbhTbatbatbaubhUbhVbhWbhXbhYbhZbiabaubenbibbicbidbiebifbgGbccbigbawaZhaIRbihbgKbiibijbikbilbimbinbiobipbipbiqbirbirbisbgQbitbiubivbiwbgQbixbiybizbiAbiBbiCbiDbiEbiFbiEbiEbiEbiGbiHbiIbiJbiIbiKbiKbhbbiLbiMbiNbhbbiObiPbiObhbbhcbhdbhfbhgbiQbiRbiQbhgbiSbiTbhgbiUbiVbiWbgWaaaaaaaaaaaaaJJaJJaJJaJJaJJaJJaJJaJJaJJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdHbdHbdHbdHbdHbdHbdHbdHbdHbdHaaaaaaazVbbeaPvbiXbeEbiYbeEbiZbjabjbbjcbeEbjdaRbbjeaRbbjfaYraYraYraYraYraYrbjgbjhbjiaRbbjjbaebaebaebjkbaebaebaebjlbaebaebaebaebjmbjnbjobjpbcJbcJbeSbjqbgqbeUaIRbjrbgrbjsbhObatbatbatbatbjtbatbjubjvbjwbjxbbObjybbObjzbjAbjBbjCbibbjDbccbjEbjFbgGbjGbjHbjIbjJbjKbjLbgKbjMbjNbjObjPbjQbjRbjSbjTbipbjUbipbipbjVbjWbjXbjYbjZbkabgQbkbbkcbkdbkcbkebkfbgRbkgbkhbkibkjbgWbkkbklbkmbknbkobkpbkqbkrbksbktbksbkubkvbkwbkxbhbbkybkzbkAbhgbkBbkCbkDbkEbkFbkGbhgbkHbkIbkJbgWaaaaaaaaaaaeaJJaJJaJJaJJaJJaJJaJJaJJaJJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdHbdHbdHbdHbdHbdHbdHbdHbdHbdHbdHaZEaZFaWCazabhibeEbhjbeEbhkbhlbeEbeEbeEaRbbhmbhnbhnbhoaYraZRbhpbcAbhqaYrbhrbhsbhtbhubhvbhwbhxbhybhzbhxbhAbhBbhCbhDbhCbhCbhEbhFbhGbhHbhIbcJbcJbhJbhKbhLbeUaIRbhMbgrbhNbhObhPbjHbhRbhSbhTbatbatbaubhUbhVbhWbhXbhYbhZbiabaubenbibbicbidbiebifbgGbccbigbawaZhaIRbihbgKbiibijbikbilbimbinbiobipbipbiqbirbirbisbgQbitbiubivbiwbgQbixbiybizbiAbiBbiCbiDbiEbiFbiEbiEbiEbiGbiHbiIbiJbiIbiKbiKbhbbiLbiMbiNbhbbiObiPbiObhbbhcbhdbhfbhgbiQbiRbiQbhgbiSbiTbhgbiUbiVbiWbgWaaaaaaaaaaaaaJJaJJaJJaJJaJJaJJaJJaJJaJJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabdHbdHbdHbdHbdHbdHbdHbdHbdHbdHaaaaaaazVbbeaPvbiXbeEbiYbeEbiZbjabjbbjcbeEbjdaRbbjeaRbbjfaYraYraYraYraYraYrbjgbjhbjiaRbbjjbaebaebaebjkbaebaebaebjlbaebaebaebaebjmbjnbjobjpbcJbcJbeSbjqbgqbeUaIRbjrbgrbjsbhObatbatbatbatbjtbatbjubjvbjwbjxbbObjybbObjzbjAbjBbjCbibbjDbccbjEbjFbgGbjGbhQbjIbjJbjKbjLbgKbjMbjNbjObjPbjQbjRbjSbjTbipbjUbipbipbjVbjWbjXbjYbjZbkabgQbkbbkcbkdbkcbkebkfbgRbkgbkhbkibkjbgWbkkbklbkmbknbkobkpbkqbkrbksbktbksbkubkvbkwbkxbhbbkybkzbkAbhgbkBbkCbkDbkEbkFbkGbhgbkHbkIbkJbgWaaaaaaaaaaaeaJJaJJaJJaJJaJJaJJaJJaJJaJJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazTasPbcubcvaZFaTNaTNaTNaAIaTNbkKazaaxYaxYbeEbkLbkMbkNbkObkPbkQbkRbkSbkSbkSbkSbkTbkUbkUbkUbhxbhxbhxbkVbkWbkWbkWbkXbaebkYbkZblablbblcbldbleblfblgblhblibljblkbllblmblnbloblpblqblqblrbjKblsbltblublvblwblxblyblzblAblBblCbjBbjBbjBbjBblDbjBbjBbjBbjBblEblFblGblHblIblJblKblLblMblNblOaIRaIRbgKblPblQblRbjPblSblTbjSblUblVblWblVblVblXblYblZbmabmbbmcbgQbmdbkcbmebkcbkebmfbgRbiWbmgbmhbmibgWbkkbmjbmkbmlbmlbmmbmnbmobmpbmpbmpbmqbmrbmsbmtbmubmvbmwbmxbmybmzbmAbkFbmBbmCbmDbhgbmEbkIbmhbgWaaaaaaaaaaaaaaaaJJaJJaJJaJJaJJaJJaJJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabmFbmGavtaYgaxbaxbaxbaPvaxYaxYbeEbmHbmIbkObmJbeEbeEbeEaPybmKbmLbmMbmNbmMbmMbmMbmNbmMaPyaPybaebaebaebmObaebleblebmPblebleblebleblebmQbmRbmSbmTbmUbmVbmVbmVbmWbmXbmYbmZbnabnbbncbndbnebnebnfbngbnhbnibnjbnkbnlbnmbnnbnobnpbnqbnrbnobnsbnmbntbibbnubnvbnubawbawbawbnwbenbnxaIRaIRbgKbnybnzbnAbjPbnBbnCbjSbjUbipbnDbnEbnFbnGbgQbnHbnIbnJbnKbgQbmdbnLbkcbkcbkebkfbgRbgWbgWbgWbgWbgWbkkbklbnMbnNbnObnPbnQbnRbnSbnTbnUbnUbnVbksbnWbhbbnXbnYbnZbhgboabobbocbodboebofbhgbmEbkIbogbgWaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaabmFavtavtaYgaxXaxXaxXbohaxXaxXbeEboibojbokbkObeEaaaaaaaaaaafaafbolbolbolbolbolbolbolaaaaaabombonboobopboqblebleblebleblebleblebleborbjpbcJbosbotboubakbakbovblkbakbakbowboxboybozboAboBboBboCboBboDboEboBabRboFboGbnoboHbnqboHbnoboIboFbntboJboKbfjboLboMboNboOboPboQboRaIRboSboTboUboVbnAbjPboWbinboXbjUbipboYboZbipbpabgQbjXbpbbpcbpdbgQbpebpfbpgbphbpibphbpjbpkbpkbpkbpkbpkbplbklbpmbknbknbnPbpnbpobppbpqbprbprbpsbptbpubhbbpvbnYbpwbhgbpxbpybpzbodbkFbpAbhgbkHbkIbpBbgWaaaaaaaaaaaaaafbpCbpDbpEbpDbpEbpDbpFaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa