fixes ooc autotoggle and adds loc to sprayer log

This commit is contained in:
Jordie0608
2015-07-09 00:52:19 +10:00
parent 68409aaaff
commit 70ae3d2134
3 changed files with 23 additions and 21 deletions
+3 -4
View File
@@ -100,7 +100,7 @@ var/datum/subsystem/ticker/ticker
if(!mode.explosion_in_progress && mode.check_finished() || force_ending)
current_state = GAME_STATE_FINISHED
auto_toggle_ooc(1) // Turn it on
toggle_ooc(1) // Turn it on
declare_completion(force_ending)
spawn(50)
if(mode.station_was_nuked)
@@ -162,7 +162,8 @@ var/datum/subsystem/ticker/ticker
mode.announce()
current_state = GAME_STATE_PLAYING
auto_toggle_ooc(0) // Turn it off
if(!config.ooc_during_round)
toggle_ooc(0) // Turn it off
round_start_time = world.time
start_landmarks_list = shuffle(start_landmarks_list) //Shuffle the order of spawn points so they dont always predictably spawn bottom-up and right-to-left
@@ -204,8 +205,6 @@ var/datum/subsystem/ticker/ticker
for (var/datum/html_interface/hi in html_interfaces)
hi.closeAll()
auto_toggle_ooc(1) // Turn it on
//initialise our cinematic screen object
cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=20;mouse_opacity=0;screen_loc="1,0";}(src)