From bb6fac09dec6f2cb904c6309ab2fa21dc7f7beb9 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Tue, 28 Mar 2017 12:38:22 -0400 Subject: [PATCH] Fix up shuttle floor refs --- maps/virgo/virgo-2.dmm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/maps/virgo/virgo-2.dmm b/maps/virgo/virgo-2.dmm index 9d4ef13278..6f0bdffd6b 100644 --- a/maps/virgo/virgo-2.dmm +++ b/maps/virgo/virgo-2.dmm @@ -434,8 +434,8 @@ "air" = (/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdownside"; nostop = 1; stopper = 0; tiles = 0},/turf/space/transit/north/shuttlespace_ns3,/area/space) "ais" = (/obj/machinery/door/blast/shutters{dir = 8; id = "qm_warehouse"; name = "Warehouse Shutters"},/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/syndicate_mothership{name = "\improper Trader Base"}) "ait" = (/turf/space/transit/north/shuttlespace_ns14,/area/shuttle/escape/transit) -"aiu" = (/obj/structure/toilet{dir = 4},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_mothership{name = "\improper Trader Base"}) -"aiv" = (/obj/machinery/door/airlock/silver{name = "Toilet"},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_mothership{name = "\improper Trader Base"}) +"aiu" = (/obj/structure/toilet{dir = 4},/turf/simulated/shuttle/floor/red,/area/syndicate_mothership{name = "\improper Trader Base"}) +"aiv" = (/obj/machinery/door/airlock/silver{name = "Toilet"},/turf/simulated/shuttle/floor/white,/area/syndicate_mothership{name = "\improper Trader Base"}) "aiw" = (/turf/space/transit/north/shuttlespace_ns3,/area/shuttle/escape/transit) "aix" = (/turf/space/transit/north/shuttlespace_ns11,/area/shuttle/escape/transit) "aiy" = (/turf/space/transit/north/shuttlespace_ns7,/area/shuttle/escape/transit) @@ -443,19 +443,19 @@ "aiA" = (/turf/simulated/shuttle/wall/dark/no_join,/area/syndicate_mothership) "aiB" = (/turf/unsimulated/wall{desc = "That looks like it doesn't open easily."; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership) "aiC" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 1},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/syndicate_elite/mothership) -"aiD" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 4; req_access = list(160)},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_mothership{name = "\improper Trader Base"}) -"aiE" = (/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_mothership{name = "\improper Trader Base"}) +"aiD" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 4; req_access = list(160)},/turf/simulated/shuttle/floor/white,/area/syndicate_mothership{name = "\improper Trader Base"}) +"aiE" = (/turf/simulated/shuttle/floor,/area/syndicate_mothership{name = "\improper Trader Base"}) "aiF" = (/turf/simulated/shuttle/wall/dark,/area/shuttle/syndicate_elite/mothership) "aiG" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 1},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/syndicate_elite/mothership) "aiH" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 1},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/syndicate_elite/mothership) "aiI" = (/obj/effect/landmark{name = "Syndicate-Commando-Bomb"},/turf/simulated/shuttle/floor/red,/area/shuttle/syndicate_elite/mothership) "aiJ" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor/red,/area/shuttle/syndicate_elite/mothership) -"aiK" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_mothership{name = "\improper Trader Base"}) -"aiL" = (/obj/structure/curtain/open/shower,/obj/machinery/shower{pixel_y = 3},/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_mothership{name = "\improper Trader Base"}) +"aiK" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/simulated/shuttle/floor/white,/area/syndicate_mothership{name = "\improper Trader Base"}) +"aiL" = (/obj/structure/curtain/open/shower,/obj/machinery/shower{pixel_y = 3},/turf/simulated/shuttle/floor,/area/syndicate_mothership{name = "\improper Trader Base"}) "aiM" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/shuttle/floor/red,/area/shuttle/syndicate_elite/mothership) "aiN" = (/obj/structure/window/reinforced,/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 1},/turf/simulated/floor/airless,/area/shuttle/syndicate_elite/mothership) -"aiO" = (/obj/structure/table/standard,/obj/item/weapon/soap/deluxe,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_mothership{name = "\improper Trader Base"}) -"aiP" = (/obj/structure/undies_wardrobe,/turf/unsimulated/floor{icon = 'icons/turf/shuttle.dmi'; icon_state = "floor3"},/area/syndicate_mothership{name = "\improper Trader Base"}) +"aiO" = (/obj/structure/table/standard,/obj/item/weapon/soap/deluxe,/turf/simulated/shuttle/floor,/area/syndicate_mothership{name = "\improper Trader Base"}) +"aiP" = (/obj/structure/undies_wardrobe,/turf/simulated/shuttle/floor,/area/syndicate_mothership{name = "\improper Trader Base"}) "aiQ" = (/turf/simulated/shuttle/floor/red,/area/shuttle/syndicate_elite/mothership) "aiR" = (/mob/living/silicon/decoy{icon_state = "ai-malf"; name = "GLaDOS"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/control) "aiS" = (/obj/item/device/radio/intercom{broadcasting = 1; dir = 1; frequency = 1213; listening = 1; name = "Syndicate Ops Intercom"; pixel_y = 0; subspace_transmission = 1; syndie = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) @@ -1507,7 +1507,7 @@ "aCY" = (/turf/space,/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) "aCZ" = (/turf/space,/obj/structure/shuttle/engine/propulsion{tag = "icon-burst_l (EAST)"; icon_state = "burst_l"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/transport1/centcom) "aDa" = (/turf/simulated/shuttle/wall,/area/centcom/tram) -"aDb" = (/obj/machinery/door/unpowered/shuttle,/turf/unsimulated/floor{icon = 'icons/turf/flooring/shuttle.dmi'; icon_state = "floor"},/area/centcom/tram) +"aDb" = (/obj/machinery/door/unpowered/shuttle,/turf/simulated/shuttle/floor,/area/centcom/tram) "aDc" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor,/area/centcom/tram) "aDd" = (/obj/effect/wingrille_spawn/reinforced/polarized{id = "ccas_room1_tint"},/turf/simulated/shuttle/plating,/area/shuttle/administration/centcom) "aDe" = (/obj/structure/bed/chair,/obj/structure/closet/walllocker/emerglocker{pixel_x = 0; pixel_y = 28},/turf/simulated/shuttle/floor,/area/centcom/tram) @@ -1815,7 +1815,7 @@ "aIU" = (/obj/machinery/door/airlock/security{name = "Equipment Storage"},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "aIV" = (/obj/machinery/account_database{name = "CentComm Accounts database"},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/command) "aIW" = (/obj/structure/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/tram) -"aIX" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{icon = 'icons/turf/flooring/shuttle.dmi'; icon_state = "floor"},/area/centcom/evac) +"aIX" = (/obj/machinery/door/airlock/external,/turf/simulated/shuttle/floor,/area/centcom/evac) "aIY" = (/turf/simulated/shuttle/floor/white,/area/centcom/evac) "aIZ" = (/obj/structure/window/shuttle,/obj/structure/grille,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/tram) "aJa" = (/obj/machinery/atmospherics/pipe/simple/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/shuttle/floor/white,/area/centcom/evac) @@ -2262,7 +2262,7 @@ "aRz" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_5_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 5"; req_access = list(13)},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "aRA" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_4_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 4"; req_access = list(13)},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "aRB" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "escape_pod_3_recovery_hatch"; locked = 1; name = "Recovery Shuttle Dock 3"; req_access = list(13)},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) -"aRC" = (/obj/machinery/door/airlock/maintenance_hatch{req_access = list(101)},/turf/unsimulated/floor{icon = 'icons/turf/flooring/shuttle.dmi'; icon_state = "floor2"},/area/centcom/evac) +"aRC" = (/obj/machinery/door/airlock/maintenance_hatch{req_access = list(101)},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "aRD" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "large_escape_pod_1_recovery"; pixel_x = -25; pixel_y = -25; req_one_access = list(13); tag_door = "large_escape_pod_1_recovery_hatch"},/turf/simulated/shuttle/floor/yellow,/area/centcom/evac) "aRE" = (/obj/structure/table/rack,/turf/simulated/shuttle/floor{tag = "icon-floor_red"; icon_state = "floor_red"},/area/centcom/evac) "aRF" = (/obj/effect/floor_decal/corner/pink,/turf/unsimulated/floor{icon_state = "white"},/area/centcom/medical)