cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-31 07:58:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes these args used and legal (#19216)

Browse Source
This commit is contained in:
Cameron Lennox
2026-02-22 23:05:43 +01:00
committed by GitHub
parent 18a9010844
commit 52444d931d
10 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile.dm
+7 -7
View File
@@ -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!
code/modules/projectiles/targeting/targeting_mob.dm
+1 -1
View File
@@ -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()