From 85f8017ab6c4bd923ed82c2c944b60847c2cb77f Mon Sep 17 00:00:00 2001 From: Amy <3855802+amylizzle@users.noreply.github.com> Date: Fri, 4 Jul 2025 19:51:32 +0100 Subject: [PATCH] More `SoftReservedKeyword` fixes (#29712) * Update shieldgen.dm Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com> * Update station_alert.dm Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com> * Update plasmafire_generator.dm Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com> * Update turf.dm Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com> * Update atmospherics.dm Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com> * Update silicon_mob.dm Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com> * Update ai_mob.dm Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com> * Update robot_mob.dm Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com> * Update on_move.dm Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com> --------- Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com> --- code/game/machinery/computer/station_alert.dm | 4 ++-- code/game/machinery/shieldgen.dm | 2 +- code/game/objects/structures/plasmafire_generator.dm | 2 +- code/game/turfs/turf.dm | 2 +- code/modules/atmospherics/machinery/atmospherics.dm | 2 +- code/modules/mob/living/silicon/ai/ai_mob.dm | 4 ++-- code/modules/mob/living/silicon/robot/robot_mob.dm | 4 ++-- code/modules/mob/living/silicon/silicon_mob.dm | 4 ++-- code/modules/shuttle/on_move.dm | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 5075852969d..1b1a3038408 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -58,7 +58,7 @@ return data -/obj/machinery/computer/station_alert/proc/alarm_triggered(src, class, area/A, list/O, obj/alarmsource) +/obj/machinery/computer/station_alert/proc/alarm_triggered(source, class, area/A, list/O, obj/alarmsource) if(!(class in alarms_listend_for)) return if(alarmsource.z != z) @@ -67,7 +67,7 @@ return update_icon() -/obj/machinery/computer/station_alert/proc/alarm_cancelled(src, class, area/A, obj/origin, cleared) +/obj/machinery/computer/station_alert/proc/alarm_cancelled(source, class, area/A, obj/origin, cleared) if(!(class in alarms_listend_for)) return if(origin.z != z) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 7e6795c808c..1be90ce4d06 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -294,7 +294,7 @@ /obj/machinery/shieldgen/update_icon_state() icon_state = "shield[active ? "on" : "off"][malfunction ? "br" : ""]" -/obj/machinery/shieldgen/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller) +/obj/machinery/shieldgen/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob) . = ..() if(active) shields_down() diff --git a/code/game/objects/structures/plasmafire_generator.dm b/code/game/objects/structures/plasmafire_generator.dm index 288eb567443..0e6234de671 100644 --- a/code/game/objects/structures/plasmafire_generator.dm +++ b/code/game/objects/structures/plasmafire_generator.dm @@ -30,7 +30,7 @@ /obj/structure/plasmafire_generator/shadow var/enabled = FALSE -/obj/structure/plasmafire_generator/shadow/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller) +/obj/structure/plasmafire_generator/shadow/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob) if(T1.z != 1) enabled = TRUE return ..() diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index a0efaa59ae6..6b8978c692b 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -818,7 +818,7 @@ overlay.blend_mode = BLEND_OVERLAY overlay.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM -/obj/effect/abstract/pressure_overlay/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller) +/obj/effect/abstract/pressure_overlay/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob) // No, I don't think I will. return FALSE diff --git a/code/modules/atmospherics/machinery/atmospherics.dm b/code/modules/atmospherics/machinery/atmospherics.dm index db53fd83d18..021317f90fd 100644 --- a/code/modules/atmospherics/machinery/atmospherics.dm +++ b/code/modules/atmospherics/machinery/atmospherics.dm @@ -76,7 +76,7 @@ Pipelines + Other Objects -> Pipe network // Updates all pipe overlays and underlays update_underlays() -/obj/machinery/atmospherics/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller) +/obj/machinery/atmospherics/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob) . = ..() update_underlays() diff --git a/code/modules/mob/living/silicon/ai/ai_mob.dm b/code/modules/mob/living/silicon/ai/ai_mob.dm index 000abc76c2e..39a636f3a4c 100644 --- a/code/modules/mob/living/silicon/ai/ai_mob.dm +++ b/code/modules/mob/living/silicon/ai/ai_mob.dm @@ -897,7 +897,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( Bot.call_bot(src, waypoint) -/mob/living/silicon/ai/alarm_triggered(src, class, area/A, list/O, obj/alarmsource) +/mob/living/silicon/ai/alarm_triggered(source, class, area/A, list/O, obj/alarmsource) if(!(class in alarms_listened_for)) return if(alarmsource.z != z) @@ -924,7 +924,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( if(viewalerts) ai_alerts() -/mob/living/silicon/ai/alarm_cancelled(src, class, area/A, obj/origin, cleared) +/mob/living/silicon/ai/alarm_cancelled(source, class, area/A, obj/origin, cleared) if(cleared) if(!(class in alarms_listened_for)) return diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm index b27f15db510..f0b3ba9c680 100644 --- a/code/modules/mob/living/silicon/robot/robot_mob.dm +++ b/code/modules/mob/living/silicon/robot/robot_mob.dm @@ -885,7 +885,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( /mob/living/silicon/robot/InCritical() return low_power_mode -/mob/living/silicon/robot/alarm_triggered(src, class, area/A, list/O, obj/alarmsource) +/mob/living/silicon/robot/alarm_triggered(source, class, area/A, list/O, obj/alarmsource) if(!(class in alarms_listened_for)) return if(alarmsource.z != z) @@ -894,7 +894,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( return queueAlarm(text("--- [class] alarm detected in [A.name]!"), class) -/mob/living/silicon/robot/alarm_cancelled(src, class, area/A, obj/origin, cleared) +/mob/living/silicon/robot/alarm_cancelled(source, class, area/A, obj/origin, cleared) if(cleared) if(!(class in alarms_listened_for)) return diff --git a/code/modules/mob/living/silicon/silicon_mob.dm b/code/modules/mob/living/silicon/silicon_mob.dm index 09fa0e1abc7..cb37a13b61d 100644 --- a/code/modules/mob/living/silicon/silicon_mob.dm +++ b/code/modules/mob/living/silicon/silicon_mob.dm @@ -129,10 +129,10 @@ /mob/living/silicon/proc/get_radio() return -/mob/living/silicon/proc/alarm_triggered(src, class, area/A, list/O, obj/alarmsource) +/mob/living/silicon/proc/alarm_triggered(source, class, area/A, list/O, obj/alarmsource) return -/mob/living/silicon/proc/alarm_cancelled(src, class, area/A, obj/origin, cleared) +/mob/living/silicon/proc/alarm_cancelled(source, class, area/A, obj/origin, cleared) return /mob/living/silicon/proc/queueAlarm(message, type, incoming = TRUE) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 9d5bd209404..e593f635e30 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -1,5 +1,5 @@ // Shuttle on-movement // -/atom/movable/proc/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller) +/atom/movable/proc/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob) var/turf/newT = get_turf(src) if(newT.z != oldT.z) on_changed_z_level(oldT, newT) @@ -10,7 +10,7 @@ abstract_move(T1) return 1 -/atom/movable/lighting_object/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller) +/atom/movable/lighting_object/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob) // lighting objects should not be moved from their parent turfs return 0