cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7281 from Mechoid/BulletPenFix

Browse Source 
Fix Penetrating Bullet Double-Jeopardy
This commit is contained in:
Atermonera
2020-06-16 00:23:52 -07:00
committed by VirgoBot
parent bf5d9f1fc8
commit 69ac9d894f
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,6 +134,8 @@
// This is distinct from the hitscan's "impact_type" var. // This is distinct from the hitscan's "impact_type" var.
var/impact_effect_type = null var/impact_effect_type = null
var/list/impacted_mobs
/obj/item/projectile/proc/Range() /obj/item/projectile/proc/Range()
range-- range--
if(range <= 0 && loc) if(range <= 0 && loc)
@@ -439,6 +441,12 @@
setAngle(Get_Angle(source, target)) setAngle(Get_Angle(source, target))
/obj/item/projectile/Destroy() /obj/item/projectile/Destroy()
if(impacted_mobs)
if(LAZYLEN(impacted_mobs))
impacted_mobs.Cut()
impacted_mobs = null
if(hitscan) if(hitscan)
finalize_hitscan_and_generate_tracers() finalize_hitscan_and_generate_tracers()
STOP_PROCESSING(SSprojectiles, src) STOP_PROCESSING(SSprojectiles, src)
@@ -634,6 +642,12 @@
if(!istype(target_mob)) if(!istype(target_mob))
return return
if(!LAZYLEN(impacted_mobs))
impacted_mobs = list()
if(target_mob in impacted_mobs)
return
//roll to-hit //roll to-hit
miss_modifier = max(15*(distance-2) - accuracy + miss_modifier + target_mob.get_evasion(), 0) miss_modifier = max(15*(distance-2) - accuracy + miss_modifier + target_mob.get_evasion(), 0)
var/hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1 || original != target_mob)) //if the projectile hits a target we weren't originally aiming at then retain the chance to miss var/hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1 || original != target_mob)) //if the projectile hits a target we weren't originally aiming at then retain the chance to miss
@@ -646,6 +660,9 @@
if(!istype(target_mob)) if(!istype(target_mob))
return FALSE // Mob deleted itself or something. return FALSE // Mob deleted itself or something.
// Safe to add the target to the list that is soon to be poofed. No double jeopardy, pixel projectiles.
impacted_mobs |= target_mob
if(result == PROJECTILE_FORCE_MISS) if(result == PROJECTILE_FORCE_MISS)
if(!silenced) if(!silenced)
target_mob.visible_message("<span class='notice'>\The [src] misses \the [target_mob] narrowly!</span>") target_mob.visible_message("<span class='notice'>\The [src] misses \the [target_mob] narrowly!</span>")