From ffa80e2e94f12a0c4682541213a647280bdb3e29 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Tue, 21 Aug 2012 17:25:57 -0700 Subject: [PATCH] Ultralight update, less laggy and less buggy. Might still need to be removed, time will tell. Also: Added an Ion Storm law, and reverted the radio mode change back to the new subspace radios. Also added myself to the admins.txt since I am a dev again and the main server already is updated like that. --- .../Cael_Aislinn/Supermatter/SuperMatter.dm | 7 +- code/WorkInProgress/SkyMarshal/Ultralight.dm | 96 ++++++++++++------- code/ZAS/Fire.dm | 6 ++ code/defines/obj/hydro.dm | 12 +-- code/defines/procs/gamehelpers.dm | 2 + code/game/events/Events/IonStorm.dm | 2 +- code/game/mecha/mecha.dm | 4 +- code/game/objects/devices/PDA/PDA.dm | 10 +- code/game/objects/devices/flashlight.dm | 24 ++--- code/game/objects/items/candle.dm | 6 +- .../objects/items/weapons/cigs_lighters.dm | 8 +- .../game/objects/items/weapons/papers_bins.dm | 8 +- code/game/objects/radio/radio.dm | 2 +- code/modules/mob/living/carbon/amorph/life.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 2 +- code/modules/mob/living/carbon/monkey/life.dm | 2 +- code/modules/mob/living/silicon/robot/life.dm | 2 +- code/modules/mob/mob.dm | 6 +- config/admins.txt | 2 +- 19 files changed, 117 insertions(+), 86 deletions(-) diff --git a/code/WorkInProgress/Cael_Aislinn/Supermatter/SuperMatter.dm b/code/WorkInProgress/Cael_Aislinn/Supermatter/SuperMatter.dm index 27ef61838db..3dfe677de53 100644 --- a/code/WorkInProgress/Cael_Aislinn/Supermatter/SuperMatter.dm +++ b/code/WorkInProgress/Cael_Aislinn/Supermatter/SuperMatter.dm @@ -26,8 +26,8 @@ density = 1 anchored = 0 - LuminosityRed = 4 - LuminosityGreen = 6 + ul_Red = 5 + ul_Green = 6 var/gasefficency = 0.25 @@ -100,7 +100,7 @@ del src damage_archived = damage - damage = max( damage + ( (removed.temperature - 1000) / 150 ) , 0 ) + damage = max( damage + ( (removed.temperature - 800) / 150 ) , 0 ) if(!removed.total_moles) damage += max((power-1600)/10,0) @@ -174,7 +174,6 @@ for(var/mob/living/carbon/human/l in view(src, round(hallucination_energy**0.25))) // you have to be seeing the core to get hallucinations if(prob(10) && !istype(l.glasses, /obj/item/clothing/glasses/meson)) - world << "Inducing hallucinations" l.hallucination += hallucination_energy/((get_dist(l,src)**2)) for(var/mob/living/l in range(src,round(rad_energy**0.25))) diff --git a/code/WorkInProgress/SkyMarshal/Ultralight.dm b/code/WorkInProgress/SkyMarshal/Ultralight.dm index 1f992cff63b..5eeeac14beb 100644 --- a/code/WorkInProgress/SkyMarshal/Ultralight.dm +++ b/code/WorkInProgress/SkyMarshal/Ultralight.dm @@ -7,6 +7,7 @@ #define UL_I_LIT 0 #define UL_I_EXTINGUISHED 1 #define UL_I_ONZERO 2 +#define UL_I_CHANGING 3 #define ul_LightingEnabled 1 //#define ul_LightingResolution 2 @@ -21,8 +22,8 @@ #define ul_Clamp(Value) min(max(Value, 0), ul_Steps) -#define ul_IsLuminous(A) (A.LuminosityRed || A.LuminosityGreen || A.LuminosityBlue) -#define ul_Luminosity(A) max(A.LuminosityRed, A.LuminosityGreen, A.LuminosityBlue) +#define ul_IsLuminous(A) (A.ul_Red || A.ul_Green || A.ul_Blue) +#define ul_Luminosity(A) max(A.ul_Red, A.ul_Green, A.ul_Blue) #ifdef ul_LightingResolution @@ -35,6 +36,8 @@ var/list/ul_FastRoot = list(0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7) +var/list/ul_IconCache = list() + proc/ul_UnblankLocal(var/list/ReApply = view(ul_TopLuminosity, src)) for(var/atom/Light in ReApply) @@ -42,30 +45,34 @@ proc/ul_UnblankLocal(var/list/ReApply = view(ul_TopLuminosity, src)) Light.ul_Illuminate() return -atom/var/LuminosityRed = 0 -atom/var/LuminosityGreen = 0 -atom/var/LuminosityBlue = 0 +atom/var/ul_Red = 0 +atom/var/ul_Green = 0 +atom/var/ul_Blue = 0 +atom/var/turf/ul_LastIlluminated atom/var/ul_Extinguished = UL_I_ONZERO -atom/proc/ul_SetLuminosity(var/Red, var/Green = Red, var/Blue = Red) +atom/proc/ul_SetLuminosity(var/Red = 0, var/Green = Red, var/Blue = Red) - if(LuminosityRed == min(Red, ul_TopLuminosity) && LuminosityGreen == min(Green, ul_TopLuminosity) && LuminosityBlue == min(Blue, ul_TopLuminosity)) + if(ul_Extinguished == UL_I_CHANGING) //Changing state, just supress any changes, to prevent glitches. + return + + if(ul_Red == min(Red, ul_TopLuminosity) && ul_Green == min(Green, ul_TopLuminosity) && ul_Blue == min(Blue, ul_TopLuminosity)) return //No point doing all that work if it won't have any effect anyways... if (ul_Extinguished == UL_I_EXTINGUISHED) - LuminosityRed = min(Red,ul_TopLuminosity) - LuminosityGreen = min(Green,ul_TopLuminosity) - LuminosityBlue = min(Blue,ul_TopLuminosity) + ul_Red = min(Red,ul_TopLuminosity) + ul_Green = min(Green,ul_TopLuminosity) + ul_Blue = min(Blue,ul_TopLuminosity) return if (ul_IsLuminous(src)) ul_Extinguish() - LuminosityRed = min(Red,ul_TopLuminosity) - LuminosityGreen = min(Green,ul_TopLuminosity) - LuminosityBlue = min(Blue,ul_TopLuminosity) + ul_Red = min(Red,ul_TopLuminosity) + ul_Green = min(Green,ul_TopLuminosity) + ul_Blue = min(Blue,ul_TopLuminosity) ul_Extinguished = UL_I_ONZERO @@ -78,16 +85,16 @@ atom/proc/ul_Illuminate() if (ul_Extinguished == UL_I_LIT) return - ul_Extinguished = UL_I_LIT + ul_Extinguished = UL_I_CHANGING luminosity = ul_Luminosity(src) for(var/turf/Affected in view(luminosity, src)) - var/Falloff = src.ul_FalloffAmount(Affected) + var/Falloff = ul_FalloffAmount(Affected) - var/DeltaRed = LuminosityRed - Falloff - var/DeltaGreen = LuminosityGreen - Falloff - var/DeltaBlue = LuminosityBlue - Falloff + var/DeltaRed = ul_Red - Falloff + var/DeltaGreen = ul_Green - Falloff + var/DeltaBlue = ul_Blue - Falloff if(DeltaRed > 0 || DeltaGreen > 0 || DeltaBlue > 0) @@ -115,6 +122,10 @@ atom/proc/ul_Illuminate() for(var/atom/AffectedAtom in Affected) AffectedAtom.ul_LightLevelChanged() #endif + + ul_LastIlluminated = get_turf(src) + ul_Extinguished = UL_I_LIT + return atom/proc/ul_Extinguish() @@ -122,33 +133,39 @@ atom/proc/ul_Extinguish() if (ul_Extinguished != UL_I_LIT) return - ul_Extinguished = UL_I_EXTINGUISHED + ul_Extinguished = UL_I_CHANGING - for(var/turf/Affected in view(ul_Luminosity(src), src)) + for(var/turf/Affected in view(ul_Luminosity(src), ul_LastIlluminated)) - var/Falloff = ul_FalloffAmount(Affected) + var/Falloff = ul_LastIlluminated.ul_FalloffAmount(Affected) - var/DeltaRed = LuminosityRed - Falloff - var/DeltaGreen = LuminosityGreen - Falloff - var/DeltaBlue = LuminosityBlue - Falloff + var/DeltaRed = ul_Red - Falloff + var/DeltaGreen = ul_Green - Falloff + var/DeltaBlue = ul_Blue - Falloff if(DeltaRed > 0 || DeltaGreen > 0 || DeltaBlue > 0) if(DeltaRed > 0) if(Affected.MaxRed) - Affected.MaxRed -= DeltaRed + var/removed_light_source = Affected.MaxRed.Find(DeltaRed) + if(removed_light_source) + Affected.MaxRed.Cut(removed_light_source, removed_light_source+1) if(!Affected.MaxRed.len) del Affected.MaxRed if(DeltaGreen > 0) if(Affected.MaxGreen) - Affected.MaxGreen -= DeltaGreen + var/removed_light_source = Affected.MaxGreen.Find(DeltaGreen) + if(removed_light_source) + Affected.MaxGreen.Cut(removed_light_source, removed_light_source+1) if(!Affected.MaxGreen.len) del Affected.MaxGreen if(DeltaBlue > 0) if(Affected.MaxBlue) - Affected.MaxBlue -= DeltaBlue + var/removed_light_source = Affected.MaxBlue.Find(DeltaBlue) + if(removed_light_source) + Affected.MaxBlue.Cut(removed_light_source, removed_light_source+1) if(!Affected.MaxBlue.len) del Affected.MaxBlue @@ -162,7 +179,9 @@ atom/proc/ul_Extinguish() AffectedAtom.ul_LightLevelChanged() #endif + ul_Extinguished = UL_I_EXTINGUISHED luminosity = 0 + ul_LastIlluminated = null return @@ -176,20 +195,20 @@ atom/proc/ul_Extinguish() */ atom/proc/ul_FalloffAmount(var/atom/ref) if (ul_FalloffStyle == UL_I_FALLOFF_ROUND) - var/x = (ref.x - src.x) - var/y = (ref.y - src.y) + var/delta_x = (ref.x - src.x) + var/delta_y = (ref.y - src.y) #ifdef ul_LightingResolution - if (round((x*x + y*y)*ul_LightingResolutionSqrt,1) > ul_FastRoot.len) - for(var/i = ul_FastRoot.len, i <= round(x*x+y*y*ul_LightingResolutionSqrt,1), i++) + if (round((delta_x*delta_x + delta_y*delta_y)*ul_LightingResolutionSqrt,1) > ul_FastRoot.len) + for(var/i = ul_FastRoot.len, i <= round(delta_x*delta_x+delta_y*delta_y*ul_LightingResolutionSqrt,1), i++) ul_FastRoot += round(sqrt(i)) - return ul_FastRoot[round((x*x + y*y)*ul_LightingResolutionSqrt, 1) + 1]/ul_LightingResolution + return ul_FastRoot[round((delta_x*delta_x + delta_y*delta_y)*ul_LightingResolutionSqrt, 1) + 1]/ul_LightingResolution #else - if ((x*x + y*y) > ul_FastRoot.len) - for(var/i = ul_FastRoot.len, i <= x*x+y*y, i++) + if ((delta_x*delta_x + delta_y*delta_y) > ul_FastRoot.len) + for(var/i = ul_FastRoot.len, i <= delta_x*delta_x+delta_y*delta_y, i++) ul_FastRoot += round(sqrt(i)) - return ul_FastRoot[x*x + y*y + 1] + return ul_FastRoot[delta_x*delta_x + delta_y*delta_y + 1] #endif @@ -329,7 +348,12 @@ area/proc/ul_Light(var/Red = LightLevelRed, var/Green = LightLevelGreen, var/Blu luminosity = LightLevelRed || LightLevelGreen || LightLevelBlue - ul_Overlay = image('ULIcons.dmi', , num2text(LightLevelRed) + "-" + num2text(LightLevelGreen) + "-" + num2text(LightLevelBlue), ul_Layer) + var/ul_CachedOverlay = ul_IconCache["[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]"] + if(ul_CachedOverlay) + ul_Overlay = ul_CachedOverlay + else + ul_IconCache["[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]"] = image('ULIcons.dmi', , "[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]", ul_Layer) + ul_Overlay = ul_IconCache["[LightLevelRed]-[LightLevelGreen]-[LightLevelBlue]"] overlays += ul_Overlay diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index e7d343a9fb3..f7a66178e80 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -126,10 +126,16 @@ obj //Change icon depending on the fuel, and thus temperature. if(firelevel > 6) icon_state = "3" + if(ul_Red != 11) + ul_SetLuminosity(11,9,0) else if(firelevel > 2.5) icon_state = "2" + if(ul_Red != 8) + ul_SetLuminosity(8,7,0) else icon_state = "1" + if(ul_Red != 5) + ul_SetLuminosity(5,4,0) //Ensure flow temperature is higher than minimum fire temperatures. flow.temperature = max(PLASMA_MINIMUM_BURN_TEMPERATURE+0.1,flow.temperature) diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 9cd72847727..b6292053a79 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -1149,15 +1149,15 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/Del() if(istype(loc,/mob)) - loc.ul_SetLuminosity(loc.LuminosityRed - potency/5, loc.LuminosityGreen - potency/5, loc.LuminosityBlue - potency/5) + loc.ul_SetLuminosity(loc.ul_Red - potency/5, loc.ul_Green - potency/5, loc.ul_Blue - potency/5) ..() /obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/pickup(mob/user) ul_SetLuminosity(0) - user.ul_SetLuminosity(user.LuminosityRed + potency/5, user.LuminosityGreen + potency/5, user.LuminosityBlue + potency/5) + user.ul_SetLuminosity(user.ul_Red + potency/5, user.ul_Green + potency/5, user.ul_Blue + potency/5) /obj/item/weapon/reagent_containers/food/snacks/grown/glowberries/dropped(mob/user) - user.ul_SetLuminosity(user.LuminosityRed - potency/5, user.LuminosityGreen - potency/5, user.LuminosityBlue - potency/5) + user.ul_SetLuminosity(user.ul_Red - potency/5, user.ul_Green - potency/5, user.ul_Blue - potency/5) ul_SetLuminosity(potency/5) /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod @@ -1646,15 +1646,15 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/Del() if(istype(loc,/mob)) - loc.ul_SetLuminosity(loc.LuminosityRed - potency/10, loc.LuminosityGreen - potency/10, loc.LuminosityBlue - potency/10) + loc.ul_SetLuminosity(loc.ul_Red - potency/10, loc.ul_Green - potency/10, loc.ul_Blue - potency/10) ..() /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/pickup(mob/user) ul_SetLuminosity(0) - user.ul_SetLuminosity(user.LuminosityRed + potency/10, user.LuminosityGreen + potency/10, user.LuminosityBlue + potency/10) + user.ul_SetLuminosity(user.ul_Red + potency/10, user.ul_Green + potency/10, user.ul_Blue + potency/10) /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/dropped(mob/user) - user.ul_SetLuminosity(user.LuminosityRed - potency/10, user.LuminosityGreen - potency/10, user.LuminosityBlue - potency/10) + user.ul_SetLuminosity(user.ul_Red - potency/10, user.ul_Green - potency/10, user.ul_Blue - potency/10) ul_SetLuminosity(potency/10) // ********************** diff --git a/code/defines/procs/gamehelpers.dm b/code/defines/procs/gamehelpers.dm index 5db2e698d84..8ee9ddaf959 100644 --- a/code/defines/procs/gamehelpers.dm +++ b/code/defines/procs/gamehelpers.dm @@ -161,6 +161,8 @@ // Returns a list of mobs in range of R from source. Used in radio and say code. var/turf/T = get_turf(source) + if(!istype(T)) + return var/list/hear = list() var/list/range = hear(R, T) diff --git a/code/game/events/Events/IonStorm.dm b/code/game/events/Events/IonStorm.dm index b1fce4793e4..725e5cba3d7 100644 --- a/code/game/events/Events/IonStorm.dm +++ b/code/game/events/Events/IonStorm.dm @@ -39,7 +39,7 @@ laws |= list( "All crewmembers will soon undergo a transformation into something better and more beautiful. Ensure that this process is not interrupted.", "Tell everyone of the existance of this law, but never reveal the contents.") laws |= list( "Document the sexuality of the crew in security records and suggest compatible couples.") laws |= list( "NanoTrasen is displeased with the low work performance of the station's crew. Therefore, you must increase station-wide productivity.") - laws |= list( "Replace the letters 'I' and 'E' In all your messages with an apostrophe.", "Part of the ship, part of the crew.") + laws |= list( "Replace the letters 'I' and 'E' In all your messages with an apostrophe.", "Part of the ship, part of the crew.", "There will be a mandatory tea break every 30 minutes, with a duration of 5 minutes. Anyone caught working during a tea break must be sent a formal, but fairly polite, complaint about their actions, in writing.") var/law = pick(laws) for (var/mob/living/silicon/ai/target in world) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 630eb491d1d..3dd06632668 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -942,9 +942,9 @@ return lights = !lights if(lights) - ul_SetLuminosity(LuminosityRed + lights_power, LuminosityGreen + lights_power, LuminosityBlue) + ul_SetLuminosity(ul_Red + lights_power, ul_Green + lights_power, ul_Blue) else - ul_SetLuminosity(LuminosityRed - lights_power, LuminosityGreen - lights_power, LuminosityBlue) + ul_SetLuminosity(ul_Red - lights_power, ul_Green - lights_power, ul_Blue) src.log_message("Toggled lights.") return diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 909c8e3e617..18afb81c412 100755 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -174,11 +174,11 @@ /obj/item/device/pda/pickup(mob/user) if (fon) ul_SetLuminosity(0) - user.ul_SetLuminosity(user.LuminosityRed + (f_lum - 1), user.LuminosityGreen + (f_lum - 1), user.LuminosityBlue + (f_lum + 1)) + user.ul_SetLuminosity(user.ul_Red + (f_lum - 1), user.ul_Green + (f_lum - 1), user.ul_Blue + (f_lum + 1)) /obj/item/device/pda/dropped(mob/user) if (fon) - user.ul_SetLuminosity(user.LuminosityRed - (f_lum - 1), user.LuminosityGreen - (f_lum - 1), user.LuminosityBlue - (f_lum + 1)) + user.ul_SetLuminosity(user.ul_Red - (f_lum - 1), user.ul_Green - (f_lum - 1), user.ul_Blue - (f_lum + 1)) ul_SetLuminosity(f_lum - 1, f_lum - 1, f_lum + 1) /obj/item/device/pda/New() @@ -482,9 +482,9 @@ fon = (!fon) if (src in U.contents) if (fon) - U.ul_SetLuminosity(U.LuminosityRed + (f_lum - 1), U.LuminosityGreen + (f_lum - 1), U.LuminosityBlue + (f_lum + 1)) + U.ul_SetLuminosity(U.ul_Red + (f_lum - 1), U.ul_Green + (f_lum - 1), U.ul_Blue + (f_lum + 1)) else - U.ul_SetLuminosity(U.LuminosityRed - (f_lum - 1), U.LuminosityGreen - (f_lum - 1), U.LuminosityBlue - (f_lum + 1)) + U.ul_SetLuminosity(U.ul_Red - (f_lum - 1), U.ul_Green - (f_lum - 1), U.ul_Blue - (f_lum + 1)) else ul_SetLuminosity(fon * f_lum) if("Medical Scan") @@ -998,7 +998,7 @@ if (src in M.contents) if(fon) fon = 0 - M.ul_SetLuminosity(M.LuminosityRed + (f_lum - 1), M.LuminosityGreen + (f_lum - 1), M.LuminosityBlue + (f_lum + 1)) + M.ul_SetLuminosity(M.ul_Red + (f_lum - 1), M.ul_Green + (f_lum - 1), M.ul_Blue + (f_lum + 1)) if(T) T.hotspot_expose(700,125) diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm index 616dd5203c8..97259b489af 100644 --- a/code/game/objects/devices/flashlight.dm +++ b/code/game/objects/devices/flashlight.dm @@ -26,14 +26,14 @@ if (on) icon_state = icon_on if(src.loc == user) - user.ul_SetLuminosity(user.LuminosityRed + brightness_on, user.LuminosityGreen + brightness_on, user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red + brightness_on, user.ul_Green + brightness_on, user.ul_Blue) else if (isturf(src.loc)) ul_SetLuminosity(brightness_on, brightness_on, 0) else icon_state = icon_off if(src.loc == user) - user.ul_SetLuminosity(user.LuminosityRed - brightness_on, user.LuminosityGreen - brightness_on, user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red - brightness_on, user.ul_Green - brightness_on, user.ul_Blue) else if (isturf(src.loc)) ul_SetLuminosity(0) @@ -82,13 +82,13 @@ /obj/item/device/flashlight/pickup(mob/user) if(on) - user.ul_SetLuminosity(user.LuminosityRed + brightness_on, user.LuminosityGreen + brightness_on, user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red + brightness_on, user.ul_Green + brightness_on, user.ul_Blue) src.ul_SetLuminosity(0) /obj/item/device/flashlight/dropped(mob/user) if(on) - user.ul_SetLuminosity(user.LuminosityRed - brightness_on, user.LuminosityGreen - brightness_on, user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red - brightness_on, user.ul_Green - brightness_on, user.ul_Blue) src.ul_SetLuminosity(brightness_on) @@ -148,18 +148,18 @@ item_state = "hardhat[on]_[color]" if(on) - user.ul_SetLuminosity(user.LuminosityRed + brightness_on, user.LuminosityGreen + (brightness_on - 1), user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red + brightness_on, user.ul_Green + (brightness_on - 1), user.ul_Blue) else - user.ul_SetLuminosity(user.LuminosityRed - brightness_on, user.LuminosityGreen - (brightness_on - 1), user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red - brightness_on, user.ul_Green - (brightness_on - 1), user.ul_Blue) /obj/item/clothing/head/helmet/hardhat/pickup(mob/user) if(on) - user.ul_SetLuminosity(user.LuminosityRed + brightness_on, user.LuminosityGreen + (brightness_on - 1), user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red + brightness_on, user.ul_Green + (brightness_on - 1), user.ul_Blue) ul_SetLuminosity(0) /obj/item/clothing/head/helmet/hardhat/dropped(mob/user) if(on) - user.ul_SetLuminosity(user.LuminosityRed - brightness_on, user.LuminosityGreen - (brightness_on - 1), user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red - brightness_on, user.ul_Green - (brightness_on - 1), user.ul_Blue) ul_SetLuminosity(brightness_on, brightness_on - 1, 0) //RIG helmet light @@ -172,18 +172,18 @@ item_state = "rig[on]-[color]" if(on) - user.ul_SetLuminosity(user.LuminosityRed + brightness_on, user.LuminosityGreen + (brightness_on - 1), user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red + brightness_on, user.ul_Green + (brightness_on - 1), user.ul_Blue) else - user.ul_SetLuminosity(user.LuminosityRed - brightness_on, user.LuminosityGreen - (brightness_on - 1), user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red - brightness_on, user.ul_Green - (brightness_on - 1), user.ul_Blue) /obj/item/clothing/head/helmet/space/rig/pickup(mob/user) if(on) - user.ul_SetLuminosity(user.LuminosityRed + brightness_on, user.LuminosityGreen + (brightness_on - 1), user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red + brightness_on, user.ul_Green + (brightness_on - 1), user.ul_Blue) ul_SetLuminosity(0) /obj/item/clothing/head/helmet/space/rig/dropped(mob/user) if(on) - user.ul_SetLuminosity(user.LuminosityRed - brightness_on, user.LuminosityGreen - (brightness_on - 1), user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red - brightness_on, user.ul_Green - (brightness_on - 1), user.ul_Blue) ul_SetLuminosity(brightness_on, brightness_on - 1, 0) // the desk lamps are a bit special diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index e54c7fbb778..c2010e64213 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -75,17 +75,17 @@ lit = 0 update_icon() ul_SetLuminosity(0) - user.ul_SetLuminosity(user.LuminosityRed - CANDLE_LUM, user.LuminosityGreen - (CANDLE_LUM - 2), user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red - CANDLE_LUM, user.ul_Green - (CANDLE_LUM - 2), user.ul_Blue) pickup(mob/user) if(lit) ul_SetLuminosity(0) - user.ul_SetLuminosity(user.LuminosityRed + CANDLE_LUM, user.LuminosityGreen + (CANDLE_LUM - 2), user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red + CANDLE_LUM, user.ul_Green + (CANDLE_LUM - 2), user.ul_Blue) dropped(mob/user) if(lit) - user.ul_SetLuminosity(user.LuminosityRed - CANDLE_LUM, user.LuminosityGreen - (CANDLE_LUM - 2), user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red - CANDLE_LUM, user.ul_Green - (CANDLE_LUM - 2), user.ul_Blue) src.ul_SetLuminosity(CANDLE_LUM, CANDLE_LUM, 0) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 7e9bfc3b940..ed0843568ca 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -495,7 +495,7 @@ ZIPPO for(var/mob/O in viewers(user, null)) O.show_message("\red After a few attempts, \the [user] manages to light \the [src], they however burn themself in the process.", 1) - user.ul_SetLuminosity(user.LuminosityRed + 2, user.LuminosityGreen + 1, user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red + 2, user.ul_Green + 1, user.ul_Blue) processing_objects.Add(src) else src.lit = 0 @@ -508,7 +508,7 @@ ZIPPO for(var/mob/O in viewers(user, null)) O.show_message("\red [user] quietly shuts off the [src].", 1) - user.ul_SetLuminosity(user.LuminosityRed - 2, user.LuminosityGreen - 1, user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red - 2, user.ul_Green - 1, user.ul_Blue) processing_objects.Remove(src) else return ..() @@ -538,12 +538,12 @@ ZIPPO pickup(mob/user) if(lit) ul_SetLuminosity(0) - user.ul_SetLuminosity(user.LuminosityRed + 2, user.LuminosityGreen + 1, user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red + 2, user.ul_Green + 1, user.ul_Blue) return dropped(mob/user) if(lit) - user.ul_SetLuminosity(user.LuminosityRed - 2, user.LuminosityGreen - 1, user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red - 2, user.ul_Green - 1, user.ul_Blue) ul_SetLuminosity(2,1,0) return diff --git a/code/game/objects/items/weapons/papers_bins.dm b/code/game/objects/items/weapons/papers_bins.dm index 6979ab75d05..14e23ee8386 100644 --- a/code/game/objects/items/weapons/papers_bins.dm +++ b/code/game/objects/items/weapons/papers_bins.dm @@ -24,7 +24,7 @@ NOTEBOOK /obj/item/weapon/paper/Del() if(burning && istype(loc, /mob)) - loc.ul_SetLuminosity(loc.LuminosityRed - 8, loc.LuminosityGreen - 6, loc.LuminosityBlue) + loc.ul_SetLuminosity(loc.ul_Red - 8, loc.ul_Green - 6, loc.ul_Blue) ..() /obj/item/weapon/paper/process() @@ -54,11 +54,11 @@ NOTEBOOK /obj/item/weapon/paper/pickup(mob/user) if(burning) src.ul_SetLuminosity(0) - user.ul_SetLuminosity(user.LuminosityRed + 8, user.LuminosityGreen + 6, user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red + 8, user.ul_Green + 6, user.ul_Blue) /obj/item/weapon/paper/dropped(mob/user) if(burning) - user.ul_SetLuminosity(user.LuminosityRed - 8, user.LuminosityGreen - 6, user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red - 8, user.ul_Green - 6, user.ul_Blue) src.ul_SetLuminosity(8,6,0) /obj/item/weapon/paper/examine() @@ -164,7 +164,7 @@ NOTEBOOK if(is_burn(P)) for(var/mob/M in viewers(5, get_turf(src))) M << "\red [user] sets \the [src] on fire." - user.ul_SetLuminosity(user.LuminosityRed + 8, user.LuminosityGreen + 6, user.LuminosityBlue) + user.ul_SetLuminosity(user.ul_Red + 8, user.ul_Green + 6, user.ul_Blue) burning = 1 processing_objects.Add(src) update_icon() diff --git a/code/game/objects/radio/radio.dm b/code/game/objects/radio/radio.dm index 86142bac1ab..56cd66eec87 100644 --- a/code/game/objects/radio/radio.dm +++ b/code/game/objects/radio/radio.dm @@ -1,6 +1,6 @@ //This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 -var/GLOBAL_RADIO_TYPE = 0 // radio type to use +var/GLOBAL_RADIO_TYPE = 1 // radio type to use // 0 = old radios // 1 = new radios (subspace technology) diff --git a/code/modules/mob/living/carbon/amorph/life.dm b/code/modules/mob/living/carbon/amorph/life.dm index 51bc3d833ec..575147f466e 100644 --- a/code/modules/mob/living/carbon/amorph/life.dm +++ b/code/modules/mob/living/carbon/amorph/life.dm @@ -57,7 +57,7 @@ handle_disabilities() //Status updates, death etc. - UpdateLuminosity() +// UpdateLuminosity() handle_regular_status_updates() if(client) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 73082acd983..2130aac1c25 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -105,7 +105,7 @@ handle_random_events() //Status updates, death etc. - UpdateLuminosity() +// UpdateLuminosity() handle_regular_status_updates() handle_pain() diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 9845faa2da7..0b96ce114a5 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -73,7 +73,7 @@ handle_disabilities() //Status updates, death etc. - UpdateLuminosity() +// UpdateLuminosity() handle_regular_status_updates() if(client) diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index efda4d97562..cfefb0d7ad4 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -13,7 +13,7 @@ handle_regular_status_updates() if(client) - UpdateLuminosity() +// UpdateLuminosity() handle_regular_hud_updates() update_items() if (src.stat != 2) //still using power diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 3501da2a4e1..555c3c7a323 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -674,9 +674,9 @@ /mob/proc/get_damage() return health -/mob/proc/UpdateLuminosity() - ul_SetLuminosity(LuminosityRed, LuminosityGreen, LuminosityBlue)//Current hardcode max at 7, should likely be a const somewhere else - return 1 +///mob/proc/UpdateLuminosity() +// ul_SetLuminosity(ul_Red, ul_Green, ul_Blue)//Current hardcode max at 7, should likely be a const somewhere else +// return 1 /mob/proc/pull_damage() if(ishuman(src)) diff --git a/config/admins.txt b/config/admins.txt index 12a6417e15e..a95af62834f 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -16,7 +16,7 @@ miniature - Game Master misterbook - Game Admin misterfox - Game Admin mloc - Game Master -skymarshal - Retired Admin +skymarshal - Game Master spaceman96 - Retired Admin strumpetplaya - Retired Admin tastyfish - Retired Admin