Merge pull request #5837 from Probe1/Bleeding-Edge

Metaclub map fixes 4x
This commit is contained in:
Rob Nelson
2015-09-25 10:36:11 -07:00

View File

@@ -3132,7 +3132,7 @@
"bil" = (/obj/machinery/computer/crew,/turf/simulated/floor{tag = "icon-darkblue (NORTH)"; icon_state = "darkblue"; dir = 1},/area/bridge)
"bim" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/structure/cable/yellow,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/bridge)
"bin" = (/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/bridge)
"bio" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/power/monitor{name = "Bridge Power Monitoring Console"},/obj/machinery/camera{c_tag = "Command - Bridge - N"; dir = 2; network = list("SS13")},/turf/simulated/floor{dir = 1; icon_state = "darkbrown"; tag = "icon-darkblue (NORTH)"},/area/bridge)
"bio" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/power/monitor{name = "Bridge Power Monitoring Console"},/obj/machinery/camera{c_tag = "Command - Bridge - N"; dir = 2; network = list("SS13")},/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor{dir = 1; icon_state = "darkbrown"; tag = "icon-darkblue (NORTH)"},/area/bridge)
"bip" = (/obj/machinery/computer/security,/turf/simulated/floor{dir = 1; icon_state = "darkred"; tag = "icon-darkblue (NORTH)"},/area/bridge)
"biq" = (/obj/machinery/computer/secure_data,/turf/simulated/floor{dir = 1; icon_state = "darkbrown"; tag = "icon-darkblue (NORTH)"},/area/bridge)
"bir" = (/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/computer/prisoner,/turf/simulated/floor{dir = 5; icon_state = "darkred"; tag = "icon-darkblue (NORTH)"},/area/bridge)
@@ -3196,7 +3196,7 @@
"bjx" = (/obj/machinery/power/apc{dir = 8; name = "Port Emergency Storage APC"; pixel_x = -28; pixel_y = 0},/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/storage/emergency2)
"bjy" = (/obj/effect/landmark{name = "blobstart"},/obj/machinery/light/small{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/plating,/area/storage/emergency2)
"bjz" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
"bjA" = (/obj/machinery/door/airlock/maintenance{name = "Mailroom Maintenance"; req_access_txt = "50"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
"bjA" = (/obj/machinery/door/airlock/maintenance{name = "Mailroom Maintenance"; req_access_txt = 0; req_one_access_txt = "50;26"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2{name = "Port Maintenance"})
"bjB" = (/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/supply/office{name = "\improper Cargo Office"})
"bjC" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor{dir = 1; icon_state = "floor"},/area/supply/office{name = "\improper Cargo Office"})
"bjD" = (/turf/simulated/floor,/area/supply/office{name = "\improper Cargo Office"})
@@ -3213,7 +3213,7 @@
"bjO" = (/obj/machinery/door/firedoor/border_only{dir = 4; name = "Firelock East"},/turf/simulated/floor{dir = 1; icon_state = "brown"},/area/hallway/primary/port)
"bjP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{dir = 1; icon_state = "browncorner"},/area/hallway/primary/central)
"bjQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{dir = 2; icon_state = "neutralcorner"},/area/hallway/primary/central)
"bjR" = (/obj/item/weapon/legcuffs/beartrap,/obj/item/weapon/legcuffs/beartrap,/obj/structure/table,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/machinery/camera{c_tag = "Custodial Closet"; dir = 4; network = list("SS13")},/obj/machinery/light/small{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/janitor)
"bjR" = (/obj/item/weapon/legcuffs/beartrap,/obj/item/weapon/legcuffs/beartrap,/obj/structure/table,/obj/machinery/camera{c_tag = "Custodial Closet"; dir = 4; network = list("SS13")},/obj/machinery/light/small{dir = 8},/obj/item/weapon/soap,/obj/item/weapon/reagent_containers/spray/cleaner,/turf/simulated/floor{icon_state = "dark"},/area/janitor)
"bjS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/janitor)
"bjT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor{icon_state = "dark"},/area/janitor)
"bjU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "dark"},/area/janitor)
@@ -3302,7 +3302,7 @@
"blz" = (/obj/machinery/power/apc{dir = 8; name = "Custodial Closet APC"; pixel_x = -24},/obj/structure/table,/obj/item/clothing/gloves/orange,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/structure/cable/yellow{d2 = 4; icon_state = "0-4"},/turf/simulated/floor{icon_state = "dark"},/area/janitor)
"blA" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"},/mob/living/simple_animal/lizard{name = "Wags-His-Tail"; real_name = "Wags-His-Tail"},/turf/simulated/floor{icon_state = "dark"},/area/janitor)
"blB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/landmark/start{name = "Janitor"},/turf/simulated/floor{icon_state = "dark"},/area/janitor)
"blC" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/mop,/obj/structure/disposalpipe/segment,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "dark"},/area/janitor)
"blC" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/disposalpipe/segment,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/mopbucket,/obj/item/weapon/mop,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor{icon_state = "dark"},/area/janitor)
"blD" = (/obj/item/weapon/tank/air,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/maintcentral)
"blE" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/maintenance/maintcentral)
"blF" = (/turf/simulated/wall/r_wall,/area/maintenance/maintcentral)
@@ -4181,7 +4181,7 @@
"bCu" = (/obj/structure/disposalpipe/segment,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/hallway/primary/starboard)
"bCv" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor{icon_state = "caution"; dir = 4},/area/hallway/primary/starboard)
"bCw" = (/turf/simulated/wall/r_wall,/area/engineering/atmos_control)
"bCx" = (/obj/machinery/alarm{pixel_y = 23},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/structure/table,/obj/item/weapon/wrench,/obj/item/weapon/crowbar/red,/obj/item/clothing/mask/gas,/turf/simulated/floor{dir = 9; icon_state = "caution"},/area/engineering/atmos_control)
"bCx" = (/obj/machinery/alarm{pixel_y = 23},/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/computer/general_air_control/atmos_automation,/turf/simulated/floor{dir = 9; icon_state = "caution"},/area/engineering/atmos_control)
"bCy" = (/obj/machinery/computer/atmoscontrol,/obj/structure/sign/atmosplaque{pixel_x = 0; pixel_y = 32},/turf/simulated/floor{dir = 1; icon_state = "caution"},/area/engineering/atmos_control)
"bCz" = (/obj/machinery/computer/atmos_alert,/turf/simulated/floor{dir = 1; icon_state = "caution"},/area/engineering/atmos_control)
"bCA" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/computer/station_alert,/turf/simulated/floor{dir = 1; icon_state = "caution"},/area/engineering/atmos_control)
@@ -4276,7 +4276,7 @@
"bEl" = (/obj/structure/table/woodentable,/obj/item/weapon/staff/broom,/obj/item/weapon/wrench,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor{tag = "icon-cult"; icon_state = "cult"; dir = 2},/area/crew_quarters/bar)
"bEm" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/pump,/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 0},/turf/simulated/floor{icon_state = "arrival"; dir = 8},/area/hallway/primary/starboard)
"bEn" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "caution"; dir = 4},/area/hallway/primary/starboard)
"bEo" = (/obj/structure/closet/fireaxecabinet{locked = 1; pixel_x = -32; pixel_y = 0},/obj/machinery/computer/general_air_control/atmos_automation,/turf/simulated/floor{dir = 8; icon_state = "caution"},/area/engineering/atmos_control)
"bEo" = (/obj/structure/closet/fireaxecabinet{locked = 1; pixel_x = -32; pixel_y = 0},/turf/simulated/floor{dir = 8; icon_state = "caution"},/area/engineering/atmos_control)
"bEp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor,/area/engineering/atmos_control)
"bEq" = (/obj/structure/bed/chair/office/dark{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/engineering/atmos_control)
"bEr" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/engineering/atmos_control)
@@ -4556,7 +4556,7 @@
"bJF" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/hallway/primary/starboard)
"bJG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor{icon_state = "caution"; dir = 4},/area/hallway/primary/starboard)
"bJH" = (/obj/structure/window/full/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "atmos"; name = "Atmos Blast Door"; opacity = 0},/turf/simulated/floor/plating,/area/engineering/atmos_control)
"bJI" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "caution"},/area/engineering/atmos_control)
"bJI" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/table,/obj/item/weapon/wrench,/obj/item/weapon/crowbar/red,/obj/item/clothing/mask/gas,/turf/simulated/floor{dir = 8; icon_state = "caution"},/area/engineering/atmos_control)
"bJJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor,/area/engineering/atmos_control)
"bJK" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "caution"; dir = 4},/area/engineering/atmos_control)
"bJL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/atmos{name = "Atmospherics"; req_access_txt = "24"},/obj/effect/decal/warning_stripes{icon_state = "unloading"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/engineering/atmos)
@@ -5850,7 +5850,7 @@
"ciz" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/paramedics)
"ciA" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/paramedics)
"ciB" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Medbay Storage"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "whitebluefull"},/area/medical/medbay2{name = "Medbay Storage"})
"ciC" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Medbay Storage"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "whitebluefull"},/area/medical/medbay2{name = "Medbay Storage"})
"ciC" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Medbay Storage"; req_access_txt = "5"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/turf/simulated/floor{icon_state = "whitebluefull"},/area/medical/medbay2{name = "Medbay Storage"})
"ciD" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/medical/medbay2{name = "Medbay Storage"})
"ciE" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26; pixel_y = 28},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/alarm{pixel_y = 28},/turf/simulated/floor{dir = 9; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"})
"ciF" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor{dir = 1; icon_state = "whiteblue"},/area/medical/medbay{name = "Medbay Central"})