From 2a59482e6cc399f74a159e31343f3ecfdc8aefe1 Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Wed, 4 Apr 2012 22:55:43 +0000 Subject: [PATCH] Modifies tick_lag to 0.6. It shouldn't cause any problems, but just in case, Game Masters have been given the ability to modify tick_lag on the fly. This SHOULD make the game feel a lot smoother. Fix for people being unable to modify NTSL code. Fix for not being able to use pills as pill-satchels properly. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3401 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/telecomms/traffic_control.dm | 2 +- code/game/master_controller.dm | 4 ++-- code/modules/admin/admin_verbs.dm | 2 ++ code/modules/admin/verbs/debug.dm | 11 +++++++++++ code/modules/chemical/Chemistry-Tools.dm | 1 - 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 240c1529e30..5a4836baf5f 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -163,13 +163,13 @@ if("editcode") if(editingcode == usr) return if(usr in viewingcode) return - winset(editingcode, "tcscode", "text=\"\"") if(!editingcode) lasteditor = usr editingcode = usr winshow(editingcode, "Telecomms IDE", 1) // show the IDE winset(editingcode, "tcscode", "is-disabled=false") + winset(editingcode, "tcscode", "text=\"\"") var/showcode = dd_replacetext(storedcode, "\\\"", "\\\\\"") showcode = dd_replacetext(storedcode, "\"", "\\\"") winset(editingcode, "tcscode", "text=\"[showcode]\"") diff --git a/code/game/master_controller.dm b/code/game/master_controller.dm index 23a7175e952..379b9fc37cd 100644 --- a/code/game/master_controller.dm +++ b/code/game/master_controller.dm @@ -28,7 +28,7 @@ datum/controller/game_controller if(!tension_master) tension_master = new /datum/tension() - world.tick_lag = 0.9 + world.tick_lag = 0.6 setup_objects() @@ -118,7 +118,7 @@ datum/controller/game_controller ticker.process() - sleep(world.timeofday+10-start_time) + sleep(world.timeofday+12-start_time) spawn process() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 82e14160036..f20f1935a9a 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -141,6 +141,7 @@ verbs += /client/proc/everyone_random verbs += /client/proc/only_one // Fateweaver suggested I do this - Doohl verbs += /client/proc/deadmin_self + verbs += /client/proc/cmd_admin_ticklag if (holder.level >= 5)//Game Admin******************************************************************** verbs += /obj/admins/proc/view_txt_log @@ -419,6 +420,7 @@ verbs -= /client/proc/startSinglo verbs -= /client/proc/jumptocoord verbs -= /client/proc/everyone_random + verbs -= /client/proc/cmd_admin_ticklag //verbs -= /client/proc/cmd_switch_radio return diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 30737928be8..0f53cc899ef 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -366,7 +366,18 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that message_admins("[key_name_admin(src)] has turned the experimental radio system [GLOBAL_RADIO_TYPE ? "on" : "off"].", 0) +/client/proc/cmd_admin_ticklag() + set category = "Debug" + set name = "Set Ticklag" + set desc = "Sets a new tick lag. Recommend you don't mess with this too much! Stable, time-tested ticklag value is 0.9" + var/newtick = input("Sets a new tick lag. Recommend you don't mess with this too much! Stable, time-tested ticklag value is 0.9",, 0.9) as num|null + if(newtick) + if(newtick <= 1 && newtick >= 0) + log_admin("[key_name(src)] has modified world.tick_lag to [newtick]", 0) + message_admins("[key_name(src)] has modified world.tick_lag to [newtick]", 0) + + world.tick_lag = newtick /client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in world) diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 7bf7d1692be..23a18c19157 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -1586,7 +1586,6 @@ icon_state = "pill[rand(1,20)]" attackby(obj/item/weapon/W as obj, mob/user as mob) - ..() if (istype(W, /obj/item/weapon/storage/pill_bottle)) var/obj/item/weapon/storage/pill_bottle/P = W if (P.mode == 1)