From a6934a531ba06845d4331d70b02c42044c3324f8 Mon Sep 17 00:00:00 2001 From: bs12 Date: Fri, 19 Sep 2014 15:03:21 -0400 Subject: [PATCH 1/3] gameticker.dm crash fix Signed-off-by: bs12 --- code/game/gamemodes/gameticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 77a48f26932..97f475373db 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -274,7 +274,7 @@ var/global/datum/controller/gameticker/ticker proc/create_characters() for(var/mob/new_player/player in player_list) - if(player.ready && player.mind) + if(player && player.ready && player.mind) if(player.mind.assigned_role=="AI") player.close_spawn_windows() player.AIize() From 119e0a89ff5cd0de8644826b590ed0ab043800a8 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Sat, 1 Nov 2014 16:14:29 +0000 Subject: [PATCH 2/3] webclient support no cid checks, not supported properly on webclient Signed-off-by: Mloc-Argent --- code/modules/client/client procs.dm | 2 +- code/modules/mob/login.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index cbc9fb80a5f..77893ef0bbf 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -105,7 +105,7 @@ /client/New(TopicData) TopicData = null //Prevent calls to client.Topic from connect - if(connection != "seeker") //Invalid connection type. + if(!(connection in list("seeker", "web"))) //Invalid connection type. return null if(byond_version < MIN_CLIENT_VERSION) //Out of date client. return null diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 9360e758a18..c8882186058 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -11,7 +11,7 @@ var/matches if( (M.lastKnownIP == client.address) ) matches += "IP ([client.address])" - if( (M.computer_id == client.computer_id) ) + if( (client.connection != "web") && (M.computer_id == client.computer_id) ) if(matches) matches += " and " matches += "ID ([client.computer_id])" spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!") From 693574da197d3d00d3cadaf7eada9dd1c51fafe2 Mon Sep 17 00:00:00 2001 From: Mloc-Argent Date: Sat, 1 Nov 2014 21:40:01 +0000 Subject: [PATCH 3/3] update IsGuestKey for webclient guests Signed-off-by: Mloc-Argent --- code/__HELPERS/unsorted.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index ee3648fea2f..4a213027771 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -228,9 +228,12 @@ Turf and target are seperate in case you want to teleport some distance from a t if (findtext(key, "Guest-", 1, 7) != 1) //was findtextEx return 0 - var/i, ch, len = length(key) + var/i = 7, ch, len = length(key) - for (i = 7, i <= len, ++i) + if(copytext(key, 7, 8) == "W") //webclient + i++ + + for (, i <= len, ++i) ch = text2ascii(key, i) if (ch < 48 || ch > 57) return 0