From 900271af91e0abaf12a2a610986de6cf72645d2a Mon Sep 17 00:00:00 2001
From: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Fri, 27 Sep 2024 13:02:16 -0400
Subject: [PATCH] Updates OD lints (#26729)
* yea
* update lints
* lint changes and code fixes
* i hate old code
* dont make this an error
---
code/__HELPERS/paths/path.dm | 2 +-
code/datums/components/orbiter.dm | 2 +-
code/datums/spells/mind_transfer.dm | 2 +-
code/datums/uplink_items/uplink_general.dm | 2 +-
code/game/objects/structures/safe.dm | 4 ++--
.../clothing/under/accessories/accessory.dm | 2 +-
.../mob/living/simple_animal/bot/honkbot.dm | 2 +-
.../simple_animal/hostile/megafauna/drake.dm | 2 +-
code/modules/paperwork/paper.dm | 2 +-
code/modules/paperwork/paper_bundle.dm | 18 ++++++++++++------
code/modules/surgery/abstract_steps.dm | 2 +-
tools/ci/lints.dm | 17 ++++++++++++++++-
12 files changed, 39 insertions(+), 18 deletions(-)
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+= "
"
dat+= ""
- if(istype(src[page], /obj/item/paper))
+ if(istype(W, /obj/item/paper))
var/obj/item/paper/P = W
dat += P.show_content(usr, view = 0)
usr << browse(dat, "window=PaperBundle[UID()]")
- else if(istype(src[page], /obj/item/photo))
+ else if(istype(W, /obj/item/photo))
var/obj/item/photo/P = W
usr << browse_rsc(P.img, "tmp_photo.png")
usr << browse(dat + "[P.name]" \
@@ -162,11 +162,11 @@
playsound(loc, "pageturn", 50, 1)
if(href_list["remove"])
- var/obj/item/W = src[page]
+ var/obj/item/W = get_page()
usr.put_in_hands(W)
to_chat(usr, "You remove [W] from the bundle.")
if(amount == 1)
- var/obj/item/paper/P = src[1]
+ var/obj/item/paper/P = get_page(1)
usr.unEquip(src)
usr.put_in_hands(P)
usr.unset_machine() // Ensure the bundle GCs
@@ -234,6 +234,7 @@
desc = "A single sheet of paper."
if(photos)
desc += "\nThere [photos == 1 ? "is a photo" : "are [photos] photos"] attached to it."
+
/obj/item/paper_bundle/update_icon_state()
if(length(contents))
var/obj/item/paper/P = contents[1]
@@ -268,3 +269,8 @@
. += "clip"
update_desc()
+
+/obj/item/paper_bundle/proc/get_page(page_override)
+ if(page_override)
+ return contents[page_override]
+ return contents[page]
diff --git a/code/modules/surgery/abstract_steps.dm b/code/modules/surgery/abstract_steps.dm
index 2632347347c..144f55e3909 100644
--- a/code/modules/surgery/abstract_steps.dm
+++ b/code/modules/surgery/abstract_steps.dm
@@ -113,7 +113,7 @@
for(var/allowed in first_step.allowed_tools)
if(ispath(allowed) && istype(tool, allowed) || (tool && istype(tool) && tool.tool_behaviour == allowed))
next_surgery = S
- if(allowed in starting_tools && !(allowed in overriding_tools))
+ if((allowed in starting_tools) && !(allowed in overriding_tools))
CRASH("[src] was provided with multiple branches that start with tool [allowed].")
else
starting_tools.Add(allowed)
diff --git a/tools/ci/lints.dm b/tools/ci/lints.dm
index 8f7bdc1f68d..3055005e072 100644
--- a/tools/ci/lints.dm
+++ b/tools/ci/lints.dm
@@ -1,6 +1,7 @@
//1000-1999
#pragma FileAlreadyIncluded error
#pragma MissingIncludedFile error
+#pragma InvalidWarningCode warning
#pragma MisplacedDirective error
#pragma UndefineMissingDirective error
#pragma DefinedMissingParen error
@@ -12,7 +13,6 @@
#pragma SoftReservedKeyword error
#pragma DuplicateVariable error
#pragma DuplicateProcDefinition error
-#pragma TooManyArguments error
#pragma PointlessParentCall error
#pragma PointlessBuiltinCall error
#pragma SuspiciousMatrixCall error
@@ -22,13 +22,28 @@
#pragma InvalidRange error
#pragma InvalidSetStatement error
#pragma InvalidOverride error
+#pragma InvalidIndexOperation error
#pragma DanglingVarType error
#pragma MissingInterpolatedExpression error
#pragma AmbiguousResourcePath error
#pragma SuspiciousSwitchCase error
+#pragma PointlessPositionalArgument error
+// NOTE: The next few pragmas are for OpenDream's experimental type checker
+// This feature is still in development, elevating these pragmas outside of local testing is discouraged
+// An RFC to finalize this feature is coming soon(TM)
+// BEGIN TYPEMAKER
+#pragma UnsupportedTypeCheck disabled
+#pragma InvalidReturnType disabled
+#pragma InvalidVarType disabled
+#pragma ImplicitNullType disabled
+#pragma LostTypeInfo disabled
+// END TYPEMAKER
+#pragma UnimplementedAccess error
//3000-3999
#pragma EmptyBlock error
#pragma EmptyProc error
#pragma UnsafeClientAccess disabled
#pragma AssignmentInConditional error
+#pragma PickWeightedSyntax disabled
+#pragma AmbiguousInOrder error