mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-26 21:49:11 +01:00
Makes these args used and legal (#19216)
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -506,7 +506,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()
|
||||
|
||||
@@ -311,22 +311,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!
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -60,7 +60,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)
|
||||
|
||||
Reference in New Issue
Block a user