diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 7c7c30c880a..0e1e54e5215 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -7,7 +7,7 @@ var/global/datum/controller/gameticker/ticker /datum/controller/gameticker - var/const/restart_timeout = 250 + var/const/restart_timeout = 600 var/current_state = GAME_STATE_PREGAME var/hide_mode = 0 @@ -29,7 +29,7 @@ var/global/datum/controller/gameticker/ticker /datum/controller/gameticker/proc/pregame() do - pregame_timeleft = 90 + pregame_timeleft = 180 world << "Welcome to the pre-game lobby!" world << "Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds" while(current_state == GAME_STATE_PREGAME) @@ -164,6 +164,7 @@ var/global/datum/controller/gameticker/ticker if(!mode.explosion_in_progress && mode.check_finished()) current_state = GAME_STATE_FINISHED + going = 1 spawn declare_completion() @@ -182,6 +183,7 @@ var/global/datum/controller/gameticker/ticker blackbox.save_all_data_to_sql() sleep(restart_timeout) + while(!going) sleep(10) world.Reboot() return 1 diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 25cbee548b8..a92253cfb62 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -2385,14 +2385,20 @@ set category = "Server" set desc="Delay the game start" set name="Delay" - if (!ticker || ticker.current_state != GAME_STATE_PREGAME) + if (!ticker || (ticker.current_state != GAME_STATE_PREGAME && ticker.current_state != GAME_STATE_FINISHED)) return alert("Too late... The game has already started!", null, null, null, null, null) going = !( going ) if (!( going )) - world << "The game start has been delayed." + if(ticker.current_state == GAME_STATE_FINISHED) + world << "The game end has been delayed." + else + world << "The game start has been delayed." log_admin("[key_name(usr)] delayed the game.") else - world << "The game will start soon." + if(ticker.current_state == GAME_STATE_FINISHED) + world << "The game will end soon." + else + world << "The game will start soon." log_admin("[key_name(usr)] removed the delay.") /obj/admins/proc/adjump() diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 7c737ebea74..a7da5cfb894 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -5448,9 +5448,9 @@ "caN" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/engine/engineering) "caO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/engine/engineering) "caP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/engine/engineering) -"caQ" = (/obj/machinery/camera{c_tag = "Singularity Northwest"; dir = 4; network = "Singularity"},/turf/simulated/floor/plating,/area/engine/engineering) +"caQ" = (/obj/machinery/camera{c_tag = "Singularity Northwest"; dir = 4; hardened = 1000; network = "Singularity"},/turf/simulated/floor/plating,/area/engine/engineering) "caR" = (/obj/item/weapon/wirecutters,/turf/simulated/floor/plating,/area/engine/engineering) -"caS" = (/obj/machinery/camera{c_tag = "Singularity Northeast"; dir = 8; network = "Singularity"},/turf/simulated/floor/plating,/area/engine/engineering) +"caS" = (/obj/machinery/camera{c_tag = "Singularity Northeast"; dir = 8; hardened = 1000; network = "Singularity"},/turf/simulated/floor/plating,/area/engine/engineering) "caT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/engine/engineering) "caU" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating/airless,/area/engine/engineering) "caV" = (/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating/airless,/area/solar/starboard) @@ -5498,9 +5498,9 @@ "cbL" = (/obj/item/device/radio,/turf/simulated/floor/plating/airless,/area/engine/engineering) "cbM" = (/obj/structure/lattice,/obj/item/clothing/head/helmet/hardhat,/turf/space,/area) "cbN" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor/plating/airless,/area/engine/engineering) -"cbO" = (/obj/machinery/emitter{anchored = 1; dir = 4; state = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/camera{c_tag = "Singularity West"; dir = 4; network = "Singularity"},/turf/simulated/floor/plating/airless,/area/engine/engineering) +"cbO" = (/obj/machinery/emitter{anchored = 1; dir = 4; state = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/camera{c_tag = "Singularity West"; dir = 4; hardened = 1000; network = "Singularity"},/turf/simulated/floor/plating/airless,/area/engine/engineering) "cbP" = (/obj/item/weapon/screwdriver,/turf/space,/area) -"cbQ" = (/obj/machinery/emitter{anchored = 1; dir = 8; state = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/camera{c_tag = "Singularity East"; dir = 8; network = "Singularity"},/turf/simulated/floor/plating/airless,/area/engine/engineering) +"cbQ" = (/obj/machinery/emitter{anchored = 1; dir = 8; state = 2},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/camera{c_tag = "Singularity East"; dir = 8; hardened = 1000; network = "Singularity"},/turf/simulated/floor/plating/airless,/area/engine/engineering) "cbR" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor/plating/airless,/area/engine/engineering) "cbS" = (/obj/structure/cable,/obj/machinery/power/tracker,/turf/simulated/floor/plating/airless,/area/solar/starboard) "cbT" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA"; pixel_x = 0; pixel_y = 0},/turf/simulated/wall/r_wall,/area/engine/engineering) @@ -5512,7 +5512,7 @@ "cbZ" = (/obj/effect/landmark/start,/turf/unsimulated/floor,/area/start) "cca" = (/turf/unsimulated/wall{icon = 'icons/misc/fullscreen.dmi'; icon_state = "title"; name = "Space Station 13"},/area/start) "ccb" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/syndicate_mothership) -"ccc" = (/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) +"ccc" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/syndicate_mothership) "ccd" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/syndicate_mothership) "cce" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate_elite/mothership) "ccf" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_r (NORTH)"; icon_state = "propulsion_r"; dir = 1},/turf/space,/area/shuttle/syndicate_elite/mothership) @@ -5584,8 +5584,8 @@ "cdt" = (/obj/structure/table,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) "cdu" = (/turf/unsimulated/wall,/area/centcom) "cdv" = (/obj/effect/landmark{name = "Nuclear-Closet"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) -"cdw" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area) -"cdx" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom) +"cdw" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "External Airlock"},/area) +"cdx" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom) "cdy" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom) "cdz" = (/turf/unsimulated/floor{name = "plating"},/area/centcom) "cdA" = (/obj/structure/stool/chair{dir = 4},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor4"},/area/syndicate_station/start) @@ -5647,7 +5647,7 @@ "ceE" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom/suppy) "ceF" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/suppy) "ceG" = (/turf/unsimulated/floor{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/centcom/suppy) -"ceH" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy) +"ceH" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/suppy) "ceI" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) "ceJ" = (/obj/effect/landmark{name = "Syndicate-Spawn"},/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) "ceK" = (/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area/syndicate_station/start) @@ -5664,7 +5664,7 @@ "ceV" = (/obj/structure/table,/obj/machinery/juicer{pixel_y = 6},/turf/unsimulated/floor{tag = "icon-redyellowfull"; icon_state = "redyellowfull"},/area/centcom/living) "ceW" = (/obj/machinery/door/airlock/external,/turf/unsimulated/floor{name = "plating"},/area/centcom/living) "ceX" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/living) -"ceY" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living) +"ceY" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/living) "ceZ" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/supply/dock) "cfa" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/supply/dock) "cfb" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/supply/dock) @@ -6036,7 +6036,7 @@ "cmd" = (/turf/simulated/shuttle/floor,/area/shuttle/escape/centcom) "cme" = (/obj/structure/stool/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "cmf" = (/obj/machinery/computer/security,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) -"cmg" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry) +"cmg" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/area/centcom/ferry) "cmh" = (/turf/unsimulated/floor{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/centcom/ferry) "cmi" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry) "cmj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry) @@ -6046,7 +6046,7 @@ "cmn" = (/obj/structure/stool/chair{dir = 8},/turf/unsimulated/floor{icon_state = "green"; dir = 4},/area/centcom/control) "cmo" = (/obj/machinery/computer/crew,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) "cmp" = (/obj/machinery/computer/communications,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom) -"cmq" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'icons/obj/doors/rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/centcom/ferry) +"cmq" = (/turf/unsimulated/wall{desc = "Why it no open!"; icon = 'rapid_pdoor.dmi'; icon_state = "pdoor1"; name = "Shuttle Bay Blast Door"},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/centcom/ferry) "cmr" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s6"; icon_state = "swall_s6"; dir = 2},/area/shuttle/transport1/centcom) "cms" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/shuttle/transport1/centcom) "cmt" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/shuttle/transport1/centcom)