cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix with telecomms.

Browse Source 
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
This commit is contained in:
vageyenaman@gmail.com
2012-04-21 16:59:33 +00:00
parent f87eefbd95
commit d8dc75f384
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/master_controller.dm
View File

@@ -45,7 +45,7 @@ datum/controller/game_controller
if(!tension_master) if(!tension_master)
tension_master = new /datum/tension() tension_master = new /datum/tension()
world.tick_lag = 0.6 world.tick_lag = 0.9
setup_objects() setup_objects()

12
code/modules/scripting/Implementations/Telecomms.dm
View File

@@ -197,9 +197,13 @@
if(signal.data["name"] != setname) if(signal.data["name"] != setname)
signal.data["realname"] = setname signal.data["realname"] = setname
signal.data["name"] = 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 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 -- */ /* -- Actual language proc code -- */
datum/signal datum/signal
@@ -223,7 +227,7 @@ datum/signal
var/obj/machinery/telecomms/server/S = data["server"] var/obj/machinery/telecomms/server/S = data["server"]
var/obj/item/device/radio/hradio var/obj/item/device/radio/hradio
if(!message && message != 0) if((!message || message == "") && message != 0)
message = "*beep*" message = "*beep*"
if(!source) if(!source)
source = "[html_encode(uppertext(S.id))]" source = "[html_encode(uppertext(S.id))]"
@@ -243,9 +247,9 @@ datum/signal
else else
newsign.data["name"] = "<i>[html_encode(uppertext(source))]<i>" newsign.data["name"] = "<i>[html_encode(uppertext(source))]<i>"
newsign.data["realname"] = newsign.data["name"] newsign.data["realname"] = newsign.data["name"]
newsign.data["job"] = html_encode(job) newsign.data["job"] = job
newsign.data["compression"] = 0 newsign.data["compression"] = 0
newsign.data["message"] = html_encode(message) newsign.data["message"] = message
newsign.data["type"] = 2 // artificial broadcast newsign.data["type"] = 2 // artificial broadcast
if(!isnum(freq)) if(!isnum(freq))
freq = text2num(freq) freq = text2num(freq)