mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 04:27:35 +01:00
Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport
Conflicts: baystation12.dme code/game/gamemodes/changeling/modularchangling.dm code/game/gamemodes/cult/runes.dm code/game/gamemodes/events.dm code/game/machinery/computer/HolodeckControl.dm code/game/objects/items/devices/radio/radio.dm code/modules/admin/admin_verbs.dm code/modules/awaymissions/zlevel.dm code/modules/client/client procs.dm code/modules/mob/living/say.dm code/modules/mob/living/simple_animal/life.dm code/modules/mob/mob_cleanup.dm code/modules/paperwork/paperbin.dm html/changelog.html icons/turf/areas.dmi maps/RandomZLevels/assistantChamber.dmm maps/RandomZLevels/fileList.txt Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
@@ -87,11 +87,14 @@
|
||||
///////////
|
||||
//CONNECT//
|
||||
///////////
|
||||
/client/New()
|
||||
//Connection-Type and client byond_version checking
|
||||
if( connection != "seeker" || (byond_version < MIN_CLIENT_VERSION)) //Out of date or wrong connection type. Update your client!!
|
||||
del(src)
|
||||
return
|
||||
/client/New(TopicData)
|
||||
TopicData = null //Prevent calls to client.Topic from connect
|
||||
|
||||
if(connection != "seeker") //Invalid connection type.
|
||||
return null
|
||||
if(byond_version < MIN_CLIENT_VERSION) //Out of date client.
|
||||
return null
|
||||
|
||||
|
||||
if(IsGuestKey(key))
|
||||
alert(src,"Baystation12 doesn't allow guest accounts to play. Please go to http://www.byond.com/ and register for a key.","Guest","OK")
|
||||
@@ -111,6 +114,8 @@
|
||||
holder.owner = src
|
||||
holder.state = null
|
||||
|
||||
. = ..() //calls mob.Login()
|
||||
|
||||
//makejson()
|
||||
|
||||
if(custom_event_msg && custom_event_msg != "")
|
||||
|
||||
Reference in New Issue
Block a user