From 850a183b4d8b5d4343c7d7eae173ecee0229ff50 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sun, 22 Feb 2026 16:33:58 -0700 Subject: [PATCH] [MIRROR] Makes these args used and legal (#12447) Co-authored-by: Cameron Lennox --- code/game/machinery/telecomms/telecomunications.dm | 4 ++-- code/game/objects/items/devices/radio/radio.dm | 4 ++-- .../items/weapons/medigun/linked_medigun.dm | 2 +- code/modules/lighting/emissive_blocker.dm | 4 ++-- code/modules/media/media_machinery.dm | 4 ++-- code/modules/mob/living/silicon/ai/ai.dm | 2 +- code/modules/projectiles/projectile.dm | 14 +++++++------- .../modules/projectiles/targeting/targeting_mob.dm | 2 +- code/modules/shieldgen/energy_shield.dm | 2 +- code/modules/shuttles/landmarks.dm | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 4b2c57a424..387b76505b 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -413,8 +413,8 @@ var/broadcasting = 1 var/receiving = 1 -/obj/machinery/telecomms/relay/forceMove(var/newloc) - . = ..(newloc) +/obj/machinery/telecomms/relay/forceMove(atom/destination, direction, movetime) + . = ..(destination, direction, movetime) listening_level = z /obj/machinery/telecomms/relay/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 134d572ca9..802681ea53 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -801,8 +801,8 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer) continue broadcast_tiles = output -/obj/item/radio/intercom/forceMove(atom/destination) - . = ..() +/obj/item/radio/intercom/forceMove(atom/destination, direction, movetime) + . = ..(destination, direction, movetime) update_broadcast_tiles() /obj/item/radio/intercom/Initialize(mapload) diff --git a/code/game/objects/items/weapons/medigun/linked_medigun.dm b/code/game/objects/items/weapons/medigun/linked_medigun.dm index ef4862dd4a..400dfa3862 100644 --- a/code/game/objects/items/weapons/medigun/linked_medigun.dm +++ b/code/game/objects/items/weapons/medigun/linked_medigun.dm @@ -14,7 +14,7 @@ medigun_base_unit = null return ..() -/obj/item/bork_medigun/linked/forceMove(atom/destination) //Forcemove override, ugh +/obj/item/bork_medigun/linked/forceMove(atom/destination, direction, movetime) //Forcemove override, ugh if(destination == medigun_base_unit || destination == medigun_base_unit.loc || isturf(destination)) . = doMove(destination, 0, 0) if(isturf(destination)) diff --git a/code/modules/lighting/emissive_blocker.dm b/code/modules/lighting/emissive_blocker.dm index b65c714d1f..c4932d4313 100644 --- a/code/modules/lighting/emissive_blocker.dm +++ b/code/modules/lighting/emissive_blocker.dm @@ -42,6 +42,6 @@ return //Prevents people from moving these after creation, because they shouldn't be. -/atom/movable/emissive_blocker/forceMove(atom/destination, no_tp=FALSE, harderforce = FALSE) +/atom/movable/emissive_blocker/forceMove(atom/destination, direction, movetime, no_tp=FALSE, harderforce = FALSE) if(harderforce) - return ..() + return ..(destination, direction, movetime) diff --git a/code/modules/media/media_machinery.dm b/code/modules/media/media_machinery.dm index f20fe2a442..0ae0f7b765 100644 --- a/code/modules/media/media_machinery.dm +++ b/code/modules/media/media_machinery.dm @@ -58,9 +58,9 @@ if(anchored) update_music() -/obj/machinery/media/forceMove(var/atom/destination) +/obj/machinery/media/forceMove(atom/destination, direction, movetime) disconnect_media_source() - . = ..() + . = ..(destination, direction, movetime) if(anchored) update_music() diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 99cd27572d..3fabc0ddee 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -504,7 +504,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( /mob/living/silicon/ai/proc/camera_visibility(mob/observer/eye/aiEye/moved_eye) cameranet.visibility(moved_eye, client, all_eyes) -/mob/living/silicon/ai/forceMove(atom/destination) +/mob/living/silicon/ai/forceMove(atom/destination, direction, movetime) . = ..() if(.) end_multicam() diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 6c1516cdcb..c50b93908d 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -313,22 +313,22 @@ trajectory.set_angle(new_angle) return TRUE -/obj/item/projectile/forceMove(atom/target) - if(!isloc(target) || !isloc(loc) || !z) +/obj/item/projectile/forceMove(atom/destination, direction, movetime) + if(!isloc(destination) || !isloc(loc) || !z) return ..() - var/zc = target.z != z + var/zc = destination.z != z var/old = loc if(zc) - before_z_change(old, target) + before_z_change(old, destination) . = ..() - if(trajectory && !trajectory_ignore_forcemove && isturf(target)) + if(trajectory && !trajectory_ignore_forcemove && isturf(destination)) if(hitscan) finalize_hitscan_and_generate_tracers(FALSE) - trajectory.initialize_location(target.x, target.y, target.z, 0, 0) + trajectory.initialize_location(destination.x, destination.y, destination.z, 0, 0) if(hitscan) record_hitscan_start(RETURN_PRECISE_POINT(src)) if(zc) - after_z_change(old, target) + after_z_change(old, destination) /obj/item/projectile/proc/fire(angle, atom/direct_target) //If no angle needs to resolve it from xo/yo! diff --git a/code/modules/projectiles/targeting/targeting_mob.dm b/code/modules/projectiles/targeting/targeting_mob.dm index 7bc5c548d9..de5d49050b 100644 --- a/code/modules/projectiles/targeting/targeting_mob.dm +++ b/code/modules/projectiles/targeting/targeting_mob.dm @@ -43,7 +43,7 @@ if(mover.aimed.len) mover.trigger_aiming(TARGET_CAN_MOVE) -/mob/living/forceMove(var/atom/destination) +/mob/living/forceMove(atom/destination, direction, movetime) . = ..() if(aiming && aiming.aiming_at) aiming.update_aiming() diff --git a/code/modules/shieldgen/energy_shield.dm b/code/modules/shieldgen/energy_shield.dm index 11bda72411..54fae0cb9e 100644 --- a/code/modules/shieldgen/energy_shield.dm +++ b/code/modules/shieldgen/energy_shield.dm @@ -57,7 +57,7 @@ // Prevents singularities and pretty much everything else from moving the field segments away. // The only thing that is allowed to move us is the Destroy() proc. -/obj/effect/shield/forceMove() +/obj/effect/shield/forceMove(atom/destination, direction, movetime) if(QDELING(src)) return ..() return 0 diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index 87fca935af..338f180f01 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -59,7 +59,7 @@ if(location && location.docking_codes && use_docking_codes) docking_controller.docking_codes = location.docking_codes -/obj/effect/shuttle_landmark/forceMove() +/obj/effect/shuttle_landmark/forceMove(atom/destination, direction, movetime) var/obj/effect/overmap/visitable/map_origin = get_overmap_sector(z) . = ..() var/obj/effect/overmap/visitable/map_destination = get_overmap_sector(z)