diff --git a/code/FEA/FEA_fire.dm b/code/FEA/FEA_fire.dm index 675b70441f..502d40efdf 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 25.5.2012 20:42:31 + atom proc temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) @@ -59,13 +61,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 @@ -171,4 +172,4 @@ obj loc = null - ..() \ No newline at end of file + ..() diff --git a/code/FEA/FEA_turf_tile.dm b/code/FEA/FEA_turf_tile.dm index f42b071991..5de5a59248 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 25.5.2012 20:42:31 + atom/movable/var/pressure_resistance = 20 atom/movable/var/last_forced_movement = 0 @@ -89,23 +91,22 @@ turf var/current_graphic = null - var/tmp - datum/gas_mixture/air + var/tmp/datum/gas_mixture/air - processing = 1 - datum/air_group/turf/parent - group_border = 0 - length_space_border = 0 + var/tmp/processing = 1 + var/tmp/datum/air_group/turf/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/virus2/antibodies.dm b/code/WorkInProgress/virus2/antibodies.dm index 72953aa4ec..6277e1a617 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 25.5.2012 20:42:33 + // pure concentrated antibodies datum/reagent/antibodies data = new/list("antibodies"=0) @@ -14,20 +16,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", @@ -51,4 +52,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..6732e2a8b9 100644 --- a/code/datums/mixed.dm +++ b/code/datums/mixed.dm @@ -1,7 +1,8 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /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 25ce382022..515d60580c 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 25.5.2012 20:42:31 + // Controls the emergency shuttle @@ -10,15 +12,14 @@ var/global/datum/shuttle_controller/emergency_shuttle/emergency_shuttle datum/shuttle_controller - var - 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" + var/fake_recall = 0 //Used in rounds to prevent "ON NOES, IT MUST [INSERT ROUND] BECAUSE SHUTTLE CAN'T BE CALLED" // call the shuttle diff --git a/code/defines/global.dm b/code/defines/global.dm index 83d2197b15..0e76f2c216 100644 --- a/code/defines/global.dm +++ b/code/defines/global.dm @@ -1,18 +1,19 @@ -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 25.5.2012 20:42:31 + +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 +var/global/list/global_map = null //list/global_map = list(list(1,5),list(4,3))//an array of map Z levels. //Resulting sector map looks like //|_1_|_4_| @@ -23,169 +24,168 @@ 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 +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 - skipupdate = 0 +var/skipupdate = 0 /////////////// - eventchance = 1 //% per 2 mins - event = 0 - hadevent = 0 - blobevent = 0 +var/eventchance = 1 //% per 2 mins +var/event = 0 +var/hadevent = 0 +var/blobevent = 0 /////////////// - diary = null - diaryofmeanpeople = null - station_name = null - game_version = "/tg/ Station 13" +var/diary = null +var/diaryofmeanpeople = null +var/station_name = null +var/game_version = "/tg/ Station 13" - 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 - guests_allowed = 1 - shuttle_frozen = 0 - shuttle_left = 0 - tinted_weldhelh = 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 +var/guests_allowed = 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/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/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) +var/list/cardinal = list( NORTH, SOUTH, EAST, WEST ) +var/list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) - 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 //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/AAlarmWireColorToFlag = RandomAAlarmWires() - 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/AAlarmWireColorToFlag = RandomAAlarmWires() +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_NAME_LEN = 26 +var/const/MAX_MESSAGE_LEN = 1024 +var/const/MAX_NAME_LEN = 26 - 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 - 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? @@ -193,14 +193,14 @@ var // These are all default values that will load should the forumdbconfig.txt // file fail to read for whatever reason. - forumsqladdress = "localhost" - forumsqlport = "3306" - forumsqldb = "tgstation" - forumsqllogin = "root" - forumsqlpass = "" - forum_activated_group = "2" - forum_authenticated_group = "10" +var/forumsqladdress = "localhost" +var/forumsqlport = "3306" +var/forumsqldb = "tgstation" +var/forumsqllogin = "root" +var/forumsqlpass = "" +var/forum_activated_group = "2" +var/forum_authenticated_group = "10" // 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. diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 0cd9a3aa1a..97d929451b 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /obj //var/datum/module/mod //not used var/m_amt = 0 // metal @@ -941,8 +943,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 b72ffed8e7..876ee22d5e 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 25.5.2012 20:42:31 + /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" @@ -399,16 +399,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" @@ -421,9 +419,8 @@ 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 diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index b4723f3906..f1b693d441 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 25.5.2012 20:42:31 + /obj/item/weapon name = "weapon" icon = 'weapons.dmi' @@ -177,9 +179,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 12bbedfc67..0af47ba12c 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 25.5.2012 20:42:31 + /* 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..c12911aa89 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 25.5.2012 20:42:31 + //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 6f4a89f1c3..f74c7d9c1c 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 25.5.2012 20:42:31 + /proc/dopage(src,target) var/href_list var/href @@ -213,11 +215,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(X1, \ or / - if(127 to 255) return //rejects weird letters like ÿ + if(127 to 255) return //rejects weird letters like � if(0 to 31) return //more weird stuff if(32) //whitespace else non_whitespace = 1 @@ -1725,19 +1727,17 @@ proc/oview_or_orange(distance = world.view , center = usr , type) return /proc/stringsplit(txt, character) - var - cur_text = txt - last_found = 1 - found_char = findtext(cur_text,character) - list/list = list() + var/cur_text = txt + var/last_found = 1 + var/found_char = findtext(cur_text,character) + var/list/list = list() if(found_char) var/fs = copytext(cur_text,last_found,found_char) list += fs last_found = found_char+length(character) found_char = findtext(cur_text,character,last_found) while(found_char) - var - found_string = copytext(cur_text,last_found,found_char) + var/found_string = copytext(cur_text,last_found,found_char) last_found = found_char+length(character) list += found_string found_char = findtext(cur_text,character,last_found) @@ -1782,4 +1782,4 @@ proc/get_mob_with_client_list() for(var/mob/M in world) if (M.client) mobs += M - return mobs \ No newline at end of file + return mobs diff --git a/code/defines/turf.dm b/code/defines/turf.dm index b25a8f70ec..946e06bb25 100644 --- a/code/defines/turf.dm +++ b/code/defines/turf.dm @@ -1,26 +1,27 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /turf icon = 'floors.dmi' var/intact = 1 //for floors, use is_plating(), is_plasteel_floor() and is_light_floor() level = 1.0 - var //Properties for open tiles (/floor) - oxygen = 0 - carbon_dioxide = 0 - nitrogen = 0 - toxins = 0 + var/oxygen = 0 + var/carbon_dioxide = 0 + var/nitrogen = 0 + var/toxins = 0 //Properties for airtight tiles (/wall) - thermal_conductivity = 0.05 - heat_capacity = 1 + var/thermal_conductivity = 0.05 + var/heat_capacity = 1 //Properties for both - temperature = T20C + var/temperature = T20C - blocks_air = 0 - icon_old = null - pathweight = 1 + var/blocks_air = 0 + var/icon_old = null + var/pathweight = 1 proc/is_plating() return 0 diff --git a/code/game/algorithm.dm b/code/game/algorithm.dm index d8283e13b6..791c0415e2 100644 --- a/code/game/algorithm.dm +++ b/code/game/algorithm.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /world/New() ..() @@ -49,25 +51,24 @@ proc/countJob(rank) jobCount++ return jobCount -/mob/living/carbon/human/var/const - slot_back = 1 - slot_wear_mask = 2 - slot_handcuffed = 3 - slot_l_hand = 4 - slot_r_hand = 5 - slot_belt = 6 - slot_wear_id = 7 - slot_ears = 8 - slot_glasses = 9 - slot_gloves = 10 - slot_head = 11 - slot_shoes = 12 - slot_wear_suit = 13 - slot_w_uniform = 14 - slot_l_store = 15 - slot_r_store = 16 - slot_s_store = 17 - slot_in_backpack = 18 +/mob/living/carbon/human/var/const/slot_back = 1 +/mob/living/carbon/human/var/const/slot_wear_mask = 2 +/mob/living/carbon/human/var/const/slot_handcuffed = 3 +/mob/living/carbon/human/var/const/slot_l_hand = 4 +/mob/living/carbon/human/var/const/slot_r_hand = 5 +/mob/living/carbon/human/var/const/slot_belt = 6 +/mob/living/carbon/human/var/const/slot_wear_id = 7 +/mob/living/carbon/human/var/const/slot_ears = 8 +/mob/living/carbon/human/var/const/slot_glasses = 9 +/mob/living/carbon/human/var/const/slot_gloves = 10 +/mob/living/carbon/human/var/const/slot_head = 11 +/mob/living/carbon/human/var/const/slot_shoes = 12 +/mob/living/carbon/human/var/const/slot_wear_suit = 13 +/mob/living/carbon/human/var/const/slot_w_uniform = 14 +/mob/living/carbon/human/var/const/slot_l_store = 15 +/mob/living/carbon/human/var/const/slot_r_store = 16 +/mob/living/carbon/human/var/const/slot_s_store = 17 +/mob/living/carbon/human/var/const/slot_in_backpack = 18 /mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = 1) for (var/slot in slots) diff --git a/code/game/asteroid/artifacts.dm b/code/game/asteroid/artifacts.dm index d59561b916..dbe7ace325 100644 --- a/code/game/asteroid/artifacts.dm +++ b/code/game/asteroid/artifacts.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + var/global/list/space_surprises = list( /obj/item/clothing/mask/facehugger/angry =4, // /obj/effect/critter/spesscarp =2, /obj/effect/critter/spesscarp/elite =2, @@ -34,9 +36,8 @@ var/global/list/spawned_surprises = list() anchored = 1 density = 1 - var - charges = 1 - insisting = 0 + var/charges = 1 + var/insisting = 0 /obj/machinery/wish_granter/attack_hand(var/mob/user as mob) usr.machine = src diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index a5b58106e8..0d73a24a87 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -1,8 +1,9 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + //Few global vars to track the blob -var - list/blobs = list() - list/blob_cores = list() - list/blob_nodes = list() +var/list/blobs = list() +var/list/blob_cores = list() +var/list/blob_nodes = list() /datum/game_mode/blob @@ -17,19 +18,18 @@ var var/const/waittime_l = 1800 //lower bound on time before intercept arrives (in tenths of seconds) var/const/waittime_h = 3600 //upper bound on time before intercept arrives (in tenths of seconds) - var - declared = 0 - stage = 0 + var/declared = 0 + var/stage = 0 - cores_to_spawn = 1 - players_per_core = 16 + var/cores_to_spawn = 1 + var/players_per_core = 16 //Controls expansion via game controller - autoexpand = 0 - expanding = 0 + var/autoexpand = 0 + var/expanding = 0 - blobnukecount = 500 - blobwincount = 700 + var/blobnukecount = 500 + var/blobwincount = 700 announce() diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index f1d25b68c8..1225824a4d 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /datum/game_mode/blob/send_intercept(var/report = 1) var/intercepttext = "" var/interceptname = "Error" @@ -43,14 +45,13 @@ /datum/station_state - var - floor = 0 - wall = 0 - r_wall = 0 - window = 0 - door = 0 - grille = 0 - mach = 0 + var/floor = 0 + var/wall = 0 + var/r_wall = 0 + var/window = 0 + var/door = 0 + var/grille = 0 + var/mach = 0 proc/count() @@ -101,4 +102,4 @@ output += (result.door / max(door,1)) output += (result.grille / max(grille,1)) output += (result.mach / max(mach,1)) - return (output/7) \ No newline at end of file + return (output/7) diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 9a2685aee9..a455ca477f 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + //I will need to recode parts of this but I am way too tired atm /obj/effect/blob name = "blob" @@ -7,19 +9,18 @@ density = 1 opacity = 0 anchored = 1 - var - active = 1 - health = 30 - brute_resist = 4 - fire_resist = 1 - blobtype = "Blob" - blobdebug = 0 + var/active = 1 + var/health = 30 + var/brute_resist = 4 + var/fire_resist = 1 + var/blobtype = "Blob" + var/blobdebug = 0 /*Types - Blob - Node - Core - Factory - Shield + var/Blob + var/Node + var/Core + var/Factory + var/Shield */ diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 255ee939f1..594420d858 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 25.5.2012 20:42:31 + /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/events/dust.dm b/code/game/gamemodes/events/dust.dm index dc2989f5d3..f76b937fe5 100644 --- a/code/game/gamemodes/events/dust.dm +++ b/code/game/gamemodes/events/dust.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /* Space dust Commonish random event that causes small clumps of "space dust" to hit the station at high speeds. @@ -34,9 +36,8 @@ The "dust" will damage the hull of the station causin minor hull breaches. icon_state = "space_dust" density = 1 anchored = 1 - var - strength = 2 //ex_act severity number - life = 2 //how many things we hit before del(src) + var/strength = 2 //ex_act severity number + var/life = 2 //how many things we hit before del(src) weak strength = 3 @@ -116,4 +117,4 @@ The "dust" will damage the hull of the station causin minor hull breaches. ex_act(severity) del(src) - return \ No newline at end of file + return diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index d4f390db4f..cba4cc9514 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +++++++++++++++++++++++++++++++++// //++++++++++++++++++++++++++++++++++ @@ -163,7 +165,7 @@ ________________________________________________________________________________ U << "\blue Extending neural-net interface...\nNow monitoring brain wave pattern..." if(3) if(U.stat==2||U.health<=0) - U << "\red FĆAL ÈRrÖR: 344--93#†&&21 BRÄÌN |/|/aVÈ PATT$RN RED\nA-A-aBÖrTÌNG..." + U << "\red FĆAL �Rr�R: 344--93#�&&21 BR��N |/|/aV� PATT$RN RED\nA-A-aB�rT�NG..." unlock_suit() break lock_suit(U,1)//Check for icons. @@ -659,24 +661,24 @@ ________________________________________________________________________________ switch(i) if(0) A << "\red WARNING: \black purge procedure detected. \nNow hacking host..." - U << "\red WARNING: HACKING AT††TEMP† IN PR0GRESs!" + U << "\red WARNING: HACKING AT��TEMP� IN PR0GRESs!" spideros = 0 k_unlock = 0 U << browse(null, "window=spideros") if(1) A << "Disconnecting neural interface..." - U << "\red WAR†NING: þR†O0†GrÈ--S 2&3%" + U << "\red WAR�NING: �R�O0�Gr�--S 2&3%" if(2) A << "Shutting down external protocol..." - U << "\red WARNING: PþþþþRÖ†GrÈ5S 677^%" + U << "\red WARNING: P����RÖ†Gr�5S 677^%" cancel_stealth() if(3) A << "Connecting to kernel..." - U << "\red WARNING: ÈR†rÖR_404" + U << "\red WARNING: �R�r�R_404" A.control_disabled = 0 if(4) A << "Connection established and secured. Menu updated." - U << "\red WÄr#nING: #%@!!WȆ|_4þ54@ \nUnÄB88l3 TÖ LÖ-†o-LÖCaT2 ##$!ÈRNÈ0..%.." + U << "\red W�r#nING: #%@!!WȆ|_4�54@ \nUn�B88l3 T� L�-�o-L�CaT2 ##$!�RN�0..%.." grant_AI_verbs() return sleep(s_delay) @@ -918,7 +920,7 @@ ________________________________________________________________________________ U << "There are [s_bombs] smoke bombs remaining." U << "There are [a_boost] adrenaline boosters remaining." else - U << "ÈrrÖR Ða†Ða†Ä No-†-† fÖÚNÐ 3RRÖr" + U << "�rr�R �a��a�� No-�-� f��N� 3RR�r" /* =================================================================================== @@ -1307,10 +1309,9 @@ It is possible to destroy the net by the occupant or someone else. mouse_opacity = 1//So you can hit it with stuff. anchored = 1//Can't drag/grab the trapped mob. - var - health = 25//How much health it has. - mob/living/affecting = null//Who it is currently affecting, if anyone. - mob/living/master = null//Who shot web. Will let this person know if the net was successful or failed. + var/health = 25//How much health it has. + var/mob/living/affecting = null//Who it is currently affecting, if anyone. + var/mob/living/master = null//Who shot web. Will let this person know if the net was successful or failed. proc healthcheck() @@ -1453,4 +1454,4 @@ It is possible to destroy the net by the occupant or someone else. health = max(0, health - aforce) healthcheck() ..() - return \ No newline at end of file + return diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 2fb5fe1035..c4eaa49fb7 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 25.5.2012 20:42:31 + /* * GAMEMODES (by Rastaf0) * @@ -11,23 +13,22 @@ /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 - required_players = 0 - 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/required_players = 0 + 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/objective.dm b/code/game/gamemodes/objective.dm index 2898de8f41..a9cbcab909 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 25.5.2012 20:42:31 + 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) @@ -545,4 +546,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 ca3bf59ca3..95a9a1ab2f 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 25.5.2012 20:42:31 + +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/access.dm b/code/game/jobs/access.dm index dd057395f2..ddb5f9ab7e 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -1,84 +1,85 @@ -/var/const - access_security = 1 - access_brig = 2 - access_armory = 3 - access_forensics_lockers= 4 - access_medical = 5 - access_morgue = 6 - access_tox = 7 - access_tox_storage = 8 - access_genetics = 9 - access_engine = 10 - access_engine_equip= 11 - access_maint_tunnels = 12 - access_external_airlocks = 13 - access_emergency_storage = 14 - access_change_ids = 15 - access_ai_upload = 16 - access_teleporter = 17 - access_eva = 18 - access_heads = 19 - access_captain = 20 - access_all_personal_lockers = 21 - access_chapel_office = 22 - access_tech_storage = 23 - access_atmospherics = 24 - access_bar = 25 - access_janitor = 26 - access_crematorium = 27 - access_kitchen = 28 - access_robotics = 29 - access_rd = 30 - access_cargo = 31 - access_construction = 32 - access_chemistry = 33 - access_cargo_bot = 34 - access_hydroponics = 35 - access_manufacturing = 36 - access_library = 37 - access_lawyer = 38 - access_virology = 39 - access_cmo = 40 - access_qm = 41 - access_court = 42 - access_clown = 43 - access_mime = 44 - access_surgery = 45 - access_theatre = 46 - access_research = 47 - access_mining = 48 - access_mining_office = 49 //not in use - access_mailsorting = 50 - access_mint = 51 - access_mint_vault = 52 - access_heads_vault = 53 - access_mining_station = 54 - access_xenobiology = 55 - access_ce = 56 - access_hop = 57 - access_hos = 58 - access_RC_announce = 59 //Request console announcements - access_keycard_auth = 60 //Used for events which require at least two people to confirm them - access_tcomsat = 61 // has access to the entire telecomms satellite / machinery +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + +/var/const/access_security = 1 +/var/const/access_brig = 2 +/var/const/access_armory = 3 +/var/const/access_forensics_lockers= 4 +/var/const/access_medical = 5 +/var/const/access_morgue = 6 +/var/const/access_tox = 7 +/var/const/access_tox_storage = 8 +/var/const/access_genetics = 9 +/var/const/access_engine = 10 +/var/const/access_engine_equip= 11 +/var/const/access_maint_tunnels = 12 +/var/const/access_external_airlocks = 13 +/var/const/access_emergency_storage = 14 +/var/const/access_change_ids = 15 +/var/const/access_ai_upload = 16 +/var/const/access_teleporter = 17 +/var/const/access_eva = 18 +/var/const/access_heads = 19 +/var/const/access_captain = 20 +/var/const/access_all_personal_lockers = 21 +/var/const/access_chapel_office = 22 +/var/const/access_tech_storage = 23 +/var/const/access_atmospherics = 24 +/var/const/access_bar = 25 +/var/const/access_janitor = 26 +/var/const/access_crematorium = 27 +/var/const/access_kitchen = 28 +/var/const/access_robotics = 29 +/var/const/access_rd = 30 +/var/const/access_cargo = 31 +/var/const/access_construction = 32 +/var/const/access_chemistry = 33 +/var/const/access_cargo_bot = 34 +/var/const/access_hydroponics = 35 +/var/const/access_manufacturing = 36 +/var/const/access_library = 37 +/var/const/access_lawyer = 38 +/var/const/access_virology = 39 +/var/const/access_cmo = 40 +/var/const/access_qm = 41 +/var/const/access_court = 42 +/var/const/access_clown = 43 +/var/const/access_mime = 44 +/var/const/access_surgery = 45 +/var/const/access_theatre = 46 +/var/const/access_research = 47 +/var/const/access_mining = 48 +/var/const/access_mining_office = 49 //not in use +/var/const/access_mailsorting = 50 +/var/const/access_mint = 51 +/var/const/access_mint_vault = 52 +/var/const/access_heads_vault = 53 +/var/const/access_mining_station = 54 +/var/const/access_xenobiology = 55 +/var/const/access_ce = 56 +/var/const/access_hop = 57 +/var/const/access_hos = 58 +/var/const/access_RC_announce = 59 //Request console announcements +/var/const/access_keycard_auth = 60 //Used for events which require at least two people to confirm them +/var/const/access_tcomsat = 61 // has access to the entire telecomms satellite / machinery //BEGIN CENTCOM ACCESS /*Should leave plenty of room if we need to add more access levels. - Mostly for admin fun times.*/ - access_cent_general = 101//General facilities. - access_cent_thunder = 102//Thunderdome. - access_cent_specops = 103//Special Ops. - access_cent_medical = 104//Medical/Research - access_cent_living = 105//Living quarters. - access_cent_storage = 106//Generic storage areas. - access_cent_teleporter = 107//Teleporter. - access_cent_creed = 108//Creed's office. - access_cent_captain = 109//Captain's office/ID comp/AI. +/var/const/Mostly for admin fun times.*/ +/var/const/access_cent_general = 101//General facilities. +/var/const/access_cent_thunder = 102//Thunderdome. +/var/const/access_cent_specops = 103//Special Ops. +/var/const/access_cent_medical = 104//Medical/Research +/var/const/access_cent_living = 105//Living quarters. +/var/const/access_cent_storage = 106//Generic storage areas. +/var/const/access_cent_teleporter = 107//Teleporter. +/var/const/access_cent_creed = 108//Creed's office. +/var/const/access_cent_captain = 109//Captain's office/ID comp/AI. //The Syndicate - access_syndicate = 150//General Syndicate Access +/var/const/access_syndicate = 150//General Syndicate Access //MONEY - access_crate_cash = 200 +/var/const/access_crate_cash = 200 /obj/var/list/req_access = null /obj/var/req_access_txt = "0" diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 1121413c7f..da15764efe 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -1,13 +1,14 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + var/global/datum/controller/occupations/job_master /datum/controller/occupations - var //List of all jobs - list/occupations = list() + var/list/occupations = list() //Players who need jobs - list/unassigned = list() + var/list/unassigned = list() //Debug info - list/job_debug = list() + var/list/job_debug = list() New() @@ -359,4 +360,4 @@ var/global/datum/controller/occupations/job_master else level4++ //not selected 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 + feedback_add_details("job_preferences",tmp_str) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index cc0dc766e0..8ba0ecc067 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -1,46 +1,47 @@ -var/const - ENGSEC =(1<<0) +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 - CAPTAIN =(1<<0) - HOS =(1<<1) - WARDEN =(1<<2) - DETECTIVE =(1<<3) - OFFICER =(1<<4) - CHIEF =(1<<5) - ENGINEER =(1<<6) - ATMOSTECH =(1<<7) - ROBOTICIST =(1<<8) - AI =(1<<9) - CYBORG =(1<<10) +var/const/ENGSEC =(1<<0) + +var/const/CAPTAIN =(1<<0) +var/const/HOS =(1<<1) +var/const/WARDEN =(1<<2) +var/const/DETECTIVE =(1<<3) +var/const/OFFICER =(1<<4) +var/const/CHIEF =(1<<5) +var/const/ENGINEER =(1<<6) +var/const/ATMOSTECH =(1<<7) +var/const/ROBOTICIST =(1<<8) +var/const/AI =(1<<9) +var/const/CYBORG =(1<<10) - MEDSCI =(1<<1) +var/const/MEDSCI =(1<<1) - RD =(1<<0) - SCIENTIST =(1<<1) - CHEMIST =(1<<2) - CMO =(1<<3) - DOCTOR =(1<<4) - GENETICIST =(1<<5) - VIROLOGIST =(1<<6) +var/const/RD =(1<<0) +var/const/SCIENTIST =(1<<1) +var/const/CHEMIST =(1<<2) +var/const/CMO =(1<<3) +var/const/DOCTOR =(1<<4) +var/const/GENETICIST =(1<<5) +var/const/VIROLOGIST =(1<<6) - CIVILIAN =(1<<2) +var/const/CIVILIAN =(1<<2) - HOP =(1<<0) - BARTENDER =(1<<1) - BOTANIST =(1<<2) - CHEF =(1<<3) - JANITOR =(1<<4) - LIBRARIAN =(1<<5) - QUARTERMASTER =(1<<6) - CARGOTECH =(1<<7) - MINER =(1<<8) - LAWYER =(1<<9) - CHAPLAIN =(1<<10) - CLOWN =(1<<11) - MIME =(1<<12) - ASSISTANT =(1<<13) +var/const/HOP =(1<<0) +var/const/BARTENDER =(1<<1) +var/const/BOTANIST =(1<<2) +var/const/CHEF =(1<<3) +var/const/JANITOR =(1<<4) +var/const/LIBRARIAN =(1<<5) +var/const/QUARTERMASTER =(1<<6) +var/const/CARGOTECH =(1<<7) +var/const/MINER =(1<<8) +var/const/LAWYER =(1<<9) +var/const/CHAPLAIN =(1<<10) +var/const/CLOWN =(1<<11) +var/const/MIME =(1<<12) +var/const/ASSISTANT =(1<<13) var/list/assistant_occupations = list( diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 289c2e2719..a45e880138 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 25.5.2012 20:42:31 + /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 41be318498..e3f58584ad 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 25.5.2012 20:42:31 + var/global/list/autolathe_recipes = list( \ /* screwdriver removed*/ \ new /obj/item/weapon/reagent_containers/glass/bucket(), \ @@ -51,10 +53,9 @@ var/global/list/autolathe_recipes_hidden = list( \ ) /obj/machinery/autolathe - var - busy = 0 - max_m_amount = 150000.0 - max_g_amount = 75000.0 + var/busy = 0 + var/max_m_amount = 150000.0 + var/max_g_amount = 75000.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 348710f1d2..3e07ccbec3 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 25.5.2012 20:42:31 + // 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 @@ -957,4 +958,4 @@ new /obj/effect/decal/cleanable/oil(src.loc) unload(0) - del(src) \ No newline at end of file + del(src) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 4b5095d19a..74411352a4 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 25.5.2012 20:42:31 + /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 1701e61d6e..fad56a7e8f 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -1,12 +1,13 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /obj/machinery/computer/operating name = "Operating Computer" density = 1 anchored = 1.0 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() ..() @@ -78,4 +79,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 01718ed832..ad411729ed 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 25.5.2012 20:42:31 + /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 80d67c7f21..7c6b785adb 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 25.5.2012 20:42:31 + /obj/structure/computerframe density = 1 anchored = 0 @@ -17,15 +19,14 @@ 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 + 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 /obj/item/weapon/circuitboard/security name = "Circuit board (Security)" diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index f93a632c7a..c95ad39153 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -1,14 +1,15 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /obj/machinery/computer/security name = "Security Cameras" desc = "Used to access the various cameras on the station." icon_state = "cameras" circuit = "/obj/item/weapon/circuitboard/security" - var - obj/machinery/camera/current = null - last_pic = 1.0 - network = "SS13" - mapping = 0//For the overview file, interesting bit of code. + var/obj/machinery/camera/current = null + var/last_pic = 1.0 + var/network = "SS13" + var/mapping = 0//For the overview file, interesting bit of code. attack_ai(var/mob/user as mob) @@ -87,4 +88,4 @@ desc = "Used to access the various cameras on the outpost." icon_state = "miningcameras" network = "MINE" - circuit = "/obj/item/weapon/circuitboard/mining" \ No newline at end of file + circuit = "/obj/item/weapon/circuitboard/mining" diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 0f56300be6..4a02a5e7e7 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 25.5.2012 20:42:31 + /obj/machinery/computer/card name = "Identification Computer" desc = "You can use this to change ID's." 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 bec9773a9e..ef57be9f47 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 25.5.2012 20:42:31 + // The communications computer /obj/machinery/computer/communications name = "Communications Console" @@ -16,16 +18,15 @@ 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 + 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/status_display_freq = "1435" var/stat_msg1 @@ -553,4 +554,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..92f0874a4e 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 25.5.2012 20:42:31 + /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 11506bc303..f0faf4c903 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 25.5.2012 20:42:31 + /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() @@ -78,4 +79,4 @@ usr << "No free cyborgs detected." else usr << "[src.current.name] selected for law changes." - return \ No newline at end of file + return diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index f74e6f119a..a58b54b0e5 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -1,19 +1,20 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /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 - authenticated = null - rank = null - screen = null - datum/data/record/active1 = null - datum/data/record/active2 = null - a_id = null - temp = null - printing = null + var/obj/item/weapon/card/id/scan = 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 /obj/machinery/computer/med_data/attack_ai(user as mob) return src.attack_hand(user) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 9123a4bfc5..2e34481abf 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 25.5.2012 20:42:31 + /obj/machinery/computer/pod name = "Pod Launch Control" desc = "A controll for launching pods. Some people prefer firing Mechas." 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 adc45dc374..6348e74e7e 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 25.5.2012 20:42:31 + /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..4db02411f3 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 25.5.2012 20:42:31 + /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 acff945c5f..3c03e9b176 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -1,22 +1,23 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /obj/machinery/computer/secure_data//TODO:SANITY 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 - 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/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 15c175a5bf..789d2bbae8 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 25.5.2012 20:42:31 + /obj/machinery/constructable_frame //Made into a seperate type to make future revisions easier. name = "machine frame" icon = 'stock_parts.dmi' @@ -5,11 +7,10 @@ density = 1 anchored = 1 use_power = 0 - var - obj/item/weapon/circuitboard/circuit = null - list/components = null - list/req_components = null - state = 1 + var/obj/item/weapon/circuitboard/circuit = null + var/list/components = null + var/list/req_components = null + var/state = 1 /obj/machinery/constructable_frame/machine_frame attackby(obj/item/P as obj, mob/user as mob) diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index c56cbc2b79..2a5ddc1414 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 25.5.2012 20:42:31 + /obj/item/weapon/airlock_electronics name = "Airlock Electronics" icon = 'door_assembly.dmi' @@ -8,10 +10,9 @@ req_access = list(access_engine) - var - list/conf_access = null - last_configurator = null - locked = 1 + var/list/conf_access = null + var/last_configurator = null + var/locked = 1 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 1fc1f69114..012b860884 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 25.5.2012 20:42:31 + /////////////////////////////////////////////////////////////////////////////////////////////// // 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 36bbbc3d75..95b5c2e840 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 25.5.2012 20:42:31 + /obj/machinery/door name = "Door" desc = "It opens and closes." @@ -8,14 +10,13 @@ density = 1 layer = 2.7 - var - secondsElectrified = 0 - visible = 1 - p_open = 0 - operating = 0 - autoclose = 0 - glass = 0 - normalspeed = 1 + var/secondsElectrified = 0 + var/visible = 1 + var/p_open = 0 + var/operating = 0 + var/autoclose = 0 + var/glass = 0 + var/normalspeed = 1 proc/bumpopen(mob/user as mob) proc/update_nearby_tiles(need_rebuild) @@ -315,4 +316,4 @@ else close() return -*/ \ No newline at end of file +*/ diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index d1a3a6a089..8ed3c62867 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + /obj/machinery/mass_driver name = "mass driver" desc = "Shoots things into space." @@ -8,11 +10,10 @@ idle_power_usage = 2 active_power_usage = 50 - var - power = 1.0 - code = 1.0 - id = 1.0 - drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess. + var/power = 1.0 + var/code = 1.0 + var/id = 1.0 + var/drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess. proc/drive(amount) @@ -32,4 +33,4 @@ spawn( 0 ) O.throw_at(target, drive_range * power, power) flick("mass_driver1", src) - return \ No newline at end of file + return diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 264619f837..732f4a901e 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 25.5.2012 20:42:31 + 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 (istype(G, /obj/item/weapon/gun/energy)) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 44a4f05623..160d2303f8 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 25.5.2012 20:42:31 + // 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 9e14ec3b5d..bee35cac59 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 25.5.2012 20:42:31 + /* 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 e969112a08..390a4e098a 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 25.5.2012 20:42:31 + /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 2c3a952cdb..4c3b07f65c 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 25.5.2012 20:42:32 + /* @@ -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/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index f7b14b5982..1d53b22e97 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 + /* 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 8faa77779a..c765ef5406 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 25.5.2012 20:42:32 + /* 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 478d52da2a..1e3cb801ec 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 25.5.2012 20:42:32 + @@ -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 4cb7bda9ca..1a16ff3b0c 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 25.5.2012 20:42:31 + /* 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/cultist/ritual.dm b/code/game/magic/cultist/ritual.dm index 8ac93540c5..8e35f2e155 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 25.5.2012 20:42:32 + var/wordtravel = null var/wordself = null @@ -60,10 +62,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] @@ -769,8 +770,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 a5b9e0b874..e5a710e21c 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 25.5.2012 20:42:32 + //******************************* // // Library SQL Configuration @@ -170,12 +172,11 @@ 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. attack_self(var/mob/user as mob) if(src.dat) @@ -261,10 +262,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 @@ -300,11 +300,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 @@ -319,12 +318,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) @@ -411,18 +409,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 @@ -702,8 +699,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 @@ -770,4 +766,4 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f b.icon_state = "book[rand(1,7)]" del(O) else - ..() \ No newline at end of file + ..() diff --git a/code/game/magic/musician.dm b/code/game/magic/musician.dm index 5aeb388794..caf0cc6266 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 25.5.2012 20:42:32 + /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 3c35491fa3..d2285f00b5 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 25.5.2012 20:42:32 - 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/crates.dm b/code/game/objects/crates.dm index f0d092fd5f..8d8ae48d48 100644 --- a/code/game/objects/crates.dm +++ b/code/game/objects/crates.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 + /obj/structure/closet/crate desc = "A crate." name = "Crate" @@ -75,9 +77,8 @@ density = 1 icon_opened = "freezeropen" icon_closed = "freezer" - var - target_temp = T0C - 40 - cooling_power = 40 + var/target_temp = T0C - 40 + var/cooling_power = 40 return_air() var/datum/gas_mixture/gas = (..()) diff --git a/code/game/objects/grille.dm b/code/game/objects/grille.dm index b584f5ec99..55bd67d8a8 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 25.5.2012 20:42:32 + /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 006a075c28..1b1ec87223 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 25.5.2012 20:42:32 + #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 76c89bb918..1387965ef9 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 25.5.2012 20:42:32 + /********************************************************************** Cyborg Spec Items ***********************************************************************/ @@ -88,8 +90,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 @@ -219,11 +220,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..b3cf8f837f 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 25.5.2012 20:42:32 + /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 818ba159f6..8a0f292d3a 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 25.5.2012 20:42:32 + /* CONTAINS: RCD @@ -18,12 +20,11 @@ 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 + var/datum/effect/effect/system/spark_spread/spark_system + var/matter = 0 + var/working = 0 + var/mode = 1 + var/disabled = 0 New() diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index d5da4c9d22..8d1c49aecf 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 25.5.2012 20:42:32 + /* CONTAINS: MATCHES @@ -111,13 +113,12 @@ 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" - type_butt = /obj/item/weapon/cigbutt - lastHolder = null - smoketime = 300 + var/lit = 0 + var/icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi + var/icon_off = "cigoff" + var/type_butt = /obj/item/weapon/cigbutt + var/lastHolder = null + var/smoketime = 300 proc light(var/flavor_text = "[usr] lights the [name].") @@ -237,13 +238,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].") @@ -469,4 +469,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 2f925c7846..2d716dfb67 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 25.5.2012 20:42:32 + /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() @@ -243,4 +244,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/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 073c913a9e..628045c268 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 25.5.2012 20:42:32 + /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() @@ -114,4 +115,4 @@ New() src.imp = new /obj/item/weapon/implant/loyalty( 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..f88e05e9ea 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 25.5.2012 20:42:32 + /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/implantfreedom.dm b/code/game/objects/items/weapons/implants/implantfreedom.dm index 09826c7a2d..9338f9a5e7 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 25.5.2012 20:42:32 + /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..3c3e910c54 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 25.5.2012 20:42:32 + /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 9dfbe21b42..37f38f50da 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 25.5.2012 20:42:32 + /obj/item/weapon/cleaner desc = "Space Cleaner!" icon = 'janitor.dmi' @@ -408,13 +410,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/tools.dm b/code/game/objects/items/weapons/tools.dm index b5cb4dd8ab..8ba16e3ce3 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 25.5.2012 20:42:32 + /* CONTAINS: @@ -55,10 +57,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) @@ -301,4 +302,4 @@ WELDINGTOOOL New() if(prob(50)) - icon_state = "cutters-y" \ No newline at end of file + icon_state = "cutters-y" diff --git a/code/game/objects/storage/lockbox.dm b/code/game/objects/storage/lockbox.dm index d8de98e291..5d0bb63909 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 25.5.2012 20:42:32 + /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) @@ -84,4 +85,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 87552b9948..2a351b5ba5 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 25.5.2012 20:42:32 + /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..dd10d33f99 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 25.5.2012 20:42:32 + +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 0acece0acc..8b4f46aa60 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 25.5.2012 20:42:32 + /proc/isassembly(O) if(istype(O, /obj/item/device/assembly)) @@ -196,11 +198,10 @@ 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 @@ -232,4 +233,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/infrared.dm b/code/modules/assembly/infrared.dm index 9d26bb603d..b7a0fdc4d7 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 25.5.2012 20:42:32 + /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() @@ -264,4 +265,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 97142fd25a..d92fc53a80 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 25.5.2012 20:42:32 + /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() @@ -143,4 +144,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 aec0a75645..b925c1770f 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 25.5.2012 20:42:32 + /obj/item/device/assembly/signaler name = "Remote Signaling Device" desc = "Used to remotely activate devices." @@ -13,12 +15,11 @@ 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 + var/code = 30 + var/frequency = 1457 + var/delay = 0 + var/airlock_wire = null + var/datum/radio_frequency/radio_connection proc signal() @@ -147,4 +148,4 @@ radio_controller.remove_object(src, frequency) frequency = new_frequency radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT) - return \ No newline at end of file + return diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 10d847a988..747e87e000 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 25.5.2012 20:42:32 + /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() @@ -106,4 +107,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 90391c4b7e..e72c0a5d6a 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 25.5.2012 20:42:32 + +var/const/TOUCH = 1 +var/const/INGEST = 2 /////////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 33ac78e35c..0704b3f7e6 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 25.5.2012 20:42:32 + /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..51a020a300 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 25.5.2012 20:42:32 + /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 9c49993f19..4cfff9468a 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 25.5.2012 20:42:32 + /obj/effect/critter name = "Critter" desc = "Generic critter." @@ -6,77 +8,76 @@ layer = 5.0 density = 1 anchored = 0 - var - alive = 1 - health = 10 - max_health = 10 - list/access_list = list()//accesses go here + var/alive = 1 + var/health = 10 + var/max_health = 10 + 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 @@ -133,4 +134,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..1c4500fb73 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 25.5.2012 20:42:32 + /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/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm index 195b6c858e..c3fdc415ff 100644 --- a/code/modules/detectivework/detective_work.dm +++ b/code/modules/detectivework/detective_work.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 + //gloves w_uniform wear_suit shoes atom/var/list/suit_fibers @@ -68,11 +70,10 @@ atom/proc/get_duplicate(var/atom/location) obj/machinery/computer/forensic_scanning name = "High-Res Forensic Scanning Computer" icon_state = "forensic" - var - obj/item/scanning - temp = "" - canclear = 1 - authenticated = 0 + var/obj/item/scanning + var/temp = "" + var/canclear = 1 + var/authenticated = 0 //Here's the structure for files: each entry is a list, and entry one in that list is the string of their //full and scrambled fingerprint. This acts as the method to arrange evidence. Each subsequent entry is list @@ -82,14 +83,14 @@ obj/machinery/computer/forensic_scanning // 3: All fibers on the object // 4: All blood on the object //This is then used to show what objects were used to "find" the full print, as well as the fibers on it. - list/files + var/list/files //This holds objects (1) without prints, and their fibers(2) and blood(3). - list/misc - obj/item/weapon/f_card/card + var/list/misc + var/obj/item/weapon/f_card/card - scan_data = "" - scan_name = "" - scan_process = 0 + var/scan_data = "" + var/scan_name = "" + var/scan_process = 0 req_access = list(access_forensics_lockers) @@ -481,10 +482,9 @@ obj/machinery/computer/forensic_scanning proc/add_data(var/atom/A, var/override = 0, var/tempfingerprints, var/tempsuit_fibers,var/tempblood_DNA) //What follows is massive. It cross references all stored data in the scanner with the other stored data, //and what is already in the computer. Not sure how bad the lag may/may not be. - var - backup_prints - backup_fibers - backup_DNA + var/backup_prints + var/backup_fibers + var/backup_DNA if(override) backup_prints = A.fingerprints A.fingerprints = tempfingerprints @@ -843,11 +843,10 @@ proc/get_tracks(mob/M) */ proc/blood_incompatible(donor,receiver) - var - donor_antigen = copytext(donor,1,lentext(donor)) - receiver_antigen = copytext(receiver,1,lentext(receiver)) - donor_rh = findtext("+",donor) - receiver_rh = findtext("+",receiver) + var/donor_antigen = copytext(donor,1,lentext(donor)) + var/receiver_antigen = copytext(receiver,1,lentext(receiver)) + var/donor_rh = findtext("+",donor) + var/receiver_rh = findtext("+",receiver) if(donor_rh && !receiver_rh) return 1 switch(receiver_antigen) if("A") @@ -872,4 +871,4 @@ proc/blood_incompatible(donor,receiver) if(do_after(user,30)) user.visible_message("[user] finishes wiping off the [A]!") A.clean_blood() - return \ No newline at end of file + return diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm index 5295e66fa5..3db3bfd52d 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 25.5.2012 20:42:32 + 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/maps/SwapMaps.dm b/code/modules/maps/SwapMaps.dm index 2d3d8e5988..8f79b6b117 100644 --- a/code/modules/maps/SwapMaps.dm +++ b/code/modules/maps/SwapMaps.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 + /* SwapMaps library by Lummox JR developed for digitalBYOND @@ -201,10 +203,12 @@ swapmap vars // all other changed vars */ Write(savefile/S) - var - x;y;z;n - list/areas - area/defarea=locate(world.area) + var/x + var/y + var/z + var/n + var/list/areas + var/area/defarea=locate(world.area) if(!defarea) defarea=new world.area areas=list() for(var/turf/T in block(locate(x1,y1,z1),locate(x2,y2,z2))) @@ -240,10 +244,12 @@ swapmap del(areas) Read(savefile/S,_id,turf/locorner) - var - x;y;z;n - list/areas - area/defarea=locate(world.area) + var/x + var/y + var/z + var/n + var/list/areas + var/area/defarea=locate(world.area) id=_id if(locorner) ischunk=1 diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index e92f33e63c..c74f12c9dc 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 25.5.2012 20:42:32 - 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 bb83808b24..dbbc0a4b5b 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 25.5.2012 20:42:32 - 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 1852989ff9..fd2758733e 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 25.5.2012 20:42:32 + /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 @@ -124,4 +125,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..be90cb872a 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 25.5.2012 20:42:32 + /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 45c1dbdbbc..1f84c897ab 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1,12 +1,13 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 + #define HUMAN_MAX_OXYLOSS 12 //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 /mob/living/carbon/human/Life() @@ -1208,4 +1209,4 @@ snippets plcheck = t_plasma oxcheck = t_oxygen G.turf_add(T, G.total_moles()) -*/ \ No newline at end of file +*/ diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 375445f7b1..d3dcf32f2a 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -1,10 +1,11 @@ -/mob/living/carbon/monkey - var - oxygen_alert = 0 - toxins_alert = 0 - fire_alert = 0 +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 - temperature_alert = 0 +/mob/living/carbon/monkey + var/oxygen_alert = 0 + var/toxins_alert = 0 + var/fire_alert = 0 + + var/temperature_alert = 0 /mob/living/carbon/monkey/Life() @@ -633,4 +634,4 @@ if (mind.special_role == "Changeling" && changeling) changeling.chem_charges = between(0, ((max((0.9 - (changeling.chem_charges / 50)), 0.1)*changeling.chem_recharge_multiplier) + changeling.chem_charges), changeling.chem_storage) if ((changeling.geneticdamage > 0)) - changeling.geneticdamage = changeling.geneticdamage-1 \ No newline at end of file + changeling.geneticdamage = changeling.geneticdamage-1 diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index 3df4261736..e5ee7e554d 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 25.5.2012 20:42:33 + // 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 @@ -205,4 +206,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/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index d1d9c64e2d..bd3f0ea071 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 25.5.2012 20:42:33 + /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 bbd8b01c36..de410f7102 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 25.5.2012 20:42:33 + #define UI_OLD 0 #define UI_NEW 1 @@ -28,17 +30,16 @@ 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) +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) @@ -735,4 +736,4 @@ datum/preferences #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 1f89d9738f..9a7cb621e5 100644 --- a/code/modules/mob/organ/organ.dm +++ b/code/modules/mob/organ/organ.dm @@ -1,7 +1,8 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 + /datum/organ - var - name = "organ" - owner = null + var/name = "organ" + var/owner = null proc/process() @@ -18,17 +19,16 @@ ****************************************************/ /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 - wound_size = 0 - max_size = 0 + var/damage_state = "00" + var/brute_dam = 0 + var/burn_dam = 0 + var/bandaged = 0 + var/max_damage = 0 + var/wound_size = 0 + var/max_size = 0 proc/take_damage(brute, burn) @@ -124,4 +124,4 @@ INTERNAL ORGANS ****************************************************/ /datum/organ/internal - name = "internal" \ No newline at end of file + name = "internal" diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 0afcb3f893..7118d8547e 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 25.5.2012 20:42:33 + /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 040b9e90fc..496d26d3af 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 25.5.2012 20:42:33 + /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..3c36d2f0cf 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 25.5.2012 20:42:33 + /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/port_gen.dm b/code/modules/power/port_gen.dm index 7feaef3a08..aba2f5f90f 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 25.5.2012 20:42:33 + /* 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() ..() @@ -307,4 +307,4 @@ display round(lastgen) and plasmatank amount time_per_sheet = 30 board_path = "/obj/item/weapon/circuitboard/pacman/mrs" 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..d68cc23e78 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 25.5.2012 20:42:33 + /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 0f679e421a..09b9d172b1 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 25.5.2012 20:42:33 + /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 7d69701c71..24b6ed1be9 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 25.5.2012 20:42:33 + /obj/machinery/emitter name = "Emitter" desc = "A heavy duty industrial laser" @@ -11,13 +13,12 @@ idle_power_usage = 10 active_power_usage = 300 - var - active = 0 - fire_delay = 100 - last_shot = 0 - shot_number = 0 - state = 0 - locked = 0 + var/active = 0 + var/fire_delay = 100 + var/last_shot = 0 + var/shot_number = 0 + var/state = 0 + var/locked = 0 verb/rotate() @@ -204,4 +205,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 c88fabc9cb..993eb2c3a0 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 25.5.2012 20:42:33 + /* field_generator power level display @@ -19,17 +21,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..ff121c2963 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 25.5.2012 20:42:33 + /////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 993a5b22fa..827bce3a92 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 25.5.2012 20:42:33 + /obj/effect/accelerated_particle name = "Accelerated Particles" desc = "Small things moving very fast." @@ -5,9 +7,8 @@ icon_state = "particle"//Need a new icon for this anchored = 1 density = 1 - var - movement_range = 10 - energy = 10 + var/movement_range = 10 + var/energy = 10 weak movement_range = 8 @@ -71,4 +72,4 @@ del(src) else sleep(lag) - move(lag) \ No newline at end of file + move(lag) diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index ed1f0b3e19..cd7066a313 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 25.5.2012 20:42:33 + /*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 bcc26a572e..3d24df1abc 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 25.5.2012 20:42:33 + /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..6ee4005e3c 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 25.5.2012 20:42:33 + /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 ad9b70c3c4..51f9cfec47 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 25.5.2012 20:42:33 + var/global/list/uneatable = list( /turf/space, /obj/effect/overlay @@ -13,23 +15,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. @@ -530,4 +531,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..7463e5fbac 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 25.5.2012 20:42:33 + #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/research/designs.dm b/code/modules/research/designs.dm index b9094e7d84..86261cdc81 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 25.5.2012 20:42:33 + /*************************************************************** ** 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 ebf0903b7e..1287dd98b0 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 25.5.2012 20:42:33 + /* 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() ..() @@ -106,4 +107,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/rdconsole.dm b/code/modules/research/rdconsole.dm index ae45eb779b..9148b4bf13 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 25.5.2012 20:42:33 + /* 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. @@ -867,4 +868,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..e297c33eae 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 25.5.2012 20:42:33 + //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/scripting/AST/Operators/Binary Operators.dm b/code/modules/scripting/AST/Operators/Binary Operators.dm index 138ff00c3b..8df19879cf 100644 --- a/code/modules/scripting/AST/Operators/Binary Operators.dm +++ b/code/modules/scripting/AST/Operators/Binary Operators.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 + /* File: Binary Operators */ @@ -6,8 +8,7 @@ Represents a binary operator in the AST. A binary operator takes two operands (ie x and y) and returns a value. */ /node/expression/operator/binary - var - node/expression/exp2 + var/node/expression/exp2 ////////// Comparison Operators ////////// /* @@ -170,4 +171,4 @@ */ // Modulo - precedence=OOP_MULTIPLY \ No newline at end of file + precedence=OOP_MULTIPLY diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm index 04e6797481..b6ab178a0c 100644 --- a/code/modules/scripting/Implementations/Telecomms.dm +++ b/code/modules/scripting/Implementations/Telecomms.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 + /* --- Traffic Control Scripting Language --- */ // Nanotrasen TCS Language - Made by Doohl @@ -16,14 +18,13 @@ /* -- Compile a raw block of text -- */ proc/Compile(code as message) - var - n_scriptOptions/nS_Options/options = new() - n_Scanner/nS_Scanner/scanner = new(code, options) - list/tokens = scanner.Scan() - n_Parser/nS_Parser/parser = new(tokens, options) - node/BlockDefinition/GlobalBlock/program = parser.Parse() + var/n_scriptOptions/nS_Options/options = new() + var/n_Scanner/nS_Scanner/scanner = new(code, options) + var/list/tokens = scanner.Scan() + var/n_Parser/nS_Parser/parser = new(tokens, options) + var/node/BlockDefinition/GlobalBlock/program = parser.Parse() - list/returnerrors = list() + var/list/returnerrors = list() returnerrors += scanner.errors returnerrors += parser.errors diff --git a/code/modules/scripting/Parser/Keywords.dm b/code/modules/scripting/Parser/Keywords.dm index 05aa0cd6a4..bdd33d8bda 100644 --- a/code/modules/scripting/Parser/Keywords.dm +++ b/code/modules/scripting/Parser/Keywords.dm @@ -1,27 +1,27 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 + /* File: Keywords */ -var/const - KW_FAIL = 0 //Fatal error; stop parsing entire script. - KW_PASS = 1 //OK - KW_ERR = 2 //Non-fatal error, keyword couldn't be handled properly. Ignore keyword but continue on. - KW_WARN = 3 //Warning +var/const/KW_FAIL = 0 //Fatal error; stop parsing entire script. +var/const/KW_PASS = 1 //OK +var/const/KW_ERR = 2 //Non-fatal error, keyword couldn't be handled properly. Ignore keyword but continue on. +var/const/KW_WARN = 3 //Warning /* - Class: n_Keyword - Represents a special statement in the code triggered by a keyword. +var/const/Class: n_Keyword +var/const/Represents a special statement in the code triggered by a keyword. */ /n_Keyword New(inline=0) src.inline=inline return ..() - var /* Var: inline 1 if the keyword is in an expression (e.g. the new keyword in many languages), 0 otherwise (such as the if and else keywords). */ - inline + var/inline /* Proc: Parse @@ -163,4 +163,4 @@ var/const parser.AddBlock(def.block) else parser.errors+=new/scriptError/BadToken(parser.curToken) - return KW_FAIL \ No newline at end of file + return KW_FAIL diff --git a/code/modules/scripting/Scanner/Tokens.dm b/code/modules/scripting/Scanner/Tokens.dm index 6bb853518f..0c2a8a5cc7 100644 --- a/code/modules/scripting/Scanner/Tokens.dm +++ b/code/modules/scripting/Scanner/Tokens.dm @@ -1,12 +1,13 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 + /* Class: Token Represents an entity and position in the source code. */ /token - var - value - line - column + var/value + var/line + var/column New(v, l=0, c=0) value=v @@ -24,9 +25,8 @@ value=text2num(value) ASSERT(!isnull(value)) accessor - var - object - member + var/object + var/member New(object, member, l=0, c=0) src.object=object @@ -35,4 +35,4 @@ src.line=l src.column=c - end \ No newline at end of file + end diff --git a/code/setup.dm b/code/setup.dm index b7b5bb28f3..15a3b63b7e 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -1,3 +1,5 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 + #define PI 3.1415 #define R_IDEAL_GAS_EQUATION 8.31 //kPa*L/(K*mol) @@ -193,24 +195,22 @@ var/MAX_EXPLOSION_RANGE = 14 #define FULL_BODY 2047 //bitflags for mutations -var/const - TK =(1<<0) - COLD_RESISTANCE =(1<<1) - XRAY =(1<<2) - HULK =(1<<3) - CLUMSY =(1<<4) - FAT =(1<<5) - HUSK =(1<<6) - LASER =(1<<7) - HEAL =(1<<8) - NOCLONE =(1<<9) +var/const/TK =(1<<0) +var/const/COLD_RESISTANCE =(1<<1) +var/const/XRAY =(1<<2) +var/const/HULK =(1<<3) +var/const/CLUMSY =(1<<4) +var/const/FAT =(1<<5) +var/const/HUSK =(1<<6) +var/const/LASER =(1<<7) +var/const/HEAL =(1<<8) +var/const/NOCLONE =(1<<9) //mob/var/stat things -var/const - CONSCIOUS = 0 - UNCONSCIOUS = 1 - DEAD = 2 +var/const/CONSCIOUS = 0 +var/const/UNCONSCIOUS = 1 +var/const/DEAD = 2 // channel numbers for power #define EQUIP 1 @@ -239,12 +239,11 @@ var/const #define MAX_STACK_AMOUNT_GLASS 50 #define MAX_STACK_AMOUNT_RODS 60 -var/const - GAS_O2 = 1 << 0 - GAS_N2 = 1 << 1 - GAS_PL = 1 << 2 - GAS_CO2 = 1 << 3 - GAS_N2O = 1 << 4 +var/const/GAS_O2 = 1 << 0 +var/const/GAS_N2 = 1 << 1 +var/const/GAS_PL = 1 << 2 +var/const/GAS_CO2 = 1 << 3 +var/const/GAS_N2O = 1 << 4 var/list/accessable_z_levels = list("3" = 30, "4" = 70) @@ -285,4 +284,4 @@ var/static/list/scarySounds = list('thudswoosh.ogg','Taser.ogg','armbomb.ogg','h #define SEC_LEVEL_RED 2 #define SEC_LEVEL_DELTA 3 -#define TRANSITIONEDGE 7 //Distance from edge to move to another z-level \ No newline at end of file +#define TRANSITIONEDGE 7 //Distance from edge to move to another z-level diff --git a/code/unused/Ultralight.dm b/code/unused/Ultralight.dm index 448a26359e..3fbec42b44 100644 --- a/code/unused/Ultralight.dm +++ b/code/unused/Ultralight.dm @@ -1,22 +1,22 @@ +//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 + //UltraLight system, by Sukasa -var - const - UL_LUMINOSITY = 0 - UL_SQUARELIGHT = 0 + const/ar/UL_LUMINOSITY = 0 + const/ar/UL_SQUARELIGHT = 0 - UL_RGB = 1 - UL_ROUNDLIGHT = 2 + const/ar/UL_RGB = 1 + const/ar/UL_ROUNDLIGHT = 2 - UL_I_FALLOFF_SQUARE = 0 - UL_I_FALLOFF_ROUND = 1 + const/ar/UL_I_FALLOFF_SQUARE = 0 + const/ar/UL_I_FALLOFF_ROUND = 1 - UL_I_LUMINOSITY = 0 - UL_I_RGB = 1 + const/ar/UL_I_LUMINOSITY = 0 + const/ar/UL_I_RGB = 1 - UL_I_LIT = 0 - UL_I_EXTINGUISHED = 1 - UL_I_ONZERO = 2 + const/ar/UL_I_LIT = 0 + const/ar/UL_I_EXTINGUISHED = 1 + const/ar/UL_I_ONZERO = 2 ul_LightingEnabled = 1 ul_LightingResolution = 1 @@ -37,12 +37,11 @@ proc return min(max(Value, 0), ul_Steps) atom - var - LuminosityRed = 0 - LuminosityGreen = 0 - LuminosityBlue = 0 + var/LuminosityRed = 0 + var/LuminosityGreen = 0 + var/LuminosityBlue = 0 - ul_Extinguished = UL_I_ONZERO + var/ul_Extinguished = UL_I_ONZERO proc ul_SetLuminosity(var/Red, var/Green = Red, var/Blue = Red) @@ -240,14 +239,13 @@ atom return turf - var - LightLevelRed = 0 - LightLevelGreen = 0 - LightLevelBlue = 0 + var/LightLevelRed = 0 + var/LightLevelGreen = 0 + var/LightLevelBlue = 0 - list/MaxRed = list( ) - list/MaxGreen = list( ) - list/MaxBlue = list( ) + var/list/MaxRed = list( ) + var/list/MaxGreen = list( ) + var/list/MaxBlue = list( ) proc @@ -304,13 +302,12 @@ turf return area - var - ul_Overlay = null - ul_Lighting = 1 + var/ul_Overlay = null + var/ul_Lighting = 1 - LightLevelRed = 0 - LightLevelGreen = 0 - LightLevelBlue = 0 + var/LightLevelRed = 0 + var/LightLevelGreen = 0 + var/LightLevelBlue = 0 proc ul_Light(var/Red = LightLevelRed, var/Green = LightLevelGreen, var/Blue = LightLevelBlue) @@ -341,4 +338,4 @@ area ul_Light() //world.log << tag - return \ No newline at end of file + return diff --git a/code/unused/beast/bodypart.dm b/code/unused/beast/bodypart.dm index 84b966c5d0..5f97031706 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 25.5.2012 20:42:33 + 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..a37f94187c 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 25.5.2012 20:42:33 + // 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..e8c6a2e4da 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 25.5.2012 20:42:33 + /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