diff --git a/code/__HELPERS/paths/path.dm b/code/__HELPERS/paths/path.dm index ef5bd32e3f1..706bd6e4cf2 100644 --- a/code/__HELPERS/paths/path.dm +++ b/code/__HELPERS/paths/path.dm @@ -386,7 +386,7 @@ GLOBAL_LIST_INIT(can_pass_info_vars, GLOBAL_PROC_REF(can_pass_check_vars)) /datum/can_pass_info/proc/compare_against(datum/can_pass_info/check_against) for(var/comparable_var in GLOB.can_pass_info_vars) - if(!(vars[comparable_var] ~= check_against[comparable_var])) + if(!(vars[comparable_var] ~= check_against.vars[comparable_var])) return FALSE if(!pulling_info != !check_against.pulling_info) return FALSE diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm index d7a5a3a8ade..d697ada974e 100644 --- a/code/datums/components/orbiter.dm +++ b/code/datums/components/orbiter.dm @@ -456,7 +456,7 @@ var/list/output = list() if(!processed) processed = list() - if(src in processed || isturf(src)) + if((src in processed) || isturf(src)) return output processed += src diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm index 613a2e3238b..441ea87cbe8 100644 --- a/code/datums/spells/mind_transfer.dm +++ b/code/datums/spells/mind_transfer.dm @@ -41,7 +41,7 @@ Also, you never added distance checking after target is selected. I've went ahea to_chat(user, "You're killing yourself! You can't concentrate enough to do this!") return - if(target.mind.special_role in protected_roles && target != user) + if((target.mind.special_role in protected_roles) && target != user) to_chat(user, "Their mind is resisting your spell.") return diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index 52d6dc1084c..71959a987b7 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -133,7 +133,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) return // If the uplink's holder is in the user's contents - if((U.loc in user.contents || (in_range(U.loc, user) && isturf(U.loc.loc)))) + if(((U.loc in user.contents) || (in_range(U.loc, user) && isturf(U.loc.loc)))) if(cost > U.uses) return diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index aedb6c68765..9690527151d 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -339,14 +339,14 @@ GLOBAL_LIST_EMPTY(safes) if(get_dist(src, driller) >= 9) return //You need to be near the drill if you want to get the buff. for(var/mob/living/carbon/human/H in view(9, src)) - if(H.job in list("Security Officer", "Detective", "Warden", "Head of Security", "Captain", "Clown") || H.mind.special_role == SPECIAL_ROLE_ERT) + if((H.job in list("Security Officer", "Detective", "Warden", "Head of Security", "Captain", "Clown")) || H.mind.special_role == SPECIAL_ROLE_ERT) if(H.mind && H.mind.special_role && H.mind.special_role != SPECIAL_ROLE_ERT) continue drill.spotted = TRUE security_assualt_in_progress() return for(var/mob/living/carbon/human/H in view(9, driller)) - if(H.job in list("Security Officer", "Detective", "Warden", "Head of Security", "Captain", "Clown") || H.mind.special_role == SPECIAL_ROLE_ERT) + if((H.job in list("Security Officer", "Detective", "Warden", "Head of Security", "Captain", "Clown")) || H.mind.special_role == SPECIAL_ROLE_ERT) if(H.mind && H.mind.special_role && H.mind.special_role != SPECIAL_ROLE_ERT) continue drill.spotted = TRUE diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 313b5c23b8e..90671880536 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -440,7 +440,7 @@ var/obj/item/pda/pda = I id_card = pda.id - if(ACCESS_SEC_DOORS in id_card.access || emagged) + if((ACCESS_SEC_DOORS in id_card.access) || emagged) to_chat(user, "You imprint your ID details onto the badge.") stored_name = id_card.registered_name name = "holobadge ([stored_name])" diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index db8e397271e..5112d7e6268 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -330,7 +330,7 @@ if(emagged) // actually emagged bike_horn() else - if(C in view(4, src) && !spam_flag) //keep the range short for patrolling + if((C in view(4, src)) && !spam_flag) //keep the range short for patrolling bike_horn() continue diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 4536949c081..9edf3e3d000 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -284,7 +284,7 @@ Difficulty: Medium hotspot.recolor() T.hotspot_expose(700,50,1) for(var/mob/living/L in T.contents) - if(L in hit_list || L == source) + if((L in hit_list) || L == source) continue hit_list += L L.adjustFireLoss(20) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 5ea585121ca..825f63ea38c 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -319,7 +319,7 @@ add_hiddenprint(usr) // No more forging nasty documents as someone else, you jerks if(!is_pen(item_write) && !istype(item_write, /obj/item/toy/crayon)) return - if(loc != usr && !Adjacent(usr) && !((istype(loc, /obj/item/clipboard) || istype(loc, /obj/item/folder)) && (usr in get_turf(src) || loc.Adjacent(usr)))) + if(loc != usr && !Adjacent(usr) && !((istype(loc, /obj/item/clipboard) || istype(loc, /obj/item/folder)) && ((usr in get_turf(src)) || loc.Adjacent(usr)))) return // If paper is not in usr, then it must be near them, or in a clipboard or folder, which must be in or near usr input_element = parsepencode(input_element, item_write, usr) // Encode everything from pencode to html if(id != "end") diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 3b866e1b186..80dba5fd47e 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -72,7 +72,7 @@ else if(is_pen(W) || istype(W, /obj/item/toy/crayon)) usr << browse("", "window=PaperBundle[UID()]") //Closes the dialog - P = src[page] + P = get_page() P.attackby(W, user, params) update_icon() @@ -106,7 +106,7 @@ /obj/item/paper_bundle/proc/show_content(mob/user as mob) var/dat = {""} - var/obj/item/W = src[page] + var/obj/item/W = get_page() switch(screen) if(0) dat+= "
" @@ -120,11 +120,11 @@ dat+= "" dat+= "