cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 09:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue 411. (Thanks Yvarov- http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8651)

Browse Source 
Added Invisty's new field generator sprites.

Added a button to check antagonists that stops the world from automatically restarting at round end.
It's toggleable, but once the round ends with it on, you'll need to reboot the world manually. (It's under check antagonists because that's where the shuttle stuff is, let me know if I should move it.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3565 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-05-07 13:02:42 +00:00
parent 8afca8ac7f
commit e89e7acdb3
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/gameticker.dm
+11 -5
View File
@@ -29,6 +29,7 @@ var/global/datum/controller/gameticker/ticker
var/pregame_timeleft = 0
var/delay_end = 0 //if set to nonzero, the round will not restart on it's own
/datum/controller/gameticker/proc/pregame()
login_music = pick('title2.ogg') // choose title music!
@@ -277,17 +278,22 @@ var/global/datum/controller/gameticker/ticker
spawn(50)
if (mode.station_was_nuked)
feedback_set_details("end_proper","nuke")
world << "\blue <B>Rebooting due to destruction of station in [restart_timeout/10] seconds</B>"
if(!delay_end)
world << "\blue <B>Rebooting due to destruction of station in [restart_timeout/10] seconds</B>"
else
feedback_set_details("end_proper","proper completion")
world << "\blue <B>Restarting in [restart_timeout/10] seconds</B>"
if(!delay_end)
world << "\blue <B>Restarting in [restart_timeout/10] seconds</B>"
if(blackbox)
blackbox.save_all_data_to_sql()
sleep(restart_timeout)
world.Reboot()
if(!delay_end)
sleep(restart_timeout)
world.Reboot()
else
world << "\blue <B>An admin has delayed the round end</B>"
return 1
@@ -304,7 +310,7 @@ var/global/datum/controller/gameticker/ticker
if (aiPlayer.connected_robots.len)
var/robolist = "<b>The AI's loyal minions were:</b> "
for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots)
robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":", (Played by: [robo.key])"]"
robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]"
world << "[robolist]"
for (var/mob/living/silicon/robot/robo in world)