From 64d8903802dc0e1f28f9fdc0eb13687876bbad68 Mon Sep 17 00:00:00 2001 From: d3athrow Date: Tue, 7 Jan 2014 21:10:20 -0600 Subject: [PATCH] Following /tg/'s lead, removes set background 1 for smoother gameplay. Conflicts: code/game/objects/effects/glowshroom.dm code/modules/mob/living/carbon/zombie/zombie.dm code/modules/mob/living/silicon/mommi/life.dm --- code/ZAS/FEA_system.dm | 6 +++--- code/__HELPERS/game.dm | 4 ++-- code/controllers/failsafe.dm | 2 +- code/controllers/lighting_controller.dm | 4 ++-- code/controllers/master_controller.dm | 2 +- code/game/area/Space Station 13 areas.dm | 4 ++-- code/game/gamemodes/blob/theblob.dm | 2 +- code/game/gamemodes/events/ninja_equipment.dm | 4 ++-- code/game/machinery/bots/cleanbot.dm | 2 +- code/game/machinery/bots/ed209bot.dm | 2 +- code/game/machinery/bots/farmbot.dm | 2 +- code/game/machinery/bots/floorbot.dm | 2 +- code/game/machinery/bots/medbot.dm | 2 +- code/game/machinery/bots/secbot.dm | 2 +- code/game/machinery/iv_drip.dm | 2 +- code/game/machinery/portable_turret.dm | 2 +- code/game/objects/effects/aliens.dm | 2 +- code/game/objects/effects/glowshroom.dm | 4 +++- code/game/supplyshuttle.dm | 2 +- code/modules/admin/verbs/check_customitem_activity.dm | 2 +- code/modules/mob/living/carbon/alien/humanoid/life.dm | 2 +- code/modules/mob/living/carbon/alien/larva/life.dm | 2 +- code/modules/mob/living/carbon/brain/life.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 2 +- code/modules/mob/living/carbon/metroid/life.dm | 2 +- code/modules/mob/living/carbon/monkey/life.dm | 2 +- code/modules/mob/living/silicon/ai/freelook/chunk.dm | 2 +- code/modules/mob/living/silicon/robot/life.dm | 4 ++-- code/modules/power/gravitygenerator.dm | 2 +- code/modules/power/singularity/singularity.dm | 4 ++-- .../research/xenoarchaeology/tools/suspension_generator.dm | 2 +- .../modules/research/xenoarchaeology/tools/tools_locater.dm | 2 +- code/world.dm | 2 +- 34 files changed, 44 insertions(+), 42 deletions(-) diff --git a/code/ZAS/FEA_system.dm b/code/ZAS/FEA_system.dm index 5a386d5959e..ecc4ff37f36 100644 --- a/code/ZAS/FEA_system.dm +++ b/code/ZAS/FEA_system.dm @@ -126,7 +126,7 @@ var/datum/controller/air_system/air_master //Inputs: None. //Outputs: None. - set background = 1 + //set background = 1 world << "\red \b Processing Geometry..." sleep(-1) @@ -158,7 +158,7 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun //Outputs: None. - set background = 1 + //set background = 1 while(1) if(!air_processing_killed) @@ -353,4 +353,4 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun potential_intrazone_connections[B] += A else - potential_intrazone_connections[B] = list(A) \ No newline at end of file + potential_intrazone_connections[B] = list(A) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 5a06f99444c..c373e5c9498 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -189,7 +189,7 @@ /proc/get_mobs_in_radio_ranges(var/list/obj/item/device/radio/radios) - set background = 1 + //set background = 1 . = list() // Returns a list of mobs who can hear any of the radios given in @radios @@ -352,4 +352,4 @@ proc/get_candidates(be_special_flag=0) C.images += I sleep(duration) for(var/client/C in show_to) - C.images -= I \ No newline at end of file + C.images -= I diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 91449e10c89..ff46b6b10b6 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -22,7 +22,7 @@ var/datum/controller/failsafe/Failsafe /datum/controller/failsafe/proc/process() processing = 1 spawn(0) - set background = 1 + //set background = 1 while(1) //more efficient than recursivly calling ourself over and over. background = 1 ensures we do not trigger an infinite loop if(!master_controller) new /datum/controller/game_controller() //replace the missing master_controller! This should never happen. if(!lighting_controller) new /datum/controller/lighting() //replace the missing lighting_controller diff --git a/code/controllers/lighting_controller.dm b/code/controllers/lighting_controller.dm index 3d4f859efaf..c118fa43abb 100644 --- a/code/controllers/lighting_controller.dm +++ b/code/controllers/lighting_controller.dm @@ -33,7 +33,7 @@ datum/controller/lighting/New() datum/controller/lighting/proc/process() processing = 1 spawn(0) - set background = 1 + //set background = 1 while(1) if(processing) iteration++ @@ -67,7 +67,7 @@ datum/controller/lighting/proc/process() datum/controller/lighting/proc/Initialize(var/z_level) processing = 0 spawn(-1) - set background = 1 + //set background = 1 for(var/i=1, i<=lights.len, i++) var/datum/light_source/L = lights[i] if(L.check()) diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 2963e56fdb0..65f7dbd5c8f 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -109,7 +109,7 @@ datum/controller/game_controller/proc/setup_objects() datum/controller/game_controller/proc/process() processing = 1 spawn(0) - set background = 1 + //set background = 1 while(1) //far more efficient than recursively calling ourself if(!Failsafe) new /datum/controller/failsafe() diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 753e6f1f099..f092665ef1f 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -1867,7 +1867,7 @@ proc/process_ghost_teleport_locs() Obj << mysound proc/process() - set background = 1 + //set background = 1 var/sound/S = null var/sound_delay = 0 @@ -2011,7 +2011,7 @@ var/list/the_station_areas = list ( Obj << mysound proc/process() - set background = 1 + //set background = 1 var/sound/S = null var/sound_delay = 0 diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 417c1ee0b4d..bb4fd4dcf68 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -51,7 +51,7 @@ proc/Pulse(var/pulse = 0, var/origin_dir = 0)//Todo: Fix spaceblob expand - set background = 1 + //set background = 1 if(run_action())//If we can do something here then we dont need to pulse more return diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index 00e9a714286..b72728e75f6 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -114,7 +114,7 @@ ________________________________________________________________________________ //=======//PROCESS PROCS//=======// /obj/item/clothing/suit/space/space_ninja/proc/ntick(mob/living/carbon/human/U = affecting) - set background = 1 + //set background = 1 //Runs in the background while the suit is initialized. spawn while(cell.charge>=0) @@ -740,7 +740,7 @@ ________________________________________________________________________________ return /obj/item/clothing/suit/space/space_ninja/proc/ai_holo_process() - set background = 1 + //set background = 1 spawn while(hologram&&s_initialized&&AI)//Suit on and there is an AI present. if(!s_initialized||get_dist(affecting,hologram.loc)>3)//Once suit is de-initialized or hologram reaches out of bounds. diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index 9a02ef5ffa9..8b68fdb1155 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -161,7 +161,7 @@ text("[src.oddbutton ? "Yes" : "No" src.screwloose = 1 /obj/machinery/bot/cleanbot/process() - set background = 1 + //set background = 1 if(!src.on) return diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 23d4e42ea74..846b3650661 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -220,7 +220,7 @@ Auto Patrol: []"}, mode = SECBOT_IDLE /obj/machinery/bot/ed209/process() - set background = 1 + //set background = 1 if (!src.on) return diff --git a/code/game/machinery/bots/farmbot.dm b/code/game/machinery/bots/farmbot.dm index faeaa025f95..0635616611a 100644 --- a/code/game/machinery/bots/farmbot.dm +++ b/code/game/machinery/bots/farmbot.dm @@ -224,7 +224,7 @@ return /obj/machinery/bot/farmbot/process() - set background = 1 + //set background = 1 if(!src.on) return diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index 0b66bdd8083..96fb18e2f8a 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -165,7 +165,7 @@ src.updateUsrDialog() /obj/machinery/bot/floorbot/process() - set background = 1 + //set background = 1 if(!src.on) return diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 2c77a2bd821..3925fb4cfd3 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -231,7 +231,7 @@ src.icon_state = "medibot[src.on]" /obj/machinery/bot/medbot/process() - set background = 1 + //set background = 1 if(!src.on) src.stunned = 0 diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index e7458c97cc0..27ef0c4fa91 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -192,7 +192,7 @@ Auto Patrol: []"}, mode = SECBOT_IDLE /obj/machinery/bot/secbot/process() - set background = 1 + //set background = 1 if(!src.on) return diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 9f10ac4eccc..237dbf01459 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -67,7 +67,7 @@ /obj/machinery/iv_drip/process() - set background = 1 + //set background = 1 if(src.attached) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 59e5ce13e33..8592bc6ce97 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -425,7 +425,7 @@ Status: []
"}, /obj/machinery/porta_turret/process() // the main machinery process - set background = 1 + //set background = 1 if(src.cover==null && anchored) // if it has no cover and is anchored if (stat & BROKEN) // if the turret is borked diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index d26a31abfb7..c4ce22455b0 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -213,7 +213,7 @@ return /obj/effect/alien/weeds/proc/Life() - set background = 1 + //set background = 1 var/turf/U = get_turf(src) /* if (locate(/obj/movable, U)) diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 598bca09199..06d189a64fa 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -44,9 +44,11 @@ processing_objects += src + SetLuminosity(round(potency/10)) lastTick = world.timeofday + /obj/effect/glowshroom/Del() processing_objects -= src ..() @@ -99,7 +101,7 @@ potency += rand(4,6) /obj/effect/glowshroom/proc/CalcDir(turf/location = loc) - set background = 1 + //set background = 1 var/direction = 16 for(var/wallDir in cardinal) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index f3c41cd080e..63dd2f334e6 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -158,7 +158,7 @@ var/list/mechtoys = list( supply_packs[P.name] = P spawn(0) - set background = 1 + //set background = 1 while(1) if(processing) iteration++ diff --git a/code/modules/admin/verbs/check_customitem_activity.dm b/code/modules/admin/verbs/check_customitem_activity.dm index 1bda56c6e58..19dfd6bbdce 100644 --- a/code/modules/admin/verbs/check_customitem_activity.dm +++ b/code/modules/admin/verbs/check_customitem_activity.dm @@ -24,7 +24,7 @@ var/inactive_keys = "None
" usr << browse(dat, "window=inactive_customitems;size=600x480") /proc/populate_inactive_customitems_list(var/client/C) - set background = 1 + //set background = 1 if(checked_for_inactives) return diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index 3b292fe41a9..d5747f5dbae 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -10,7 +10,7 @@ /mob/living/carbon/alien/humanoid/Life() set invisibility = 0 - set background = 1 + //set background = 1 if (monkeyizing) return diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index daf2722ff4c..b0240ef267d 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -7,7 +7,7 @@ /mob/living/carbon/alien/larva/Life() set invisibility = 0 - set background = 1 + //set background = 1 if (monkeyizing) return diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index a26ce0fa693..bcf3a4f5acb 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -1,6 +1,6 @@ /mob/living/carbon/brain/Life() set invisibility = 0 - set background = 1 + //set background = 1 ..() if(stat != DEAD) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d4d94632866..7944615ba10 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1156,7 +1156,7 @@ /* /mob/living/carbon/human/verb/simulate() set name = "sim" - set background = 1 + //set background = 1 var/damage = input("Wound damage","Wound damage") as num diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 0d042e1f12a..c976a51a217 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -33,7 +33,7 @@ /mob/living/carbon/human/Life() set invisibility = 0 - set background = 1 + //set background = 1 if (monkeyizing) return if(!loc) return // Fixing a null error that occurs when the mob isn't found in the world -- TLE diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm index 47e9f6c675f..f10075625bf 100644 --- a/code/modules/mob/living/carbon/metroid/life.dm +++ b/code/modules/mob/living/carbon/metroid/life.dm @@ -1,6 +1,6 @@ /mob/living/carbon/slime/Life() set invisibility = 0 - set background = 1 + //set background = 1 if (src.monkeyizing) return diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 0cbb115f9e8..e87d9b39fa5 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -11,7 +11,7 @@ /mob/living/carbon/monkey/Life() set invisibility = 0 - set background = 1 + //set background = 1 if (monkeyizing) return ..() diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm index 5e0548581ec..e2778c534e8 100644 --- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm +++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm @@ -68,7 +68,7 @@ /datum/camerachunk/proc/update() - set background = 1 + //set background = 1 var/list/newVisibleTurfs = list() diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index e71f073130a..81db811de8e 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -1,6 +1,6 @@ /mob/living/silicon/robot/Life() set invisibility = 0 - set background = 1 + //set background = 1 if (src.monkeyizing) return @@ -326,4 +326,4 @@ if(!on_fire) //Silicons don't gain stacks from hotspots, but hotspots can ignite them IgniteMob() -//Robots on fire \ No newline at end of file +//Robots on fire diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 73a0fce4ec5..e86715366d9 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -113,7 +113,7 @@ /obj/machinery/computer/gravity_control_computer/Topic(href, href_list) - set background = 1 + //set background = 1 ..() if ( (get_dist(src, usr) > 1 )) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 83abddb76b1..a2b6f3500ea 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -205,7 +205,7 @@ var/global/list/uneatable = list( /obj/machinery/singularity/proc/eat() - set background = 1 + //set background = 1 if(defer_powernet_rebuild != 2) defer_powernet_rebuild = 1 // Let's just make this one loop. @@ -559,7 +559,7 @@ var/global/list/uneatable = list( grav_pull = 0 /obj/machinery/singularity/narsie/wizard/eat() - set background = 1 + //set background = 1 if(defer_powernet_rebuild != 2) defer_powernet_rebuild = 1 for(var/atom/X in orange(consume_range,src)) diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm index 2831e5ccc1f..9c137ee4717 100644 --- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm +++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm @@ -20,7 +20,7 @@ ..() /obj/machinery/suspension_gen/process() - set background = 1 + //set background = 1 if (suspension_field) cell.charge -= power_use diff --git a/code/modules/research/xenoarchaeology/tools/tools_locater.dm b/code/modules/research/xenoarchaeology/tools/tools_locater.dm index 64f6caec5be..4b4301479ee 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_locater.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_locater.dm @@ -38,7 +38,7 @@ scan_ticks++ if(prob(scan_ticks * 10)) spawn(0) - set background = 1 + //set background = 1 if(processing_objects.Find(src)) //scan radios in the world to try and find one var/cur_dist = 999 diff --git a/code/world.dm b/code/world.dm index 3bad2883fb0..eb27a131208 100644 --- a/code/world.dm +++ b/code/world.dm @@ -202,7 +202,7 @@ #define DISCONNECTED_DELETE 6000 //10 minutes in ticks (approx) /world/proc/KickDisconnectedClients() spawn(-1) - set background = 1 + //set background = 1 while(1) sleep(DISCONNECTED_DELETE) for(var/mob/living/carbon/human/C in living_mob_list)