mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-21 12:02:31 +01:00
Fixes #5390
This commit is contained in:
@@ -277,3 +277,24 @@
|
||||
|
||||
/obj/item/projectile/beam/pulse/drone
|
||||
damage = 10
|
||||
|
||||
/obj/item/projectile/beam/drone/after_move()
|
||||
var/turf/T = get_turf(src)
|
||||
var/mob/living/carbon/human/H = locate() in T
|
||||
if(!H)
|
||||
return 0
|
||||
if(H.lying)
|
||||
Bump(H, 1) // Force the bump since mobs lying don't trigger it. We'll only do this for drones since they don't target the mob they target the turf.
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/obj/item/projectile/beam/pulse/drone/after_move()
|
||||
var/turf/T = get_turf(src)
|
||||
var/mob/living/carbon/human/H = locate() in T
|
||||
if(!H)
|
||||
return 0
|
||||
if(H.lying)
|
||||
Bump(H, 1) // Force the bump since mobs lying don't trigger it. We'll only do this for drones since they don't target the mob they target the turf.
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
@@ -298,6 +298,8 @@
|
||||
|
||||
before_move()
|
||||
Move(location.return_turf())
|
||||
if(after_move())
|
||||
return 1
|
||||
|
||||
if(!bumped && !isturf(original))
|
||||
if(loc == get_turf(original))
|
||||
@@ -315,7 +317,10 @@
|
||||
sleep(step_delay) //add delay between movement iterations if it's not a hitscan weapon
|
||||
|
||||
/obj/item/projectile/proc/before_move()
|
||||
return
|
||||
return 0
|
||||
|
||||
/obj/item/projectile/proc/after_move()
|
||||
return 0
|
||||
|
||||
/obj/item/projectile/proc/setup_trajectory(turf/startloc, turf/targloc, var/x_offset = 0, var/y_offset = 0)
|
||||
// setup projectile state
|
||||
|
||||
Reference in New Issue
Block a user