cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

CI lint for UID() misuse (#28465)

Browse Source 
* Adds CI check for UID() being passed parameters.

* Fixes cases of UID() being passed parameters.
This commit is contained in:
chuga-git
2025-02-21 19:35:02 +00:00
committed by GitHub
parent 746cf7eb5c
commit 38642d5888
12 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/action_button.dm
+1 -1
View File
@@ -67,7 +67,7 @@
if(last_hovered)
last_hovered.MouseExited(over_location, over_control, params)
closeToolTip(usr)
last_hovered_ref = UID(over_object)
last_hovered_ref = over_object?.UID()
if(!isnull(over_object))
over_object.MouseEntered(over_location, over_control, params)
code/datums/ai/ai_controller.dm
+3 -3
View File
@@ -468,9 +468,9 @@ RESTRICT_TYPE(/datum/ai_controller)
#define TRACK_AI_DATUM_TARGET(tracked_datum, key) do { \
if(isdatum(tracked_datum)) { \
var/datum/_tracked_datum = tracked_datum; \
if(!HAS_TRAIT_FROM(_tracked_datum, TRAIT_AI_TRACKING, "[UID(src)]_[key]")) { \
if(!HAS_TRAIT_FROM(_tracked_datum, TRAIT_AI_TRACKING, "[UID()]_[key]")) { \
RegisterSignal(_tracked_datum, COMSIG_PARENT_QDELETING, PROC_REF(sig_remove_from_blackboard), override = TRUE); \
ADD_TRAIT(_tracked_datum, TRAIT_AI_TRACKING, "[UID(src)]_[key]"); \
ADD_TRAIT(_tracked_datum, TRAIT_AI_TRACKING, "[UID()]_[key]"); \
}; \
}; \
} while(FALSE)
@@ -484,7 +484,7 @@ RESTRICT_TYPE(/datum/ai_controller)
#define CLEAR_AI_DATUM_TARGET(tracked_datum, key) do { \
if(isdatum(tracked_datum)) { \
var/datum/_tracked_datum = tracked_datum; \
REMOVE_TRAIT(_tracked_datum, TRAIT_AI_TRACKING, "[UID(src)]_[key]"); \
REMOVE_TRAIT(_tracked_datum, TRAIT_AI_TRACKING, "[UID()]_[key]"); \
if(!HAS_TRAIT(_tracked_datum, TRAIT_AI_TRACKING)) { \
UnregisterSignal(_tracked_datum, COMSIG_PARENT_QDELETING); \
}; \
code/datums/components/scope.dm
+2 -2
View File
@@ -183,7 +183,7 @@
)
RegisterSignals(user, capacity_signals, PROC_REF(on_incapacitated))
START_PROCESSING(SSprojectiles, src)
ADD_TRAIT(user, TRAIT_SCOPED, "[UID(src)]")
ADD_TRAIT(user, TRAIT_SCOPED, "[UID()]")
if(istype(parent, /obj/item/gun))
var/obj/item/gun/G = parent
G.on_scope_success(user)
@@ -218,7 +218,7 @@
COMSIG_CARBON_SWAP_HANDS,
COMSIG_PARENT_QDELETING,
))
REMOVE_TRAIT(user, TRAIT_SCOPED, "[UID(src)]")
REMOVE_TRAIT(user, TRAIT_SCOPED, "[UID()]")
user.playsound_local(parent, 'sound/weapons/scope.ogg', 75, TRUE, frequency = -1)
user.clear_fullscreen("scope")
code/game/objects/items/weapons/melee/melee_misc.dm
+2 -2
View File
@@ -425,7 +425,7 @@
zap(target, user, list(user), power)
/datum/enchantment/lightning/toggle_traits(obj/item/I, mob/living/user)
var/enchant_ID = UID(src) // so it only removes the traits applied by this specific enchant.
var/enchant_ID = UID() // so it only removes the traits applied by this specific enchant.
if(applied_traits)
REMOVE_TRAIT(user, TRAIT_SHOCKIMMUNE, "[enchant_ID]")
else
@@ -462,7 +462,7 @@
toggle_traits(S, user)
/datum/enchantment/fire/toggle_traits(obj/item/I, mob/living/user)
var/enchant_ID = UID(src) // so it only removes the traits applied by this specific enchant.
var/enchant_ID = UID() // so it only removes the traits applied by this specific enchant.
if(applied_traits)
REMOVE_TRAIT(user, TRAIT_NOFIRE, "[enchant_ID]")
REMOVE_TRAIT(user, TRAIT_RESISTHEAT, "[enchant_ID]")
code/modules/clothing/suits/wiz_robe.dm
+4 -4
View File
@@ -202,13 +202,13 @@
/obj/item/clothing/suit/space/hardsuit/wizard/equipped(mob/user, slot)
. = ..()
ADD_TRAIT(user, TRAIT_ANTIMAGIC, "[UID(src)]")
ADD_TRAIT(user, TRAIT_ANTIMAGIC_NO_SELFBLOCK, "[UID(src)]")
ADD_TRAIT(user, TRAIT_ANTIMAGIC, "[UID()]")
ADD_TRAIT(user, TRAIT_ANTIMAGIC_NO_SELFBLOCK, "[UID()]")
/obj/item/clothing/suit/space/hardsuit/wizard/dropped(mob/user)
. = ..()
REMOVE_TRAIT(user, TRAIT_ANTIMAGIC, "[UID(src)]")
REMOVE_TRAIT(user, TRAIT_ANTIMAGIC_NO_SELFBLOCK, "[UID(src)]")
REMOVE_TRAIT(user, TRAIT_ANTIMAGIC, "[UID()]")
REMOVE_TRAIT(user, TRAIT_ANTIMAGIC_NO_SELFBLOCK, "[UID()]")
/obj/item/clothing/suit/space/hardsuit/wizard/arch
code/modules/mod/mod_actions.dm
+1 -1
View File
@@ -116,7 +116,7 @@
return ..()
/datum/action/item_action/mod/pinned_module/Grant(mob/user)
var/user_uid = UID(user)
var/user_uid = user.UID()
if(!pinner_uid)
pinner_uid = user_uid
module.pinned_to[pinner_uid] = src
code/modules/mod/mod_types.dm
+2 -2
View File
@@ -28,9 +28,9 @@
for(var/obj/item/mod/module/module as anything in modules)
if(!default_pins[module.type]) //this module isnt meant to be pinned by default
continue
if(UID(wearer) in default_pins[module.type]) //if we already had pinned once to this user, don care anymore
if(wearer.UID() in default_pins[module.type]) //if we already had pinned once to this user, don care anymore
continue
default_pins[module.type] += UID(wearer)
default_pins[module.type] += wearer.UID()
module.pin(wearer)
/obj/item/mod/control/pre_equipped/uninstall(obj/item/mod/module/old_module, deleting)
code/modules/mod/mod_ui.dm
+1 -1
View File
@@ -27,7 +27,7 @@
"description" = module.desc,
"module_type" = module.module_type,
"module_active" = module.active,
"pinned" = module.pinned_to[UID(user)], //might just want user here
"pinned" = module.pinned_to[user.UID()], //might just want user here
"idle_power" = module.idle_power_cost,
"active_power" = module.active_power_cost,
"use_power" = module.use_power_cost,
code/modules/mod/modules/_modules.dm
+1 -1
View File
@@ -59,7 +59,7 @@
/obj/item/mod/module/Initialize(mapload)
. = ..()
module_UID = UID(src)
module_UID = UID()
if(module_type != MODULE_ACTIVE)
return
if(ispath(device))
code/modules/mod/modules/modules_antag.dm
+2 -2
View File
@@ -540,10 +540,10 @@
incompatible_modules = list(/obj/item/mod/module/anti_magic)
/obj/item/mod/module/anti_magic/on_suit_activation()
ADD_TRAIT(mod.wearer, TRAIT_ANTIMAGIC, "[UID(src)]")
ADD_TRAIT(mod.wearer, TRAIT_ANTIMAGIC, "[UID()]")
/obj/item/mod/module/anti_magic/on_suit_deactivation(deleting = FALSE)
REMOVE_TRAIT(mod.wearer, TRAIT_ANTIMAGIC, "[UID(src)]")
REMOVE_TRAIT(mod.wearer, TRAIT_ANTIMAGIC, "[UID()]")
/obj/item/mod/module/anomaly_locked/teslawall
name = "MOD arc-shield module" // temp
code/modules/projectiles/guns/energy/special_eguns.dm
+2 -2
View File
@@ -686,11 +686,11 @@
/obj/item/gun/energy/bsg/equipped(mob/user, slot, initial)
. = ..()
ADD_TRAIT(user, TRAIT_BSG_IMMUNE, "[UID(src)]")
ADD_TRAIT(user, TRAIT_BSG_IMMUNE, "[UID()]")
/obj/item/gun/energy/bsg/dropped(mob/user, silent)
. = ..()
REMOVE_TRAIT(user, TRAIT_BSG_IMMUNE, "[UID(src)]")
REMOVE_TRAIT(user, TRAIT_BSG_IMMUNE, "[UID()]")
/obj/item/gun/energy/bsg/process_fire(atom/target, mob/living/user, message = TRUE, params, zone_override, bonus_spread = 0)
if(!has_bluespace_crystal)
tools/ci/check_grep2.py
+6
View File
@@ -187,6 +187,11 @@ def check_camel_case_type_names(idx, line):
type_result = result.group(0)
return [(idx + 1, f"name of type {type_result} is not in snake_case format.")]
UID_WITH_PARAMETER = re.compile(r"\bUID\(\w+\)")
def check_uid_parameters(idx, line):
if result := UID_WITH_PARAMETER.search(line):
return [(idx + 1, "UID() does not take arguments. Use UID() instead of UID(src) and datum.UID() instead of UID(datum).")]
CODE_CHECKS = [
check_space_indentation,
check_mixed_indentation,
@@ -204,6 +209,7 @@ CODE_CHECKS = [
check_empty_list_whitespace,
check_istype_src,
check_camel_case_type_names,
check_uid_parameters,
]