mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-07-11 00:03:55 +01:00
The 515 MegaPR early downport (#7783)
Co-authored-by: Selis <selis@xynolabs.com> Co-authored-by: Selis <sirlionfur@hotmail.de> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: SatinIsle <thesatinisle@gmail.com> Co-authored-by: Heroman <alesha3000@list.ru> Co-authored-by: Casey <a.roaming.shadow@gmail.com> Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
@@ -14,7 +14,9 @@
|
||||
return trace.launch_projectile(target) //Test it!
|
||||
|
||||
/obj/item/projectile/proc/_check_fire(atom/target as mob, var/mob/living/user as mob) //Checks if you can hit them or not.
|
||||
check_trajectory(target, user, pass_flags, flags)
|
||||
if(target in check_trajectory(target, user, pass_flags, flags))
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
//"Tracing" projectile
|
||||
/obj/item/projectile/test //Used to see if you can hit them.
|
||||
@@ -22,6 +24,7 @@
|
||||
hitscan = TRUE
|
||||
nodamage = TRUE
|
||||
damage = 0
|
||||
bump_targets = FALSE
|
||||
var/list/hit = list()
|
||||
|
||||
/obj/item/projectile/test/process_hitscan()
|
||||
@@ -33,7 +36,24 @@
|
||||
/obj/item/projectile/test/Bump(atom/A)
|
||||
if(A != src)
|
||||
hit |= A
|
||||
if(isturf(A))
|
||||
for(var/obj/O in A)
|
||||
hit |= A
|
||||
for(var/mob/living/M in A)
|
||||
hit |= A
|
||||
return ..()
|
||||
|
||||
/obj/item/projectile/test/fire(angle, atom/direct_target)
|
||||
. = ..()
|
||||
if(direct_target)
|
||||
if(direct_target != src)
|
||||
hit |= direct_target
|
||||
. = hit
|
||||
|
||||
|
||||
/obj/item/projectile/test/attack_mob()
|
||||
return
|
||||
|
||||
//Don't generate tracers - they are generated on Destroy()
|
||||
/obj/item/projectile/test/finalize_hitscan_and_generate_tracers()
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user