From 1283fdf5856084f076b217ec251f246e7a737761 Mon Sep 17 00:00:00 2001 From: "Superxpdude@gmail.com" Date: Fri, 5 Aug 2011 15:56:42 +0000 Subject: [PATCH] Fixed a small bug with the armory atmospheric pumps and scrubbers. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1984 316c924e-a436-60f5-8080-3fe189b3f50e --- maps/tgstation.2.0.8.dmm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 7f44a86d36e..73ef270d46a 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -447,7 +447,7 @@ "aiE" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor,/area/security/warden) "aiF" = (/obj/rack,/obj/machinery/atmospherics/pipe/simple{dir = 4},/obj/item/weapon/melee/baton,/obj/item/clothing/suit/armor/vest,/obj/item/clothing/head/helmet,/turf/simulated/floor,/area/security/warden) "aiG" = (/obj/machinery/atmospherics/pipe/manifold{dir = 4},/obj/rack,/obj/item/weapon/melee/baton,/obj/item/clothing/suit/armor/vest,/obj/item/clothing/head/helmet,/turf/simulated/floor,/area/security/warden) -"aiH" = (/obj/machinery/alarm{frequency = 1437; pixel_y = 23},/turf/simulated/floor,/area/security/warden) +"aiH" = (/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor,/area/security/warden) "aiI" = (/obj/machinery/flasher/portable,/obj/window/reinforced,/turf/simulated/floor{tag = "icon-delivery (SOUTHWEST)"; icon_state = "delivery"; dir = 10},/area/security/warden) "aiJ" = (/obj/machinery/atmospherics/pipe/simple,/turf/simulated/wall/r_wall,/area/security/hos) "aiK" = (/obj/grille,/obj/window/reinforced{dir = 1},/obj/window/reinforced,/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/security/hos) @@ -4009,7 +4009,7 @@ "bze" = (/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bzf" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 6; icon_state = "intact-r-f"; initialize_directions = 6; level = 1; name = "pipe"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bzg" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"bzh" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"bzh" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bzi" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bzj" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/obj/machinery/camera{c_tag = "Arrivals North"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bzk" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) @@ -4019,7 +4019,7 @@ "bzo" = (/obj/machinery/light/small{dir = 1},/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bzp" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 5; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bzq" = (/obj/machinery/atmospherics/valve{dir = 4},/obj/machinery/camera{c_tag = "East Maintenance Shaft"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"bzr" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 4; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"bzr" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 4; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bzs" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 8; initialize_directions = 0},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bzt" = (/turf/simulated/wall,/area/maintenance/asmaint2) "bzu" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/shuttle/mining/station) @@ -5797,7 +5797,7 @@ "chy" = (/obj/stool/bed,/obj/item/weapon/bedsheet,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) "chz" = (/obj/table,/obj/item/weapon/gun/projectile/automatic/mini_uzi,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) "chA" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) -"chB" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership) +"chB" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership) "chC" = (/obj/stool,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) "chD" = (/obj/rack,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile/shotgun/combat,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) "chE" = (/obj/rack,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile/silenced,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) @@ -5925,7 +5925,7 @@ "cjW" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 1},/turf/unsimulated/floor{name = "plating"},/area/syndicate_mothership) "cjX" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced,/obj/window/reinforced{dir = 1},/turf/unsimulated/floor{name = "plating"},/area/syndicate_mothership) "cjY" = (/obj/machinery/door/airlock/external{icon_state = "door_locked"; locked = 1},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_mothership) -"cjZ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area/syndicate_mothership) +"cjZ" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area/syndicate_mothership) "cka" = (/obj/landmark{name = "Nuclear-Closet"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) "ckb" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/turf/unsimulated/floor{name = "plating"},/area/syndicate_mothership) "ckc" = (/obj/stool/chair{dir = 4},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) @@ -6889,7 +6889,7 @@ "cCy" = (/turf/unsimulated/floor{dir = 1; icon_state = "chapel"},/area/wizard_station) "cCz" = (/turf/unsimulated/floor{dir = 4; icon_state = "chapel"},/area/wizard_station) "cCA" = (/obj/item/weapon/spacecash,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) -"cCB" = (/mob/living/carbon/metroid{desc = "A tamed other thing. Very smart looking."; icon = 'otherthing.dmi'; icon_state = "otherthing"; name = "Tamed Otherthing"; toxloss = 0; voice_message = "gurgles"; voice_name = "otherthing"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) +"cCB" = (/mob/living/carbon/metroid{desc = "A tamed other thing. Very smart looking."; icon = 'icons/obj/otherthing.dmi'; icon_state = "otherthing"; name = "Tamed Otherthing"; toxloss = 0; voice_message = "gurgles"; voice_name = "otherthing"},/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "cCC" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/turf/unsimulated/floor,/area/wizard_station) "cCD" = (/obj/stool,/turf/unsimulated/floor{dir = 2; icon_state = "carpetside"},/area/wizard_station) "cCE" = (/turf/unsimulated/floor{dir = 8; icon_state = "chapel"},/area/wizard_station)