From 88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Thu, 28 Oct 2021 18:25:50 -0400 Subject: [PATCH] removes double spaces before symbols (#62397) This can apparently cause some bugs on occasions, so I thought I might as well try to kill them all. --- code/__HELPERS/_logging.dm | 2 +- code/__HELPERS/priority_announce.dm | 2 +- code/_globalvars/bitfields.dm | 2 +- code/_globalvars/lists/maintenance_loot.dm | 2 +- code/_js/byjax.dm | 2 +- code/controllers/subsystem/blackmarket.dm | 6 ++--- code/controllers/subsystem/discord.dm | 2 +- code/controllers/subsystem/ticker.dm | 22 +++++++++---------- code/datums/components/crafting/crafting.dm | 2 +- code/datums/components/crafting/recipes.dm | 10 ++++----- code/datums/datacore.dm | 12 +++++----- code/datums/elements/atmos_requirements.dm | 2 +- .../machinery/computer/camera_advanced.dm | 2 +- code/game/machinery/computer/dna_console.dm | 4 ++-- code/game/machinery/dance_machine.dm | 2 +- code/game/machinery/doppler_array.dm | 2 +- code/game/machinery/syndicatebomb.dm | 2 +- code/game/objects/items/RCD.dm | 2 +- .../circuitboards/machine_circuitboards.dm | 2 +- code/game/objects/items/dna_injector.dm | 2 +- code/game/objects/items/food/sandwichtoast.dm | 2 +- .../objects/items/implants/implantchair.dm | 2 +- code/game/objects/items/stacks/stack.dm | 2 +- code/game/objects/items/wayfinding.dm | 2 +- code/game/objects/structures/traps.dm | 2 +- code/game/turfs/closed/minerals.dm | 2 +- code/modules/admin/permissionedit.dm | 2 +- code/modules/admin/sql_ban_system.dm | 2 +- code/modules/admin/topic.dm | 2 +- code/modules/admin/verbs/admingame.dm | 2 +- .../admin/verbs/ghost_pool_protection.dm | 2 +- code/modules/admin/verbs/secrets.dm | 2 +- .../antagonists/changeling/changeling.dm | 2 +- code/modules/antagonists/cult/blood_magic.dm | 2 +- .../eldritch_cult/knowledge/flesh_lore.dm | 2 +- .../eldritch_cult/knowledge/rust_lore.dm | 2 +- .../eldritch_cult/knowledge/void_lore.dm | 2 +- code/modules/aquarium/aquarium.dm | 2 +- code/modules/asset_cache/asset_list_items.dm | 8 +++---- .../machinery/components/fusion/hfr_core.dm | 2 +- code/modules/cargo/centcom_podlauncher.dm | 4 ++-- code/modules/cargo/packs.dm | 2 +- code/modules/cargo/supplypod.dm | 2 +- .../modules/clothing/suits/reactive_armour.dm | 4 ++-- code/modules/events/wizard/shuffle.dm | 6 ++--- .../explorer_drone/exploration_site.dm | 4 ++-- code/modules/food_and_drinks/drinks/drinks.dm | 2 +- .../food_and_drinks/recipes/food_mixtures.dm | 2 +- .../recipes/tablecraft/recipes_frozen.dm | 2 +- code/modules/hydroponics/hydroitemdefines.dm | 2 +- code/modules/jobs/job_types/_job.dm | 2 +- code/modules/jobs/job_types/botanist.dm | 2 +- code/modules/lighting/lighting_corner.dm | 16 +++++++------- code/modules/lighting/lighting_source.dm | 2 +- code/modules/mining/machine_stacking.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 2 +- .../mob/living/simple_animal/simple_animal.dm | 2 +- code/modules/plumbing/plumbers/bottler.dm | 8 +++---- code/modules/power/apc.dm | 12 +++++----- code/modules/power/cable.dm | 2 +- .../projectiles/ammunition/energy/stun.dm | 2 +- code/modules/projectiles/guns/ballistic.dm | 2 +- .../projectiles/guns/ballistic/rifle.dm | 2 +- .../projectiles/guns/ballistic/shotgun.dm | 4 ++-- code/modules/reagents/chemistry/holder.dm | 2 +- .../chemistry/reagents/drink_reagents.dm | 8 +++---- .../chemistry/reagents/other_reagents.dm | 2 +- .../reagents/chemistry/recipes/others.dm | 6 ++--- .../vatgrowing/samples/cell_lines/common.dm | 2 +- code/modules/shuttle/navigation_computer.dm | 2 +- code/modules/surgery/tools.dm | 2 +- code/modules/vending/clothesmate.dm | 2 +- code/modules/vending/games.dm | 2 +- html/statbrowser.html | 2 +- 74 files changed, 125 insertions(+), 125 deletions(-) diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 016dd8cf038..62044e37174 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -45,7 +45,7 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global")) #define testing_profile_global_output(NAME) testing_profile_output(NAME, GLOB.testing_global_profiler) #define testing_profile_global_output_all testing_profile_output_all(GLOB.testing_global_profiler) -#define testing_profile_local_init(PROFILE_NAME) var/list/_timer_system = list( "_PROFILE_NAME" = PROFILE_NAME, "_start_of_proc" = world.timeofday ) +#define testing_profile_local_init(PROFILE_NAME) var/list/_timer_system = list( "_PROFILE_NAME" = PROFILE_NAME, "_start_of_proc" = world.timeofday ) #define testing_profile_local_start(NAME) testing_profile_start(NAME, _timer_system) #define testing_profile_local_current(NAME) testing_profile_current(NAME, _timer_system) #define testing_profile_local_output(NAME) testing_profile_output(NAME, _timer_system) diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index 31506d73758..ea5c69195c1 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -83,7 +83,7 @@ if(announce) priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", SSstation.announcer.get_rand_report_sound(), has_important_message = TRUE) - var/datum/comm_message/M = new + var/datum/comm_message/M = new M.title = title M.content = text diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index c7096411907..f849ca56e8d 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -328,7 +328,7 @@ DEFINE_BITFIELD(chemical_flags, list( )) DEFINE_BITFIELD(reaction_flags, list( - "REACTION_CLEAR_IMPURE" = REACTION_CLEAR_IMPURE, + "REACTION_CLEAR_IMPURE" = REACTION_CLEAR_IMPURE, "REACTION_CLEAR_INVERSE" = REACTION_CLEAR_INVERSE, "REACTION_CLEAR_RETAIN" = REACTION_CLEAR_RETAIN, "REACTION_INSTANT" = REACTION_INSTANT, diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index fef54924334..b85973867f3 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -180,7 +180,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/clothing/glasses/hud/diagnostic = 1, /obj/item/storage/belt/utility = 1, /obj/item/storage/belt/medical = 1, - /obj/item/clothing/suit/armor/vest/old = 1, + /obj/item/clothing/suit/armor/vest/old = 1, /obj/item/clothing/head/helmet/old = 1, /obj/item/clothing/mask/muzzle = 1, /obj/item/clothing/ears/earmuffs = 1, diff --git a/code/_js/byjax.dm b/code/_js/byjax.dm index 7ac9bbff189..ba2811be9bb 100644 --- a/code/_js/byjax.dm +++ b/code/_js/byjax.dm @@ -5,7 +5,7 @@ function replaceContent() { var args = Array.prototype.slice.call(arguments); var id = args\[0\]; var content = args\[1\]; - var callback = null; + var callback = null; if(args\[2\]){ callback = args\[2\]; if(args\[3\]){ diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm index 8b7335ed9fa..4a1eaa0ad97 100644 --- a/code/controllers/subsystem/blackmarket.dm +++ b/code/controllers/subsystem/blackmarket.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(blackmarket) - name = "Blackmarket" - flags = SS_BACKGROUND - init_order = INIT_ORDER_DEFAULT + name = "Blackmarket" + flags = SS_BACKGROUND + init_order = INIT_ORDER_DEFAULT /// Descriptions for each shipping methods. var/shipping_method_descriptions = list( diff --git a/code/controllers/subsystem/discord.dm b/code/controllers/subsystem/discord.dm index 0edf4248e93..90b978171c7 100644 --- a/code/controllers/subsystem/discord.dm +++ b/code/controllers/subsystem/discord.dm @@ -113,7 +113,7 @@ SUBSYSTEM_DEF(discord) * * lookup_id The discord id as a string */ /datum/controller/subsystem/discord/proc/lookup_ckey(lookup_id) - var/datum/discord_link_record/link = find_discord_link_by_discord_id(lookup_id) + var/datum/discord_link_record/link = find_discord_link_by_discord_id(lookup_id) if(link) return link.ckey diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c2980a9d594..32031285b87 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -60,18 +60,18 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/Initialize(timeofday) var/list/byond_sound_formats = list( - "mid" = TRUE, + "mid" = TRUE, "midi" = TRUE, - "mod" = TRUE, - "it" = TRUE, - "s3m" = TRUE, - "xm" = TRUE, - "oxm" = TRUE, - "wav" = TRUE, - "ogg" = TRUE, - "raw" = TRUE, - "wma" = TRUE, - "aiff" = TRUE + "mod" = TRUE, + "it" = TRUE, + "s3m" = TRUE, + "xm" = TRUE, + "oxm" = TRUE, + "wav" = TRUE, + "ogg" = TRUE, + "raw" = TRUE, + "wma" = TRUE, + "aiff" = TRUE, ) var/list/provisional_title_music = flist("[global.config.directory]/title_music/sounds/") diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index ac436f7ae71..8e50f35b1a7 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -117,7 +117,7 @@ return for(var/atom/movable/AM in range(radius_range, a)) - if((AM.flags_1 & HOLOGRAM_1) || (blacklist && (AM.type in blacklist))) + if((AM.flags_1 & HOLOGRAM_1) || (blacklist && (AM.type in blacklist))) continue . += AM diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 6aa2d000c03..5341f015d80 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -1212,7 +1212,7 @@ name = "Alcohol burner" result = /obj/item/burner time = 5 SECONDS - reqs = list(/obj/item/reagent_containers/glass/beaker = 1, + reqs = list(/obj/item/reagent_containers/glass/beaker = 1, /datum/reagent/consumable/ethanol = 15, /obj/item/paper = 1 ) @@ -1222,7 +1222,7 @@ name = "Oil burner" result = /obj/item/burner/oil time = 5 SECONDS - reqs = list(/obj/item/reagent_containers/glass/beaker = 1, + reqs = list(/obj/item/reagent_containers/glass/beaker = 1, /datum/reagent/fuel/oil = 15, /obj/item/paper = 1 ) @@ -1232,7 +1232,7 @@ name = "Fuel burner" result = /obj/item/burner/fuel time = 5 SECONDS - reqs = list(/obj/item/reagent_containers/glass/beaker = 1, + reqs = list(/obj/item/reagent_containers/glass/beaker = 1, /datum/reagent/fuel = 15, /obj/item/paper = 1 ) @@ -1275,8 +1275,8 @@ tool_behaviors = list(TOOL_WELDER) time = 5 SECONDS reqs = list( - /obj/item/stack/sheet/glass = 1, - ) + /obj/item/stack/sheet/glass = 1, + ) category = CAT_CHEMISTRY /datum/crafting_recipe/improvised_chem_heater diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 516160a2e86..c79c60b9d9b 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -250,11 +250,11 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) G.fields["m_stat"] = "Stable" G.fields["gender"] = H.gender if(H.gender == "male") - G.fields["gender"] = "Male" + G.fields["gender"] = "Male" else if(H.gender == "female") - G.fields["gender"] = "Female" + G.fields["gender"] = "Female" else - G.fields["gender"] = "Other" + G.fields["gender"] = "Other" G.fields["photo_front"] = photo_front G.fields["photo_side"] = photo_side general += G @@ -293,11 +293,11 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new) L.fields["age"] = H.age L.fields["gender"] = H.gender if(H.gender == "male") - G.fields["gender"] = "Male" + G.fields["gender"] = "Male" else if(H.gender == "female") - G.fields["gender"] = "Female" + G.fields["gender"] = "Female" else - G.fields["gender"] = "Other" + G.fields["gender"] = "Other" L.fields["blood_type"] = H.dna.blood_type L.fields["b_dna"] = H.dna.unique_enzymes L.fields["identity"] = H.dna.unique_identity diff --git a/code/datums/elements/atmos_requirements.dm b/code/datums/elements/atmos_requirements.dm index ce07e848ccc..3153ce0472a 100644 --- a/code/datums/elements/atmos_requirements.dm +++ b/code/datums/elements/atmos_requirements.dm @@ -51,7 +51,7 @@ var/plas = open_turf_gases[/datum/gas/plasma][MOLES] var/oxy = open_turf_gases[/datum/gas/oxygen][MOLES] - var/n2 = open_turf_gases[/datum/gas/nitrogen][MOLES] + var/n2 = open_turf_gases[/datum/gas/nitrogen][MOLES] var/co2 = open_turf_gases[/datum/gas/carbon_dioxide][MOLES] open_turf.air.garbage_collect() diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 3491158e2d5..da3a079890d 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -17,7 +17,7 @@ var/datum/action/innate/camera_multiz_down/move_down_action = new var/list/actions = list() ///Should we supress any view changes? - var/should_supress_view_changes = TRUE + var/should_supress_view_changes = TRUE interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_SET_MACHINE | INTERACT_MACHINE_REQUIRES_SIGHT diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 16d1e707e16..eb5cc990f5c 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -1262,7 +1262,7 @@ // If there is a connected scanner, we can use its upgrades to reduce // the radiation generated by this injector if(scanner_operational()) - I.damage_coeff = connected_scanner.damage_coeff + I.damage_coeff = connected_scanner.damage_coeff if("uf") // GUARD CHECK - There's currently no way to save partial genetic data. // However, if this is the case, we can't make a complete injector and @@ -1277,7 +1277,7 @@ // If there is a connected scanner, we can use its upgrades to reduce // the radiation generated by this injector if(scanner_operational()) - I.damage_coeff = connected_scanner.damage_coeff + I.damage_coeff = connected_scanner.damage_coeff if("mixed") // GUARD CHECK - There's currently no way to save partial genetic data. // However, if this is the case, we can't make a complete injector and diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index fb2590538e4..eecb80df4ff 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -159,7 +159,7 @@ return TRUE if("set_volume") var/new_volume = params["volume"] - if(new_volume == "reset") + if(new_volume == "reset") volume = initial(volume) return TRUE else if(new_volume == "min") diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 41563a10d30..f1c17cb7c7a 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -75,7 +75,7 @@ records -= record return TRUE if("print_record") - var/datum/data/tachyon_record/record = locate(params["ref"]) in records + var/datum/data/tachyon_record/record = locate(params["ref"]) in records if(!records || !(record in records)) return print(usr, record) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 3fa2cfe9e2d..116d0d6b345 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -27,7 +27,7 @@ var/obj/item/bombcore/payload = /obj/item/bombcore var/beepsound = 'sound/items/timer.ogg' var/delayedbig = FALSE //delay wire pulsed? - var/delayedlittle = FALSE //activation wire pulsed? + var/delayedlittle = FALSE //activation wire pulsed? var/obj/effect/countdown/syndicatebomb/countdown var/next_beep diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index ebe5b4eeef2..0e13e13108c 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -1043,7 +1043,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) if(useResource(launchcost, user)) activate() to_chat(user, span_notice("You fire a glowstick!")) - var/obj/item/flashlight/glowstick/G = new /obj/item/flashlight/glowstick(start) + var/obj/item/flashlight/glowstick/G = new /obj/item/flashlight/glowstick(start) G.color = color_choice G.set_light_color(G.color) G.throw_at(A, 9, 3, user) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index f7481bb7ee7..c040176d3ee 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -542,7 +542,7 @@ /obj/machinery/vending/medical = "NanoMed Plus", /obj/machinery/vending/drugs = "NanoDrug Plus", /obj/machinery/vending/wallmed = "NanoMed", - /obj/machinery/vending/assist = "Part-Mart", + /obj/machinery/vending/assist = "Part-Mart", /obj/machinery/vending/engivend = "Engi-Vend", /obj/machinery/vending/hydronutrients = "NutriMax", /obj/machinery/vending/hydroseeds = "MegaSeed Servitor", diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index c9fefebb2bf..4c791c1d67c 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -10,7 +10,7 @@ throw_range = 5 w_class = WEIGHT_CLASS_TINY - var/damage_coeff = 1 + var/damage_coeff = 1 var/list/fields var/list/add_mutations = list() var/list/remove_mutations = list() diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/game/objects/items/food/sandwichtoast.dm index ba6df4da230..253d277c426 100644 --- a/code/game/objects/items/food/sandwichtoast.dm +++ b/code/game/objects/items/food/sandwichtoast.dm @@ -49,7 +49,7 @@ /obj/item/food/jellysandwich/slime food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/slimejelly = 10, /datum/reagent/consumable/nutriment/vitamin = 4) - foodtypes = GRAIN | TOXIC + foodtypes = GRAIN | TOXIC /obj/item/food/jellysandwich/cherry food_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/cherryjelly = 8, /datum/reagent/consumable/nutriment/vitamin = 4) diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index 51ee04ec7d4..e1b3a94579c 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -48,7 +48,7 @@ data["occupant"]["stat"] = mob_occupant.stat data["special_name"] = special ? special_name : null - data["ready_implants"] = ready_implants + data["ready_implants"] = ready_implants data["ready"] = ready data["replenishing"] = replenishing diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index c3bcb3dfc15..e2f5f9ebcd7 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -557,7 +557,7 @@ add_blood_DNA(from.return_blood_DNA()) add_fingerprint_list(from.return_fingerprints()) add_hiddenprint_list(from.return_hiddenprints()) - fingerprintslast = from.fingerprintslast + fingerprintslast = from.fingerprintslast //TODO bloody overlay /obj/item/stack/microwave_act(obj/machinery/microwave/M) diff --git a/code/game/objects/items/wayfinding.dm b/code/game/objects/items/wayfinding.dm index 4ba178cb8e7..37055667dea 100644 --- a/code/game/objects/items/wayfinding.dm +++ b/code/game/objects/items/wayfinding.dm @@ -274,7 +274,7 @@ . = ..() var/msg = "Its tracking indicator reads " if(target) - var/obj/machinery/navbeacon/wayfinding/B = target + var/obj/machinery/navbeacon/wayfinding/B = target msg += "\"[B.codes["wayfinding"]]\"." else msg = "Its tracking indicator is blank." diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index 9825cc15613..3b65c8d1027 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -105,7 +105,7 @@ icon_state = "bounty_trap_on" stun_time = 200 sparks = FALSE //the item version gives them off to prevent runtimes (see Destroy()) - checks_antimagic = FALSE + checks_antimagic = FALSE var/obj/item/bountytrap/stored_item var/caught = FALSE diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index f7561c7cc53..8806b3a812c 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -301,7 +301,7 @@ /turf/closed/mineral/random/snow/high_chance mineralSpawnChanceList = list( - /obj/item/stack/ore/uranium = 35, /obj/item/stack/ore/diamond = 30, /obj/item/stack/ore/gold = 45, /obj/item/stack/ore/titanium = 45, + /obj/item/stack/ore/uranium = 35, /obj/item/stack/ore/diamond = 30, /obj/item/stack/ore/gold = 45, /obj/item/stack/ore/titanium = 45, /obj/item/stack/ore/silver = 50, /obj/item/stack/ore/plasma = 50, /obj/item/stack/ore/bluespace_crystal = 20) /turf/closed/mineral/random/labormineral diff --git a/code/modules/admin/permissionedit.dm b/code/modules/admin/permissionedit.dm index e359c60212a..d9ffcb3eaf3 100644 --- a/code/modules/admin/permissionedit.dm +++ b/code/modules/admin/permissionedit.dm @@ -58,7 +58,7 @@ while(query_search_admin_logs.NextRow()) var/datetime = query_search_admin_logs.item[1] var/round_id = query_search_admin_logs.item[2] - var/admin_key = query_search_admin_logs.item[3] + var/admin_key = query_search_admin_logs.item[3] operation = query_search_admin_logs.item[4] target = query_search_admin_logs.item[5] var/log = query_search_admin_logs.item[6] diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index c6d0df66b13..9e29a10a18d 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -669,7 +669,7 @@ while(query_unban_search_bans.NextRow()) var/ban_id = query_unban_search_bans.item[1] var/ban_datetime = query_unban_search_bans.item[2] - var/ban_round_id = query_unban_search_bans.item[3] + var/ban_round_id = query_unban_search_bans.item[3] var/role = query_unban_search_bans.item[4] var/expiration_time = query_unban_search_bans.item[5] //we don't cast duration as num because if the duration is large enough to be converted to scientific notation by byond then the + character gets lost when passed through href causing SQL to interpret '4.321e 007' as '4' diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 3dfb11b4dc3..33aca41eb1d 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1489,7 +1489,7 @@ already_wanted = 1 if(already_wanted) - src.admincaster_wanted_message.criminal = GLOB.news_network.wanted_issue.criminal + src.admincaster_wanted_message.criminal = GLOB.news_network.wanted_issue.criminal src.admincaster_wanted_message.body = GLOB.news_network.wanted_issue.body src.admincaster_screen = 14 src.access_news_network() diff --git a/code/modules/admin/verbs/admingame.dm b/code/modules/admin/verbs/admingame.dm index 4c4c76a9f39..a40828eae40 100644 --- a/code/modules/admin/verbs/admingame.dm +++ b/code/modules/admin/verbs/admingame.dm @@ -453,7 +453,7 @@ Traitors and the like can also be revived with the previous role mostly intact. else to_chat(usr, "This can only be used on instances of type /mob and /mind", confidential = TRUE) return - var/datum/skill_panel/SP = new(usr, target_mind) + var/datum/skill_panel/SP = new(usr, target_mind) SP.ui_interact(usr) /datum/admins/proc/show_lag_switch_panel() diff --git a/code/modules/admin/verbs/ghost_pool_protection.dm b/code/modules/admin/verbs/ghost_pool_protection.dm index 2033d0c936f..843f6868e70 100644 --- a/code/modules/admin/verbs/ghost_pool_protection.dm +++ b/code/modules/admin/verbs/ghost_pool_protection.dm @@ -4,7 +4,7 @@ set name = "Ghost Pool Protection" set desc = "Choose which ways people can get into the round, or just clear it out completely for admin events." set category = "Admin.Events" - var/datum/ghost_pool_menu/tgui = new(usr)//create the datum + var/datum/ghost_pool_menu/tgui = new(usr)//create the datum tgui.ui_interact(usr)//datum has a tgui component, here we open the window /datum/ghost_pool_menu diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 9d75497f56f..484702a4190 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -5,7 +5,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) set desc = "Abuse harder than you ever have before with this handy dandy semi-misc stuff menu" set category = "Admin.Game" SSblackbox.record_feedback("tally", "admin_verb", 1, "Secrets Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - var/datum/secrets_menu/tgui = new(usr)//create the datum + var/datum/secrets_menu/tgui = new(usr)//create the datum tgui.ui_interact(usr)//datum has a tgui component, here we open the window /datum/secrets_menu diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 148385ee927..3a8c15817f9 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -4,7 +4,7 @@ /datum/antagonist/changeling name = "Changeling" - roundend_category = "changelings" + roundend_category = "changelings" antagpanel_category = "Changeling" job_rank = ROLE_CHANGELING antag_moodlet = /datum/mood_event/focused diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index ae56200bc62..7d70d870edb 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -115,7 +115,7 @@ ..() /datum/action/innate/cult/blood_spell/IsAvailable() - if(!IS_CULTIST(owner) || owner.incapacitated() || !charges) + if(!IS_CULTIST(owner) || owner.incapacitated() || !charges) return FALSE return ..() diff --git a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm index ca35ec80672..36d737db958 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm @@ -126,7 +126,7 @@ if(!ishuman(target)) return var/mob/living/carbon/human/human_target = target - var/datum/status_effect/eldritch/eldritch_effect = human_target.has_status_effect(/datum/status_effect/eldritch/rust) || human_target.has_status_effect(/datum/status_effect/eldritch/ash) || human_target.has_status_effect(/datum/status_effect/eldritch/flesh) || human_target.has_status_effect(/datum/status_effect/eldritch/void) + var/datum/status_effect/eldritch/eldritch_effect = human_target.has_status_effect(/datum/status_effect/eldritch/rust) || human_target.has_status_effect(/datum/status_effect/eldritch/ash) || human_target.has_status_effect(/datum/status_effect/eldritch/flesh) || human_target.has_status_effect(/datum/status_effect/eldritch/void) if(eldritch_effect) eldritch_effect.on_effect() if(iscarbon(target)) diff --git a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm index 7d457726d7a..88046c6705a 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm @@ -41,7 +41,7 @@ . = ..() if(ishuman(target)) var/mob/living/carbon/human/victim = target - var/datum/status_effect/eldritch/effect = victim.has_status_effect(/datum/status_effect/eldritch/rust) || victim.has_status_effect(/datum/status_effect/eldritch/ash) || victim.has_status_effect(/datum/status_effect/eldritch/flesh) || victim.has_status_effect(/datum/status_effect/eldritch/void) + var/datum/status_effect/eldritch/effect = victim.has_status_effect(/datum/status_effect/eldritch/rust) || victim.has_status_effect(/datum/status_effect/eldritch/ash) || victim.has_status_effect(/datum/status_effect/eldritch/flesh) || victim.has_status_effect(/datum/status_effect/eldritch/void) if(effect) effect.on_effect() victim.adjustOrganLoss(pick(ORGAN_SLOT_BRAIN,ORGAN_SLOT_EARS,ORGAN_SLOT_EYES,ORGAN_SLOT_LIVER,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_HEART),25) diff --git a/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm index dcc3bad9a54..8fe6746907b 100644 --- a/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm +++ b/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm @@ -46,7 +46,7 @@ if(!ishuman(target)) return var/mob/living/carbon/human/victim = target - var/datum/status_effect/eldritch/effect = victim.has_status_effect(/datum/status_effect/eldritch/rust) || victim.has_status_effect(/datum/status_effect/eldritch/ash) || victim.has_status_effect(/datum/status_effect/eldritch/flesh) || victim.has_status_effect(/datum/status_effect/eldritch/void) + var/datum/status_effect/eldritch/effect = victim.has_status_effect(/datum/status_effect/eldritch/rust) || victim.has_status_effect(/datum/status_effect/eldritch/ash) || victim.has_status_effect(/datum/status_effect/eldritch/flesh) || victim.has_status_effect(/datum/status_effect/eldritch/void) if(!effect) return effect.on_effect() diff --git a/code/modules/aquarium/aquarium.dm b/code/modules/aquarium/aquarium.dm index 46170dad502..c6fc660471d 100644 --- a/code/modules/aquarium/aquarium.dm +++ b/code/modules/aquarium/aquarium.dm @@ -156,7 +156,7 @@ return user.visible_message(span_danger("[user] starts to put [living_pulled] into [src]!")) if(do_after(user, 10 SECONDS, target = src)) - if(QDELETED(living_pulled) || user.pulling != living_pulled || living_pulled.buckled || living_pulled.has_buckled_mobs()) + if(QDELETED(living_pulled) || user.pulling != living_pulled || living_pulled.buckled || living_pulled.has_buckled_mobs()) return var/datum/component/aquarium_content/content_component = living_pulled.GetComponent(/datum/component/aquarium_content) if(content_component || content_component.is_ready_to_insert(src)) diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index bd6bf1ff086..c61e2cc678e 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -133,11 +133,11 @@ /datum/asset/simple/namespaced/fontawesome assets = list( - "fa-regular-400.eot" = 'html/font-awesome/webfonts/fa-regular-400.eot', + "fa-regular-400.eot" = 'html/font-awesome/webfonts/fa-regular-400.eot', "fa-regular-400.woff" = 'html/font-awesome/webfonts/fa-regular-400.woff', - "fa-solid-900.eot" = 'html/font-awesome/webfonts/fa-solid-900.eot', - "fa-solid-900.woff" = 'html/font-awesome/webfonts/fa-solid-900.woff', - "v4shim.css" = 'html/font-awesome/css/v4-shims.min.css' + "fa-solid-900.eot" = 'html/font-awesome/webfonts/fa-solid-900.eot', + "fa-solid-900.woff" = 'html/font-awesome/webfonts/fa-solid-900.woff', + "v4shim.css" = 'html/font-awesome/css/v4-shims.min.css', ) parents = list("font-awesome.css" = 'html/font-awesome/css/all.min.css') diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_core.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_core.dm index 3c13e0c612a..114d4f2cbc6 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hfr_core.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hfr_core.dm @@ -100,7 +100,7 @@ ///User controlled variable to control the flow of the fusion by changing the contact of the material var/heating_conductor = 100 ///User controlled variable to control the flow of the fusion by changing the volume of the gasmix by controlling the power of the magnetic fields - var/magnetic_constrictor = 100 + var/magnetic_constrictor = 100 ///User controlled variable to control the flow of the fusion by changing the instability of the reaction var/current_damper = 0 ///Stores the current fusion mix power level diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index 8597f8ea197..24bb099c6b5 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -825,8 +825,8 @@ temp_pod.effectShrapnel = dataToLoad["effectShrapnel"] //If true, creates a cloud of shrapnel of a decided type and magnitude on landing temp_pod.shrapnel_type = text2path(dataToLoad["shrapnelType"]) temp_pod.shrapnel_magnitude = dataToLoad["shrapnelMagnitude"] - temp_pod.effectStun = dataToLoad["effectStun"]//If true, stuns anyone under the pod when it launches until it lands, forcing them to get hit by the pod. Devilish! - temp_pod.effectLimb = dataToLoad["effectLimb"]//If true, pops off a limb (if applicable) from anyone caught under the pod when it lands + temp_pod.effectStun = dataToLoad["effectStun"]//If true, stuns anyone under the pod when it launches until it lands, forcing them to get hit by the pod. Devilish! + temp_pod.effectLimb = dataToLoad["effectLimb"]//If true, pops off a limb (if applicable) from anyone caught under the pod when it lands temp_pod.effectOrgans = dataToLoad["effectOrgans"]//If true, yeets the organs out of any bodies caught under the pod when it lands temp_pod.bluespace = dataToLoad["effectBluespace"] //If true, the pod deletes (in a shower of sparks) after landing temp_pod.effectStealth = dataToLoad["effectStealth"]//If true, a target icon isn't displayed on the turf where the pod will land diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index e0318db0ffa..9edb4c04c44 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -929,7 +929,7 @@ name = "Solar Panel Crate" desc = "Go green with this DIY advanced solar array. Contains twenty one solar assemblies, a solar-control circuit board, and tracker. If you have any questions, please check out the enclosed instruction book." cost = CARGO_CRATE_VALUE * 8 - contains = list(/obj/item/solar_assembly, + contains = list(/obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index b06ea002650..49503053b81 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -51,7 +51,7 @@ var/rubble_type //Rubble effect associated with this supplypod var/decal = "default" //What kind of extra decals we add to the pod to make it look nice var/door = "pod_door" - var/fin_mask = "topfin" + var/fin_mask = "topfin" var/obj/effect/supplypod_rubble/rubble var/obj/effect/engineglow/glow_effect var/effectShrapnel = FALSE diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index 78e8dfb71f3..3f915764cfe 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -8,9 +8,9 @@ /obj/item/reactive_armour_shell/attackby(obj/item/I, mob/user, params) ..() var/static/list/anomaly_armour_types = list( - /obj/effect/anomaly/grav = /obj/item/clothing/suit/armor/reactive/repulse, + /obj/effect/anomaly/grav = /obj/item/clothing/suit/armor/reactive/repulse, /obj/effect/anomaly/flux = /obj/item/clothing/suit/armor/reactive/tesla, - /obj/effect/anomaly/bluespace = /obj/item/clothing/suit/armor/reactive/teleport + /obj/effect/anomaly/bluespace = /obj/item/clothing/suit/armor/reactive/teleport, ) if(istype(I, /obj/item/assembly/signaler/anomaly)) diff --git a/code/modules/events/wizard/shuffle.dm b/code/modules/events/wizard/shuffle.dm index 39c1d18ba8e..c00917edd73 100644 --- a/code/modules/events/wizard/shuffle.dm +++ b/code/modules/events/wizard/shuffle.dm @@ -10,7 +10,7 @@ /datum/round_event/wizard/shuffleloc/start() var/list/moblocs = list() - var/list/mobs = list() + var/list/mobs = list() for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) if(!is_station_level(H.z)) @@ -46,7 +46,7 @@ /datum/round_event/wizard/shufflenames/start() var/list/mobnames = list() - var/list/mobs = list() + var/list/mobs = list() for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) mobnames += H.real_name @@ -79,7 +79,7 @@ earliest_start = 0 MINUTES /datum/round_event/wizard/shuffleminds/start() - var/list/mobs = list() + var/list/mobs = list() for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) if(H.stat || !H.mind || IS_WIZARD(H)) diff --git a/code/modules/explorer_drone/exploration_site.dm b/code/modules/explorer_drone/exploration_site.dm index 5576ae13d8e..89510036657 100644 --- a/code/modules/explorer_drone/exploration_site.dm +++ b/code/modules/explorer_drone/exploration_site.dm @@ -60,9 +60,9 @@ GLOBAL_LIST_EMPTY(exploration_sites) /datum/exploration_event/simple/resource = 1 ) /// Weight mods scaled by distance, resources are more easily found on farther sites - var/static/list/distance_modifiers = list( + var/static/list/distance_modifiers = list( /datum/exploration_event/simple/trader = 0.3, - /datum/exploration_event/simple/resource = 0.3 + /datum/exploration_event/simple/resource = 0.3, ) var/list/category_weights = base_weights.Copy() for(var/modifier in distance_modifiers) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 975d0c00f1f..4abf765be56 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -252,7 +252,7 @@ /obj/item/reagent_containers/food/drinks/ice/prison name = "dirty ice cup" desc = "Either Nanotrasen's water supply is contaminated, or this machine actually vends lemon, chocolate, and cherry snow cones." - list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/liquidgibs = 5) + list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/liquidgibs = 5) /obj/item/reagent_containers/food/drinks/mug // parent type is literally just so empty mug sprites are a thing name = "mug" diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index 116009e965b..49aa831ff00 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -31,7 +31,7 @@ /datum/chemical_reaction/food/chocolatepudding results = list(/datum/reagent/consumable/chocolatepudding = 20) - required_reagents = list(/datum/reagent/consumable/cream = 5, /datum/reagent/consumable/coco = 5, /datum/reagent/consumable/eggyolk = 2) + required_reagents = list(/datum/reagent/consumable/cream = 5, /datum/reagent/consumable/coco = 5, /datum/reagent/consumable/eggyolk = 2) /datum/chemical_reaction/food/vanillapudding results = list(/datum/reagent/consumable/vanillapudding = 20) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index 085cb814f9f..a9d662a144d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -174,7 +174,7 @@ name = "Fruit Salad snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/water = 5, + /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/orangejuice = 5, /datum/reagent/consumable/limejuice = 5, diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 55ce7e3361a..9624f45194e 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -312,7 +312,7 @@ text += "Maximum reagent capacity: [scanned_plant.reagents.maximum_volume]\n" var/chem_cap = 0 for(var/_reagent in scanned_plant.reagents.reagent_list) - var/datum/reagent/reagent = _reagent + var/datum/reagent/reagent = _reagent var/amount = reagent.volume chem_cap += reagent.volume reagents_text += "\n- [reagent.name]: [amount]" diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 2edb0bc1ab6..c1b078ce3fc 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -239,7 +239,7 @@ box = /obj/item/storage/box/survival var/backpack = /obj/item/storage/backpack - var/satchel = /obj/item/storage/backpack/satchel + var/satchel = /obj/item/storage/backpack/satchel var/duffelbag = /obj/item/storage/backpack/duffelbag var/pda_slot = ITEM_SLOT_BELT diff --git a/code/modules/jobs/job_types/botanist.dm b/code/modules/jobs/job_types/botanist.dm index 0b12775c94f..45ecb044863 100644 --- a/code/modules/jobs/job_types/botanist.dm +++ b/code/modules/jobs/job_types/botanist.dm @@ -43,7 +43,7 @@ suit_store = /obj/item/plant_analyzer belt = /obj/item/pda/botanist ears = /obj/item/radio/headset/headset_srv - gloves =/obj/item/clothing/gloves/botanic_leather + gloves = /obj/item/clothing/gloves/botanic_leather backpack = /obj/item/storage/backpack/botany satchel = /obj/item/storage/backpack/satchel/hyd diff --git a/code/modules/lighting/lighting_corner.dm b/code/modules/lighting/lighting_corner.dm index 65e5a32dfc6..19285ae9888 100644 --- a/code/modules/lighting/lighting_corner.dm +++ b/code/modules/lighting/lighting_corner.dm @@ -33,11 +33,11 @@ . = ..() save_master(new_turf, turn(diagonal, 180)) - var/vertical = diagonal & ~(diagonal - 1) // The horizontal directions (4 and 8) are bigger than the vertical ones (1 and 2), so we can reliably say the lsb is the horizontal direction. + var/vertical = diagonal & ~(diagonal - 1) // The horizontal directions (4 and 8) are bigger than the vertical ones (1 and 2), so we can reliably say the lsb is the horizontal direction. var/horizontal = diagonal & ~vertical // Now that we know the horizontal one we can get the vertical one. x = new_turf.x + (horizontal == EAST ? 0.5 : -0.5) - y = new_turf.y + (vertical == NORTH ? 0.5 : -0.5) + y = new_turf.y + (vertical == NORTH ? 0.5 : -0.5) // My initial plan was to make this loop through a list of all the dirs (horizontal, vertical, diagonal). // Issue being that the only way I could think of doing it was very messy, slow and honestly overengineered. @@ -113,13 +113,13 @@ else if (largest_color_luminosity < LIGHTING_SOFT_THRESHOLD) . = 0 // 0 means soft lighting. - cache_r = round(lum_r * ., LIGHTING_ROUND_VALUE) || LIGHTING_SOFT_THRESHOLD - cache_g = round(lum_g * ., LIGHTING_ROUND_VALUE) || LIGHTING_SOFT_THRESHOLD - cache_b = round(lum_b * ., LIGHTING_ROUND_VALUE) || LIGHTING_SOFT_THRESHOLD + cache_r = round(lum_r * ., LIGHTING_ROUND_VALUE) || LIGHTING_SOFT_THRESHOLD + cache_g = round(lum_g * ., LIGHTING_ROUND_VALUE) || LIGHTING_SOFT_THRESHOLD + cache_b = round(lum_b * ., LIGHTING_ROUND_VALUE) || LIGHTING_SOFT_THRESHOLD #else - cache_r = round(lum_r * ., LIGHTING_ROUND_VALUE) - cache_g = round(lum_g * ., LIGHTING_ROUND_VALUE) - cache_b = round(lum_b * ., LIGHTING_ROUND_VALUE) + cache_r = round(lum_r * ., LIGHTING_ROUND_VALUE) + cache_g = round(lum_g * ., LIGHTING_ROUND_VALUE) + cache_b = round(lum_b * ., LIGHTING_ROUND_VALUE) #endif src.largest_color_luminosity = round(largest_color_luminosity, LIGHTING_ROUND_VALUE) diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index dc993c92ad0..ca600b7d8f2 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -81,7 +81,7 @@ if (needs_update == LIGHTING_NO_UPDATE) \ SSlighting.sources_queue += src; \ if (needs_update < level) \ - needs_update = level; \ + needs_update = level; \ // This proc will cause the light source to update the top atom, and add itself to the update queue. diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 25425436586..90f51edb688 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -86,7 +86,7 @@ output_dir = WEST var/obj/machinery/mineral/stacking_unit_console/console var/stk_types = list() - var/stk_amt = list() + var/stk_amt = list() var/stack_list[0] //Key: Type. Value: Instance of type. var/stack_amt = 50 //amount to stack before releassing var/datum/component/remote_materials/materials diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 942d7427f6b..7240e0116a4 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -437,7 +437,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/area/A = V if(!(A.area_flags & HIDDEN_AREA)) filtered += A - var/area/thearea = input("Area to jump to", "BOOYEA") as null|anything in filtered + var/area/thearea = input("Area to jump to", "BOOYEA") as null|anything in filtered if(!thearea) return diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index f59d0592da4..4e4d0048d3d 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -322,7 +322,7 @@ var/plas = ST_gases[/datum/gas/plasma][MOLES] var/oxy = ST_gases[/datum/gas/oxygen][MOLES] - var/n2 = ST_gases[/datum/gas/nitrogen][MOLES] + var/n2 = ST_gases[/datum/gas/nitrogen][MOLES] var/co2 = ST_gases[/datum/gas/carbon_dioxide][MOLES] ST.air.garbage_collect() diff --git a/code/modules/plumbing/plumbers/bottler.dm b/code/modules/plumbing/plumbers/bottler.dm index ea31dcb1698..f2fc17c2b2e 100644 --- a/code/modules/plumbing/plumbers/bottler.dm +++ b/code/modules/plumbing/plumbers/bottler.dm @@ -38,19 +38,19 @@ if(NORTH) goodspot = get_step(get_turf(src), NORTH) inputspot = get_step(get_turf(src), SOUTH) - badspot = get_step(get_turf(src), EAST) + badspot = get_step(get_turf(src), EAST) if(SOUTH) goodspot = get_step(get_turf(src), SOUTH) inputspot = get_step(get_turf(src), NORTH) - badspot = get_step(get_turf(src), WEST) + badspot = get_step(get_turf(src), WEST) if(WEST) goodspot = get_step(get_turf(src), WEST) inputspot = get_step(get_turf(src), EAST) - badspot = get_step(get_turf(src), NORTH) + badspot = get_step(get_turf(src), NORTH) if(EAST) goodspot = get_step(get_turf(src), EAST) inputspot = get_step(get_turf(src), WEST) - badspot = get_step(get_turf(src), SOUTH) + badspot = get_step(get_turf(src), SOUTH) ///changing input ammount with a window /obj/machinery/plumbing/bottler/interact(mob/user) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index f2093f2a9a9..ccf3c107986 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -953,8 +953,8 @@ "status" = equipment, "topicParams" = list( "auto" = list("eqp" = 3), - "on" = list("eqp" = 2), - "off" = list("eqp" = 1) + "on" = list("eqp" = 2), + "off" = list("eqp" = 1), ) ), list( @@ -963,8 +963,8 @@ "status" = lighting, "topicParams" = list( "auto" = list("lgt" = 3), - "on" = list("lgt" = 2), - "off" = list("lgt" = 1) + "on" = list("lgt" = 2), + "off" = list("lgt" = 1), ) ), list( @@ -973,8 +973,8 @@ "status" = environ, "topicParams" = list( "auto" = list("env" = 3), - "on" = list("env" = 2), - "off" = list("env" = 1) + "on" = list("env" = 2), + "off" = list("env" = 1), ) ) ) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 90c49d6839e..665e3aacd39 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -261,7 +261,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri var/inverse_dir = (!direction)? 0 : turn(direction, 180) //flip the direction, to match with the source position on its turf - var/turf/TB = get_step(src, direction) + var/turf/TB = get_step(src, direction) for(var/obj/structure/cable/C in TB) if(!C) diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm index 00a12feb6da..11ce484f0c1 100644 --- a/code/modules/projectiles/ammunition/energy/stun.dm +++ b/code/modules/projectiles/ammunition/energy/stun.dm @@ -17,7 +17,7 @@ /obj/item/ammo_casing/energy/disabler projectile_type = /obj/projectile/beam/disabler - select_name = "disable" + select_name = "disable" e_cost = 50 fire_sound = 'sound/weapons/taser2.ogg' harmful = FALSE diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index ba4f1748424..d5fe823d9a7 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -85,7 +85,7 @@ ///Whether the gun can be tacloaded by slapping a fresh magazine directly on it var/tac_reloads = TRUE //Snowflake mechanic no more. ///Whether the gun can be sawn off by sawing tools - var/can_be_sawn_off = FALSE + var/can_be_sawn_off = FALSE var/flip_cooldown = 0 var/suppressor_x_offset ///pixel offset for the suppressor overlay on the x axis. var/suppressor_y_offset ///pixel offset for the suppressor overlay on the y axis. diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index ab0e08e9568..e367d852801 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -90,7 +90,7 @@ if(chambered.loaded_projectile) if(prob(jamming_chance)) jammed = TRUE - jamming_chance += jamming_increment + jamming_chance += jamming_increment jamming_chance = clamp (jamming_chance, 0, 100) return ..() diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 0701cc51cbf..20f656e89c8 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -47,7 +47,7 @@ fire_delay = 8 mag_type = /obj/item/ammo_box/magazine/internal/shot/riot sawn_desc = "Come with me if you want to live." - can_be_sawn_off = TRUE + can_be_sawn_off = TRUE // Automatic Shotguns// @@ -168,7 +168,7 @@ ) semi_auto = TRUE bolt_type = BOLT_TYPE_NO_BOLT - can_be_sawn_off = TRUE + can_be_sawn_off = TRUE pb_knockback = 3 // it's a super shotgun! /obj/item/gun/ballistic/shotgun/doublebarrel/AltClick(mob/user) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 9512f038e0f..d54fc9020a3 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -891,7 +891,7 @@ if(total_matching_reagents == total_required_reagents && total_matching_catalysts == total_required_catalysts && matching_container && matching_other) if(meets_temp_requirement && meets_ph_requirement) - possible_reactions += reaction + possible_reactions += reaction else LAZYADD(failed_but_capable_reactions, reaction) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index f50ee274361..79af94679b8 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -125,7 +125,7 @@ description = "This juice is VERY sour." color = "#863333" // rgb: 175, 175, 0 taste_description = "sourness" - glass_icon_state = "lemonglass" + glass_icon_state = "lemonglass" glass_name = "glass of lemon juice" glass_desc = "Sour..." ph = 2 @@ -259,7 +259,7 @@ description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" color = "#DFD7AF" // rgb: 223, 215, 175 taste_description = "creamy milk" - glass_icon_state = "glass_white" + glass_icon_state = "glass_white" glass_name = "glass of cream" glass_desc = "Ewwww..." chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -418,7 +418,7 @@ description = "A refreshing beverage." color = "#100800" // rgb: 16, 8, 0 taste_description = "cola" - glass_icon_state = "spacecola" + glass_icon_state = "spacecola" glass_name = "glass of Space Cola" glass_desc = "A glass of refreshing Space Cola." chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -847,7 +847,7 @@ nutriment_factor = 3 * REAGENTS_METABOLISM color = "#403010" // rgb: 64, 48, 16 taste_description = "creamy chocolate" - glass_icon_state = "chocolateglass" + glass_icon_state = "chocolateglass" glass_name = "glass of hot coco" glass_desc = "A favorite winter drink to warm you up." chemical_flags = REAGENT_CAN_BE_SYNTHESIZED diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index ba69eb8c7a7..1f3111f3a11 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -229,7 +229,7 @@ name = "Holy Water" description = "Water blessed by some deity." color = "#E0E8EF" // rgb: 224, 232, 239 - glass_icon_state = "glass_clear" + glass_icon_state = "glass_clear" glass_name = "glass of holy water" glass_desc = "A glass of holy water." self_consuming = TRUE //divine intervention won't be limited by the lack of a liver diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index d5ff17c71db..5a103e0953b 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -84,7 +84,7 @@ reaction_tags = REACTION_TAG_EASY | REACTION_TAG_UNIQUE | REACTION_TAG_OTHER /datum/chemical_reaction/soapification - required_reagents = list(/datum/reagent/liquidgibs = 10, /datum/reagent/lye = 10) // requires two scooped gib tiles + required_reagents = list(/datum/reagent/liquidgibs = 10, /datum/reagent/lye = 10) // requires two scooped gib tiles required_temp = 374 mob_react = FALSE reaction_flags = REACTION_INSTANT @@ -110,7 +110,7 @@ new /obj/item/soap/omega(location) /datum/chemical_reaction/candlefication - required_reagents = list(/datum/reagent/liquidgibs = 5, /datum/reagent/oxygen = 5) // + required_reagents = list(/datum/reagent/liquidgibs = 5, /datum/reagent/oxygen = 5) // required_temp = 374 mob_react = FALSE reaction_flags = REACTION_INSTANT @@ -671,7 +671,7 @@ /datum/chemical_reaction/pax results = list(/datum/reagent/pax = 3) - required_reagents = list(/datum/reagent/toxin/mindbreaker = 1, /datum/reagent/medicine/synaptizine = 1, /datum/reagent/water = 1) + required_reagents = list(/datum/reagent/toxin/mindbreaker = 1, /datum/reagent/medicine/synaptizine = 1, /datum/reagent/water = 1) reaction_tags = REACTION_TAG_EASY | REACTION_TAG_UNIQUE | REACTION_TAG_OTHER /datum/chemical_reaction/yuck diff --git a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm index 05ecf6a42c2..95584f18143 100644 --- a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm +++ b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm @@ -630,7 +630,7 @@ /datum/reagent/ants, /datum/reagent/medicine/omnizine) - supplementary_reagents = list( + supplementary_reagents = list( /datum/reagent/toxin/venom = 6, /datum/reagent/drug/kronkaine = 4, /datum/reagent/consumable/nutriment/peptides = 3, diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm index d2084806518..2be48b1c461 100644 --- a/code/modules/shuttle/navigation_computer.dm +++ b/code/modules/shuttle/navigation_computer.dm @@ -2,7 +2,7 @@ name = "navigation computer" desc = "Used to designate a precise transit location for a spacecraft." jump_action = null - should_supress_view_changes = FALSE + should_supress_view_changes = FALSE // Docking cameras should only interact with their current z-level. move_up_action = null diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index c233e5585c8..00f4c31d212 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -350,7 +350,7 @@ icon_state = "shears" flags_1 = CONDUCT_1 item_flags = SURGICAL_TOOL - toolspeed = 1 + toolspeed = 1 force = 12 w_class = WEIGHT_CLASS_NORMAL throwforce = 6 diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 2b8342d75a0..919205eb670 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -60,7 +60,7 @@ /obj/item/clothing/under/pants/tan = 2, /obj/item/clothing/under/pants/track = 2, /obj/item/clothing/shoes/sneakers/black = 4, - /obj/item/clothing/head/wig/natural = 4, + /obj/item/clothing/head/wig/natural = 4, /obj/item/clothing/under/dress/skirt/plaid = 2, /obj/item/clothing/under/dress/skirt/plaid/blue = 2, /obj/item/clothing/under/dress/skirt/plaid/green = 2, diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index 2506c77aaf4..5dff958ec73 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -40,7 +40,7 @@ ) premium = list( /obj/item/disk/holodisk = 5, - /obj/item/toy/crayon/spraycan = 3, + /obj/item/toy/crayon/spraycan = 3, /obj/item/canvas/twentyfour_twentyfour = 5, /obj/item/rcl = 2, /obj/item/airlock_painter = 1, diff --git a/html/statbrowser.html b/html/statbrowser.html index b32c657679d..714c45b77e0 100644 --- a/html/statbrowser.html +++ b/html/statbrowser.html @@ -1215,7 +1215,7 @@ function set_style_sheet(sheet) { var currentSheet = document.getElementById("goonStyle"); currentSheet.parentElement.removeChild(currentSheet); } - var head = document.getElementsByTagName('head')[0]; + var head = document.getElementsByTagName('head')[0]; var sheetElement = document.createElement("link"); sheetElement.id = "goonStyle"; sheetElement.rel = "stylesheet";