Fixes a really stupid mistake where a sleep() was causing the explosion() proc to end after the sleep due to src being null. This meant that the lighting process was turned off but never turned back on. It also meant powernets were deferred permanently :( sorry.

Reduced the Login delay for new_players. It stays because it protects against rapid connect/disconnects sending resources repeatedly, it's just a lot less annoying now.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4554 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
2012-08-26 17:50:29 +00:00
parent 5eb6bd3b68
commit 474294466a
3 changed files with 59 additions and 62 deletions
+46 -47
View File
@@ -31,7 +31,7 @@
spawn(60)
spawn(30)
if(client)
if(!preferences.savefile_load(src, 0))
preferences.ShowChoices(src)
@@ -50,50 +50,49 @@
new_player_panel()
if(preferences.lobby_music)
Playmusic()
//PDA Resource Initialisation =======================================================>
/*
Quick note: local dream daemon instances don't seem to cache images right. Might be
a local problem with my machine but it's annoying nontheless.
*/
if(client)
//load the PDA iconset into the client
src << browse_rsc('icons/pda_icons/pda_atmos.png')
src << browse_rsc('icons/pda_icons/pda_back.png')
src << browse_rsc('icons/pda_icons/pda_bell.png')
src << browse_rsc('icons/pda_icons/pda_blank.png')
src << browse_rsc('icons/pda_icons/pda_boom.png')
src << browse_rsc('icons/pda_icons/pda_bucket.png')
src << browse_rsc('icons/pda_icons/pda_crate.png')
src << browse_rsc('icons/pda_icons/pda_cuffs.png')
src << browse_rsc('icons/pda_icons/pda_eject.png')
src << browse_rsc('icons/pda_icons/pda_exit.png')
src << browse_rsc('icons/pda_icons/pda_flashlight.png')
src << browse_rsc('icons/pda_icons/pda_honk.png')
src << browse_rsc('icons/pda_icons/pda_mail.png')
src << browse_rsc('icons/pda_icons/pda_medical.png')
src << browse_rsc('icons/pda_icons/pda_menu.png')
src << browse_rsc('icons/pda_icons/pda_mule.png')
src << browse_rsc('icons/pda_icons/pda_notes.png')
src << browse_rsc('icons/pda_icons/pda_power.png')
src << browse_rsc('icons/pda_icons/pda_rdoor.png')
src << browse_rsc('icons/pda_icons/pda_reagent.png')
src << browse_rsc('icons/pda_icons/pda_refresh.png')
src << browse_rsc('icons/pda_icons/pda_scanner.png')
src << browse_rsc('icons/pda_icons/pda_signaler.png')
src << browse_rsc('icons/pda_icons/pda_status.png')
//Loads icons for SpiderOS into client
src << browse_rsc('icons/spideros_icons/sos_1.png')
src << browse_rsc('icons/spideros_icons/sos_2.png')
src << browse_rsc('icons/spideros_icons/sos_3.png')
src << browse_rsc('icons/spideros_icons/sos_4.png')
src << browse_rsc('icons/spideros_icons/sos_5.png')
src << browse_rsc('icons/spideros_icons/sos_6.png')
src << browse_rsc('icons/spideros_icons/sos_7.png')
src << browse_rsc('icons/spideros_icons/sos_8.png')
src << browse_rsc('icons/spideros_icons/sos_9.png')
src << browse_rsc('icons/spideros_icons/sos_10.png')
src << browse_rsc('icons/spideros_icons/sos_11.png')
src << browse_rsc('icons/spideros_icons/sos_12.png')
src << browse_rsc('icons/spideros_icons/sos_13.png')
src << browse_rsc('icons/spideros_icons/sos_14.png')
//PDA Resource Initialisation =======================================================>
/*
Quick note: local dream daemon instances don't seem to cache images right. Might be
a local problem with my machine but it's annoying nontheless.
*/
//load the PDA iconset into the client
src << browse_rsc('icons/pda_icons/pda_atmos.png')
src << browse_rsc('icons/pda_icons/pda_back.png')
src << browse_rsc('icons/pda_icons/pda_bell.png')
src << browse_rsc('icons/pda_icons/pda_blank.png')
src << browse_rsc('icons/pda_icons/pda_boom.png')
src << browse_rsc('icons/pda_icons/pda_bucket.png')
src << browse_rsc('icons/pda_icons/pda_crate.png')
src << browse_rsc('icons/pda_icons/pda_cuffs.png')
src << browse_rsc('icons/pda_icons/pda_eject.png')
src << browse_rsc('icons/pda_icons/pda_exit.png')
src << browse_rsc('icons/pda_icons/pda_flashlight.png')
src << browse_rsc('icons/pda_icons/pda_honk.png')
src << browse_rsc('icons/pda_icons/pda_mail.png')
src << browse_rsc('icons/pda_icons/pda_medical.png')
src << browse_rsc('icons/pda_icons/pda_menu.png')
src << browse_rsc('icons/pda_icons/pda_mule.png')
src << browse_rsc('icons/pda_icons/pda_notes.png')
src << browse_rsc('icons/pda_icons/pda_power.png')
src << browse_rsc('icons/pda_icons/pda_rdoor.png')
src << browse_rsc('icons/pda_icons/pda_reagent.png')
src << browse_rsc('icons/pda_icons/pda_refresh.png')
src << browse_rsc('icons/pda_icons/pda_scanner.png')
src << browse_rsc('icons/pda_icons/pda_signaler.png')
src << browse_rsc('icons/pda_icons/pda_status.png')
//Loads icons for SpiderOS into client
src << browse_rsc('icons/spideros_icons/sos_1.png')
src << browse_rsc('icons/spideros_icons/sos_2.png')
src << browse_rsc('icons/spideros_icons/sos_3.png')
src << browse_rsc('icons/spideros_icons/sos_4.png')
src << browse_rsc('icons/spideros_icons/sos_5.png')
src << browse_rsc('icons/spideros_icons/sos_6.png')
src << browse_rsc('icons/spideros_icons/sos_7.png')
src << browse_rsc('icons/spideros_icons/sos_8.png')
src << browse_rsc('icons/spideros_icons/sos_9.png')
src << browse_rsc('icons/spideros_icons/sos_10.png')
src << browse_rsc('icons/spideros_icons/sos_11.png')
src << browse_rsc('icons/spideros_icons/sos_12.png')
src << browse_rsc('icons/spideros_icons/sos_13.png')
src << browse_rsc('icons/spideros_icons/sos_14.png')
//End PDA Resource Initialisation =====================================================>