cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge tgstation13 r4570 into bs12_with_tgport

Browse Source 
Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-08-28 19:57:11 +10:00
parent f1ddffcfb4 b0f750339c
commit eacd84b212
269 changed files with 14389 additions and 13349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/login.dm
+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 =====================================================>