From 631330a7f4e411781eb72b0defcd617c8f19a424 Mon Sep 17 00:00:00 2001 From: Hawk-v3 Date: Wed, 20 Jun 2012 12:41:14 +0100 Subject: [PATCH 1/3] Upping the upload limit for sound files. --- code/modules/client/client procs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 7a6795ff337..f48c21715a5 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -2,7 +2,7 @@ //SECURITY// //////////// #define TOPIC_SPAM_DELAY 7 //7 tick delay is about half a second -#define UPLOAD_LIMIT 1048576 //Restricts client uploads to the server to 1MB //Could probably do with being lower. +#define UPLOAD_LIMIT 10485760 //Restricts client uploads to the server to 10MB //Could probably do with being lower. /* When somebody clicks a link in game, this Topic is called first. It does the stuff in this proc and then is redirected to the Topic() proc for the src=[0xWhatever] From 37c0132f35c6706b7c1692becb2876c7afdd06af Mon Sep 17 00:00:00 2001 From: Hawk-v3 Date: Wed, 20 Jun 2012 13:05:06 +0100 Subject: [PATCH 2/3] Abi's request --- code/modules/client/client procs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index f48c21715a5..2f32e2312aa 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -63,6 +63,7 @@ src << "Error: AllowUpload(): Spam prevention. Please wait [round(time_to_wait/10)] seconds." return 0 fileaccess_timer = world.time + FTPDELAY */ + world.log << "[src] uploaded [filename] of [filelength]" return 1 From 61124c86a8c8ae450cc10dfd79118a42ae6fc327 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Wed, 20 Jun 2012 09:34:17 -0700 Subject: [PATCH 3/3] Reduction of number of ul_Illuminate and ul_Extinguish calls. (@Miniature) Also fixed a bug with the SMES room lighting. --- code/WorkInProgress/SkyMarshal/Ultralight.dm | 9 ++++++--- code/game/area/areas.dm | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/WorkInProgress/SkyMarshal/Ultralight.dm b/code/WorkInProgress/SkyMarshal/Ultralight.dm index 84c690bb764..0c41b6d2b46 100644 --- a/code/WorkInProgress/SkyMarshal/Ultralight.dm +++ b/code/WorkInProgress/SkyMarshal/Ultralight.dm @@ -278,9 +278,12 @@ atom/Del() . = ..() atom/movable/Move() - ul_Extinguish() - . = ..() - ul_Illuminate() + if(LuminosityRed || LuminosityGreen || LuminosityBlue) + ul_Extinguish() + . = ..() + ul_Illuminate() + else + return ..() turf/var/list/MaxRed diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 4dcea1bf829..bc42481c643 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -37,8 +37,8 @@ power_light = 0//rastaf0 power_equip = 0//rastaf0 power_environ = 0//rastaf0 - luminosity = 1 - ul_Lighting = 0 + if(!ul_Lighting) + luminosity = 1 else luminosity = 0 area_lights_luminosity = rand(6,7)