From ce4775c6af82f2d1015eb3c74880748af2737dc0 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 2 Aug 2018 09:03:17 -0700 Subject: [PATCH] z6 mapmerge, teleportation.dm refactor, stop bluespace tomatoes working in tele_proof areas --- _maps/map_files/cyberiad/z6.dmm | 1668 ++++++++--------- .../objects/items/weapons/teleportation.dm | 11 +- code/modules/hydroponics/plant_genes.dm | 11 +- 3 files changed, 850 insertions(+), 840 deletions(-) diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm index e1ceea161c4..11ab7124721 100644 --- a/_maps/map_files/cyberiad/z6.dmm +++ b/_maps/map_files/cyberiad/z6.dmm @@ -39,15 +39,15 @@ "aM" = (/obj/structure/stool/bed/chair/office/light,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation) "aN" = (/obj/machinery/door/airlock/public/glass{name = "Cabin"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation) "aO" = (/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/djstation) -"aP" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/djstation) -"aQ" = (/obj/structure/girder/reinforced,/turf/simulated/floor/plating/airless,/area/space) -"aR" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/djstation) -"aS" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/djstation) -"aT" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/djstation) -"aU" = (/obj/structure/table,/obj/item/storage/fancy/cigarettes/dromedaryco,/obj/item/lighter/zippo/engraved,/obj/item/ashtray/glass{pixel_y = 7},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation) -"aV" = (/obj/structure/table,/obj/item/paper/djstation{info = "Welcome new owner!

You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
  1. Equip yourself with a multi-tool
  2. Use the multitool on each machine, that is the broadcaster, receiver and the relay.
  3. Turn all the machines on, it has already been configured for you to listen on.
Simple as that. Now to listen to the private channels, you'll have to configure the intercoms, located on the front desk. Here is a list of frequencies for you to listen on.