From d8dc75f384b0811da383942c1a36ae6024963879 Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Sat, 21 Apr 2012 16:59:33 +0000 Subject: [PATCH] Bugfix with telecomms. Reverted tick_lag back to 0.9. Enjoy lagstation again skrubs :( git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3486 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/master_controller.dm | 2 +- code/modules/scripting/Implementations/Telecomms.dm | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/master_controller.dm b/code/game/master_controller.dm index 1f29af3b3c..091545d8b1 100644 --- a/code/game/master_controller.dm +++ b/code/game/master_controller.dm @@ -45,7 +45,7 @@ datum/controller/game_controller if(!tension_master) tension_master = new /datum/tension() - world.tick_lag = 0.6 + world.tick_lag = 0.9 setup_objects() diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm index a22905aea6..04e6797481 100644 --- a/code/modules/scripting/Implementations/Telecomms.dm +++ b/code/modules/scripting/Implementations/Telecomms.dm @@ -197,9 +197,13 @@ if(signal.data["name"] != setname) signal.data["realname"] = setname signal.data["name"] = setname - signal.data["job"] = trim(copytext(sanitize(interpreter.GetVar("$job")), 1, MAX_MESSAGE_LEN)) + signal.data["job"] = interpreter.GetVar("$job") signal.data["reject"] = !(interpreter.GetVar("$pass")) // set reject to the opposite of $pass + // If the message is invalid, just don't broadcast it! + if(signal.data["message"] == "" || !signal.data["message"]) + signal.data["reject"] = 1 + /* -- Actual language proc code -- */ datum/signal @@ -223,7 +227,7 @@ datum/signal var/obj/machinery/telecomms/server/S = data["server"] var/obj/item/device/radio/hradio - if(!message && message != 0) + if((!message || message == "") && message != 0) message = "*beep*" if(!source) source = "[html_encode(uppertext(S.id))]" @@ -243,9 +247,9 @@ datum/signal else newsign.data["name"] = "[html_encode(uppertext(source))]" newsign.data["realname"] = newsign.data["name"] - newsign.data["job"] = html_encode(job) + newsign.data["job"] = job newsign.data["compression"] = 0 - newsign.data["message"] = html_encode(message) + newsign.data["message"] = message newsign.data["type"] = 2 // artificial broadcast if(!isnum(freq)) freq = text2num(freq)