From 4f108d520db25b5d2120f11038e107bbddd3b9c5 Mon Sep 17 00:00:00 2001 From: "ericgfwong@hotmail.com" Date: Thu, 19 Jul 2012 15:40:12 +0000 Subject: [PATCH] -Small fix for meteor spawns -Color-coded escape shuttle doors appropriately git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4112 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/meteor/meteors.dm | 14 +++++++------- maps/tgstation.2.0.9.dmm | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index b7be37d0440..7847c6d2d8b 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -39,21 +39,21 @@ starty = world.maxy-8 startx = rand(8, world.maxx-8) endy = 8 - endx = rand(1, world.maxx-8) + endx = rand(8, world.maxx-8) if(2) //EAST - starty = rand(1,world.maxy-8) + starty = rand(8,world.maxy-8) startx = world.maxx-8 - endy = rand(1, world.maxy-8) + endy = rand(8, world.maxy-8) endx = 8 if(3) //SOUTH starty = 8 - startx = rand(1, world.maxx-8) + startx = rand(8, world.maxx-8) endy = world.maxy-8 - endx = rand(1, world.maxx-8) + endx = rand(8, world.maxx-8) if(4) //WEST - starty = rand(1, world.maxy-8) + starty = rand(8, world.maxy-8) startx = 8 - endy = rand(1,world.maxy-8) + endy = rand(8,world.maxy-8) endx = world.maxx-8 pickedstart = locate(startx, starty, 1) diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index 58b4ec1a1d8..981c8d89998 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -6777,7 +6777,7 @@ "cAq" = (/turf/simulated/shuttle/wall{tag = "icon-swall7"; icon_state = "swall7"; dir = 2},/area/shuttle/escape/centcom) "cAr" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/shuttle/escape/centcom) "cAs" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/shuttle/escape/centcom) -"cAt" = (/obj/machinery/door/airlock/glass{name = "Escape Shuttle Cockpit"; req_access_txt = "19"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) +"cAt" = (/obj/machinery/door/airlock/glass_command{name = "Escape Shuttle Cockpit"; req_access_txt = "19"},/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "cAu" = (/turf/simulated/shuttle/wall{tag = "icon-swall11"; icon_state = "swall11"; dir = 2},/area/shuttle/escape/centcom) "cAv" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/shuttle/transport1/centcom) "cAw" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/shuttle/transport1/centcom) @@ -6884,7 +6884,7 @@ "cCt" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/unsimulated/floor{name = "plating"},/area/tdome) "cCu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{name = "plating"},/area/centcom/evac) "cCv" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/unsimulated/floor{name = "plating"},/area/centcom/evac) -"cCw" = (/obj/machinery/door/airlock/glass{name = "Escape Shuttle Infirmary"; req_access_txt = "0"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) +"cCw" = (/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "0"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "cCx" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall{tag = "icon-swall11"; icon_state = "swall11"; dir = 2},/area/shuttle/escape/centcom) "cCy" = (/obj/structure/closet/emcloset,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "cCz" = (/obj/structure/rack,/obj/item/weapon/storage/crayonbox,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)