From fbb67b2e42a4fc5a2936d7ecd0f90668cc2dc21f Mon Sep 17 00:00:00 2001 From: Mloc Date: Tue, 29 May 2012 16:26:48 +0100 Subject: [PATCH] Huge commit! Standardizes var definitions in most places. Signed-off-by: Mloc --- code/FEA/FEA_fire.dm | 13 +- code/FEA/FEA_gas_mixture.dm | 11 +- code/FEA/FEA_turf_tile.dm | 25 +- .../WorkInProgress/SkyMarshal/traitoritems.dm | 11 +- code/WorkInProgress/SkyMarshal/wardrobes.dm | 7 +- code/WorkInProgress/animusstation/atm.dm | 13 +- code/WorkInProgress/virus2/antibodies.dm | 31 +- code/datums/mixed.dm | 30 +- code/datums/shuttle_controller.dm | 21 +- code/defines/global.dm | 311 +++++++++--------- code/defines/obj.dm | 14 +- code/defines/obj/machinery.dm | 43 ++- code/defines/obj/weapon.dm | 7 +- code/defines/procs/AStar.dm | 23 +- code/defines/procs/dbcore.dm | 54 ++- code/defines/procs/gamehelpers.dm | 13 +- code/defines/procs/icon_procs.dm | 34 +- code/defines/sd_procs/base64.dm | 32 +- code/defines/sd_procs/color.dm | 28 +- code/defines/sd_procs/hsl.dm | 27 +- code/defines/turf.dm | 23 +- code/game/algorithm.dm | 39 +-- code/game/asteroid/artifacts.dm | 9 +- code/game/events/EventProcs/dust.dm | 9 +- code/game/events/Events/ElectricalStorm.dm | 11 +- code/game/events/Events/IonStorm.dm | 9 +- code/game/events/Events/VirusEpidemic.dm | 9 +- code/game/gamemodes/blob/blob.dm | 26 +- code/game/gamemodes/blob/blob_report.dm | 19 +- code/game/gamemodes/blob/theblob.dm | 29 +- code/game/gamemodes/changeling/changeling.dm | 38 +-- code/game/gamemodes/cult/cult.dm | 7 +- code/game/gamemodes/game_mode.dm | 37 ++- code/game/gamemodes/meme/meme.dm | 40 +-- code/game/gamemodes/objective.dm | 13 +- code/game/gamemodes/sandbox/h_sandbox.dm | 17 +- code/game/jobs/job_controller.dm | 13 +- code/game/machinery/alarm.dm | 11 +- code/game/machinery/autolathe.dm | 13 +- code/game/machinery/bots/mulebot.dm | 23 +- code/game/machinery/cell_charger.dm | 7 +- code/game/machinery/computer/Operating.dm | 9 +- code/game/machinery/computer/atmos_alert.dm | 13 +- .../game/machinery/computer/buildandrepair.dm | 21 +- code/game/machinery/computer/card.dm | 13 +- .../game/machinery/computer/communications.dm | 25 +- code/game/machinery/computer/hologram.dm | 17 +- code/game/machinery/computer/law.dm | 9 +- code/game/machinery/computer/medical.dm | 27 +- code/game/machinery/computer/pod.dm | 11 +- code/game/machinery/computer/prisoner.dm | 15 +- code/game/machinery/computer/robot.dm | 15 +- code/game/machinery/computer/security.dm | 29 +- code/game/machinery/constructable_frame.dm | 13 +- .../machinery/doors/airlock_electronics.dm | 13 +- code/game/machinery/doors/brigdoors.dm | 15 +- code/game/machinery/doors/door.dm | 19 +- code/game/machinery/recharger.dm | 7 +- code/game/machinery/syndicatebeacon.dm | 16 +- code/game/machinery/telecomms/broadcaster.dm | 5 +- code/game/machinery/telecomms/logbrowser.dm | 17 +- .../telecomms/machine_interactions.dm | 7 +- .../machinery/telecomms/telecommunications.dm | 56 ++-- code/game/machinery/telecomms/telemonitor.dm | 15 +- .../machinery/telecomms/traffic_control.dm | 23 +- code/game/machinery/vending.dm | 11 +- code/game/magic/archived_book.dm | 19 +- code/game/magic/cultist/ritual.dm | 12 +- code/game/magic/library.dm | 76 ++--- code/game/magic/musician.dm | 18 +- code/game/objects/alien/facehugger.dm | 13 +- code/game/objects/devices/flashlight.dm | 13 +- code/game/objects/grille.dm | 7 +- code/game/objects/items/candle.dm | 7 +- code/game/objects/items/robot_items.dm | 12 +- code/game/objects/items/tk_grab.dm | 9 +- code/game/objects/items/weapons/RCD.dm | 15 +- .../objects/items/weapons/cigs_lighters.dm | 35 +- .../objects/items/weapons/flamethrower.dm | 21 +- code/game/objects/items/weapons/grenades.dm | 14 +- .../objects/items/weapons/implants/implant.dm | 21 +- .../items/weapons/implants/implantcase.dm | 7 +- .../items/weapons/implants/implantchair.dm | 21 +- .../items/weapons/implants/implanter.dm | 7 +- .../items/weapons/implants/implantfreedom.dm | 7 +- .../items/weapons/implants/implantpad.dm | 9 +- .../objects/items/weapons/mops_cleaners.dm | 15 +- .../objects/items/weapons/surgery_tools.dm | 9 +- code/game/objects/items/weapons/tools.dm | 11 +- code/game/objects/radio/headset.dm | 13 +- code/game/objects/radio/radio.dm | 47 ++- code/game/objects/storage/lockbox.dm | 15 +- code/game/objects/tanks/jetpack.dm | 13 +- code/modules/admin/banjob.dm | 7 +- code/modules/assembly/assembly.dm | 65 ++-- code/modules/assembly/holder.dm | 11 +- code/modules/assembly/infrared.dm | 11 +- code/modules/assembly/proximity.dm | 11 +- code/modules/assembly/signaler.dm | 15 +- code/modules/assembly/timer.dm | 9 +- code/modules/chemical/Chemistry-Holder.dm | 7 +- code/modules/chemical/Chemistry-Reagents.dm | 17 +- code/modules/clothing/glasses.dm | 11 +- code/modules/clothing/glasses/hud.dm | 5 +- code/modules/clothing/spacesuits/ninja.dm | 63 ++-- code/modules/critters/critter.dm | 97 +++--- code/modules/critters/hivebots/hivebot.dm | 20 +- code/modules/flufftext/TextFilters.dm | 12 +- code/modules/mob/living/blob/blob.dm | 7 +- .../mob/living/carbon/alien/humanoid/life.dm | 13 +- .../mob/living/carbon/alien/larva/life.dm | 13 +- code/modules/mob/living/carbon/brain/MMI.dm | 13 +- code/modules/mob/living/carbon/brain/brain.dm | 9 +- code/modules/mob/living/carbon/human/life.dm | 21 +- code/modules/mob/living/parasite/meme.dm | 7 +- .../modules/mob/living/silicon/pai/recruit.dm | 17 +- .../mob/living/silicon/robot/robot_modules.dm | 9 +- code/modules/mob/mob_helpers.dm | 10 +- code/modules/mob/mob_movement.dm | 3 +- code/modules/mob/new_player/new_player.dm | 13 +- code/modules/mob/new_player/preferences.dm | 27 +- code/modules/mob/organ/organ.dm | 83 +++-- code/modules/paperwork/paper.dm | 32 +- code/modules/paperwork/paperbin.dm | 11 +- code/modules/paperwork/photocopier.dm | 13 +- code/modules/power/antimatter/computer.dm | 9 +- code/modules/power/pacman2.dm | 11 +- code/modules/power/port_gen.dm | 30 +- code/modules/power/singularity/collector.dm | 13 +- .../power/singularity/containment_field.dm | 9 +- code/modules/power/singularity/emitter.dm | 23 +- .../power/singularity/field_generator.dm | 23 +- code/modules/power/singularity/generator.dm | 7 +- .../particle_accelerator/particle.dm | 23 +- .../particle_accelerator.dm | 30 +- .../particle_accelerator/particle_control.dm | 9 +- .../particle_accelerator/particle_emitter.dm | 9 +- code/modules/power/singularity/singularity.dm | 37 ++- code/modules/power/solar.dm | 36 +- code/modules/projectiles/ammunition.dm | 18 +- code/modules/projectiles/guns/energy.dm | 13 +- .../projectiles/guns/energy/nuclear.dm | 5 +- code/modules/projectiles/guns/projectile.dm | 13 +- .../projectiles/guns/projectile/shotgun.dm | 11 +- code/modules/projectiles/projectile.dm | 54 +-- code/modules/recycling/disposal.dm | 32 +- code/modules/research/circuitprinter.dm | 11 +- code/modules/research/designs.dm | 25 +- code/modules/research/destructive_analyzer.dm | 9 +- code/modules/research/protolathe.dm | 25 +- code/modules/research/rdconsole.dm | 23 +- code/modules/research/rdmachines.dm | 25 +- code/modules/research/research.dm | 26 +- code/modules/research/server.dm | 36 +- code/unused/beast/bodypart.dm | 9 +- code/unused/spacecraft/manufacturing.dm | 44 ++- code/unused/spacecraft/shipcore.dm | 23 +- 157 files changed, 1736 insertions(+), 1634 deletions(-) diff --git a/code/FEA/FEA_fire.dm b/code/FEA/FEA_fire.dm index 14fd727dd9..c37e51ac2c 100644 --- a/code/FEA/FEA_fire.dm +++ b/code/FEA/FEA_fire.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + atom proc/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) //Purpose: Managing temperature exposure. @@ -67,13 +69,12 @@ obj layer = TURF_LAYER - var - volume = 125 - temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST + var/volume = 125 + var/temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - just_spawned = 1 + var/just_spawned = 1 - bypassing = 0 + var/bypassing = 0 proc/perform_exposure() var/turf/simulated/floor/location = loc @@ -179,4 +180,4 @@ obj loc = null - ..() \ No newline at end of file + ..() diff --git a/code/FEA/FEA_gas_mixture.dm b/code/FEA/FEA_gas_mixture.dm index 8edefe79d7..751431ef7b 100644 --- a/code/FEA/FEA_gas_mixture.dm +++ b/code/FEA/FEA_gas_mixture.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /* What are the archived variables for? Calculations are done using the archived variables with the results merged into the regular variables. @@ -22,11 +24,10 @@ datum volatile_fuel specific_heat = 30 - var - moles = 0 - specific_heat = 0 + var/moles = 0 + var/specific_heat = 0 - moles_archived = 0 + var/moles_archived = 0 gas_mixture var //Holds the "moles" of each of the four gases. @@ -1006,4 +1007,4 @@ datum corresponding.moles -= trace_gas.moles update_values() - return 1 \ No newline at end of file + return 1 diff --git a/code/FEA/FEA_turf_tile.dm b/code/FEA/FEA_turf_tile.dm index 38083f52ce..2fe7cbbcc6 100644 --- a/code/FEA/FEA_turf_tile.dm +++ b/code/FEA/FEA_turf_tile.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + atom/movable/var/pressure_resistance = 20 atom/movable/var/last_forced_movement = 0 @@ -91,23 +93,22 @@ turf var/current_graphic = null - var/tmp - datum/gas_mixture/air + var/tmp/datum/gas_mixture/air - processing = 1 - datum/air_group/parent - group_border = 0 - length_space_border = 0 + var/tmp/processing = 1 + var/tmp/datum/air_group/parent + var/tmp/group_border = 0 + var/tmp/length_space_border = 0 - air_check_directions = 0 //Do not modify this, just add turf to air_master.tiles_to_update + var/tmp/air_check_directions = 0 //Do not modify this, just add turf to air_master.tiles_to_update - archived_cycle = 0 - current_cycle = 0 + var/tmp/archived_cycle = 0 + var/tmp/current_cycle = 0 - obj/effect/hotspot/active_hotspot + var/tmp/obj/effect/hotspot/active_hotspot - temperature_archived //USED ONLY FOR SOLIDS - being_superconductive = 0 + var/tmp/temperature_archived //USED ONLY FOR SOLIDS + var/tmp/being_superconductive = 0 proc diff --git a/code/WorkInProgress/SkyMarshal/traitoritems.dm b/code/WorkInProgress/SkyMarshal/traitoritems.dm index 19e2d2e9a0..a2b24f4f5c 100644 --- a/code/WorkInProgress/SkyMarshal/traitoritems.dm +++ b/code/WorkInProgress/SkyMarshal/traitoritems.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + /obj/item/weapon/stamperaser name = "eraser" desc = "It looks like some kind of eraser." @@ -15,10 +17,9 @@ var/on = 0 flags = FPRINT|TABLEPASS w_class = 1 - var - list/obj/item/device/radio/Old = list() - list/obj/item/device/radio/Curr = list() - time_remaining = 5 + var/list/obj/item/device/radio/Old = list() + var/list/obj/item/device/radio/Curr = list() + var/time_remaining = 5 /obj/item/device/jammer/New() ..() @@ -72,4 +73,4 @@ icon_state = "t-ray0" sleep(2) - */ \ No newline at end of file + */ diff --git a/code/WorkInProgress/SkyMarshal/wardrobes.dm b/code/WorkInProgress/SkyMarshal/wardrobes.dm index 56b7f4d36f..f8fa93cef3 100755 --- a/code/WorkInProgress/SkyMarshal/wardrobes.dm +++ b/code/WorkInProgress/SkyMarshal/wardrobes.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + /obj/item/wardrobe name = "\improper Wardrobe" desc = "A standard-issue bag for clothing and equipment. Usually comes sealed, stocked with everything you need for a particular job." @@ -6,9 +8,8 @@ item_state = "wardrobe" w_class = 4 layer = 2.99 - var - descriptor = "various clothing" - seal_torn = 0 + var/descriptor = "various clothing" + var/seal_torn = 0 attack_self(mob/user) if(!contents.len) diff --git a/code/WorkInProgress/animusstation/atm.dm b/code/WorkInProgress/animusstation/atm.dm index a6dce70e50..71235421ce 100644 --- a/code/WorkInProgress/animusstation/atm.dm +++ b/code/WorkInProgress/animusstation/atm.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + /* TODO: @@ -15,12 +17,11 @@ log transactions anchored = 1 use_power = 1 idle_power_usage = 10 - var - obj/item/weapon/card/id/card - obj/item/weapon/money/cashes = list() - inserted = 0 - accepted = 0 - pincode = 0 + var/obj/item/weapon/card/id/card + var/obj/item/weapon/money/cashes = list() + var/inserted = 0 + var/accepted = 0 + var/pincode = 0 attackby(var/obj/A, var/mob/user) if(istype(A,/obj/item/weapon/money)) diff --git a/code/WorkInProgress/virus2/antibodies.dm b/code/WorkInProgress/virus2/antibodies.dm index 31de7c02ba..5c12beb948 100644 --- a/code/WorkInProgress/virus2/antibodies.dm +++ b/code/WorkInProgress/virus2/antibodies.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + // pure concentrated antibodies datum/reagent/antibodies data = new/list("antibodies"=0) @@ -16,20 +18,19 @@ datum/reagent/antibodies return // reserving some numbers for later special antigens -var/global/const - ANTIGEN_A = 1 - ANTIGEN_B = 2 - ANTIGEN_RH = 4 - ANTIGEN_Q = 8 - ANTIGEN_U = 16 - ANTIGEN_V = 32 - ANTIGEN_X = 64 - ANTIGEN_Y = 128 - ANTIGEN_Z = 256 - ANTIGEN_M = 512 - ANTIGEN_N = 1024 - ANTIGEN_P = 2048 - ANTIGEN_O = 4096 +var/global/const/ANTIGEN_A = 1 +var/global/const/ANTIGEN_B = 2 +var/global/const/ANTIGEN_RH = 4 +var/global/const/ANTIGEN_Q = 8 +var/global/const/ANTIGEN_U = 16 +var/global/const/ANTIGEN_V = 32 +var/global/const/ANTIGEN_X = 64 +var/global/const/ANTIGEN_Y = 128 +var/global/const/ANTIGEN_Z = 256 +var/global/const/ANTIGEN_M = 512 +var/global/const/ANTIGEN_N = 1024 +var/global/const/ANTIGEN_P = 2048 +var/global/const/ANTIGEN_O = 4096 var/global/list/ANTIGENS = list("[ANTIGEN_A]" = "A", "[ANTIGEN_B]" = "B", "[ANTIGEN_RH]" = "RH", "[ANTIGEN_Q]" = "Q", "[ANTIGEN_U]" = "U", "[ANTIGEN_V]" = "V", "[ANTIGEN_Z]" = "Z", "[ANTIGEN_M]" = "M", @@ -53,4 +54,4 @@ var/global/list/ANTIGENS = list("[ANTIGEN_A]" = "A", "[ANTIGEN_B]" = "B", "[ANTI // iterate over the list of antigens and see what matches var/code = "" for(var/V in ANTIGENS) if(text2num(V) & M.antibodies) code += ANTIGENS[V] - user << text("\blue [src] The antibody scanner displays a cryptic set of data: [code]") \ No newline at end of file + user << text("\blue [src] The antibody scanner displays a cryptic set of data: [code]") diff --git a/code/datums/mixed.dm b/code/datums/mixed.dm index cbe786dbe2..d7c19d40ac 100644 --- a/code/datums/mixed.dm +++ b/code/datums/mixed.dm @@ -1,7 +1,8 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /datum/data - var - name = "data" - size = 1.0 + var/name = "data" + var/size = 1.0 /datum/data/function @@ -30,20 +31,19 @@ /datum/powernet - var - list/cables = list() // all cables & junctions - list/nodes = list() // all APCs & sources + var/list/cables = list() // all cables & junctions + var/list/nodes = list() // all APCs & sources - newload = 0 - load = 0 - newavail = 0 - avail = 0 - viewload = 0 - number = 0 - perapc = 0 // per-apc avilability - netexcess = 0 + var/newload = 0 + var/load = 0 + var/newavail = 0 + var/avail = 0 + var/viewload = 0 + var/number = 0 + var/perapc = 0 // per-apc avilability + var/netexcess = 0 /datum/debug - var/list/debuglist \ No newline at end of file + var/list/debuglist diff --git a/code/datums/shuttle_controller.dm b/code/datums/shuttle_controller.dm index d67c7c5505..356ac366ed 100644 --- a/code/datums/shuttle_controller.dm +++ b/code/datums/shuttle_controller.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + // Controls the emergency shuttle @@ -10,19 +12,18 @@ var/global/datum/shuttle_controller/emergency_shuttle/emergency_shuttle datum/shuttle_controller - var - alert = 0 //0 = emergency, 1 = crew cycle + var/alert = 0 //0 = emergency, 1 = crew cycle - location = 0 //0 = somewhere far away (in spess), 1 = at SS13, 2 = returned from SS13 - online = 0 - direction = 1 //-1 = going back to central command, 1 = going to SS13, 2 = in transit to centcom (not recalled) + var/location = 0 //0 = somewhere far away (in spess), 1 = at SS13, 2 = returned from SS13 + var/online = 0 + var/direction = 1 //-1 = going back to central command, 1 = going to SS13, 2 = in transit to centcom (not recalled) - endtime // timeofday that shuttle arrives - timelimit //important when the shuttle gets called for more than shuttlearrivetime + var/endtime // timeofday that shuttle arrives + var/timelimit //important when the shuttle gets called for more than shuttlearrivetime //timeleft = 360 //600 - fake_recall = 0 //Used in rounds to prevent "ON NOES, IT MUST [INSERT ROUND] BECAUSE SHUTTLE CAN'T BE CALLED" - deny_shuttle = 0 //for admins not allowing it to be called. - departed = 0 + var/fake_recall = 0 //Used in rounds to prevent "ON NOES, IT MUST [INSERT ROUND] BECAUSE SHUTTLE CAN'T BE CALLED" + var/deny_shuttle = 0 //for admins not allowing it to be called. + var/departed = 0 // sound_siren = 1 //if siren should go off //People hat it :( // call the shuttle // if not called before, set the endtime to T+600 seconds diff --git a/code/defines/global.dm b/code/defines/global.dm index d5b1876046..b4b5da3d44 100644 --- a/code/defines/global.dm +++ b/code/defines/global.dm @@ -1,16 +1,17 @@ -var/global - obj/datacore/data_core = null - obj/effect/overlay/plmaster = null - obj/effect/overlay/slmaster = null +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + +var/global/obj/datacore/data_core = null +var/global/obj/effect/overlay/plmaster = null +var/global/obj/effect/overlay/slmaster = null //obj/hud/main_hud1 = null - list/machines = list() - list/processing_objects = list() - list/active_diseases = list() +var/global/list/machines = list() +var/global/list/processing_objects = list() +var/global/list/active_diseases = list() //items that ask to be called every cycle - defer_powernet_rebuild = 0 // true if net rebuild will be called manually after an event +var/global/defer_powernet_rebuild = 0 // true if net rebuild will be called manually after an event //list/global_map = null //Borked, do not touch. DMTG //list/global_map = list(list(1,5),list(4,3))//an array of map Z levels. @@ -23,197 +24,196 @@ var/global //3 - AI satellite //5 - empty space -var ////////////// - BLINDBLOCK = 0 - DEAFBLOCK = 0 - HULKBLOCK = 0 - TELEBLOCK = 0 - FIREBLOCK = 0 - XRAYBLOCK = 0 - CLUMSYBLOCK = 0 - FAKEBLOCK = 0 - BLOCKADD = 0 - DIFFMUT = 0 - HEADACHEBLOCK = 0 - COUGHBLOCK = 0 - TWITCHBLOCK = 0 - NERVOUSBLOCK = 0 - NOBREATHBLOCK = 0 - REMOTEVIEWBLOCK = 0 - REGENERATEBLOCK = 0 - INCREASERUNBLOCK = 0 - REMOTETALKBLOCK = 0 - MORPHBLOCK = 0 - BLENDBLOCK = 0 - HALLUCINATIONBLOCK = 0 - NOPRINTSBLOCK = 0 - SHOCKIMMUNITYBLOCK = 0 - SMALLSIZEBLOCK = 0 - GLASSESBLOCK = 0 - MONKEYBLOCK = 27 +var/BLINDBLOCK = 0 +var/DEAFBLOCK = 0 +var/HULKBLOCK = 0 +var/TELEBLOCK = 0 +var/FIREBLOCK = 0 +var/XRAYBLOCK = 0 +var/CLUMSYBLOCK = 0 +var/FAKEBLOCK = 0 +var/BLOCKADD = 0 +var/DIFFMUT = 0 +var/HEADACHEBLOCK = 0 +var/COUGHBLOCK = 0 +var/TWITCHBLOCK = 0 +var/NERVOUSBLOCK = 0 +var/NOBREATHBLOCK = 0 +var/REMOTEVIEWBLOCK = 0 +var/REGENERATEBLOCK = 0 +var/INCREASERUNBLOCK = 0 +var/REMOTETALKBLOCK = 0 +var/MORPHBLOCK = 0 +var/BLENDBLOCK = 0 +var/HALLUCINATIONBLOCK = 0 +var/NOPRINTSBLOCK = 0 +var/SHOCKIMMUNITYBLOCK = 0 +var/SMALLSIZEBLOCK = 0 +var/GLASSESBLOCK = 0 +var/MONKEYBLOCK = 27 - skipupdate = 0 +var/skipupdate = 0 /////////////// - eventchance = 1 //% per 2 mins - EventsOn = 1 - hadevent = 0 - blobevent = 0 +var/eventchance = 1 //% per 2 mins +var/EventsOn = 1 +var/hadevent = 0 +var/blobevent = 0 /////////////// - diary = null - diaryofmeanpeople = null - station_name = null - game_version = "Baystation 12" +var/diary = null +var/diaryofmeanpeople = null +var/station_name = null +var/game_version = "Baystation 12" - datum/air_tunnel/air_tunnel1/SS13_airtunnel = null - going = 1.0 - master_mode = "traitor"//"extended" - secret_force_mode = "secret" // if this is anything but "secret", the secret rotation will forceably choose this mode +var/datum/air_tunnel/air_tunnel1/SS13_airtunnel = null +var/going = 1.0 +var/master_mode = "traitor"//"extended" +var/secret_force_mode = "secret" // if this is anything but "secret", the secret rotation will forceably choose this mode - datum/engine_eject/engine_eject_control = null - host = null - aliens_allowed = 1 - ooc_allowed = 1 - dooc_allowed = 1 - traitor_scaling = 1 - goonsay_allowed = 0 - dna_ident = 1 - abandon_allowed = 1 - enter_allowed = 1 +var/datum/engine_eject/engine_eject_control = null +var/host = null +var/aliens_allowed = 1 +var/ooc_allowed = 1 +var/dooc_allowed = 1 +var/traitor_scaling = 1 +var/goonsay_allowed = 0 +var/dna_ident = 1 +var/abandon_allowed = 1 +var/enter_allowed = 1 // guests_allowed = 1 - shuttle_frozen = 0 - shuttle_left = 0 - tinted_weldhelh = 1 +var/shuttle_frozen = 0 +var/shuttle_left = 0 +var/tinted_weldhelh = 1 - list/jobMax = list() - list/bombers = list( ) - list/admin_log = list ( ) - list/lastsignalers = list( ) //keeps last 100 signals here in format: "[src] used \ref[src] @ location [src.loc]: [freq]/[code]" - list/lawchanges = list( ) //Stores who uploaded laws to which silicon-based lifeform, and what the law was - list/admins = list( ) - list/alien_whitelist = list( ) - list/shuttles = list( ) - list/reg_dna = list( ) +var/list/jobMax = list() +var/list/bombers = list( ) +var/list/admin_log = list ( ) +var/list/lastsignalers = list( ) //keeps last 100 signals here in format: "[src] used \ref[src] @ location [src.loc]: [freq]/[code]" +var/list/lawchanges = list( ) //Stores who uploaded laws to which silicon-based lifeform, and what the law was +var/list/admins = list( ) +var/list/alien_whitelist = list( ) +var/list/shuttles = list( ) +var/list/reg_dna = list( ) // list/traitobj = list( ) - CELLRATE = 0.002 // multiplier for watts per tick <> cell storage (eg: .002 means if there is a load of 1000 watts, 20 units will be taken from a cell per second) - CHARGELEVEL = 0.001 // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second) +var/CELLRATE = 0.002 // multiplier for watts per tick <> cell storage (eg: .002 means if there is a load of 1000 watts, 20 units will be taken from a cell per second) +var/CHARGELEVEL = 0.001 // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second) - shuttle_z = 2 //default - airtunnel_start = 68 // default - airtunnel_stop = 68 // default - airtunnel_bottom = 72 // default - list/monkeystart = list() - list/wizardstart = list() - list/newplayer_start = list() - list/latejoin = list() - list/prisonwarp = list() //prisoners go to these - list/holdingfacility = list() //captured people go here - list/xeno_spawn = list()//Aliens spawn at these. +var/shuttle_z = 2 //default +var/airtunnel_start = 68 // default +var/airtunnel_stop = 68 // default +var/airtunnel_bottom = 72 // default +var/list/monkeystart = list() +var/list/wizardstart = list() +var/list/newplayer_start = list() +var/list/latejoin = list() +var/list/prisonwarp = list() //prisoners go to these +var/list/holdingfacility = list() //captured people go here +var/list/xeno_spawn = list()//Aliens spawn at these. // list/mazewarp = list() - list/tdome1 = list() - list/tdome2 = list() - list/tdomeobserve = list() - list/tdomeadmin = list() - list/prisonsecuritywarp = list() //prison security goes to these - list/prisonwarped = list() //list of players already warped - list/blobstart = list() +var/list/tdome1 = list() +var/list/tdome2 = list() +var/list/tdomeobserve = list() +var/list/tdomeadmin = list() +var/list/prisonsecuritywarp = list() //prison security goes to these +var/list/prisonwarped = list() //list of players already warped +var/list/blobstart = list() // list/traitors = list() //traitor list - list/cardinal = list( NORTH, SOUTH, EAST, WEST ) - list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) - list/emclosets = list() //random emergency closets woo +var/list/cardinal = list( NORTH, SOUTH, EAST, WEST ) +var/list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) +var/list/emclosets = list() //random emergency closets woo - datum/station_state/start_state = null - datum/configuration/config = null - datum/vote/vote = null - datum/sun/sun = null +var/datum/station_state/start_state = null +var/datum/configuration/config = null +var/datum/vote/vote = null +var/datum/sun/sun = null - list/combatlog = list() - list/IClog = list() - list/OOClog = list() - list/adminlog = list() +var/list/combatlog = list() +var/list/IClog = list() +var/list/OOClog = list() +var/list/adminlog = list() - list/powernets = null +var/list/powernets = null - Debug = 0 // global debug switch - Debug2 = 0 +var/Debug = 0 // global debug switch +var/Debug2 = 0 - datum/debug/debugobj +var/datum/debug/debugobj - datum/moduletypes/mods = new() +var/datum/moduletypes/mods = new() - wavesecret = 0 +var/wavesecret = 0 - shuttlecoming = 0 +var/shuttlecoming = 0 - join_motd = null - rules = null - forceblob = 0 +var/join_motd = null +var/rules = null +var/forceblob = 0 - custom_event_msg = null +var/custom_event_msg = null //airlockWireColorToIndex takes a number representing the wire color, e.g. the orange wire is always 1, the dark red wire is always 2, etc. It returns the index for whatever that wire does. //airlockIndexToWireColor does the opposite thing - it takes the index for what the wire does, for example AIRLOCK_WIRE_IDSCAN is 1, AIRLOCK_WIRE_POWER1 is 2, etc. It returns the wire color number. //airlockWireColorToFlag takes the wire color number and returns the flag for it (1, 2, 4, 8, 16, etc) - list/airlockWireColorToFlag = RandomAirlockWires() - list/airlockIndexToFlag - list/airlockIndexToWireColor - list/airlockWireColorToIndex - list/APCWireColorToFlag = RandomAPCWires() - list/APCIndexToFlag - list/APCIndexToWireColor - list/APCWireColorToIndex - list/BorgWireColorToFlag = RandomBorgWires() - list/BorgIndexToFlag - list/BorgIndexToWireColor - list/BorgWireColorToIndex - list/ScrambledFrequencies = list( ) //These are used for electrical storms, and anything else that jams radios. - list/UnscrambledFrequencies = list( ) - list/AAlarmWireColorToFlag = RandomAAlarmWires() // Air Alarm hacking wires. - list/AAlarmIndexToFlag - list/AAlarmIndexToWireColor - list/AAlarmWireColorToIndex +var/list/airlockWireColorToFlag = RandomAirlockWires() +var/list/airlockIndexToFlag +var/list/airlockIndexToWireColor +var/list/airlockWireColorToIndex +var/list/APCWireColorToFlag = RandomAPCWires() +var/list/APCIndexToFlag +var/list/APCIndexToWireColor +var/list/APCWireColorToIndex +var/list/BorgWireColorToFlag = RandomBorgWires() +var/list/BorgIndexToFlag +var/list/BorgIndexToWireColor +var/list/BorgWireColorToIndex +var/list/ScrambledFrequencies = list( ) //These are used for electrical storms, and anything else that jams radios. +var/list/UnscrambledFrequencies = list( ) +var/list/AAlarmWireColorToFlag = RandomAAlarmWires() // Air Alarm hacking wires. +var/list/AAlarmIndexToFlag +var/list/AAlarmIndexToWireColor +var/list/AAlarmWireColorToIndex - const/SPEED_OF_LIGHT = 3e8 //not exact but hey! - const/SPEED_OF_LIGHT_SQ = 9e+16 - const/FIRE_DAMAGE_MODIFIER = 0.0215 //Higher values result in more external fire damage to the skin (default 0.0215) - const/AIR_DAMAGE_MODIFIER = 2.025 //More means less damage from hot air scalding lungs, less = more damage. (default 2.025) - const/INFINITY = 1e31 //closer then enough +var/const/SPEED_OF_LIGHT = 3e8 //not exact but hey! +var/const/SPEED_OF_LIGHT_SQ = 9e+16 +var/const/FIRE_DAMAGE_MODIFIER = 0.0215 //Higher values result in more external fire damage to the skin (default 0.0215) +var/const/AIR_DAMAGE_MODIFIER = 2.025 //More means less damage from hot air scalding lungs, less = more damage. (default 2.025) +var/const/INFINITY = 1e31 //closer then enough //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam - const/MAX_MESSAGE_LEN = 1024 - const/MAX_PAPER_MESSAGE_LEN = 3072 - const/MAX_BOOK_MESSAGE_LEN = 9216 +var/const/MAX_MESSAGE_LEN = 1024 +var/const/MAX_PAPER_MESSAGE_LEN = 3072 +var/const/MAX_BOOK_MESSAGE_LEN = 9216 - const/MAX_NAME_LEN = 40 +var/const/MAX_NAME_LEN = 40 - list/paper_blacklist = list("script","frame","iframe","input","button","a","embed","object") +var/list/paper_blacklist = list("script","frame","iframe","input","button","a","embed","object") - const/shuttle_time_in_station = 1800 // 3 minutes in the station - const/shuttle_time_to_arrive = 6000 // 10 minutes to arrive +var/const/shuttle_time_in_station = 1800 // 3 minutes in the station +var/const/shuttle_time_to_arrive = 6000 // 10 minutes to arrive // MySQL configuration. You can also use the config/dbconfig.txt file. - sqladdress = "localhost" - sqlport = "3306" - sqldb = "tgstation" - sqllogin = "root" - sqlpass = "" +var/sqladdress = "localhost" +var/sqlport = "3306" +var/sqldb = "tgstation" +var/sqllogin = "root" +var/sqlpass = "" // Feedback gathering sql connection - sqlfdbkdb = "test" - sqlfdbklogin = "root" - sqlfdbkpass = "" +var/sqlfdbkdb = "test" +var/sqlfdbklogin = "root" +var/sqlfdbkpass = "" - sqllogging = 0 // Should we log deaths, population stats, etc? +var/sqllogging = 0 // Should we log deaths, population stats, etc? @@ -231,7 +231,7 @@ var // For FTP requests. (i.e. downloading runtime logs.) // However it'd be ok to use for accessing attack logs and such too, which are even laggier. - fileaccess_timer = 1800 //Cannot access files by ftp until the game is finished setting up and stuff. +var/fileaccess_timer = 1800 //Cannot access files by ftp until the game is finished setting up and stuff. // It turns out that /var/const can't handle lists, because lists use // an initializer. Sigh. That's no reason that we shouldn't make @@ -239,8 +239,7 @@ var // separate location, though, so: below are all lists that should not // ever be changed in code. -/var/global - AI_VERB_LIST = list( +/var/global/AI_VERB_LIST = list( /mob/living/silicon/ai/proc/ai_call_shuttle, /mob/living/silicon/ai/proc/show_laws_verb, /mob/living/silicon/ai/proc/ai_camera_track, @@ -250,4 +249,4 @@ var /mob/living/silicon/ai/proc/ai_statuschange, /mob/living/silicon/ai/proc/ai_hologram_change, /mob/living/silicon/ai/proc/ai_roster, - ) \ No newline at end of file + ) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 83700c3686..9a03044210 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj //var/datum/module/mod //not used var/m_amt = 0 // metal @@ -30,11 +32,10 @@ icon_state = "rollstart" flags = FPRINT w_class = 1.0 - var - turf/start - turf/end - tape_type = /obj/item/tape - icon_base + var/turf/start + var/turf/end + var/tape_type = /obj/item/tape + var/icon_base /obj/item/tape name = "tape" @@ -1100,8 +1101,7 @@ throw_range = 5 origin_tech = "biotech=3" - var - mob/living/carbon/brain/brainmob = null + var/mob/living/carbon/brain/brainmob = null New() ..() diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index b29f26d928..084f0746ce 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -1,22 +1,22 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery name = "machinery" icon = 'stationobjs.dmi' - var - stat = 0 - emagged = 0 - use_power = 0 + var/stat = 0 + var/emagged = 0 + var/use_power = 0 //0 = dont run the auto //1 = run auto, use idle //2 = run auto, use active - idle_power_usage = 0 - active_power_usage = 0 - power_channel = EQUIP + var/idle_power_usage = 0 + var/active_power_usage = 0 + var/power_channel = EQUIP //EQUIP,ENVIRON or LIGHT - list/component_parts = null //list of all the parts used to build it, if made from certain kinds of frames. - uid - manual = 0 - global - gl_uid = 1 + var/list/component_parts = null //list of all the parts used to build it, if made from certain kinds of frames. + var/uid + var/manual = 0 + var/global/gl_uid = 1 /obj/machinery/autolathe name = "\improper Autolathe" @@ -384,16 +384,14 @@ use_power = 1 idle_power_usage = 5 active_power_usage = 100 - var - obj/effect/overlay/hologram//The projection itself. If there is one, the instrument is on, off otherwise. + var/obj/effect/overlay/hologram//The projection itself. If there is one, the instrument is on, off otherwise. /obj/machinery/hologram/holopad name = "\improper AI holopad" desc = "It's a floor-mounted device for projecting holographic images. It is activated remotely." icon_state = "holopad0" - var - mob/living/silicon/ai/master//Which AI, if any, is controlling the object? Only one AI may control a hologram at any time. - last_request = 0 //to prevent request spam. ~Carn + var/mob/living/silicon/ai/master//Which AI, if any, is controlling the object? Only one AI may control a hologram at any time. + var/last_request = 0 //to prevent request spam. ~Carn /obj/machinery/hologram/projector name = "hologram projector" @@ -406,12 +404,11 @@ desc = "It's used by the AI for fooling around." icon = 'stationobjs.dmi' icon_state = "hologram0" - var - temp = null - lumens = 0.0 - h_r = 245.0 - h_g = 245.0 - h_b = 245.0 + var/temp = null + var/lumens = 0.0 + var/h_r = 245.0 + var/h_g = 245.0 + var/h_b = 245.0 /obj/machinery/coatrack name = "coat rack" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index c143fc109a..1af2a50a96 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/item/weapon name = "weapon" icon = 'weapons.dmi' @@ -326,9 +328,8 @@ m_amt = 30 g_amt = 20 origin_tech = "magnets=2;biotech=2" - var - details = 0 - recent_fail = 0 + var/details = 0 + var/recent_fail = 0 /obj/item/device/mass_spectrometer/adv name = "advanced mass-spectrometer" diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm index d106e8f64f..059a11b95b 100644 --- a/code/defines/procs/AStar.dm +++ b/code/defines/procs/AStar.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /* A Star pathfinding algorithm Returns a list of tiles forming a path from A to B, taking dense objects as well as walls, and the orientation of @@ -36,9 +38,8 @@ length to avoid portals or something i guess?? Not that they're counted right no PriorityQueue - var - L[] - cmp + var/L[] + var/cmp New(compare) L = new() cmp = compare @@ -92,13 +93,12 @@ PriorityQueue if(ind) Remove(ind) PathNode - var - datum/source - PathNode/prevNode - f - g - h - nt // Nodes traversed + var/datum/source + var/PathNode/prevNode + var/f + var/g + var/h + var/nt // Nodes traversed New(s,p,pg,ph,pnt) source = s prevNode = p @@ -109,8 +109,7 @@ PathNode nt = pnt datum - var - bestF + var/bestF proc PathWeightCompare(PathNode/a, PathNode/b) return a.f - b.f diff --git a/code/defines/procs/dbcore.dm b/code/defines/procs/dbcore.dm index ff63a1d6de..a517134d32 100644 --- a/code/defines/procs/dbcore.dm +++ b/code/defines/procs/dbcore.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + //cursors #define Default_Cursor 0 #define Client_Cursor 1 @@ -37,9 +39,8 @@ // Deprecated! See global.dm for new configuration vars /* -var - DB_SERVER = "" // This is the location of your MySQL server (localhost is USUALLY fine) - DB_PORT = 3306 // This is the port your MySQL server is running on (3306 is the default) +var/DB_SERVER = "" // This is the location of your MySQL server (localhost is USUALLY fine) +var/DB_PORT = 3306 // This is the port your MySQL server is running on (3306 is the default) */ DBConnection @@ -69,15 +70,14 @@ DBConnection return Connect("[dbi?"[dbi]":"dbi:mysql:[database_name]:[sqladdress]:[sqlport]"]",user,password) NewQuery(sql_query,cursor_handler=src.default_cursor) return new/DBQuery(sql_query,src,cursor_handler) - var - _db_con // This variable contains a reference to the actual database connection. - dbi // This variable is a string containing the DBI MySQL requires. - user // This variable contains the username data. - password // This variable contains the password data. - default_cursor // This contains the default database cursor data. + var/_db_con // This variable contains a reference to the actual database connection. + var/dbi // This variable is a string containing the DBI MySQL requires. + var/user // This variable contains the username data. + var/password // This variable contains the password data. + var/default_cursor // This contains the default database cursor data. // - server = "" - port = 3306 + var/server = "" + var/port = 3306 DBQuery New(sql_query,DBConnection/connection_handler,cursor_handler) @@ -134,25 +134,23 @@ DBQuery else if(conversions.len < column) conversions.len = column conversions[column] = conversion - var - sql // The sql query being executed. - default_cursor - list/columns //list of DB Columns populated by Columns() - list/conversions - list/item[0] //list of data values populated by NextRow() + var/sql // The sql query being executed. + var/default_cursor + var/list/columns //list of DB Columns populated by Columns() + var/list/conversions + var/list/item[0] //list of data values populated by NextRow() - DBConnection/db_connection - _db_query + var/DBConnection/db_connection + var/_db_query DBColumn - var - name - table - position //1-based index into item data - sql_type - flags - length - max_length + var/name + var/table + var/position //1-based index into item data + var/sql_type + var/flags + var/length + var/max_length New(name_handler,table_handler,position_handler,type_handler,flag_handler,length_handler,max_length_handler) src.name = name_handler @@ -179,4 +177,4 @@ DBColumn if(TIMESTAMP) return "TIMESTAMP" if(TIME) return "TIME" if(STRING) return "STRING" - if(BLOB) return "BLOB" \ No newline at end of file + if(BLOB) return "BLOB" diff --git a/code/defines/procs/gamehelpers.dm b/code/defines/procs/gamehelpers.dm index dc04c1e4ca..f8e6492665 100644 --- a/code/defines/procs/gamehelpers.dm +++ b/code/defines/procs/gamehelpers.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /proc/dopage(src,target) var/href_list var/href @@ -261,11 +263,10 @@ proc return 0 Y1+=s else - var - m=(32*(Y2-Y1)+(PY2-PY1))/(32*(X2-X1)+(PX2-PX1)) - b=(Y1+PY1/32-0.015625)-m*(X1+PX1/32-0.015625) //In tiles - signX = SIGN(X2-X1) - signY = SIGN(Y2-Y1) + var/m=(32*(Y2-Y1)+(PY2-PY1))/(32*(X2-X1)+(PX2-PX1)) + var/b=(Y1+PY1/32-0.015625)-m*(X1+PX1/32-0.015625) //In tiles + var/signX = SIGN(X2-X1) + var/signY = SIGN(Y2-Y1) if(X1The current game mode is - Changeling!" @@ -233,4 +233,4 @@ if(possibleIDs.len) changelingID = pick(possibleIDs) else - changelingID = "[rand(1,1000)]" \ No newline at end of file + changelingID = "[rand(1,1000)]" diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 7f5a1a431f..858c4f641e 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -1,7 +1,8 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /datum/game_mode - var - list/datum/mind/cult = list() - list/allwords = list("travel","self","see","hell","blood","join","tech","destroy", "other", "hide") + var/list/datum/mind/cult = list() + var/list/allwords = list("travel","self","see","hell","blood","join","tech","destroy", "other", "hide") /proc/iscultist(mob/living/M as mob) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 6cff317a6c..fa1f19fa2e 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /* * GAMEMODES (by Rastaf0) * @@ -11,24 +13,23 @@ /datum/game_mode - var - name = "invalid" - config_tag = null - intercept_hacked = 0 - votable = 1 - probability = 1 - station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm - explosion_in_progress = 0 //sit back and relax - list/datum/mind/modePlayer = new - list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist - list/protected_jobs = list() // Jobs that can't be tratiors because - list/logtraitors = list() - required_players = 1 - required_enemies = 0 - recommended_enemies = 0 - uplink_welcome - uplink_uses - uplink_items = {"Highly Visible and Dangerous Weapons; + var/name = "invalid" + var/config_tag = null + var/intercept_hacked = 0 + var/votable = 1 + var/probability = 1 + var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm + var/explosion_in_progress = 0 //sit back and relax + var/list/datum/mind/modePlayer = new + var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist + var/list/protected_jobs = list() // Jobs that can't be tratiors because + var/list/logtraitors = list() + var/required_players = 1 + var/required_enemies = 0 + var/recommended_enemies = 0 + var/uplink_welcome + var/uplink_uses + var/uplink_items = {"Highly Visible and Dangerous Weapons; /obj/item/weapon/gun/projectile:6:Revolver; /obj/item/ammo_magazine/a357:2:Ammo-357; /obj/item/weapon/gun/energy/crossbow:5:Energy Crossbow; diff --git a/code/game/gamemodes/meme/meme.dm b/code/game/gamemodes/meme/meme.dm index 2782617d8d..11802d6dfb 100644 --- a/code/game/gamemodes/meme/meme.dm +++ b/code/game/gamemodes/meme/meme.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /datum/game_mode/var/list/memes = list() /datum/game_mode/meme @@ -9,31 +11,29 @@ votable = 0 // temporarily disable this mode for voting - var - var/list/datum/mind/first_hosts = list() - var/list/assigned_hosts = list() + var/var/list/datum/mind/first_hosts = list() + var/var/list/assigned_hosts = list() - const - prob_int_murder_target = 50 // intercept names the assassination target half the time - prob_right_murder_target_l = 25 // lower bound on probability of naming right assassination target - prob_right_murder_target_h = 50 // upper bound on probability of naimg the right assassination target + var/const/prob_int_murder_target = 50 // intercept names the assassination target half the time + var/const/prob_right_murder_target_l = 25 // lower bound on probability of naming right assassination target + var/const/prob_right_murder_target_h = 50 // upper bound on probability of naimg the right assassination target - prob_int_item = 50 // intercept names the theft target half the time - prob_right_item_l = 25 // lower bound on probability of naming right theft target - prob_right_item_h = 50 // upper bound on probability of naming the right theft target + var/const/prob_int_item = 50 // intercept names the theft target half the time + var/const/prob_right_item_l = 25 // lower bound on probability of naming right theft target + var/const/prob_right_item_h = 50 // upper bound on probability of naming the right theft target - prob_int_sab_target = 50 // intercept names the sabotage target half the time - prob_right_sab_target_l = 25 // lower bound on probability of naming right sabotage target - prob_right_sab_target_h = 50 // upper bound on probability of naming right sabotage target + var/const/prob_int_sab_target = 50 // intercept names the sabotage target half the time + var/const/prob_right_sab_target_l = 25 // lower bound on probability of naming right sabotage target + var/const/prob_right_sab_target_h = 50 // upper bound on probability of naming right sabotage target - prob_right_killer_l = 25 //lower bound on probability of naming the right operative - prob_right_killer_h = 50 //upper bound on probability of naming the right operative - prob_right_objective_l = 25 //lower bound on probability of determining the objective correctly - prob_right_objective_h = 50 //upper bound on probability of determining the objective correctly + var/const/prob_right_killer_l = 25 //lower bound on probability of naming the right operative + var/const/prob_right_killer_h = 50 //upper bound on probability of naming the right operative + var/const/prob_right_objective_l = 25 //lower bound on probability of determining the objective correctly + var/const/prob_right_objective_h = 50 //upper bound on probability of determining the objective correctly - waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds) - waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds) + var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds) + var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds) /datum/game_mode/meme/announce() world << "The current game mode is - Meme!" @@ -177,4 +177,4 @@ else world << "The meme has failed!" feedback_add_details("meme_success","FAIL") - return 1 \ No newline at end of file + return 1 diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 3c01abe667..14426d5aae 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1,9 +1,10 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + datum/objective - var - datum/mind/owner = null //Who owns the objective. - explanation_text = "Nothing" //What that person is supposed to do. - datum/mind/target = null //If they are focused on a particular person. - target_amount = 0 //If they are focused on a particular number. Steal objectives have their own counter. + var/datum/mind/owner = null //Who owns the objective. + var/explanation_text = "Nothing" //What that person is supposed to do. + var/datum/mind/target = null //If they are focused on a particular person. + var/target_amount = 0 //If they are focused on a particular number. Steal objectives have their own counter. New(var/text) if(text) @@ -530,4 +531,4 @@ datum/objective/absorb return 0 /*-------ENDOF CULTIST------*/ -*/ \ No newline at end of file +*/ diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 6a257acd6d..e6e1aa700f 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -1,6 +1,7 @@ -var - hsboxspawn = 1 - list +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + +var/hsboxspawn = 1 +var/list hrefs = list( "hsbsuit" = "Suit Up (Space Travel Gear)", "hsbmetal" = "Spawn 50 Metal", @@ -15,8 +16,7 @@ var "hsbmedkit" = "Spawn Medical Kit") mob - var - datum/hSB/sandbox = null + var/datum/hSB/sandbox = null proc CanBuild() if(master_mode == "sandbox") @@ -30,9 +30,8 @@ mob sandbox.update() datum/hSB - var - owner = null - admin = 0 + var/owner = null + var/admin = 0 proc update() var/hsbpanel = "
h_Sandbox Panel
" @@ -153,4 +152,4 @@ datum/hSB var/hsbitem = input(usr, "Choose an object to spawn.", "Sandbox:") in selectable + "Cancel" if(hsbitem != "Cancel") - new hsbitem(usr.loc) \ No newline at end of file + new hsbitem(usr.loc) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index c7f2139042..1521165420 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -1,14 +1,15 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + var/global/datum/controller/occupations/job_master /datum/controller/occupations - var //List of all jobs - list/occupations = list() - list/occupations2 = list() // Prevents problems with latejoiners. + var/list/occupations = list() + var/list/occupations2 = list() // Prevents problems with latejoiners. //Players who need jobs - list/unassigned = list() + var/list/unassigned = list() //Debug info - list/job_debug = list() + var/list/job_debug = list() New() @@ -392,4 +393,4 @@ var/global/datum/controller/occupations/job_master tmp_str += "HIGH=[level1]|MEDIUM=[level2]|LOW=[level3]|NEVER=[level4]|BANNED=[level5]|-" feedback_add_details("job_preferences",tmp_str) -*/ \ No newline at end of file +*/ diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 2f5ce30828..761654028f 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /proc/RandomAAlarmWires() //to make this not randomize the wires, just set index to 1 and increment it in the flag for loop (after doing everything else). @@ -24,11 +26,10 @@ // A datum for dealing with threshold limit values // used in /obj/machinery/alarm /datum/tlv - var - min2 - min1 - max1 - max2 + var/min2 + var/min1 + var/max1 + var/max2 New(_min2 as num, _min1 as num, _max1 as num, _max2 as num) min2 = _min2 min1 = _min1 diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index c848a6d8c8..63bb619054 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + var/global/list/autolathe_recipes = list( \ /* screwdriver removed*/ \ new /obj/item/weapon/reagent_containers/glass/bucket(), \ @@ -54,12 +56,11 @@ var/global/list/autolathe_recipes_hidden = list( \ ) /obj/machinery/autolathe - var - busy = 0 - max_m_amount = 150000.0 - max_g_amount = 75000.0 - outputAmount = 1 - makeDir = 0 + var/busy = 0 + var/max_m_amount = 150000.0 + var/max_g_amount = 75000.0 + var/outputAmount = 1 + var/makeDir = 0 proc wires_win(mob/user as mob) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index fe00a74c63..6ad3d0a7dc 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + // Mulebot - carries crates around for Quartermaster // Navigates via floor navbeacons // Remote Controlled from QM's PDA @@ -52,17 +54,16 @@ // the installed power cell // constants for internal wiring bitflags - var/const - wire_power1 = 1 // power connections - wire_power2 = 2 - wire_mobavoid = 4 // mob avoidance - wire_loadcheck = 8 // load checking (non-crate) - wire_motor1 = 16 // motor wires - wire_motor2 = 32 // - wire_remote_rx = 64 // remote recv functions - wire_remote_tx = 128 // remote trans status - wire_beacon_rx = 256 // beacon ping recv - wire_beacon_tx = 512 // beacon ping trans + var/const/wire_power1 = 1 // power connections + var/const/wire_power2 = 2 + var/const/wire_mobavoid = 4 // mob avoidance + var/const/wire_loadcheck = 8 // load checking (non-crate) + var/const/wire_motor1 = 16 // motor wires + var/const/wire_motor2 = 32 // + var/const/wire_remote_rx = 64 // remote recv functions + var/const/wire_remote_tx = 128 // remote trans status + var/const/wire_beacon_rx = 256 // beacon ping recv + var/const/wire_beacon_tx = 512 // beacon ping trans var/wires = 1023 // all flags on diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 4b5095d19a..4da98f3c46 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/cell_charger name = "cell charger" @@ -9,9 +11,8 @@ idle_power_usage = 5 active_power_usage = 60 power_channel = EQUIP - var - obj/item/weapon/cell/charging = null - chargelevel = -1 + var/obj/item/weapon/cell/charging = null + var/chargelevel = -1 proc updateicon() icon_state = "ccharger[charging ? 1 : 0]" diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 213ff56546..b8cc1c70a3 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/computer/operating name = "Operating Computer" density = 1 @@ -5,9 +7,8 @@ desc = "Used to monitor status of people being operated on." icon_state = "operating" circuit = "/obj/item/weapon/circuitboard/operating" - var - mob/living/carbon/human/victim = null - obj/machinery/optable/table = null + var/mob/living/carbon/human/victim = null + var/obj/machinery/optable/table = null /obj/machinery/computer/operating/New() ..() @@ -93,4 +94,4 @@ if(!(stat & (NOPOWER|BROKEN)) ) use_power(500) - src.updateDialog() \ No newline at end of file + src.updateDialog() diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 659f98b939..c12b4957bd 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -1,13 +1,14 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/computer/atmos_alert name = "Atmospheric Alert Computer" desc = "Used to access the station's atmospheric sensors." icon_state = "alert:0" - var - list/priority_alarms = list() - list/minor_alarms = list() - receive_frequency = 1437 - datum/radio_frequency/radio_connection + var/list/priority_alarms = list() + var/list/minor_alarms = list() + var/receive_frequency = 1437 + var/datum/radio_frequency/radio_connection initialize() @@ -102,4 +103,4 @@ if(ckey(zone) == removing_zone) minor_alarms -= zone update_icon() - return \ No newline at end of file + return diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 826eb0eb2c..33247d02f2 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/structure/computerframe density = 1 anchored = 0 @@ -17,16 +19,15 @@ icon_state = "id_mod" item_state = "electronic" origin_tech = "programming=2" - var - id = null - frequency = null - build_path = null - board_type = "computer" - list/req_components = null - powernet = null - list/records = null - frame_desc = null - contain_parts = 1 + var/id = null + var/frequency = null + var/build_path = null + var/board_type = "computer" + var/list/req_components = null + var/powernet = null + var/list/records = null + var/frame_desc = null + var/contain_parts = 1 /obj/item/weapon/circuitboard/aicore name = "Circuit board (AI core)" diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 9e79a702fc..bb55e8f65f 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -1,15 +1,16 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/computer/card name = "Identification Computer" desc = "A computer used to modify ID cards." icon_state = "id" req_access = list(access_change_ids) circuit = "/obj/item/weapon/circuitboard/card" - var - obj/item/weapon/card/id/scan = null - obj/item/weapon/card/id/modify = null - authenticated = 0.0 - mode = 0.0 - printing = null + var/obj/item/weapon/card/id/scan = null + var/obj/item/weapon/card/id/modify = null + var/authenticated = 0.0 + var/mode = 0.0 + var/printing = null /obj/machinery/computer/card/attackby(O as obj, user as mob)//TODO:SANITY diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 84c936a426..322d548e7e 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + // The communications computer /obj/machinery/computer/communications name = "Communications Console" @@ -16,17 +18,16 @@ var/message_cooldown = 0 var/centcomm_message_cooldown = 0 var/tmp_alertlevel = 0 - var/const - STATE_DEFAULT = 1 - STATE_CALLSHUTTLE = 2 - STATE_CANCELSHUTTLE = 3 - STATE_MESSAGELIST = 4 - STATE_VIEWMESSAGE = 5 - STATE_DELMESSAGE = 6 - STATE_STATUSDISPLAY = 7 - STATE_ALERT_LEVEL = 8 - STATE_CONFIRM_LEVEL = 9 - STATE_CREWTRANSFER = 10 + var/const/STATE_DEFAULT = 1 + var/const/STATE_CALLSHUTTLE = 2 + var/const/STATE_CANCELSHUTTLE = 3 + var/const/STATE_MESSAGELIST = 4 + var/const/STATE_VIEWMESSAGE = 5 + var/const/STATE_DELMESSAGE = 6 + var/const/STATE_STATUSDISPLAY = 7 + var/const/STATE_ALERT_LEVEL = 8 + var/const/STATE_CONFIRM_LEVEL = 9 + var/const/STATE_CREWTRANSFER = 10 var/status_display_freq = "1435" var/stat_msg1 @@ -612,4 +613,4 @@ captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") world << sound('shuttlecalled.ogg') - ..() \ No newline at end of file + ..() diff --git a/code/game/machinery/computer/hologram.dm b/code/game/machinery/computer/hologram.dm index 278a0704ff..52866919b0 100644 --- a/code/game/machinery/computer/hologram.dm +++ b/code/game/machinery/computer/hologram.dm @@ -1,15 +1,16 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/computer/hologram_comp name = "Hologram Computer" desc = "Rumoured to control holograms." icon = 'stationobjs.dmi' icon_state = "holo_console0" - var - obj/machinery/hologram/projector/projector = null - temp = null - lumens = 0.0 - h_r = 245.0 - h_g = 245.0 - h_b = 245.0 + var/obj/machinery/hologram/projector/projector = null + var/temp = null + var/lumens = 0.0 + var/h_r = 245.0 + var/h_g = 245.0 + var/h_b = 245.0 /obj/machinery/computer/hologram_comp/New() @@ -105,4 +106,4 @@ for(var/mob/M in viewers(1, src)) if ((M.client && M.machine == src)) src.show_console(M) - return \ No newline at end of file + return diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 7f55918b62..14b1e5b4e8 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -1,11 +1,12 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/computer/aiupload name = "AI Upload" desc = "Used to upload laws to the AI." icon_state = "command" circuit = "/obj/item/weapon/circuitboard/aiupload" - var - mob/living/silicon/ai/current = null - opened = 0 + var/mob/living/silicon/ai/current = null + var/opened = 0 verb/AccessInternals() @@ -188,4 +189,4 @@ for(var/obj/item/weapon/aiModule/M in src) M.loc = src.loc M.ex_act(severity) - del(src) \ No newline at end of file + del(src) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index b25043f1f8..6c16a433ce 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -1,22 +1,23 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/computer/med_data//TODO:SANITY name = "Medical Records" desc = "This can be used to check medical records." icon_state = "medcomp" req_access = list(access_medical) circuit = "/obj/item/weapon/circuitboard/med_data" - var - obj/item/weapon/card/id/scan = null - obj/item/weapon/disk/records/disk = null - authenticated = null - rank = null - screen = null - datum/data/record/active1 = null - datum/data/record/active2 = null - a_id = null - temp = null - printing = null - list/Perp - tempname = null + var/obj/item/weapon/card/id/scan = null + var/obj/item/weapon/disk/records/disk = null + var/authenticated = null + var/rank = null + var/screen = null + var/datum/data/record/active1 = null + var/datum/data/record/active2 = null + var/a_id = null + var/temp = null + var/printing = null + var/list/Perp + var/tempname = null /obj/machinery/computer/med_data/attackby(obj/item/O as obj, user as mob) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 51f00e6115..8deb695af0 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -1,12 +1,13 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/computer/pod name = "Pod Launch Control" desc = "A control for launching pods." icon_state = "computer_generic" - var - id = 1.0 - obj/machinery/mass_driver/connected = null - timing = 0.0 - time = 30.0 + var/id = 1.0 + var/obj/machinery/mass_driver/connected = null + var/timing = 0.0 + var/time = 30.0 /obj/machinery/computer/pod/New() diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 61e2679626..f478d8656e 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -1,16 +1,17 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/computer/prisoner name = "Prisoner Management" icon = 'computer.dmi' icon_state = "explosive" req_access = list(access_armory) circuit = "/obj/item/weapon/circuitboard/prisoner" - var - id = 0.0 - temp = null - status = 0 - timeleft = 60 - stop = 0.0 - screen = 0 // 0 - No Access Denied, 1 - Access allowed + var/id = 0.0 + var/temp = null + var/status = 0 + var/timeleft = 60 + var/stop = 0.0 + var/screen = 0 // 0 - No Access Denied, 1 - Access allowed attack_ai(var/mob/user as mob) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 567d4e23b2..ac42241001 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/computer/robotics name = "Robotics Control" @@ -7,13 +9,12 @@ req_access = list(access_robotics) circuit = "/obj/item/weapon/circuitboard/robotics" - var - id = 0.0 - temp = null - status = 0 - timeleft = 60 - stop = 0.0 - screen = 0 // 0 - Main Menu, 1 - Cyborg Status, 2 - Kill 'em All! -- In text + var/id = 0.0 + var/temp = null + var/status = 0 + var/timeleft = 60 + var/stop = 0.0 + var/screen = 0 // 0 - Main Menu, 1 - Cyborg Status, 2 - Kill 'em All! -- In text /obj/machinery/computer/robotics/attack_ai(var/mob/user as mob) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 2a657a0abc..aee7d03009 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -1,23 +1,24 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/computer/secure_data name = "Security Records" desc = "Used to view and edit personnel's security records" icon_state = "security" req_access = list(access_security) circuit = "/obj/item/weapon/circuitboard/secure_data" - var - obj/item/weapon/card/id/scan = null - obj/item/weapon/disk/records/disk = null - authenticated = null - rank = null - screen = null - datum/data/record/active1 = null - datum/data/record/active2 = null - a_id = null - temp = null - printing = null - can_change_id = 0 - list/Perp - tempname = null + var/obj/item/weapon/card/id/scan = null + var/obj/item/weapon/disk/records/disk = null + var/authenticated = null + var/rank = null + var/screen = null + var/datum/data/record/active1 = null + var/datum/data/record/active2 = null + var/a_id = null + var/temp = null + var/printing = null + var/can_change_id = 0 + var/list/Perp + var/tempname = null /obj/machinery/computer/secure_data/attackby(obj/item/O as obj, user as mob) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index a6db2f9fc9..5c22accd98 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/constructable_frame //Made into a seperate type to make future revisions easier. name = "machine frame" icon = 'stock_parts.dmi' @@ -5,12 +7,11 @@ density = 1 anchored = 1 use_power = 0 - var - obj/item/weapon/circuitboard/circuit = null - list/components = null - list/req_components = null - list/req_component_names = null - state = 1 + var/obj/item/weapon/circuitboard/circuit = null + var/list/components = null + var/list/req_components = null + var/list/req_component_names = null + var/state = 1 proc/update_desc() var/D diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 6e169231e6..34379e9a6a 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/item/weapon/airlock_electronics name = "Airlock Electronics" icon = 'door_assembly.dmi' @@ -8,12 +10,11 @@ req_access = list(access_engine) - var - list/conf_access = null - last_configurator = null - locked = 1 - style_name = "General" - style = /obj/structure/door_assembly/door_assembly_0 + var/list/conf_access = null + var/last_configurator = null + var/locked = 1 + var/style_name = "General" + var/style = /obj/structure/door_assembly/door_assembly_0 attack_self(mob/user as mob) if (!ishuman(user)) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 742934ef4c..0f24573596 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /////////////////////////////////////////////////////////////////////////////////////////////// // Brig Door control displays. // Description: This is a controls the timer for the brig doors, displays the timer on itself and @@ -14,12 +16,11 @@ req_access = list(access_brig) anchored = 1.0 // can't pick it up density = 0 // can walk through it. - var - id = null // id of door it controls. - releasetime = 0 // when world.time reaches it - release the prisoneer - timing = 1 // boolean, true/1 timer is on, false/0 means it's not timing - picture_state // icon_state of alert picture, if not displaying text/numbers - list/obj/machinery/targets = list() + var/id = null // id of door it controls. + var/releasetime = 0 // when world.time reaches it - release the prisoneer + var/timing = 1 // boolean, true/1 timer is on, false/0 means it's not timing + var/picture_state // icon_state of alert picture, if not displaying text/numbers + var/list/obj/machinery/targets = list() New() @@ -293,4 +294,4 @@ name = "Cell 6" id = "Cell 6" dir = 4 - pixel_x = 32 \ No newline at end of file + pixel_x = 32 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index aa51784a61..d69782a62f 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/door name = "Door" desc = "It opens and closes." @@ -8,15 +10,14 @@ density = 1 layer = 2.7 - var - secondsElectrified = 0 - visible = 1 - p_open = 0 - operating = 0 - autoclose = 0 - glass = 0 - forcecrush = 0 - holdopen = 0 + var/secondsElectrified = 0 + var/visible = 1 + var/p_open = 0 + var/operating = 0 + var/autoclose = 0 + var/glass = 0 + var/forcecrush = 0 + var/holdopen = 0 proc/bumpopen(mob/user as mob) proc/update_nearby_tiles(need_rebuild) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index dba8093868..247f445295 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + obj/machinery/recharger anchored = 1 icon = 'stationobjs.dmi' @@ -7,9 +9,8 @@ obj/machinery/recharger idle_power_usage = 4 active_power_usage = 250 - var - obj/item/weapon/gun/energy/charging = null - obj/item/weapon/melee/baton/charging2 = null + var/obj/item/weapon/gun/energy/charging = null + var/obj/item/weapon/melee/baton/charging2 = null attackby(obj/item/weapon/G as obj, mob/user as mob) if(issilicon(user)) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 44a4f05623..0031f7cc06 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + // Beacon randomly spawns in space // When a non-traitor (no special role in /mind) uses it, he is given the choice to become a traitor // If he accepts there is a random chance he will be accepted, rejected, or rejected and killed @@ -13,10 +15,9 @@ anchored = 1 density = 1 - var - temptext = "" - selfdestructing = 0 - charges = 1 + var/temptext = "" + var/selfdestructing = 0 + var/charges = 1 attack_hand(var/mob/user as mob) usr.machine = src @@ -113,10 +114,9 @@ layer = MOB_LAYER - 0.1 //so people can't hide it and it's REALLY OBVIOUS stat = 0 - var - active = 0 //It doesn't use up power, so use_power wouldn't really suit it - icontype = "beacon" - obj/structure/cable/attached = null + var/active = 0 //It doesn't use up power, so use_power wouldn't really suit it + var/icontype = "beacon" + var/obj/structure/cable/attached = null proc/Activate(mob/user = null) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index f8d209f6f5..6f42f783f4 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /* The broadcaster sends processed messages to all radio devices in the game. They do not have to be headsets; intercoms and station-bounced radios suffice. @@ -5,8 +7,7 @@ They receive their message from a server after the message has been logged. */ -var - list/recentmessages = list() // global list of recent messages broadcasted : used to circumvent massive radio spam +var/list/recentmessages = list() // global list of recent messages broadcasted : used to circumvent massive radio spam /obj/machinery/telecomms/broadcaster diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 9e4bf23ab9..33edca2cce 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -1,16 +1,17 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /obj/machinery/computer/telecomms/server name = "Telecommunications Server Monitor" icon_state = "comm_logs" - var - screen = 0 // the screen number: - list/servers = list() // the servers located by the computer - var/obj/machinery/telecomms/server/SelectedServer + var/screen = 0 // the screen number: + var/list/servers = list() // the servers located by the computer + var/var/obj/machinery/telecomms/server/SelectedServer - network = "NULL" // the network to probe - temp = "" // temporary feedback messages + var/network = "NULL" // the network to probe + var/temp = "" // temporary feedback messages - universal_translate = 0 // set to 1 if it can translate nonhuman speech + var/universal_translate = 0 // set to 1 if it can translate nonhuman speech req_access = list(access_tcomsat) @@ -241,4 +242,4 @@ emagged = 1 user << "\blue You you disable the security protocols" src.updateUsrDialog() - return \ No newline at end of file + return diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index f715af521e..cc9a551018 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /* @@ -6,9 +8,8 @@ */ /obj/machinery/telecomms - var - temp = "" // output message - construct_op = 0 + var/temp = "" // output message + var/construct_op = 0 diff --git a/code/game/machinery/telecomms/telecommunications.dm b/code/game/machinery/telecomms/telecommunications.dm index 3881a10b6b..7bed7ae278 100644 --- a/code/game/machinery/telecomms/telecommunications.dm +++ b/code/game/machinery/telecomms/telecommunications.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /* Hello, friends, this is Doohl from sexylands. You may be wondering what this monstrous code file is. Sit down, boys and girls, while I tell you the tale. @@ -12,24 +14,23 @@ */ /obj/machinery/telecomms - var - list/links = list() // list of machines this machine is linked to - traffic = 0 // value increases as traffic increases - netspeed = 5 // how much traffic to lose per tick (50 gigabytes/second * netspeed) - list/autolinkers = list() // list of text/number values to link with - id = "NULL" // identification string - network = "NULL" // the network of the machinery + var/list/links = list() // list of machines this machine is linked to + var/traffic = 0 // value increases as traffic increases + var/netspeed = 5 // how much traffic to lose per tick (50 gigabytes/second * netspeed) + var/list/autolinkers = list() // list of text/number values to link with + var/id = "NULL" // identification string + var/network = "NULL" // the network of the machinery - list/freq_listening = list() // list of frequencies to tune into: if none, will listen to all + var/list/freq_listening = list() // list of frequencies to tune into: if none, will listen to all - machinetype = 0 // just a hacky way of preventing alike machines from pairing - on = 1 - integrity = 100 // basically HP, loses integrity by heat - heatgen = 20 // how much heat to transfer to the environment - delay = 10 // how many process() ticks to delay per heat - heating_power = 40000 + var/machinetype = 0 // just a hacky way of preventing alike machines from pairing + var/on = 1 + var/integrity = 100 // basically HP, loses integrity by heat + var/heatgen = 20 // how much heat to transfer to the environment + var/delay = 10 // how many process() ticks to delay per heat + var/heating_power = 40000 - circuitboard = null // string pointing to a circuitboard type + var/circuitboard = null // string pointing to a circuitboard type @@ -360,22 +361,21 @@ machinetype = 4 heatgen = 50 circuitboard = "/obj/item/weapon/circuitboard/telecomms/server" - var - list/log_entries = list() - list/stored_names = list() - list/TrafficActions = list() - logs = 0 // number of logs - totaltraffic = 0 // gigabytes (if > 1024, divide by 1024 -> terrabytes) + var/list/log_entries = list() + var/list/stored_names = list() + var/list/TrafficActions = list() + var/logs = 0 // number of logs + var/totaltraffic = 0 // gigabytes (if > 1024, divide by 1024 -> terrabytes) - list/memory = list() // stored memory - rawcode = "" // the code to compile (raw text) - datum/TCS_Compiler/Compiler // the compiler that compiles and runs the code - autoruncode = 0 // 1 if the code is set to run every time a signal is picked up + var/list/memory = list() // stored memory + var/rawcode = "" // the code to compile (raw text) + var/datum/TCS_Compiler/Compiler // the compiler that compiles and runs the code + var/autoruncode = 0 // 1 if the code is set to run every time a signal is picked up - encryption = "null" // encryption key: ie "password" - salt = "null" // encryption salt: ie "123comsat" + var/encryption = "null" // encryption key: ie "password" + var/salt = "null" // encryption salt: ie "123comsat" // would add up to md5("password123comsat") - language = "human" + var/language = "human" receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index b777f24a70..210c45e6ab 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /* Telecomms monitor tracks the overall trafficing of a telecommunications network @@ -9,14 +11,13 @@ name = "Telecommunications Monitor" icon_state = "comm_monitor" - var - screen = 0 // the screen number: - list/machines = list() // the machines located by the computer - var/obj/machinery/telecomms/SelectedMachine + var/screen = 0 // the screen number: + var/list/machines = list() // the machines located by the computer + var/var/obj/machinery/telecomms/SelectedMachine - network = "NULL" // the network to probe + var/network = "NULL" // the network to probe - temp = "" // temporary feedback messages + var/temp = "" // temporary feedback messages attack_hand(mob/user as mob) if(stat & (BROKEN|NOPOWER)) @@ -153,4 +154,4 @@ emagged = 1 user << "\blue You you disable the security protocols" src.updateUsrDialog() - return \ No newline at end of file + return diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 0831fb00c6..0f45a2f43c 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + @@ -6,18 +8,17 @@ name = "Telecommunications Traffic Control" icon_state = "computer_generic" - var - screen = 0 // the screen number: - list/servers = list() // the servers located by the computer - mob/editingcode - mob/lasteditor - list/viewingcode = list() - obj/machinery/telecomms/server/SelectedServer + var/screen = 0 // the screen number: + var/list/servers = list() // the servers located by the computer + var/mob/editingcode + var/mob/lasteditor + var/list/viewingcode = list() + var/obj/machinery/telecomms/server/SelectedServer - network = "NULL" // the network to probe - temp = "" // temporary feedback messages + var/network = "NULL" // the network to probe + var/temp = "" // temporary feedback messages - storedcode = "" // code stored + var/storedcode = "" // code stored proc/update_ide() @@ -237,4 +238,4 @@ emagged = 1 user << "\blue You you disable the security protocols" src.updateUsrDialog() - return \ No newline at end of file + return diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index f696f28e9f..ab776706a8 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + /* Important notice: I changed "vendingwindow" to "vendingwindow_n" (n for new) because I extended the window's height a small amount and, for some reason, BYOND saves the @@ -10,11 +12,10 @@ To combat this, I changed the window name. -- Doohl #define PRODUCTS_PER_PAGE 15 // # of products per page /obj/machinery/vending - var/const - WIRE_EXTEND = 1 - WIRE_SCANID = 2 - WIRE_SHOCK = 3 - WIRE_SHOOTINV = 4 + var/const/WIRE_EXTEND = 1 + var/const/WIRE_SCANID = 2 + var/const/WIRE_SHOCK = 3 + var/const/WIRE_SHOOTINV = 4 var/page var/builtpaths = 0 var/lastpaths diff --git a/code/game/magic/archived_book.dm b/code/game/magic/archived_book.dm index d8452caa83..2fc9412fcd 100644 --- a/code/game/magic/archived_book.dm +++ b/code/game/magic/archived_book.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04 + #define BOOK_VERSION_MIN 1 #define BOOK_VERSION_MAX 2 #define BOOK_PATH "data/books/" @@ -61,16 +63,15 @@ datum/book_manager/proc/remove(var/id) fdel(path(id)) datum/archived_book - var - author // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned - title // The real name of the book. - category // The category/genre of the book - id // the id of the book (like an isbn number) - dat // Actual page content + var/author // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned + var/title // The real name of the book. + var/category // The category/genre of the book + var/id // the id of the book (like an isbn number) + var/dat // Actual page content - author_real // author's real_name - author_key // author's byond key - list/icon/photos // in-game photos used + var/author_real // author's real_name + var/author_key // author's byond key + var/list/icon/photos // in-game photos used // loads the book corresponding by the specified id datum/archived_book/New(var/path) diff --git a/code/game/magic/cultist/ritual.dm b/code/game/magic/cultist/ritual.dm index 6c1304a225..9430019626 100644 --- a/code/game/magic/cultist/ritual.dm +++ b/code/game/magic/cultist/ritual.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + var/use_uristrunes = 1 @@ -64,10 +66,9 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", layer = TURF_LAYER - var - word1 - word2 - word3 + var/word1 + var/word2 + var/word3 // Places these combos are mentioned: this file - twice in the rune code, once in imbued tome, once in tome's HTML runes.dm - in the imbue rune code. If you change a combination - dont forget to change it everywhere. // travel self [word] - Teleport to random [rune with word destination matching] @@ -781,8 +782,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", w_class = 1.0 flags = FPRINT | TABLEPASS - var - data + var/data attack_self(mob/user as mob) view_scrap(user) diff --git a/code/game/magic/library.dm b/code/game/magic/library.dm index 6fc25a3fde..ad51227c5a 100644 --- a/code/game/magic/library.dm +++ b/code/game/magic/library.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + //******************************* // // Library SQL Configuration @@ -211,20 +213,19 @@ throw_range = 5 w_class = 1.0 flags = FPRINT | TABLEPASS - var - dat // Actual page content - due_date = 0 // Game time in 1/10th seconds - author // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned - unique = 0 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified - title // The real name of the book. + var/dat // Actual page content + var/due_date = 0 // Game time in 1/10th seconds + var/author // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned + var/unique = 0 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified + var/title // The real name of the book. - author_real // author's real_name - author_key // author's byond key - ssbn // the ssbn, if a downloaded book + var/author_real // author's real_name + var/author_key // author's byond key + var/ssbn // the ssbn, if a downloaded book - list/pages = new() // individual pages as a list of text - cur_page = 1 // current page being read - list/icon/photos // in-game photos used + var/list/pages = new() // individual pages as a list of text + var/cur_page = 1 // current page being read + var/list/icon/photos // in-game photos used proc/navbar() return "
" \ @@ -414,10 +415,9 @@ throw_range = 5 w_class = 1.0 flags = FPRINT | TABLEPASS - var - obj/machinery/librarycomp/computer // Associated computer - Modes 1 to 3 use this - obj/item/weapon/book/book // Currently scanned book - mode = 0 // 0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory + var/obj/machinery/librarycomp/computer // Associated computer - Modes 1 to 3 use this + var/obj/item/weapon/book/book // Currently scanned book + var/mode = 0 // 0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory attack_self(mob/user as mob) mode += 1 @@ -453,11 +453,10 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and for how long. - var - bookname - mobname - getdate - duedate + var/bookname + var/mobname + var/getdate + var/duedate @@ -472,12 +471,11 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f icon_state = "computer" anchored = 1 density = 1 - var - screenstate = 0 - title - category = "Any" - author - SQLquery + var/screenstate = 0 + var/title + var/category = "Any" + var/author + var/SQLquery /obj/machinery/librarypubliccomp/attack_hand(var/mob/user as mob) @@ -580,18 +578,17 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f icon_state = "computer" anchored = 1 density = 1 - var - arcanecheckout = 0 - screenstate = 0 // 0 - Main Menu, 1 - Inventory, 2 - Checked Out, 3 - Check Out a Book - buffer_book - buffer_mob - upload_category = "Fiction" - list/checkouts = list() - list/inventory = list() - checkoutperiod = 5 // In minutes - obj/machinery/libraryscanner/scanner // Book scanner that will be used when uploading books to the Archive + var/arcanecheckout = 0 + var/screenstate = 0 // 0 - Main Menu, 1 - Inventory, 2 - Checked Out, 3 - Check Out a Book + var/buffer_book + var/buffer_mob + var/upload_category = "Fiction" + var/list/checkouts = list() + var/list/inventory = list() + var/checkoutperiod = 5 // In minutes + var/obj/machinery/libraryscanner/scanner // Book scanner that will be used when uploading books to the Archive - bibledelay = 0 // LOL NO SPAM (1 minute delay) -- Doohl + var/bibledelay = 0 // LOL NO SPAM (1 minute delay) -- Doohl /obj/machinery/librarycomp/attack_hand(var/mob/user as mob) usr.machine = src @@ -936,8 +933,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f icon_state = "bigscanner" anchored = 1 density = 1 - var - obj/item/weapon/book/cache // Last scanned book + var/obj/item/weapon/book/cache // Last scanned book diff --git a/code/game/magic/musician.dm b/code/game/magic/musician.dm index c46f746475..60003e6b41 100644 --- a/code/game/magic/musician.dm +++ b/code/game/magic/musician.dm @@ -1,8 +1,9 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /datum/song - var - name = "Untitled" - list/lines = new() - tempo = 5 + var/name = "Untitled" + var/list/lines = new() + var/tempo = 5 /obj/structure/device/piano name = "space minimoog" @@ -10,11 +11,10 @@ icon_state = "minimoog" anchored = 1 density = 1 - var - datum/song/song - playing = 0 - help = 0 - edit = 1 + var/datum/song/song + var/playing = 0 + var/help = 0 + var/edit = 1 proc playnote(var/note as text) diff --git a/code/game/objects/alien/facehugger.dm b/code/game/objects/alien/facehugger.dm index 1d8dac0c22..6fa55c6ad2 100644 --- a/code/game/objects/alien/facehugger.dm +++ b/code/game/objects/alien/facehugger.dm @@ -1,9 +1,10 @@ -var/const - MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone - MAX_IMPREGNATION_TIME = 150 +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 - MIN_ACTIVE_TIME = 300 //time between being dropped and going idle - MAX_ACTIVE_TIME = 600 +var/const/MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone +var/const/MAX_IMPREGNATION_TIME = 150 + +var/const/MIN_ACTIVE_TIME = 300 //time between being dropped and going idle +var/const/MAX_ACTIVE_TIME = 600 /obj/item/clothing/mask/facehugger name = "alien" @@ -267,4 +268,4 @@ var/const ..(M) processing_objects.Remove(src) -*/ \ No newline at end of file +*/ diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm index 66b6f327f2..3f3ce72861 100644 --- a/code/game/objects/devices/flashlight.dm +++ b/code/game/objects/devices/flashlight.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/device/flashlight name = "flashlight" desc = "A hand-held emergency light." @@ -7,11 +9,10 @@ flags = FPRINT | ONBELT | TABLEPASS | CONDUCT m_amt = 50 g_amt = 20 - var - on = 0 - brightness_on = 4 //luminosity when on - icon_on = "flight1" - icon_off = "flight0" + var/on = 0 + var/brightness_on = 4 //luminosity when on + var/icon_on = "flight1" + var/icon_off = "flight0" /obj/item/device/flashlight/initialize() ..() @@ -196,4 +197,4 @@ set src in oview(1) if(!usr.stat) - attack_self(usr) \ No newline at end of file + attack_self(usr) diff --git a/code/game/objects/grille.dm b/code/game/objects/grille.dm index b584f5ec99..065977e07e 100644 --- a/code/game/objects/grille.dm +++ b/code/game/objects/grille.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/structure/grille desc = "A piece of metal with evenly spaced gridlike holes in it. Blocks large object but lets small items, gas, or energy beams through. Strangely enough these grilles also lets meteors pass through them, whether they be small or huge station breaking death stones." name = "grille" @@ -8,9 +10,8 @@ flags = FPRINT | CONDUCT pressure_resistance = 5*ONE_ATMOSPHERE layer = 2.9 - var - health = 10 - destroyed = 0 + var/health = 10 + var/destroyed = 0 proc healthcheck() shock(mob/user, prb) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 33a1c461ea..5cda2c423e 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + #define CANDLE_LUM 3 /obj/item/candle @@ -7,9 +9,8 @@ icon_state = "candle1" item_state = "candle1" - var - wax = 200 - lit = 0 + var/wax = 200 + var/lit = 0 proc light(var/flavor_text = "\red [usr] lights the [name].") diff --git a/code/game/objects/items/robot_items.dm b/code/game/objects/items/robot_items.dm index 30e18dc177..a57bc2ed88 100644 --- a/code/game/objects/items/robot_items.dm +++ b/code/game/objects/items/robot_items.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /********************************************************************** Cyborg Spec Items ***********************************************************************/ @@ -90,8 +92,7 @@ possible_transfer_amounts = list(5,10,15,25,30,50,100) flags = FPRINT | TABLEPASS | OPENCONTAINER volume = 60 - var - reagent = "" + var/reagent = "" /obj/item/weapon/reagent_containers/glass/bottle/robot/inaprovaline @@ -221,11 +222,10 @@ flags = FPRINT | TABLEPASS| CONDUCT force = 5.0 w_class = 3.0 - var // datum/effect/effect/system/spark_spread/spark_system - working = 0 - mode = 1 - disabled = 0 + var/working = 0 + var/mode = 1 + var/disabled = 0 /* New() diff --git a/code/game/objects/items/tk_grab.dm b/code/game/objects/items/tk_grab.dm index a506cf4308..790d5ff54a 100644 --- a/code/game/objects/items/tk_grab.dm +++ b/code/game/objects/items/tk_grab.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/tk_grab name = "Telekinetic Grab" desc = "Magic" @@ -8,10 +10,9 @@ w_class = 10.0 layer = 20 - var - last_throw = 0 - obj/focus = null - mob/living/host = null + var/last_throw = 0 + var/obj/focus = null + var/mob/living/host = null dropped(mob/user as mob) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 25f32a3934..db9f1206a3 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /* CONTAINS: RCD @@ -18,13 +20,12 @@ RCD w_class = 3.0 m_amt = 50000 origin_tech = "engineering=4;materials=2" - var - datum/effect/effect/system/spark_spread/spark_system - matter = 0 - working = 0 - mode = 1 - disabled = 0 - max_matter = 30 + var/datum/effect/effect/system/spark_spread/spark_system + var/matter = 0 + var/working = 0 + var/mode = 1 + var/disabled = 0 + var/max_matter = 30 New() diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 7e0c05a176..899853e205 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /* CONTAINS: MATCHES @@ -113,14 +115,13 @@ ZIPPO item_state = "cigoff" w_class = 1 body_parts_covered = null - var - lit = 0 - icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi - icon_off = "cigoff" - icon_butt = "cigbutt" - lastHolder = null - smoketime = 300 - butt_count = 5 //count of butt sprite variations + var/lit = 0 + var/icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi + var/icon_off = "cigoff" + var/icon_butt = "cigbutt" + var/lastHolder = null + var/smoketime = 300 + var/butt_count = 5 //count of butt sprite variations proc light(var/flavor_text = "[usr] lights the [name].") @@ -244,13 +245,12 @@ ZIPPO item_state = "cobpipeoff" w_class = 1 body_parts_covered = null - var - lit = 0 - icon_on = "cobpipeon" //Note - these are in masks.dmi - icon_off = "cobpipeoff" - lastHolder = null - smoketime = 100 - maxsmoketime = 100 //make sure this is equal to your smoketime + var/lit = 0 + var/icon_on = "cobpipeon" //Note - these are in masks.dmi + var/icon_off = "cobpipeoff" + var/lastHolder = null + var/smoketime = 100 + var/maxsmoketime = 100 //make sure this is equal to your smoketime proc light(var/flavor_text = "[usr] lights the [name].") @@ -338,8 +338,7 @@ ZIPPO w_class = 1 throwforce = 2 flags = ONBELT | TABLEPASS - var - cigcount = 6 + var/cigcount = 6 update_icon() @@ -472,4 +471,4 @@ ZIPPO if(lit) user.total_luminosity -= 2 src.sd_SetLuminosity(2) - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index f976d3ee99..a20c6a20c7 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/flamethrower/full/New(var/loc) ..() weldtool = new/obj/item/weapon/weldingtool(src) @@ -24,15 +26,14 @@ w_class = 3.0 m_amt = 500 origin_tech = "combat=1;plasmatech=1" - var - status = 0 - throw_amount = 100 - lit = 0 //on or off - operating = 0//cooldown - turf/previousturf = null - obj/item/weapon/weldingtool/weldtool = null - obj/item/device/assembly/igniter/igniter = null - obj/item/weapon/tank/plasma/ptank = null + var/status = 0 + var/throw_amount = 100 + var/lit = 0 //on or off + var/operating = 0//cooldown + var/turf/previousturf = null + var/obj/item/weapon/weldingtool/weldtool = null + var/obj/item/device/assembly/igniter/igniter = null + var/obj/item/weapon/tank/plasma/ptank = null Del() @@ -245,4 +246,4 @@ //target.hotspot_expose(part4.air_contents.temperature*2,300) target.hotspot_expose((ptank.air_contents.temperature*2) + 380,500) // -- More of my "how do I shot fire?" dickery. -- TLE //location.hotspot_expose(1000,500,1) - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/grenades.dm b/code/game/objects/items/weapons/grenades.dm index 96e5480a8b..0782d2206e 100644 --- a/code/game/objects/items/weapons/grenades.dm +++ b/code/game/objects/items/weapons/grenades.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /* CONTAINS: EMP GRENADE @@ -16,9 +18,8 @@ FLASHBANG throw_range = 20 flags = FPRINT | TABLEPASS | CONDUCT | ONBELT origin_tech = "materials=2;magnets=3" - var - active = 0 - det_time = 50 + var/active = 0 + var/det_time = 50 proc prime() clown_check(var/mob/living/user) @@ -90,10 +91,9 @@ FLASHBANG throw_range = 20 flags = FPRINT | TABLEPASS | CONDUCT | ONBELT origin_tech = "materials=2;combat=1" - var - active = 0 - det_time = 30 - banglet = 0 + var/active = 0 + var/det_time = 30 + var/banglet = 0 proc bang(var/turf/T , var/mob/living/carbon/M) prime() diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 6c0fd9a6bc..6e404c1a65 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -1,13 +1,14 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/implant name = "implant" desc = "An implant. Not usually seen outside a body." icon = 'items.dmi' icon_state = "implant" - var - implanted = null - mob/imp_in = null - color = "b" - allow_reagents = 0 + var/implanted = null + var/mob/imp_in = null + var/color = "b" + var/allow_reagents = 0 proc trigger(emote, source as mob) activate() @@ -48,9 +49,8 @@ /obj/item/weapon/implant/uplink name = "uplink implant" desc = "A micro-telecrystal implant which allows for instant transportation of equipment." - var - activation_emote = "chuckle" - obj/item/device/uplink/radio/uplink = null + var/activation_emote = "chuckle" + var/obj/item/device/uplink/radio/uplink = null New() @@ -77,8 +77,7 @@ /obj/item/weapon/implant/tracking name = "tracking implant" desc = "An implant which relays information to the appropriate tracking computer." - var - id = 1.0 + var/id = 1.0 get_data() @@ -450,4 +449,4 @@ the implant may become unstable and either pre-maturely inject the subject or si usr << "You suddenly start seeing body temperatures of whoever is around you." else usr << "This implant is not compatible!" - return*/ \ No newline at end of file + return*/ diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 1c792e6fe7..9593966346 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/implantcase name = "Glass Case" desc = "A case containing an implant." @@ -6,8 +8,7 @@ throw_speed = 1 throw_range = 5 w_class = 1.0 - var - obj/item/weapon/implant/imp = null + var/obj/item/weapon/implant/imp = null proc update() @@ -125,4 +126,4 @@ New() src.imp = new /obj/item/weapon/implant/death_alarm( src ) ..() - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index f73af2ad2b..4f49e2ca49 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/machinery/implantchair name = "Loyalty Implanter" desc = "Used to implant occupants with loyalty implants." @@ -7,16 +9,15 @@ opacity = 0 anchored = 1 - var - ready = 1 - malfunction = 0 - list/obj/item/weapon/implant/loyalty/implant_list = list() - max_implants = 5 - injection_cooldown = 600 - replenish_cooldown = 6000 - replenishing = 0 - mob/living/carbon/occupant = null - injecting = 0 + var/ready = 1 + var/malfunction = 0 + var/list/obj/item/weapon/implant/loyalty/implant_list = list() + var/max_implants = 5 + var/injection_cooldown = 600 + var/replenish_cooldown = 6000 + var/replenishing = 0 + var/mob/living/carbon/occupant = null + var/injecting = 0 proc go_out() diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index d32bb8155d..9b0fa8d803 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/implanter name = "implanter" icon = 'items.dmi' @@ -6,8 +8,7 @@ throw_speed = 1 throw_range = 5 w_class = 2.0 - var - obj/item/weapon/implant/imp = null + var/obj/item/weapon/implant/imp = null proc update() @@ -108,4 +109,4 @@ var/obj/item/weapon/implant/compressed/c = imp c.scanned = A A.loc.contents.Remove(A) - update() \ No newline at end of file + update() diff --git a/code/game/objects/items/weapons/implants/implantfreedom.dm b/code/game/objects/items/weapons/implants/implantfreedom.dm index 21cb9f81f9..7540061142 100644 --- a/code/game/objects/items/weapons/implants/implantfreedom.dm +++ b/code/game/objects/items/weapons/implants/implantfreedom.dm @@ -1,10 +1,11 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/implant/freedom name = "freedom" desc = "Use this to escape from those evil Red Shirts." color = "r" - var - activation_emote = "chuckle" - uses = 1.0 + var/activation_emote = "chuckle" + var/uses = 1.0 New() diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index b42fe178dd..5b2b4da7f0 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/implantpad name = "implantpad" desc = "Used to modify implants." @@ -7,10 +9,9 @@ throw_speed = 1 throw_range = 5 w_class = 2.0 - var - obj/item/weapon/implantcase/case = null - broadcasting = null - listening = 1.0 + var/obj/item/weapon/implantcase/case = null + var/broadcasting = null + var/listening = 1.0 proc update() diff --git a/code/game/objects/items/weapons/mops_cleaners.dm b/code/game/objects/items/weapons/mops_cleaners.dm index 2af673ae4f..1a32c2c9e1 100644 --- a/code/game/objects/items/weapons/mops_cleaners.dm +++ b/code/game/objects/items/weapons/mops_cleaners.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/cleaner desc = "A chemical that cleans messes." icon = 'janitor.dmi' @@ -451,13 +453,12 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A as turf) /proc/GetColors(hex) hex = uppertext(hex) - var - hi1 = text2ascii(hex, 2) - lo1 = text2ascii(hex, 3) - hi2 = text2ascii(hex, 4) - lo2 = text2ascii(hex, 5) - hi3 = text2ascii(hex, 6) - lo3 = text2ascii(hex, 7) + var/hi1 = text2ascii(hex, 2) + var/lo1 = text2ascii(hex, 3) + var/hi2 = text2ascii(hex, 4) + var/lo2 = text2ascii(hex, 5) + var/hi3 = text2ascii(hex, 6) + var/lo3 = text2ascii(hex, 7) return list(((hi1>= 65 ? hi1-55 : hi1-48)<<4) | (lo1 >= 65 ? lo1-55 : lo1-48), ((hi2 >= 65 ? hi2-55 : hi2-48)<<4) | (lo2 >= 65 ? lo2-55 : lo2-48), ((hi3 >= 65 ? hi3-55 : hi3-48)<<4) | (lo3 >= 65 ? lo3-55 : lo3-48)) diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index cf501a4a63..163adf1f40 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /* CONTAINS: RETRACTOR @@ -651,11 +653,10 @@ CIRCULAR SAW /obj/item/weapon/autopsy_scanner/var/timeofdeath = null /datum/autopsy_data_data - var - weapon = null // this is the DEFINITE weapon type that was used - list/organs_scanned = list() // this maps a number of scanned organs to + var/weapon = null // this is the DEFINITE weapon type that was used + var/list/organs_scanned = list() // this maps a number of scanned organs to // the wounds to those organs with this data's weapon type - organ_names = "" + var/organ_names = "" /obj/item/weapon/autopsy_scanner/proc/add_data(var/datum/organ/external/O) if(!O.autopsy_data.len && !O.trace_chemicals.len) return diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 4d301b5fc0..6beb984163 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /* CONTAINS: @@ -53,10 +55,9 @@ WELDINGTOOOL m_amt = 70 g_amt = 30 origin_tech = "engineering=1" - var - welding = 0 - status = 1 - max_fuel = 20 + var/welding = 0 + var/status = 1 + var/max_fuel = 20 proc get_fuel() remove_fuel(var/amount = 1, var/mob/M = null) @@ -334,4 +335,4 @@ WELDINGTOOOL M.update_clothing() return else - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/radio/headset.dm b/code/game/objects/radio/headset.dm index 7e58b10f89..582a08e8ae 100644 --- a/code/game/objects/radio/headset.dm +++ b/code/game/objects/radio/headset.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/device/radio/headset name = "radio headset" desc = "An updated, modular intercom that fits over the head. Takes encryption keys" @@ -8,11 +10,10 @@ subspace_transmission = 1 protective_temperature = 0 canhear_range = 1 // can't hear headsets from very far away - var - translate_binary = 0 - translate_hive = 0 - obj/item/device/encryptionkey/keyslot1 = null - obj/item/device/encryptionkey/keyslot2 = null + var/translate_binary = 0 + var/translate_hive = 0 + var/obj/item/device/encryptionkey/keyslot1 = null + var/obj/item/device/encryptionkey/keyslot2 = null /obj/item/device/radio/headset/New() ..() @@ -245,4 +246,4 @@ src.name = "broken radio headset" return - return \ No newline at end of file + return diff --git a/code/game/objects/radio/radio.dm b/code/game/objects/radio/radio.dm index e9c27e0a95..75b9774a6f 100644 --- a/code/game/objects/radio/radio.dm +++ b/code/game/objects/radio/radio.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + var/GLOBAL_RADIO_TYPE = 1 // radio type to use // 0 = old radios // 1 = new radios (subspace technology) @@ -9,21 +11,20 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use suffix = "\[3\]" icon_state = "walkietalkie" item_state = "walkietalkie" - var - on = 1 // 0 for off - last_transmission - frequency = 1459 //common chat - traitor_frequency = 0 //tune to frequency to unlock traitor supplies - canhear_range = 3 // the range which mobs can hear this radio from - obj/item/device/radio/patch_link = null - obj/item/device/uplink/radio/traitorradio = null - wires = WIRE_SIGNAL | WIRE_RECEIVE | WIRE_TRANSMIT - b_stat = 0 - broadcasting = 0 - listening = 1 - freerange = 0 // 0 - Sanitize frequencies, 1 - Full range - list/channels = list() //see communications.dm for full list. First channes is a "default" for :h - subspace_transmission = 0 + var/on = 1 // 0 for off + var/last_transmission + var/frequency = 1459 //common chat + var/traitor_frequency = 0 //tune to frequency to unlock traitor supplies + var/canhear_range = 3 // the range which mobs can hear this radio from + var/obj/item/device/radio/patch_link = null + var/obj/item/device/uplink/radio/traitorradio = null + var/wires = WIRE_SIGNAL | WIRE_RECEIVE | WIRE_TRANSMIT + var/b_stat = 0 + var/broadcasting = 0 + var/listening = 1 + var/freerange = 0 // 0 - Sanitize frequencies, 1 - Full range + var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h + var/subspace_transmission = 0 // "Example" = FREQ_LISTENING|FREQ_BROADCASTING flags = 450 // hello i'm a fucking idiot why is this 450?? CODE GODS PLEASE EXPLAIN~ throw_speed = 2 @@ -31,19 +32,17 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use w_class = 2 g_amt = 25 m_amt = 75 - var/const - WIRE_SIGNAL = 1 //sends a signal, like to set off a bomb or electrocute someone - WIRE_RECEIVE = 2 - WIRE_TRANSMIT = 4 - TRANSMISSION_DELAY = 5 // only 2/second/radio - FREQ_LISTENING = 1 + var/const/WIRE_SIGNAL = 1 //sends a signal, like to set off a bomb or electrocute someone + var/const/WIRE_RECEIVE = 2 + var/const/WIRE_TRANSMIT = 4 + var/const/TRANSMISSION_DELAY = 5 // only 2/second/radio + var/const/FREQ_LISTENING = 1 //FREQ_BROADCASTING = 2 /obj/item/device/radio - var - datum/radio_frequency/radio_connection - list/datum/radio_frequency/secure_radio_connections = new + var/datum/radio_frequency/radio_connection + var/list/datum/radio_frequency/secure_radio_connections = new proc set_frequency(new_frequency) radio_controller.remove_object(src, frequency) diff --git a/code/game/objects/storage/lockbox.dm b/code/game/objects/storage/lockbox.dm index 38141dd1e6..d15663409e 100644 --- a/code/game/objects/storage/lockbox.dm +++ b/code/game/objects/storage/lockbox.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/storage/lockbox name = "lockbox" desc = "A locked box." @@ -8,12 +10,11 @@ max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item. storage_slots = 4 req_access = list(access_armory) - var - locked = 1 - broken = 0 - icon_locked = "lockbox+l" - icon_closed = "lockbox" - icon_broken = "lockbox+b" + var/locked = 1 + var/broken = 0 + var/icon_locked = "lockbox+l" + var/icon_closed = "lockbox" + var/icon_broken = "lockbox+b" attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -90,4 +91,4 @@ New() ..() - new /obj/item/weapon/flashbang/clusterbang(src) \ No newline at end of file + new /obj/item/weapon/flashbang/clusterbang(src) diff --git a/code/game/objects/tanks/jetpack.dm b/code/game/objects/tanks/jetpack.dm index a8b853b6b7..9a0cee7402 100644 --- a/code/game/objects/tanks/jetpack.dm +++ b/code/game/objects/tanks/jetpack.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/tank/jetpack name = "Jetpack (Empty)" desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution." @@ -5,11 +7,10 @@ w_class = 4.0 item_state = "jetpack" distribute_pressure = ONE_ATMOSPHERE*O2STANDARD - var - datum/effect/effect/system/ion_trail_follow/ion_trail - on = 0.0 - stabilization_on = 0 - volume_rate = 500 //Needed for borg jetpack transfer + var/datum/effect/effect/system/ion_trail_follow/ion_trail + var/on = 0.0 + var/stabilization_on = 0 + var/volume_rate = 500 //Needed for borg jetpack transfer New() ..() @@ -108,4 +109,4 @@ if(air_contents.carbon_dioxide < 10) usr << text("\red The meter on the [src.name] indicates you are almost out of air!") playsound(usr, 'alert.ogg', 50, 1) - return \ No newline at end of file + return diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index cd6ef81420..bcb433e473 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -1,6 +1,7 @@ -var - jobban_runonce // Updates legacy bans with new info - jobban_keylist[0] //to store the keys & ranks +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + +var/jobban_runonce // Updates legacy bans with new info +var/jobban_keylist[0] //to store the keys & ranks /proc/jobban_fullban(mob/M, rank, reason) if (!M || !M.key) return diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 039aac0192..1a0e282d4d 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /proc/isassembly(O) if(istype(O, /obj/item/device/assembly)) @@ -46,38 +48,35 @@ throw_range = 10 origin_tech = "magnets=1" - var - secured = 1 - small_icon_state_left = null - small_icon_state_right = null - list/small_icon_state_overlays = null - obj/item/device/assembly_holder/holder = null - cooldown = 0//To prevent spam - wires = WIRE_RECEIVE | WIRE_PULSE + var/secured = 1 + var/small_icon_state_left = null + var/small_icon_state_right = null + var/list/small_icon_state_overlays = null + var/obj/item/device/assembly_holder/holder = null + var/cooldown = 0//To prevent spam + var/wires = WIRE_RECEIVE | WIRE_PULSE - var/const - WIRE_RECEIVE = 1 //Allows Pulsed(0) to call Activate() - WIRE_PULSE = 2 //Allows Pulse(0) to act on the holder - WIRE_PULSE_SPECIAL = 4 //Allows Pulse(0) to act on the holders special assembly - WIRE_RADIO_RECEIVE = 8 //Allows Pulsed(1) to call Activate() - WIRE_RADIO_PULSE = 16 //Allows Pulse(1) to send a radio message - - proc - activate() //What the device does when turned on - pulsed(var/radio = 0) //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs - pulse(var/radio = 0) //Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct - toggle_secure() //Code that has to happen when the assembly is un\secured goes here - attach_assembly(var/obj/A, var/mob/user) //Called when an assembly is attacked by another - process_cooldown() //Called via spawn(10) to have it count down the cooldown var - holder_movement() //Called when the holder is moved - interact(mob/user as mob) //Called when attack_self is called + var/const/WIRE_RECEIVE = 1 //Allows Pulsed(0) to call Activate() + var/const/WIRE_PULSE = 2 //Allows Pulse(0) to act on the holder + var/const/WIRE_PULSE_SPECIAL = 4 //Allows Pulse(0) to act on the holders special assembly + var/const/WIRE_RADIO_RECEIVE = 8 //Allows Pulsed(1) to call Activate() + var/const/WIRE_RADIO_PULSE = 16 //Allows Pulse(1) to send a radio message - process_cooldown() + proc/activate() //What the device does when turned on + proc/pulsed(var/radio = 0) //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs + pulse(var/radio = 0) //Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct + proc/toggle_secure() //Code that has to happen when the assembly is un\secured goes here + proc/attach_assembly(var/obj/A, var/mob/user) //Called when an assembly is attacked by another + proc/holder_movement() //Called when the holder is moved + proc/interact(mob/user as mob) //Called when attack_self is called + + + proc/process_cooldown() cooldown-- if(cooldown <= 0) return 0 spawn(10) - process_cooldown() + process_cooldown() return 1 @@ -89,7 +88,7 @@ return 1 - pulse(var/radio = 0) + proc/pulse(var/radio = 0) if(holder && (wires & WIRE_PULSE)) holder.process_activation(src, 1, 0) if(holder && (wires & WIRE_PULSE_SPECIAL)) @@ -186,15 +185,13 @@ Desc: If true is an object that can be attached to an assembly holder but is a s /obj/proc/IsSpecialAssembly() return 0 /* - var - small_icon_state = null//If this obj will go inside the assembly use this for icons - list/small_icon_state_overlays = null//Same here - obj/holder = null - cooldown = 0//To prevent spam + var/small_icon_state = null//If this obj will go inside the assembly use this for icons + var/list/small_icon_state_overlays = null//Same here + var/obj/holder = null + var/cooldown = 0//To prevent spam proc Activate()//Called when this assembly is pulsed by another one - Process_cooldown()//Call this via spawn(10) to have it count down the cooldown var Attach_Holder(var/obj/H, var/mob/user)//Called when an assembly holder attempts to attach, sets src's loc in here @@ -222,4 +219,4 @@ Desc: If true is an object that can be attached to an assembly holder but is a s //Remember to have it set its loc somewhere in here -*/ \ No newline at end of file +*/ diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index ac0cb27ad5..51ac5e3933 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/device/assembly_holder name = "Assembly" desc = "Holds various devices"//Fix this by adding dynamic desc @@ -11,11 +13,10 @@ throw_speed = 3 throw_range = 10 - var - secured = 0 - obj/item/device/assembly/a_left = null - obj/item/device/assembly/a_right = null - obj/special_assembly = null + var/secured = 0 + var/obj/item/device/assembly/a_left = null + var/obj/item/device/assembly/a_right = null + var/obj/special_assembly = null proc attach(var/obj/item/device/D, var/obj/item/device/D2, var/mob/user) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index c57c773048..130965ecef 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/device/assembly/infra name = "Infrared Beam" desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted." @@ -11,10 +13,9 @@ small_icon_state_left = "infrared_left" small_icon_state_right = "infrared_right" - var - scanning = 0 - visible = 0 - obj/effect/beam/i_beam/first = null + var/scanning = 0 + var/visible = 0 + var/obj/effect/beam/i_beam/first = null proc trigger_beam() @@ -271,4 +272,4 @@ /obj/effect/beam/i_beam/Del() del(src.next) ..() - return \ No newline at end of file + return diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index aab24bded2..b9853beb32 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/device/assembly/prox_sensor name = "proximity sensor" desc = "Used for scanning and alerting when someone enters a certain proximity." @@ -11,10 +13,9 @@ small_icon_state_left = "prox_left" small_icon_state_right = "prox_right" - var - scanning = 0 - timing = 0 - time = 10 + var/scanning = 0 + var/timing = 0 + var/time = 10 proc toggle_scan() @@ -153,4 +154,4 @@ attack_self(usr) - return \ No newline at end of file + return diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 2cba4266bc..e8a9a8b6bf 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/device/assembly/signaler name = "Remote Signaling Device" desc = "Used to remotely activate devices." @@ -13,13 +15,12 @@ small_icon_state_left = "signaller_left" small_icon_state_right = "signaller_right" - var - code = 30 - frequency = 1457 - delay = 0 - airlock_wire = null - datum/radio_frequency/radio_connection - deadman = 0 + var/code = 30 + var/frequency = 1457 + var/delay = 0 + var/airlock_wire = null + var/datum/radio_frequency/radio_connection + var/deadman = 0 proc signal() diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index b905de1f0e..0b856c2179 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/device/assembly/timer name = "timer" desc = "Used to time things. Works well with contraptions which has to count down. Tick tock." @@ -11,9 +13,8 @@ small_icon_state_left = "timer_left" small_icon_state_right = "timer_right" - var - timing = 0 - time = 10 + var/timing = 0 + var/time = 10 proc timer_end() @@ -114,4 +115,4 @@ if(usr) attack_self(usr) - return \ No newline at end of file + return diff --git a/code/modules/chemical/Chemistry-Holder.dm b/code/modules/chemical/Chemistry-Holder.dm index 459f298a96..e6e75ad9a7 100644 --- a/code/modules/chemical/Chemistry-Holder.dm +++ b/code/modules/chemical/Chemistry-Holder.dm @@ -1,6 +1,7 @@ -var/const - TOUCH = 1 - INGEST = 2 +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + +var/const/TOUCH = 1 +var/const/INGEST = 2 /////////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index c94cd145e7..edf31b672d 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + #define SOLID 1 #define LIQUID 2 #define GAS 3 @@ -2654,14 +2656,13 @@ datum reagent_state = LIQUID nutriment_factor = 0 //So alcohol can fill you up! If they want to. color = "#404030" // rgb: 64, 64, 48 - var - dizzy_adj = 3 - slurr_adj = 3 - confused_adj = 2 - slur_start = 65 //amount absorbed after which mob starts slurring - confused_start = 130 //amount absorbed after which mob starts confusing directions - blur_start = 260 //amount absorbed after which mob starts getting blurred vision - pass_out = 325 //amount absorbed after which mob starts passing out + var/dizzy_adj = 3 + var/slurr_adj = 3 + var/confused_adj = 2 + var/slur_start = 65 //amount absorbed after which mob starts slurring + var/confused_start = 130 //amount absorbed after which mob starts confusing directions + var/blur_start = 260 //amount absorbed after which mob starts getting blurred vision + var/pass_out = 325 //amount absorbed after which mob starts passing out on_mob_life(var/mob/living/M as mob) M:nutrition += nutriment_factor diff --git a/code/modules/clothing/glasses.dm b/code/modules/clothing/glasses.dm index 53f7e1eaf8..b1527b2087 100644 --- a/code/modules/clothing/glasses.dm +++ b/code/modules/clothing/glasses.dm @@ -1,13 +1,14 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/clothing/glasses name = "glasses" icon = 'glasses.dmi' w_class = 2.0 flags = GLASSESCOVERSEYES - var - vision_flags = 0 - darkness_view = 0//Base human is 2 - invisa_view = 0 - prescription = 0 + var/vision_flags = 0 + var/darkness_view = 0//Base human is 2 + var/invisa_view = 0 + var/prescription = 0 /* SEE_SELF // can see self, no matter what diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 3709e1ab39..e857e8b350 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -1,10 +1,11 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/clothing/glasses/hud name = "HUD" desc = "A heads-up display that provides important info in (almost) real time." flags = null //doesn't protect eyes because it's a monocle, duh origin_tech = "magnets=3;biotech=2" - var - list/icon/current = list() //the current hud icons + var/list/icon/current = list() //the current hud icons proc process_hud(var/mob/M) return diff --git a/code/modules/clothing/spacesuits/ninja.dm b/code/modules/clothing/spacesuits/ninja.dm index ce028fe46a..a1a95239d9 100644 --- a/code/modules/clothing/spacesuits/ninja.dm +++ b/code/modules/clothing/spacesuits/ninja.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/clothing/head/helmet/space/space_ninja desc = "What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear." name = "ninja hood" @@ -18,45 +20,44 @@ slowdown = 0 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) - var //Important parts of the suit. - mob/living/carbon/affecting = null//The wearer. - obj/item/weapon/cell/cell//Starts out with a high-capacity cell using New(). - datum/effect/effect/system/spark_spread/spark_system//To create sparks. - reagent_list[] = list("tricordrazine","dexalinp","spaceacillin","anti_toxin","nutriment","radium","hyronalin")//The reagents ids which are added to the suit at New(). - stored_research[]//For stealing station research. - obj/item/weapon/disk/tech_disk/t_disk//To copy design onto disk. + var/mob/living/carbon/affecting = null//The wearer. + var/obj/item/weapon/cell/cell//Starts out with a high-capacity cell using New(). + var/datum/effect/effect/system/spark_spread/spark_system//To create sparks. + var/reagent_list[] = list("tricordrazine","dexalinp","spaceacillin","anti_toxin","nutriment","radium","hyronalin")//The reagents ids which are added to the suit at New(). + var/stored_research[]//For stealing station research. + var/obj/item/weapon/disk/tech_disk/t_disk//To copy design onto disk. //Other articles of ninja gear worn together, used to easily reference them after initializing. - obj/item/clothing/head/helmet/space/space_ninja/n_hood - obj/item/clothing/shoes/space_ninja/n_shoes - obj/item/clothing/gloves/space_ninja/n_gloves + var/obj/item/clothing/head/helmet/space/space_ninja/n_hood + var/obj/item/clothing/shoes/space_ninja/n_shoes + var/obj/item/clothing/gloves/space_ninja/n_gloves //Main function variables. - s_initialized = 0//Suit starts off. - s_coold = 0//If the suit is on cooldown. Can be used to attach different cooldowns to abilities. Ticks down every second based on suit ntick(). - s_cost = 5.0//Base energy cost each ntick. - s_acost = 25.0//Additional cost for additional powers active. - k_cost = 200.0//Kamikaze energy cost each ntick. - k_damage = 1.0//Brute damage potentially done by Kamikaze each ntick. - s_delay = 40.0//How fast the suit does certain things, lower is faster. Can be overridden in specific procs. Also determines adverse probability. - a_transfer = 20.0//How much reagent is transferred when injecting. - r_maxamount = 80.0//How much reagent in total there is. + var/s_initialized = 0//Suit starts off. + var/s_coold = 0//If the suit is on cooldown. Can be used to attach different cooldowns to abilities. Ticks down every second based on suit ntick(). + var/s_cost = 5.0//Base energy cost each ntick. + var/s_acost = 25.0//Additional cost for additional powers active. + var/k_cost = 200.0//Kamikaze energy cost each ntick. + var/k_damage = 1.0//Brute damage potentially done by Kamikaze each ntick. + var/s_delay = 40.0//How fast the suit does certain things, lower is faster. Can be overridden in specific procs. Also determines adverse probability. + var/a_transfer = 20.0//How much reagent is transferred when injecting. + var/r_maxamount = 80.0//How much reagent in total there is. //Support function variables. - spideros = 0//Mode of SpiderOS. This can change so I won't bother listing the modes here (0 is hub). Check ninja_equipment.dm for how it all works. - s_active = 0//Stealth off. - s_busy = 0//Is the suit busy with a process? Like AI hacking. Used for safety functions. - kamikaze = 0//Kamikaze on or off. - k_unlock = 0//To unlock Kamikaze. + var/spideros = 0//Mode of SpiderOS. This can change so I won't bother listing the modes here (0 is hub). Check ninja_equipment.dm for how it all works. + var/s_active = 0//Stealth off. + var/s_busy = 0//Is the suit busy with a process? Like AI hacking. Used for safety functions. + var/kamikaze = 0//Kamikaze on or off. + var/k_unlock = 0//To unlock Kamikaze. //Ability function variables. - s_bombs = 10.0//Number of starting ninja smoke bombs. - a_boost = 3.0//Number of adrenaline boosters. + var/s_bombs = 10.0//Number of starting ninja smoke bombs. + var/a_boost = 3.0//Number of adrenaline boosters. //Onboard AI related variables. - mob/living/silicon/ai/AI//If there is an AI inside the suit. - obj/item/device/paicard/pai//A slot for a pAI device - obj/effect/overlay/hologram//Is the AI hologram on or off? Visible only to the wearer of the suit. This works by attaching an image to a blank overlay. - flush = 0//If an AI purge is in progress. - s_control = 1//If user in control of the suit. + var/mob/living/silicon/ai/AI//If there is an AI inside the suit. + var/obj/item/device/paicard/pai//A slot for a pAI device + var/obj/effect/overlay/hologram//Is the AI hologram on or off? Visible only to the wearer of the suit. This works by attaching an image to a blank overlay. + var/flush = 0//If an AI purge is in progress. + var/s_control = 1//If user in control of the suit. diff --git a/code/modules/critters/critter.dm b/code/modules/critters/critter.dm index 854765817c..cffef45900 100644 --- a/code/modules/critters/critter.dm +++ b/code/modules/critters/critter.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/effect/critter name = "Critter" desc = "Generic critter." @@ -6,79 +8,78 @@ layer = 5.0 density = 1 anchored = 0 - var - alive = 1 - health = 10 - max_health = 10 - aggression = 100 - speed = 8 - list/access_list = list()//accesses go here + var/alive = 1 + var/health = 10 + var/max_health = 10 + var/aggression = 100 + var/speed = 8 + var/list/access_list = list()//accesses go here //AI things - task = "thinking" + var/task = "thinking" //Attacks at will - aggressive = 1 + var/aggressive = 1 //Will target an attacker - defensive = 0 + var/defensive = 0 //Will randomly move about - wanderer = 1 + var/wanderer = 1 //Will open doors it bumps ignoring access - opensdoors = 0 + var/opensdoors = 0 //Will randomly travel through vents - ventcrawl = 0 + var/ventcrawl = 0 //Internal tracking ignore - frustration = 0 - max_frustration = 8 - attack = 0 - attacking = 0 - steps = 0 - last_found = null - target = null - oldtarget_name = null - target_lastloc = null + var/frustration = 0 + var/max_frustration = 8 + var/attack = 0 + var/attacking = 0 + var/steps = 0 + var/last_found = null + var/target = null + var/oldtarget_name = null + var/target_lastloc = null - thinkspeed = 15 - chasespeed = 4 - wanderspeed = 10 + var/thinkspeed = 15 + var/chasespeed = 4 + var/wanderspeed = 10 //The last guy who attacked it - attacker = null + var/attacker = null //Will not attack this thing - friend = null + var/friend = null //How far to look for things dont set this overly high - seekrange = 7 + var/seekrange = 7 //If true will attack these things - atkcarbon = 1 - atksilicon = 0 - atkcritter = 0 + var/atkcarbon = 1 + var/atksilicon = 0 + var/atkcritter = 0 //Attacks critters of the same type - atksame = 0 - atkmech = 0 + var/atksame = 0 + var/atkmech = 0 //Attacks syndies/traitors (distinguishes via mind) - atksynd = 1 + var/atksynd = 1 //Attacks things NOT in its obj/req_access list - atkreq = 0 + var/atkreq = 0 //Damage multipliers - brutevuln = 1 - firevuln = 1 + var/brutevuln = 1 + var/firevuln = 1 //DR - armor = 0 + var/armor = 0 //How much damage it does it melee - melee_damage_lower = 1 - melee_damage_upper = 2 + var/melee_damage_lower = 1 + var/melee_damage_upper = 2 //Basic attack message when they move to attack and attack - angertext = "charges at" - attacktext = "attacks" - deathtext = "dies!" + var/angertext = "charges at" + var/attacktext = "attacks" + var/deathtext = "dies!" - chasestate = null // the icon state to use when attacking or chasing a target - attackflick = null // the icon state to flick when it attacks - attack_sound = null // the sound it makes when it attacks! + var/chasestate = null // the icon state to use when attacking or chasing a target + var/attackflick = null // the icon state to flick when it attacks + var/attack_sound = null // the sound it makes when it attacks! - attack_speed = 25 // delay of attack + var/attack_speed = 25 // delay of attack proc @@ -135,4 +136,4 @@ -*/ \ No newline at end of file +*/ diff --git a/code/modules/critters/hivebots/hivebot.dm b/code/modules/critters/hivebots/hivebot.dm index 329660fe24..bfc2709fbe 100644 --- a/code/modules/critters/hivebots/hivebot.dm +++ b/code/modules/critters/hivebots/hivebot.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/projectile/hivebotbullet damage = 5 damage_type = BRUTE @@ -25,9 +27,8 @@ melee_damage_upper = 3 angertext = "leaps at" attacktext = "claws" - var - ranged = 0 - rapid = 0 + var/ranged = 0 + var/rapid = 0 proc Shoot(var/target, var/start, var/user, var/bullet = 0) OpenFire(var/thing)//bluh ill rename this later or somethin @@ -186,12 +187,11 @@ seekrange = 2 armor = 10 - var - bot_type = "norm" - bot_amt = 10 - spawn_delay = 600 - turn_on = 0 - auto_spawn = 1 + var/bot_type = "norm" + var/bot_amt = 10 + var/spawn_delay = 600 + var/turn_on = 0 + var/auto_spawn = 1 proc warpbots() @@ -247,4 +247,4 @@ /obj/effect/critter/hivebot/tele/rapid bot_type = "rapid" - spawn_delay = 800 \ No newline at end of file + spawn_delay = 800 diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm index cc228dbbe1..613454ff55 100644 --- a/code/modules/flufftext/TextFilters.dm +++ b/code/modules/flufftext/TextFilters.dm @@ -1,9 +1,11 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + proc/Intoxicated(phrase) phrase = html_decode(phrase) - var - leng=lentext(phrase) - counter=lentext(phrase) - newphrase="";newletter="" + var/leng=lentext(phrase) + var/counter=lentext(phrase) + var/newphrase="" + var/newletter="" while(counter>=1) newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2) if(rand(1,3)==3) @@ -78,4 +80,4 @@ proc/Ellipsis(original_msg, chance = 50) new_msg = dd_list2text(new_words," ") - return new_msg \ No newline at end of file + return new_msg diff --git a/code/modules/mob/living/blob/blob.dm b/code/modules/mob/living/blob/blob.dm index 7c4cd8eeec..8c271791a2 100644 --- a/code/modules/mob/living/blob/blob.dm +++ b/code/modules/mob/living/blob/blob.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /mob/living/blob name = "blob fragment" real_name = "blob fragment" @@ -6,9 +8,8 @@ pass_flags = PASSBLOB see_in_dark = 8 see_invisible = 2 - var - ghost_name = "Unknown" - creating_blob = 0 + var/ghost_name = "Unknown" + var/creating_blob = 0 New() diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index 7a386ef417..f83b1e4bba 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -1,10 +1,11 @@ -/mob/living/carbon/alien/humanoid - var - oxygen_alert = 0 - toxins_alert = 0 - fire_alert = 0 +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 - temperature_alert = 0 +/mob/living/carbon/alien/humanoid + var/oxygen_alert = 0 + var/toxins_alert = 0 + var/fire_alert = 0 + + var/temperature_alert = 0 /mob/living/carbon/alien/humanoid/Life() diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index b35b973543..5025d724f7 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -1,10 +1,11 @@ -/mob/living/carbon/alien/larva - var - oxygen_alert = 0 - toxins_alert = 0 - fire_alert = 0 +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 - temperature_alert = 0 +/mob/living/carbon/alien/larva + var/oxygen_alert = 0 + var/toxins_alert = 0 + var/fire_alert = 0 + + var/temperature_alert = 0 /mob/living/carbon/alien/larva/Life() diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index b0931dfee2..39b7387655 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/device/mmi name = "Man-Machine Interface" desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity." @@ -14,11 +16,10 @@ //Revised. Brainmob is now contained directly within object of transfer. MMI in this case. - var - locked = 0 - mob/living/carbon/brain/brainmob = null//The current occupant. - mob/living/silicon/robot = null//Appears unused. - obj/mecha = null//This does not appear to be used outside of reference in mecha.dm. + var/locked = 0 + var/mob/living/carbon/brain/brainmob = null//The current occupant. + var/mob/living/silicon/robot = null//Appears unused. + var/obj/mecha = null//This does not appear to be used outside of reference in mecha.dm. attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(O,/obj/item/brain) && !brainmob) //Time to stick a brain in it --NEO @@ -132,4 +133,4 @@ brainmob << "Can't do that while incapacitated or dead." radio.listening = radio.listening==1 ? 0 : 1 - brainmob << "\blue Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast." \ No newline at end of file + brainmob << "\blue Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast." diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index fc7e81cf2a..f9d6ce11f0 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -1,7 +1,8 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /mob/living/carbon/brain - var - obj/item/container = null - timeofhostdeath = 0 + var/obj/item/container = null + var/timeofhostdeath = 0 New() var/datum/reagents/R = new/datum/reagents(1000) @@ -41,4 +42,4 @@ if (!container || !istype(container, /obj/item/device/mmi)) src.verbs += /mob/proc/ghost - return \ No newline at end of file + return diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index e16ea5fe50..027e94fe09 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1,19 +1,20 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + #define HUMAN_MAX_OXYLOSS 3 //Defines how much oxyloss humans can get per tick. No air applies this value. /mob/living/carbon/human - var - oxygen_alert = 0 - toxins_alert = 0 - fire_alert = 0 + var/oxygen_alert = 0 + var/toxins_alert = 0 + var/fire_alert = 0 - temperature_alert = 0 + var/temperature_alert = 0 // used to do some stuff only on every X life tick - life_tick = 0 - isbreathing = 1 - holdbreath = 0 - lyingcheck = 0 - buckle_check = 0 + var/life_tick = 0 + var/isbreathing = 1 + var/holdbreath = 0 + var/lyingcheck = 0 + var/buckle_check = 0 /mob/living/carbon/human/Life() set invisibility = 0 diff --git a/code/modules/mob/living/parasite/meme.dm b/code/modules/mob/living/parasite/meme.dm index c3c65b9911..9a24614341 100644 --- a/code/modules/mob/living/parasite/meme.dm +++ b/code/modules/mob/living/parasite/meme.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + // === MEMETIC ANOMALY === // ======================= @@ -18,8 +20,7 @@ var/global/const/MAXIMUM_MEME_POINTS = 750 mob/living/carbon/var/list/parasites = list() mob/living/parasite - var - mob/living/carbon/host // the host that this parasite occupies + var/mob/living/carbon/host // the host that this parasite occupies Login() ..() @@ -592,4 +593,4 @@ mob/living/parasite/check_contents_for(t) mob/living/parasite/check_contents_for_reagent(t) if(!host) return 0 - return host.check_contents_for_reagent(t) \ No newline at end of file + return host.check_contents_for_reagent(t) diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index 8f238e2313..49a0baadd2 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -1,15 +1,16 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + // Recruiting observers to play as pAIs var/datum/paiController/paiController // Global handler for pAI candidates /datum/paiCandidate - var - name - key - description - role - comments - ready = 0 + var/name + var/key + var/description + var/role + var/comments + var/ready = 0 @@ -217,4 +218,4 @@ var/datum/paiController/paiController // Global handler for pAI candidates if(response == "Yes") recruitWindow(C.mob) else if (response == "Never for this round") - C.be_pai = 0 \ No newline at end of file + C.be_pai = 0 diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 2962b34692..382a03930c 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/robot_module name = "robot module" icon = 'module.dmi' @@ -5,10 +7,9 @@ w_class = 100.0 item_state = "electronic" flags = FPRINT|TABLEPASS | CONDUCT - var - list/modules = list() - obj/item/emag = null - obj/item/borg/upgrade/jetpack = null + var/list/modules = list() + var/obj/item/emag = null + var/obj/item/borg/upgrade/jetpack = null emp_act(severity) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index b84e24a47f..57f08b3206 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + // fun if you want to typecast humans/monkeys/etc without writing long path-filled lines. /proc/ishuman(A) @@ -212,10 +214,10 @@ proc/hasorgans(A) proc/slur(phrase) phrase = html_decode(phrase) - var - leng=lentext(phrase) - counter=lentext(phrase) - newphrase="";newletter="" + var/leng=lentext(phrase) + var/counter=lentext(phrase) + var/newphrase="" + var/newletter="" while(counter>=1) newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2) if(rand(1,3)==3) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 9cda9325cf..b9a78017fc 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /mob/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if(air_group || (height==0)) return 1 @@ -224,7 +226,6 @@ if(isAI(mob)) return AIMove(n,direct,mob) - if(mob.monkeyizing) return//This is sota the goto stop mobs from moving var if(mob.incorporeal_move)//Move though walls Process_Incorpmove(direct) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index c5f213f906..431230e350 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -1,10 +1,11 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /mob/new_player - var - datum/preferences/preferences = null - ready = 0 - spawning = 0//Referenced when you want to delete the new_player later on in the code. - totalPlayers = 0 //Player counts for the Lobby tab - totalPlayersReady = 0 + var/datum/preferences/preferences = null + var/ready = 0 + var/spawning = 0//Referenced when you want to delete the new_player later on in the code. + var/totalPlayers = 0 //Player counts for the Lobby tab + var/totalPlayersReady = 0 invisibility = 101 diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 97f7f19907..615d09231c 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + #define UI_OLD 0 #define UI_NEW 1 @@ -29,18 +31,17 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set "infested monkey" = ispath(text2path("/datum/game_mode/monkey")), ) */ -var/const - BE_TRAITOR =(1<<0) - BE_OPERATIVE =(1<<1) - BE_CHANGELING=(1<<2) - BE_WIZARD =(1<<3) - BE_MALF =(1<<4) - BE_REV =(1<<5) - BE_ALIEN =(1<<6) - BE_CULTIST =(1<<7) - BE_MONKEY =(1<<8) - BE_PAI =(1<<9) - BE_MEME =(1<<10) +var/const/BE_TRAITOR =(1<<0) +var/const/BE_OPERATIVE =(1<<1) +var/const/BE_CHANGELING=(1<<2) +var/const/BE_WIZARD =(1<<3) +var/const/BE_MALF =(1<<4) +var/const/BE_REV =(1<<5) +var/const/BE_ALIEN =(1<<6) +var/const/BE_CULTIST =(1<<7) +var/const/BE_MONKEY =(1<<8) +var/const/BE_PAI =(1<<9) +var/const/BE_MEME =(1<<10) @@ -1093,4 +1094,4 @@ datum/preferences character.disabilities = disabilities #undef UI_OLD -#undef UI_NEW \ No newline at end of file +#undef UI_NEW diff --git a/code/modules/mob/organ/organ.dm b/code/modules/mob/organ/organ.dm index 24d7e967c2..7e7d657aba 100644 --- a/code/modules/mob/organ/organ.dm +++ b/code/modules/mob/organ/organ.dm @@ -1,10 +1,11 @@ -/datum/organ - var - name = "organ" - mob/living/carbon/human/owner = null +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 - list/datum/autopsy_data/autopsy_data = list() - list/trace_chemicals = list() // traces of chemicals in the organ, +/datum/organ + var/name = "organ" + var/mob/living/carbon/human/owner = null + + var/list/datum/autopsy_data/autopsy_data = list() + var/list/trace_chemicals = list() // traces of chemicals in the organ, // links chemical IDs to number of ticks for which they'll stay in the blood @@ -15,12 +16,11 @@ return 0 /datum/autopsy_data - var - weapon = null - pretend_weapon = null - damage = 0 - hits = 0 - time_inflicted = 0 + var/weapon = null + var/pretend_weapon = null + var/damage = 0 + var/hits = 0 + var/time_inflicted = 0 proc/copy() var/datum/autopsy_data/W = new() @@ -36,38 +36,37 @@ ****************************************************/ /datum/organ/external name = "external" - var - icon_name = null - body_part = null + var/icon_name = null + var/body_part = null - damage_state = "00" - brute_dam = 0 - burn_dam = 0 - bandaged = 0 - max_damage = 0 - max_size = 0 - tmp/list/obj/item/weapon/implant/implant = list() + var/damage_state = "00" + var/brute_dam = 0 + var/burn_dam = 0 + var/bandaged = 0 + var/max_damage = 0 + var/max_size = 0 + var/tmp/list/obj/item/weapon/implant/implant = list() - display_name - tmp/list/wounds = list() - tmp/bleeding = 0 - tmp/perma_injury = 0 - tmp/perma_dmg = 0 - tmp/broken = 0 - tmp/destroyed = 0 - tmp/destspawn = 0 //Has it spawned the broken limb? - tmp/gauzed = 0 //Has the missing limb been patched? - tmp/robot = 0 //ROBOT ARM MAN! - tmp/cutaway = 0 //First part of limb reattachment. - tmp/attachable = 0 //Can limb be attached? - min_broken_damage = 30 - datum/organ/external/parent - list/datum/organ/external/children - damage_msg = "\red You feel a intense pain" + var/display_name + var/tmp/list/wounds = list() + var/tmp/bleeding = 0 + var/tmp/perma_injury = 0 + var/tmp/perma_dmg = 0 + var/tmp/broken = 0 + var/tmp/destroyed = 0 + var/tmp/destspawn = 0 //Has it spawned the broken limb? + var/tmp/gauzed = 0 //Has the missing limb been patched? + var/tmp/robot = 0 //ROBOT ARM MAN! + var/tmp/cutaway = 0 //First part of limb reattachment. + var/tmp/attachable = 0 //Can limb be attached? + var/min_broken_damage = 30 + var/datum/organ/external/parent + var/list/datum/organ/external/children + var/damage_msg = "\red You feel a intense pain" - var/open = 0 - var/stage = 0 - var/wound = 0 + var/var/open = 0 + var/var/stage = 0 + var/var/wound = 0 New(mob/living/carbon/H) ..(H) @@ -602,4 +601,4 @@ INTERNAL ORGANS ****************************************************/ /datum/organ/internal - name = "internal" \ No newline at end of file + name = "internal" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 9a6910be38..7455c7ad67 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/paper name = "paper" gender = PLURAL @@ -10,22 +12,20 @@ layer = 4 pressure_resistance = 1 - var - info //What's actually written on the paper. - info_links //A different version of the paper which includes html links at fields and EOF - stamps //The (text for the) stamps on the paper. - fields //Amount of user created fields - list/stamped - see_face = 1 - body_parts_covered = HEAD - protective_temperature = 0 - rigged = 0 - spam_flag = 0 + var/info //What's actually written on the paper. + var/info_links //A different version of the paper which includes html links at fields and EOF + var/stamps //The (text for the) stamps on the paper. + var/fields //Amount of user created fields + var/list/stamped + var/see_face = 1 + var/body_parts_covered = HEAD + var/protective_temperature = 0 + var/rigged = 0 + var/spam_flag = 0 - const - deffont = "Verdana" - signfont = "Times New Roman" - crayonfont = "Comic Sans MS" + const/ar/deffont = "Verdana" + const/ar/signfont = "Times New Roman" + const/ar/crayonfont = "Comic Sans MS" New() ..() @@ -285,4 +285,4 @@ user << "\blue You stamp the paper with your rubber stamp." add_fingerprint(user) - return \ No newline at end of file + return diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 6419d16a04..0f833d809f 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/paper_bin name = "paper bin" icon = 'bureaucracy.dmi' @@ -8,10 +10,9 @@ throw_speed = 3 throw_range = 7 pressure_resistance = 10 - var - amount = 30 //How much paper is in the bin. - list/papers = new/list() //List of papers put in the bin for reference. - sealed = 1 //If it's brandnew and unopened, it's sealed. + var/amount = 30 //How much paper is in the bin. + var/list/papers = new/list() //List of papers put in the bin for reference. + var/sealed = 1 //If it's brandnew and unopened, it's sealed. MouseDrop(mob/user as mob) if ((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr)))))) @@ -86,4 +87,4 @@ if(amount < 1) icon_state = "paper_bin0" else - icon_state = "paper_bin1" \ No newline at end of file + icon_state = "paper_bin1" diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index dfbf6b8dd3..3f0fbb7b3c 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/machinery/photocopier name = "Photocopier" icon = 'library.dmi' @@ -8,11 +10,10 @@ idle_power_usage = 30 active_power_usage = 200 power_channel = EQUIP - var - obj/item/weapon/paper/copy = null //what's in the copier! - copies = 1 //how many copies to print! - toner = 30 //how much toner is left! woooooo~ - maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier! + var/obj/item/weapon/paper/copy = null //what's in the copier! + var/copies = 1 //how many copies to print! + var/toner = 30 //how much toner is left! woooooo~ + var/maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier! attack_ai(mob/user as mob) return src.attack_hand(user) @@ -132,4 +133,4 @@ /obj/item/device/toner name = "toner cartridge" - icon_state = "tonercartridge" \ No newline at end of file + icon_state = "tonercartridge" diff --git a/code/modules/power/antimatter/computer.dm b/code/modules/power/antimatter/computer.dm index 31e52fc5b6..6e8d49cc9e 100644 --- a/code/modules/power/antimatter/computer.dm +++ b/code/modules/power/antimatter/computer.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/machinery/computer/am_engine name = "Antimatter Engine Console" icon = 'stationobjs.dmi' @@ -8,10 +10,9 @@ var/obj/machinery/power/am_engine/engine/connected_E = null var/obj/machinery/power/am_engine/injector/connected_I = null var/state = STATE_DEFAULT - var/const - STATE_DEFAULT = 1 - STATE_INJECTOR = 2 - STATE_ENGINE = 3 + var/const/STATE_DEFAULT = 1 + var/const/STATE_INJECTOR = 2 + var/const/STATE_ENGINE = 3 /obj/machinery/computer/am_engine/New() ..() diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm index 98d3eb1e8f..d6b9c5d3d6 100644 --- a/code/modules/power/pacman2.dm +++ b/code/modules/power/pacman2.dm @@ -1,14 +1,15 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + //Baseline portable generator. Has all the default handling. Not intended to be used on it's own (since it generates unlimited power). /obj/machinery/power/port_gen/pacman2 name = "Pacman II" desc = "P.A.C.M.A.N. type II portable generator. Uses liquid plasma as a fuel source." power_gen = 4500 - var - obj/item/weapon/tank/plasma/P = null - board_path = "/obj/item/weapon/circuitboard/pacman2" - emagged = 0 - heat = 0 + var/obj/item/weapon/tank/plasma/P = null + var/board_path = "/obj/item/weapon/circuitboard/pacman2" + var/emagged = 0 + var/heat = 0 /* process() if(P) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index bf2875e305..1b1b6e612a 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /* new portable generator - work in progress /obj/machinery/power/port_gen @@ -49,12 +51,11 @@ display round(lastgen) and plasmatank amount directwired = 1 use_power = 0 - var - active = 0 - power_gen = 5000 - open = 0 - recent_fault = 0 - power_output = 1 + var/active = 0 + var/power_gen = 5000 + var/open = 0 + var/recent_fault = 0 + var/power_output = 1 proc HasFuel() //Placeholder for fuel check. @@ -98,14 +99,13 @@ display round(lastgen) and plasmatank amount /obj/machinery/power/port_gen/pacman name = "P.A.C.M.A.N.-type Portable Generator" - var - sheets = 0 - max_sheets = 100 - sheet_path = /obj/item/stack/sheet/plasma - board_path = "/obj/item/weapon/circuitboard/pacman" - sheet_left = 0 // How much is left of the sheet - time_per_sheet = 10 - heat = 0 + var/sheets = 0 + var/max_sheets = 100 + var/sheet_path = /obj/item/stack/sheet/plasma + var/board_path = "/obj/item/weapon/circuitboard/pacman" + var/sheet_left = 0 // How much is left of the sheet + var/time_per_sheet = 10 + var/heat = 0 New() ..() @@ -322,4 +322,4 @@ display round(lastgen) and plasmatank amount time_per_sheet = 30 board_path = "/obj/item/weapon/circuitboard/pacman/industrial" overheat() - explosion(src.loc, 4, 4, 4, -1) \ No newline at end of file + explosion(src.loc, 4, 4, 4, -1) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 8a4514cfee..82f1f4e3da 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/machinery/power/rad_collector name = "Radiation Collector Array" @@ -9,12 +11,11 @@ directwired = 1 req_access = list(access_engine) // use_power = 0 - var - obj/item/weapon/tank/plasma/P = null - last_power = 0 - active = 0 - locked = 0 - drainratio = 1 + var/obj/item/weapon/tank/plasma/P = null + var/last_power = 0 + var/active = 0 + var/locked = 0 + var/drainratio = 1 process() if(P) diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 1e49b8c2ca..4cfcd3bbaa 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/machinery/containment_field name = "Containment Field" desc = "An energy field." @@ -7,9 +9,8 @@ density = 0 unacidable = 1 use_power = 0 - var - obj/machinery/field_generator/FG1 = null - obj/machinery/field_generator/FG2 = null + var/obj/machinery/field_generator/FG1 = null + var/obj/machinery/field_generator/FG2 = null New() spawn(1) @@ -92,4 +93,4 @@ return 0 FG1 = master1 FG2 = master2 - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index e8ce8d4a36..19c20412b0 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/machinery/emitter name = "Emitter" desc = "A heavy duty industrial laser" @@ -11,16 +13,15 @@ idle_power_usage = 10 active_power_usage = 300 - var - frequency = 1 - active = 0 - fire_delay = 100 - last_shot = 0 - shot_number = 0 - state = 0 - locked = 0 - energy = 0 - mega_energy = 0 + var/frequency = 1 + var/active = 0 + var/fire_delay = 100 + var/last_shot = 0 + var/shot_number = 0 + var/state = 0 + var/locked = 0 + var/energy = 0 + var/mega_energy = 0 verb/rotate() @@ -207,4 +208,4 @@ power_change() ..() update_icon() - return \ No newline at end of file + return diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index ccefe0cf57..1525d0adfb 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + var/containment_fail_announced = 0 /* @@ -20,17 +22,16 @@ field_generator power level display anchored = 0 density = 1 use_power = 0 - var - const/num_power_levels = 6 // Total number of power level icon has - Varedit_start = 0 - Varpower = 0 - active = 0 - power = 20 // Current amount of power - state = 0 - warming_up = 0 - list/obj/machinery/containment_field/fields - list/obj/machinery/field_generator/connected_gens - clean_up = 0 + var/const/num_power_levels = 6 // Total number of power level icon has + var/Varedit_start = 0 + var/Varpower = 0 + var/active = 0 + var/power = 20 // Current amount of power + var/state = 0 + var/warming_up = 0 + var/list/obj/machinery/containment_field/fields + var/list/obj/machinery/field_generator/connected_gens + var/clean_up = 0 update_icon() diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index 9cf20a8f39..bd2cbc5b37 100644 --- a/code/modules/power/singularity/generator.dm +++ b/code/modules/power/singularity/generator.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /////SINGULARITY SPAWNER /obj/machinery/the_singularitygen/ @@ -8,8 +10,7 @@ anchored = 0 density = 1 use_power = 0 - var - energy = 0 + var/energy = 0 //////////////////////Singularity gen START @@ -56,4 +57,4 @@ for (var/obj/X in orange(4,T)) //TODO: do we need requirement to singularity be actually _surrounded_ by field? if(istype(X, /obj/machinery/containment_field) || istype(X, /obj/machinery/shieldwall)) checkpointC ++ - return checkpointC >= 20 \ No newline at end of file + return checkpointC >= 20 diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index a76077f58e..459159f8fc 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/effect/accelerated_particle name = "Accelerated Particles" desc = "Small things moving very fast." @@ -5,17 +7,16 @@ icon_state = "particle"//Need a new icon for this anchored = 1 density = 1 - var - movement_range = 10 - energy = 10 //energy in eV - mega_energy = 0 //energy in MeV - frequency = 1 - ionizing = 0 - particle_type - additional_particles = 0 - turf/target - turf/source - movetotarget = 1 + var/movement_range = 10 + var/energy = 10 //energy in eV + var/mega_energy = 0 //energy in MeV + var/frequency = 1 + var/ionizing = 0 + var/particle_type + var/additional_particles = 0 + var/turf/target + var/turf/source + var/movetotarget = 1 weak movement_range = 8 energy = 5 diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index ed1f0b3e19..811d4ebde5 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /*Composed of 7 parts 3 Particle emitters proc @@ -62,13 +64,12 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin icon_state = "none" anchored = 0 density = 1 - var - obj/machinery/particle_accelerator/control_box/master = null - construction_state = 0 - reference = null - powered = 0 - strength = null - desc_holder = null + var/obj/machinery/particle_accelerator/control_box/master = null + var/construction_state = 0 + var/reference = null + var/powered = 0 + var/strength = null + var/desc_holder = null end_cap name = "Alpha Particle Generation Array" @@ -291,13 +292,12 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin use_power = 0 idle_power_usage = 0 active_power_usage = 0 - var - construction_state = 0 - active = 0 - reference = null - powered = null - strength = 0 - desc_holder = null + var/construction_state = 0 + var/active = 0 + var/reference = null + var/powered = null + var/strength = 0 + var/desc_holder = null verb/rotate() @@ -440,4 +440,4 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin use_power = 1 update_icon() return 1 - return 0 \ No newline at end of file + return 0 diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 758a27eb4a..cb8868dc34 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/machinery/particle_accelerator/control_box name = "Particle Accelerator Control Computer" desc = "This controls the density of the particles." @@ -11,10 +13,9 @@ active_power_usage = 10000 construction_state = 0 active = 0 - var - list/obj/structure/particle_accelerator/connected_parts - assembled = 0 - parts = null + var/list/obj/structure/particle_accelerator/connected_parts + var/assembled = 0 + var/parts = null New() diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm index 509a1ed0c1..1a338c7e00 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm @@ -1,11 +1,12 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/structure/particle_accelerator/particle_emitter name = "EM Containment Grid" desc_holder = "This launchs the Alpha particles, might not want to stand near this end." icon = 'particle_accelerator.dmi' icon_state = "none" - var - fire_delay = 50 - last_shot = 0 + var/fire_delay = 50 + var/last_shot = 0 center icon_state = "emitter_center" @@ -46,4 +47,4 @@ if(A) A.dir = src.dir return 1 - return 0 \ No newline at end of file + return 0 diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 668b969d3f..bf31dce135 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + var/global/list/uneatable = list( /turf/space, /obj/effect/overlay, @@ -15,23 +17,22 @@ var/global/list/uneatable = list( layer = 6 unacidable = 1 //Don't comment this out. use_power = 0 - var - current_size = 1 - allowed_size = 1 - contained = 1 //Are we going to move around? - energy = 100 //How strong are we? - dissipate = 1 //Do we lose energy over time? - dissipate_delay = 10 - dissipate_track = 0 - dissipate_strength = 1 //How much energy do we lose? - move_self = 1 //Do we move on our own? - grav_pull = 4 //How many tiles out do we pull? - consume_range = 0 //How many tiles out do we eat - event_chance = 15 //Prob for event each tick - target = null //its target. moves towards the target if it has one - last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing - teleport_del = 0 - last_warning + var/current_size = 1 + var/allowed_size = 1 + var/contained = 1 //Are we going to move around? + var/energy = 100 //How strong are we? + var/dissipate = 1 //Do we lose energy over time? + var/dissipate_delay = 10 + var/dissipate_track = 0 + var/dissipate_strength = 1 //How much energy do we lose? + var/move_self = 1 //Do we move on our own? + var/grav_pull = 4 //How many tiles out do we pull? + var/consume_range = 0 //How many tiles out do we eat + var/event_chance = 15 //Prob for event each tick + var/target = null //its target. moves towards the target if it has one + var/last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing + var/teleport_del = 0 + var/last_warning New(loc, var/starting_energy = 50, var/temp = 0) //CARN: admin-alert for chuckle-fuckery. @@ -552,4 +553,4 @@ var/global/list/uneatable = list( consume(X) if(defer_powernet_rebuild != 2) defer_powernet_rebuild = 0 - return \ No newline at end of file + return diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 462755b9be..9cbbbf4fa2 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + #define SOLARGENRATE 1500 /obj/machinery/power/solar name = "solar panel" @@ -10,15 +12,14 @@ use_power = 0 idle_power_usage = 0 active_power_usage = 0 - var - health = 10 - id = 1 - obscured = 0 - sunfrac = 0 - adir = SOUTH - ndir = SOUTH - turn_angle = 0 - obj/machinery/power/solar_control/control = null + var/health = 10 + var/id = 1 + var/obscured = 0 + var/sunfrac = 0 + var/adir = SOUTH + var/ndir = SOUTH + var/turn_angle = 0 + var/obj/machinery/power/solar_control/control = null proc healthcheck() updateicon() @@ -162,15 +163,14 @@ use_power = 1 idle_power_usage = 5 active_power_usage = 20 - var - id = 1 - cdir = 0 - gen = 0 - lastgen = 0 - track = 2 // 0= off 1=timed 2=auto (tracker) - trackrate = 600 // 300-900 seconds - trackdir = 1 // 0 =CCW, 1=CW - nexttime = 0 + var/id = 1 + var/cdir = 0 + var/gen = 0 + var/lastgen = 0 + var/track = 2 // 0= off 1=timed 2=auto (tracker) + var/trackrate = 600 // 300-900 seconds + var/trackdir = 1 // 0 =CCW, 1=CW + var/nexttime = 0 proc updateicon() tracker_update(var/angle) diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index a8802a7f1a..9b7a6715c3 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/ammo_casing name = "bullet casing" desc = "A bullet casing." @@ -6,10 +8,9 @@ flags = FPRINT | TABLEPASS | CONDUCT | ONBELT throwforce = 1 w_class = 1.0 - var - caliber = "" //Which kind of guns it can be loaded into - projectile_type = ""//The bullet type to create when New() is called - obj/item/projectile/BB = null //The loaded bullet + var/caliber = "" //Which kind of guns it can be loaded into + var/projectile_type = ""//The bullet type to create when New() is called + var/obj/item/projectile/BB = null //The loaded bullet New() @@ -35,11 +36,10 @@ w_class = 1.0 throw_speed = 4 throw_range = 10 - var - list/stored_ammo = list() - ammo_type = "/obj/item/ammo_casing" - max_ammo = 7 - multiple_sprites = 0 + var/list/stored_ammo = list() + var/ammo_type = "/obj/item/ammo_casing" + var/max_ammo = 7 + var/multiple_sprites = 0 New() diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 5e70bb3741..5e51c673b5 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -1,15 +1,16 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/gun/energy icon_state = "energy" name = "energy gun" desc = "A basic energy-based gun." fire_sound = 'Taser.ogg' - var - obj/item/weapon/cell/power_supply //What type of power cell this uses - charge_cost = 100 //How much energy is needed to fire. - cell_type = "/obj/item/weapon/cell" - projectile_type = "/obj/item/projectile/energy" - modifystate + var/obj/item/weapon/cell/power_supply //What type of power cell this uses + var/charge_cost = 100 //How much energy is needed to fire. + var/cell_type = "/obj/item/weapon/cell" + var/projectile_type = "/obj/item/projectile/energy" + var/modifystate emp_act(severity) power_supply.use(round(power_supply.maxcharge / severity)) diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 8df4b8bb45..dc32ba1f08 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/gun/energy/gun icon_state = "energystun100" item_state = "energystun100" @@ -10,8 +12,7 @@ origin_tech = "combat=3;magnets=2" modifystate = "energystun" - var - mode = 0 //0 = stun, 1 = kill + var/mode = 0 //0 = stun, 1 = kill attack_self(mob/living/user as mob) diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 25b9144faf..385e167719 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/gun/projectile desc = "A classic revolver. Uses 357 ammo" name = "revolver" @@ -8,12 +10,11 @@ m_amt = 1000 force = 10 //Pistol whipp'n good. (It was frigging SIXTY on pre-goon code) - var - ammo_type = "/obj/item/ammo_casing/a357" - list/loaded = list() - max_shells = 7 - load_method = 0 //0 = Single shells or quick loader, 1 = box, 2 = magazine - obj/item/ammo_magazine/empty_mag = null + var/ammo_type = "/obj/item/ammo_casing/a357" + var/list/loaded = list() + var/max_shells = 7 + var/load_method = 0 //0 = Single shells or quick loader, 1 = box, 2 = magazine + var/obj/item/ammo_magazine/empty_mag = null New() diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 72daf9dc61..559ac2ae01 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /obj/item/weapon/gun/projectile/shotgun/pump name = "shotgun" desc = "Useful for sweeping alleys." @@ -10,10 +12,9 @@ caliber = "shotgun" origin_tech = "combat=4;materials=2" ammo_type = "/obj/item/ammo_casing/shotgun/beanbag" - var - recentpump = 0 // to prevent spammage - pumped = 0 - obj/item/ammo_casing/current_shell = null + var/recentpump = 0 // to prevent spammage + var/pumped = 0 + var/obj/item/ammo_casing/current_shell = null load_into_chamber() @@ -128,4 +129,4 @@ flags |= ONBELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) name = "sawn-off shotgun" desc = "Omar's coming!" - user << "You shorten the barrel of \the [src]!" \ No newline at end of file + user << "You shorten the barrel of \the [src]!" diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 9e223da1b1..7b119584bf 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /* #define BRUTE "brute" #define BURN "burn" @@ -19,33 +21,32 @@ flags = FPRINT | TABLEPASS pass_flags = PASSTABLE mouse_opacity = 0 - var - bumped = 0 //Prevents it from hitting more than one guy at once - def_zone = "" //Aiming at - mob/firer = null//Who shot it - silenced = 0 //Attack message - yo = null - xo = null - current = null - turf/original = null // the original turf clicked - turf/starting = null // the projectile's starting turf + var/bumped = 0 //Prevents it from hitting more than one guy at once + var/def_zone = "" //Aiming at + var/mob/firer = null//Who shot it + var/silenced = 0 //Attack message + var/yo = null + var/xo = null + var/current = null + var/turf/original = null // the original turf clicked + var/turf/starting = null // the projectile's starting turf - p_x = 16 - p_y = 16 // the pixel location of the tile that the player clicked. Default is the center + var/p_x = 16 + var/p_y = 16 // the pixel location of the tile that the player clicked. Default is the center - damage = 10 - damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here - nodamage = 0 //Determines if the projectile will skip any damage inflictions - flag = "bullet" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb - projectile_type = "/obj/item/projectile" + var/damage = 10 + var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here + var/nodamage = 0 //Determines if the projectile will skip any damage inflictions + var/flag = "bullet" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb + var/projectile_type = "/obj/item/projectile" //Effects - stun = 0 - weaken = 0 - paralyze = 0 - irradiate = 0 - stutter = 0 - eyeblur = 0 - drowsy = 0 + var/stun = 0 + var/weaken = 0 + var/paralyze = 0 + var/irradiate = 0 + var/stutter = 0 + var/eyeblur = 0 + var/drowsy = 0 proc/on_hit(var/atom/target, var/blocked = 0) @@ -154,9 +155,8 @@ invisibility = 101 //Nope! Can't see me! yo = null xo = null - var - target = null - result = 0 //To pass the message back to the gun. + var/target = null + var/result = 0 //To pass the message back to the gun. Bump(atom/A as mob|obj|turf|area) if(A == firer) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 80ec3ea55e..9a3afaee3a 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + // Disposal bin // Holds items for disposal into pipe system // Draws air from turf, gradually charges internal reservoir @@ -1076,17 +1078,16 @@ desc = "An underfloor disposal pipe with a package sorting mechanism." icon_state = "pipe-j1s" - var - list/sortType = list() - list/backType = list() - backsort = 0 //For sending disposal packets to upstream destinations. - mailsort = 0 - posdir = 0 - negdir = 0 - sortdir = 0 - service = 0 - screen = 0 - icon_state_old = null + var/list/sortType = list() + var/list/backType = list() + var/backsort = 0 //For sending disposal packets to upstream destinations. + var/mailsort = 0 + var/posdir = 0 + var/negdir = 0 + var/sortdir = 0 + var/service = 0 + var/screen = 0 + var/icon_state_old = null nonsorting NE @@ -1249,11 +1250,10 @@ name = "\improper Package Discrimination Unit" desc = "An underfloor disposal pipe that is racist against packages." icon_state = "pipe-j1s" - var - posdir = 0 - negdir = 0 - sortdir = 0 - screen = 0 + var/posdir = 0 + var/negdir = 0 + var/sortdir = 0 + var/screen = 0 New() diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index f99231a3d3..16edac9088 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05 + /*///////////////Circuit Imprinter (By Darem)//////////////////////// Used to print new circuit boards (for computers and similar systems) and AI modules. Each circuit board pattern are stored in a /datum/desgin on the linked R&D console. You can then print them out in a fasion similar to a regular lathe. However, instead of @@ -8,11 +10,10 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). name = "Circuit Imprinter" icon_state = "circuit_imprinter" flags = OPENCONTAINER - var - g_amount = 0 - gold_amount = 0 - diamond_amount = 0 - max_material_amount = 75000.0 + var/g_amount = 0 + var/gold_amount = 0 + var/diamond_amount = 0 + var/max_material_amount = 75000.0 New() ..() diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 9470049029..e3cae5c9f6 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + /*************************************************************** ** Design Datums ** ** All the data for building stuff and tracking reliability. ** @@ -39,18 +41,17 @@ other types of metals and chemistry for reagents). datum design //Datum for object designs, used in construction - var - name = "Name" //Name of the created object. - desc = "Desc" //Description of the created object. - id = "id" //ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols - list/req_tech = list() //IDs of that techs the object originated from and the minimum level requirements. - reliability_mod = 0 //Reliability modifier of the device at it's starting point. - reliability_base = 100 //Base reliability of a device before modifiers. - reliability = 100 //Reliability of the device. - build_type = null //Flag as to what kind machine the design is built in. See defines. - list/materials = list() //List of materials. Format: "id" = amount. - build_path = "" //The file path of the object that gets created - locked = 0 //If true it will spawn inside a lockbox with currently sec access + var/name = "Name" //Name of the created object. + var/desc = "Desc" //Description of the created object. + var/id = "id" //ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols + var/list/req_tech = list() //IDs of that techs the object originated from and the minimum level requirements. + var/reliability_mod = 0 //Reliability modifier of the device at it's starting point. + var/reliability_base = 100 //Base reliability of a device before modifiers. + var/reliability = 100 //Reliability of the device. + var/build_type = null //Flag as to what kind machine the design is built in. See defines. + var/list/materials = list() //List of materials. Format: "id" = amount. + var/build_path = "" //The file path of the object that gets created + var/locked = 0 //If true it will spawn inside a lockbox with currently sec access proc //A proc to calculate the reliability of a design based on tech levels and innate modifiers. diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 5b120e5117..2a108a4986 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + /* Destructive Analyzer @@ -8,9 +10,8 @@ Note: Must be placed within 3 tiles of the R&D Console /obj/machinery/r_n_d/destructive_analyzer name = "Destructive Analyzer" icon_state = "d_analyzer" - var - obj/item/weapon/loaded_item = null - decon_mod = 1 + var/obj/item/weapon/loaded_item = null + var/decon_mod = 1 New() ..() @@ -109,4 +110,4 @@ Note: Must be placed within 3 tiles of the R&D Console icon_state = "d20" g_amt = 5000 m_amt = 5000 - origin_tech = "materials=5;plasmatech=5;syndicate=5;programming=9"*/ \ No newline at end of file + origin_tech = "materials=5;plasmatech=5;syndicate=5;programming=9"*/ diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index c4da96269a..bb7694a026 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + /* Protolathe @@ -11,17 +13,16 @@ Note: Must be placed west/left of and R&D console to function. name = "Protolathe" icon_state = "protolathe" flags = OPENCONTAINER - var - max_material_storage = 100000 //All this could probably be done better with a list but meh. - m_amount = 0.0 - g_amount = 0.0 - gold_amount = 0.0 - silver_amount = 0.0 - plasma_amount = 0.0 - uranium_amount = 0.0 - diamond_amount = 0.0 - clown_amount = 0.0 - adamantine_amount = 0.0 + var/max_material_storage = 100000 //All this could probably be done better with a list but meh. + var/m_amount = 0.0 + var/g_amount = 0.0 + var/gold_amount = 0.0 + var/silver_amount = 0.0 + var/plasma_amount = 0.0 + var/uranium_amount = 0.0 + var/diamond_amount = 0.0 + var/clown_amount = 0.0 + var/adamantine_amount = 0.0 New() @@ -174,4 +175,4 @@ Note: Must be placed west/left of and R&D console to function. stack.use(amount) busy = 0 src.updateUsrDialog() - return \ No newline at end of file + return diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index a309ea13b3..32cbbe50df 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + /* Research and Development (R&D) Console @@ -32,18 +34,17 @@ won't update every console in existence) but it's more of a hassle to do. Also, /obj/machinery/computer/rdconsole name = "R&D Console" icon_state = "rdcomp" - var - datum/research/files //Stores all the collected research data. - obj/item/weapon/disk/tech_disk/t_disk = null //Stores the technology disk. - obj/item/weapon/disk/design_disk/d_disk = null //Stores the design disk. + var/datum/research/files //Stores all the collected research data. + var/obj/item/weapon/disk/tech_disk/t_disk = null //Stores the technology disk. + var/obj/item/weapon/disk/design_disk/d_disk = null //Stores the design disk. - obj/machinery/r_n_d/destructive_analyzer/linked_destroy = null //Linked Destructive Analyzer - obj/machinery/r_n_d/protolathe/linked_lathe = null //Linked Protolathe - obj/machinery/r_n_d/circuit_imprinter/linked_imprinter = null //Linked Circuit Imprinter + var/obj/machinery/r_n_d/destructive_analyzer/linked_destroy = null //Linked Destructive Analyzer + var/obj/machinery/r_n_d/protolathe/linked_lathe = null //Linked Protolathe + var/obj/machinery/r_n_d/circuit_imprinter/linked_imprinter = null //Linked Circuit Imprinter - screen = 1.0 //Which screen is currently showing. - id = 0 //ID of the computer (for server restrictions). - sync = 1 //If sync = 0, it doesn't show up on Server Control Console + var/screen = 1.0 //Which screen is currently showing. + var/id = 0 //ID of the computer (for server restrictions). + var/sync = 1 //If sync = 0, it doesn't show up on Server Control Console req_access = list(access_tox) //Data and setting manipulation requires scientist access. @@ -890,4 +891,4 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(linked_imprinter.diamond_amount >= 3750) dat += "(Max Sheets)" user << browse("Research and Development Console
[dat]", "window=rdconsole;size=575x400") - onclose(user, "rdconsole") \ No newline at end of file + onclose(user, "rdconsole") diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 43f92517bf..a496c609a9 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + //All devices that link into the R&D console fall into thise type for easy identification and some shared procs. @@ -6,17 +8,16 @@ density = 1 anchored = 1 use_power = 1 - var - busy = 0 - hacked = 0 - disabled = 0 - shocked = 0 - list/wires = list() - hack_wire - disable_wire - shock_wire - opened = 0 - obj/machinery/computer/rdconsole/linked_console + var/busy = 0 + var/hacked = 0 + var/disabled = 0 + var/shocked = 0 + var/list/wires = list() + var/hack_wire + var/disable_wire + var/shock_wire + var/opened = 0 + var/obj/machinery/computer/rdconsole/linked_console New() ..() @@ -102,4 +103,4 @@ if(src.shock_wire == temp_wire) src.shocked = !src.shocked src.shock(usr,50) - src.updateUsrDialog() \ No newline at end of file + src.updateUsrDialog() diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 34ee129b99..6815f4a46b 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + /* General Explination: The research datum is the "folder" where all the research information is stored in a R&D console. It's also a holder for all the @@ -45,12 +47,11 @@ research holder datum. ***************************************************************/ /datum/research //Holder for all the existing, archived, and known tech. Individual to console. - var - list //Datum/tech go here. - possible_tech = list() //List of all tech in the game that players have access to (barring special events). - known_tech = list() //List of locally known tech. - possible_designs = list() //List of all designs (at base reliability). - known_designs = list() //List of available designs (at base reliability). + //Datum/tech go here. + var/list/possible_tech = list() //List of all tech in the game that players have access to (barring special events). + var/list/known_tech = list() //List of locally known tech. + var/list/possible_designs = list() //List of all designs (at base reliability). + var/list/known_designs = list() //List of available designs (at base reliability). New() //Insert techs into possible_tech here. Known_tech automatically updated. for(var/T in typesof(/datum/tech) - /datum/tech) @@ -170,12 +171,11 @@ research holder datum. datum tech //Datum of individual technologies. - var - name = "name" //Name of the technology. - desc = "description" //General description of what it does and what it makes. - id = "id" //An easily referenced ID. Must be alphanumeric, lower-case, and no symbols. - level = 1 //A simple number scale of the research level. Level 0 = Secret tech. - list/req_tech = list() //List of ids associated values of techs required to research this tech. "id" = # + var/name = "name" //Name of the technology. + var/desc = "description" //General description of what it does and what it makes. + var/id = "id" //An easily referenced ID. Must be alphanumeric, lower-case, and no symbols. + var/level = 1 //A simple number scale of the research level. Level 0 = Secret tech. + var/list/req_tech = list() //List of ids associated values of techs required to research this tech. "id" = # //Trunk Technologies (don't require any other techs and you start knowning them). @@ -268,4 +268,4 @@ datum var/datum/tech/stored New() src.pixel_x = rand(-5.0, 5) - src.pixel_y = rand(-5.0, 5) \ No newline at end of file + src.pixel_y = rand(-5.0, 5) diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 604a31c5d5..3ce78f337f 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -1,18 +1,18 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + /obj/machinery/r_n_d/server name = "R&D Server" icon_state = "server" - var - datum/research/files - health = 100 - list - id_with_upload = list() //List of R&D consoles with upload to server access. - id_with_download = list() //List of R&D consoles with download from server access. - id_with_upload_string = "" //String versions for easy editing in map editor. - id_with_download_string = "" - server_id = 0 - heat_gen = 100 - heating_power = 40000 - delay = 10 + var/datum/research/files + var/health = 100 + var/list/id_with_upload = list() //List of R&D consoles with upload to server access. + var/list/id_with_download = list() //List of R&D consoles with download from server access. + var/id_with_upload_string = "" //String versions for easy editing in map editor. + var/id_with_download_string = "" + var/server_id = 0 + var/heat_gen = 100 + var/heating_power = 40000 + var/delay = 10 req_access = list(access_rd) //Only the R&D can change server settings. New() @@ -159,13 +159,11 @@ /obj/machinery/computer/rdservercontrol name = "R&D Server Controller" icon_state = "rdcomp" - var - screen = 0 - obj/machinery/r_n_d/server/temp_server - list - servers = list() - consoles = list() - badmin = 0 + var/screen = 0 + var/obj/machinery/r_n_d/server/temp_server + var/list/servers = list() + var/list/consoles = list() + var/badmin = 0 Topic(href, href_list) if(..()) diff --git a/code/unused/beast/bodypart.dm b/code/unused/beast/bodypart.dm index 84b966c5d0..88300f978d 100644 --- a/code/unused/beast/bodypart.dm +++ b/code/unused/beast/bodypart.dm @@ -1,7 +1,8 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + datum/bodypart - var - name = "unidentified bodypart" - health = 50 + var/name = "unidentified bodypart" + var/health = 50 datum/bodypart/body health = 100 @@ -12,4 +13,4 @@ datum/bodypart/head datum/bodypart/limb datum/bodypart/tail - health = 15 \ No newline at end of file + health = 15 diff --git a/code/unused/spacecraft/manufacturing.dm b/code/unused/spacecraft/manufacturing.dm index 172ce5f519..cfbc75c7c8 100644 --- a/code/unused/spacecraft/manufacturing.dm +++ b/code/unused/spacecraft/manufacturing.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + // Entirely unfinished. Mostly just bouncing ideas off the code. @@ -10,8 +12,7 @@ icon = 'mining.dmi' icon_state = "deploycrate" density = 1 - var - payload + var/payload /obj/deploycrate/attack_hand(mob/user as mob) switch(payload) @@ -30,20 +31,19 @@ icon_state = "sprayer" density = 1 anchored = 1 - var - payload - hacked = 0 - temp = 100 + var/payload + var/hacked = 0 + var/temp = 100 - usr_density = 5 - usr_lastupdate = 0 + var/usr_density = 5 + var/usr_lastupdate = 0 - time_started = 0 + var/time_started = 0 - points = 0 - totalpoints = 0 + var/points = 0 + var/totalpoints = 0 - state = 0 // 0 - Idle, 1 - Spraying, 2 - Done, 3 - Overheated + var/state = 0 // 0 - Idle, 1 - Spraying, 2 - Done, 3 - Overheated obj/machinery/nanosprayer/proc/update_temp() // 1 second : 1 degree @@ -102,7 +102,7 @@ obj/machinery/nanosprayer/attack_hand(user as mob) var/dat if(..()) return - dat += text("Core Temp: [temp]°C
") + dat += text("Core Temp: [temp]�C
") dat += text("Nanocloud Density: [usr_density] million
") dat += text("\[- / +\]
") if(payload) @@ -171,12 +171,11 @@ obj/machinery/nanosprayer/Topic(href, href_list) icon_state = "sprayer" density = 1 anchored = 1 - var - locked = 0 - closed = 0 - state = 0 // 0 - Idle, 1 - Smelt, 2 - Cool, 3 - Clean - slag = 0 - hacked = 0 + var/locked = 0 + var/closed = 0 + var/state = 0 // 0 - Idle, 1 - Smelt, 2 - Cool, 3 - Clean + var/slag = 0 + var/hacked = 0 obj/machinery/smelter/attack_hand(user as mob) var/dat @@ -239,11 +238,10 @@ obj/machinery/smelter/Topic(href, href_list) density = 1 anchored = 1 - var - gameticker - gameworld + var/gameticker + var/gameworld New() ..() gameticker = ticker - gameworld = world \ No newline at end of file + gameworld = world diff --git a/code/unused/spacecraft/shipcore.dm b/code/unused/spacecraft/shipcore.dm index 6bbaea164b..d574a078dd 100644 --- a/code/unused/spacecraft/shipcore.dm +++ b/code/unused/spacecraft/shipcore.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06 + /obj/machinery/shipcore icon = 'craft.dmi' icon_state = "core" @@ -193,10 +195,9 @@ obj/machinery/shipcore/Topic(href, href_list) obj/machinery/ship_component name = "ship component" icon = 'craft.dmi' - var - obj/machinery/shipcore/core - required_draw = 0 - active = 1 + var/obj/machinery/shipcore/core + var/required_draw = 0 + var/active = 1 proc draw_power(var/n as num) @@ -213,10 +214,9 @@ obj/machinery/ship_component/thruster density = 1 opacity = 1 - var - cooldown = 600 // In 1/10th seconds - lastused - ready = 0 + var/cooldown = 600 // In 1/10th seconds + var/lastused + var/ready = 0 required_draw = 100 proc @@ -249,9 +249,8 @@ obj/machinery/ship_component/engine density = 1 opacity = 1 - var - charge = 1000 - capacity = 1000 + var/charge = 1000 + var/capacity = 1000 draw_power(var/n as num) if(charge >= n) @@ -346,4 +345,4 @@ obj/machinery/ship_component/control_panel if(!active) return src.active = 0 - src.anchored = 0 \ No newline at end of file + src.anchored = 0