cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes projectiles embedding in mobs that they pass through

Browse Source
This commit is contained in:
mwerezak
2015-02-17 01:32:14 -05:00
parent 8c3660357a
commit b1546ee3eb
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/modules/projectiles/projectile.dm
View File

@@ -65,8 +65,19 @@
/obj/item/projectile/proc/on_impact(var/atom/A)
return
//Checks if the projectile is eligible for embedding. Not that it necessarily will.
//Mainly used to ensure that projectiles won't embed if they are penetrating the mob.
/obj/item/projectile/proc/can_embed()
//embed must be enabled and damage type must be brute
if(!embed || damage_type != BRUTE)
return 0
//can't embed if the projectile is penetrating through the mob
if(penetrating > 0 && damage > 20 && prob(damage))
return 0
return 1
//return 1 if the projectile should be allowed to pass through after all, 0 if not.
/obj/item/projectile/proc/on_penetrate(var/atom/A)
/obj/item/projectile/proc/check_penetrate(var/atom/A)
return 1
/obj/item/projectile/proc/check_fire(atom/target as mob, var/mob/living/user as mob) //Checks if you can hit them or not.
@@ -195,9 +206,9 @@
for(var/mob/M in A)
attack_mob(M, distance)
//penetrating projectiles can pass through things that otherwise would not let them
//penetrating projectiles can pass through things that otherwise would not let them
if(!passthrough && penetrating > 0)
if(on_penetrate(A))
if(check_penetrate(A))
passthrough = 1
penetrating--
@@ -300,4 +311,4 @@
trace.firer = user
var/output = trace.process() //Test it!
del(trace) //No need for it anymore
return output //Send it back to the gun!
return output //Send it back to the gun!