diff --git a/code/___linters/odlint.dm b/code/___linters/odlint.dm index e7ce43a9a1b..3714dc5298c 100644 --- a/code/___linters/odlint.dm +++ b/code/___linters/odlint.dm @@ -32,5 +32,6 @@ #pragma EmptyBlock error #pragma SuspiciousSwitchCase error #pragma AssignmentInConditional error +#pragma AmbiguousInOrder error #endif diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index 8a2562f3157..aa6a0ccaba2 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -288,7 +288,7 @@ SUBSYSTEM_DEF(jobs) if(SSatlas.current_sector.description) to_chat(H, SSatlas.current_sector.get_chat_description()) - if("Arrivals Shuttle" in SSatlas.current_map.allowed_spawns && spawning_at == "Arrivals Shuttle") + if(("Arrivals Shuttle" in SSatlas.current_map.allowed_spawns) && spawning_at == "Arrivals Shuttle") H.centcomm_despawn_timer = addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living, centcomm_timeout)), 10 MINUTES, TIMER_STOPPABLE) to_chat(H,SPAN_NOTICE("You have ten minutes to reach the station before you will be forced there.")) diff --git a/code/game/gamemodes/events/power_failure.dm b/code/game/gamemodes/events/power_failure.dm index 73c7b83f4c2..ea6e0f2784b 100644 --- a/code/game/gamemodes/events/power_failure.dm +++ b/code/game/gamemodes/events/power_failure.dm @@ -22,7 +22,7 @@ C.cell.charge = C.cell.maxcharge for(var/obj/machinery/power/smes/S in SSmachinery.smes_units) var/area/current_area = get_area(S) - if(current_area.type in skipped_areas || !is_station_level(S.z)) + if((current_area.type in skipped_areas) || !is_station_level(S.z)) continue S.charge = S.capacity S.update_icon() diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 1f6822496cb..673d480f2d2 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -133,7 +133,7 @@ var/newnet = sanitize(input(usr, "Which network do you want to view?", "Comm Monitor", network) as null|text) - if(newnet && ((usr in range(1, src) || issilicon(usr)))) + if(newnet && (((usr in range(1, src)) || issilicon(usr)))) if(length(newnet) > 15) temp = "- FAILED: NETWORK TAG STRING TOO LENGHTLY -" diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index 52633d896f2..bf4cb37f1bf 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -111,7 +111,7 @@ if(href_list["network"]) var/newnet = sanitize(input(usr, "Which network do you want to view?", "Comm Monitor", network) as null|text) - if(newnet && ((usr in range(1, src) || issilicon(usr)))) + if(newnet && (((usr in range(1, src)) || issilicon(usr)))) if(length(newnet) > 15) temp = "- FAILED: NETWORK TAG STRING TOO LENGHTLY -" diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index e103d920f46..06bba584c5c 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -406,7 +406,7 @@ pixel_x = 8; if(!istype(position) || !(position.z in levels)) return FALSE - if(input_frequency in ANTAG_FREQS && !syndie) + if((input_frequency in ANTAG_FREQS) && !syndie) return FALSE//Prevents broadcast of messages over devices lacking the encryption return TRUE diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index beeb6a12f3b..8111fb70e67 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -65,7 +65,7 @@ effective or pretty fucking useless. if(!istype(target)) to_chat(user, SPAN_NOTICE("[target] is not a valid target!")) return - if(GLOB.all_languages[LANGUAGE_LIIDRA] in target.languages || target.internal_organs_by_name["blackkois"]) + if((GLOB.all_languages[LANGUAGE_LIIDRA] in target.languages) || target.internal_organs_by_name["blackkois"]) to_chat(user, SPAN_NOTICE("[target] is already part of the Lii'dra Hivemind!")) return if(isvaurca(target)) diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index deae873ef64..89051ad374a 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -444,7 +444,7 @@ ) while(!P) P = pick(typesof(/obj/structure/flora/pottedplant)) - if(P in unwanted || ((P in rare) && prob(50))) + if((P in unwanted) || ((P in rare) && prob(50))) P = null . = new P(loc) @@ -465,7 +465,7 @@ ) while(!P) P = pick(typesof(/obj/item/flora/pottedplant_small)) - if(P in unwanted || ((P in rare) && prob(50))) + if((P in unwanted) || ((P in rare) && prob(50))) P = null . = new P(loc) diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index e135077b528..5ec6b703608 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -154,7 +154,7 @@ if(!istype(id_card)) return - if(ACCESS_SECURITY in id_card.access || emagged) + if((ACCESS_SECURITY in id_card.access) || emagged) to_chat(user, "You imprint your ID details onto the badge.") set_name(user.real_name) else diff --git a/code/modules/organs/subtypes/parasite/black_kois.dm b/code/modules/organs/subtypes/parasite/black_kois.dm index 12841bdaa0e..06fe25816b6 100644 --- a/code/modules/organs/subtypes/parasite/black_kois.dm +++ b/code/modules/organs/subtypes/parasite/black_kois.dm @@ -158,10 +158,10 @@ SPAN_DANGER("You feel the cold of the knife cutting and cutting, but it is too late. There is nothing left of you but the Lii'dra's will, now. A final cut - and then you are granted the only escape that still remains to you.")) to_chat(target, SPAN_GOOD("Your function is fulfilled. We have no further need of you. Releasing control.")) target.death(FALSE) //too late, there is no brain left to save - if(GLOB.all_languages[LANGUAGE_VAURCA] in target.languages && stage >= 3 && !isvaurca(target)) + if((GLOB.all_languages[LANGUAGE_VAURCA] in target.languages) && stage >= 3 && !isvaurca(target)) target.remove_language(LANGUAGE_VAURCA) to_chat(target, SPAN_WARNING("Your mind suddenly grows dark as the unity of the Hive is torn from you.")) - if(GLOB.all_languages[LANGUAGE_LIIDRA] in target.languages && stage >= 3) + if((GLOB.all_languages[LANGUAGE_LIIDRA] in target.languages) && stage >= 3) target.remove_language(LANGUAGE_LIIDRA) removed_langs = 0 remove_verb(owner, /mob/living/carbon/human/proc/kois_cough) diff --git a/code/modules/overmap/events/event.dm b/code/modules/overmap/events/event.dm index 84771457023..05ed2c1e298 100644 --- a/code/modules/overmap/events/event.dm +++ b/code/modules/overmap/events/event.dm @@ -142,7 +142,7 @@ /singleton/overmap_event_handler/proc/is_event_in_turf(var/datum/event/E, var/turf/T) for(var/obj/effect/overmap/event/hazard in hazard_by_turf[T]) - if(E in hazard.events && E.severity == hazard.difficulty) + if((E in hazard.events) && E.severity == hazard.difficulty) return TRUE /singleton/overmap_event_handler/proc/is_event_included(var/list/hazards, var/obj/effect/overmap/event/E, var/equal_or_better)//this proc is only used so it can break out of 2 loops cleanly diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm index 55711b58f5f..38d240d59f3 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_special.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm @@ -81,7 +81,7 @@ //see if we've identified anyone nearby if(world.time - last_bloodcall > bloodcall_interval && nearby_mobs.len) var/mob/living/carbon/human/M = pop(nearby_mobs) - if(M in view(7,src) && M.health > 20) + if((M in view(7,src)) && M.health > 20) if(prob(50)) bloodcall(M) nearby_mobs.Add(M) diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index a786c345801..d98bbb411f4 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -105,7 +105,7 @@ return else if(owned_capacitor) - if(!(owned_capacitor in range(1, src) && get_dir(owned_capacitor, src) == owned_capacitor.dir && owned_capacitor.anchored)) + if(!((owned_capacitor in range(1, src)) && get_dir(owned_capacitor, src) == owned_capacitor.dir && owned_capacitor.anchored)) if(owned_capacitor.owned_gen == src) owned_capacitor.owned_gen = null owned_capacitor = null diff --git a/code/unit_tests/ruins_tests.dm b/code/unit_tests/ruins_tests.dm index 497835058ff..19cc1a49b55 100644 --- a/code/unit_tests/ruins_tests.dm +++ b/code/unit_tests/ruins_tests.dm @@ -48,7 +48,7 @@ //See if the ruin is in the unit test groups we're supposed to run var/is_in_unit_test_groups = FALSE for(var/unit_test_group in tested_ruin.unit_test_groups) - if(unit_test_group in SSunit_tests_config.config["ruins_unit_test_groups"] || SSunit_tests_config.config["ruins_unit_test_groups"][1] == "*") + if((unit_test_group in SSunit_tests_config.config["ruins_unit_test_groups"]) || SSunit_tests_config.config["ruins_unit_test_groups"][1] == "*") is_in_unit_test_groups = TRUE break