cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 10:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix recursion limit triggering in hiero blasts (#28038)

Browse Source 
* fix recursion limit triggering in hiero blasts

* Update code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
warriorstar-orion
2025-01-26 08:46:45 -05:00
committed by GitHub
parent 509e7955c1
commit 21ec00fb63
1 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
View File

@@ -738,42 +738,64 @@ Difficulty: Hard
bursting = FALSE //we no longer damage crossers
/obj/effect/temp_visual/hierophant/blast/proc/on_atom_entered(datum/source, atom/movable/entered)
if(bursting)
do_damage(get_turf(src))
if(!bursting)
return
if(ismecha(entered))
damage_mech(entered)
else if(isliving(entered))
damage_living(entered)
/obj/effect/temp_visual/hierophant/blast/proc/damage_living(mob/living/target)
if(!istype(target))
return
if(target in hit_things)
return
hit_things |= target
if((friendly_fire_check && caster && target.faction_check_mob(caster)) || target.stat == DEAD)
return
target.flash_screen_color("#660099", 1)
playsound(target,'sound/weapons/sear.ogg', 50, TRUE, -4)
to_chat(target, "<span class='userdanger'>You're struck by \a [name]!</span>")
var/limb_to_hit = target.get_organ(pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG))
var/armor = target.run_armor_check(limb_to_hit, MELEE, "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 50, "Your armor was penetrated by [src]!")
target.apply_damage(damage, BURN, limb_to_hit, armor)
if(ishostile(target))
var/mob/living/simple_animal/hostile/H = target //mobs find and damage you...
if(H.stat == CONSCIOUS && !H.target && H.AIStatus != AI_OFF && !H.client)
if(!QDELETED(caster))
if(get_dist(H, caster) <= H.aggro_vision_range)
H.FindTarget(list(caster), 1)
else
H.Goto(get_turf(caster), H.move_to_delay, 3)
if(monster_damage_boost && (ismegafauna(target) || istype(target, /mob/living/simple_animal/hostile/asteroid)))
target.adjustBruteLoss(damage)
if(caster)
add_attack_logs(caster, target, "Struck with a [name]")
/obj/effect/temp_visual/hierophant/blast/proc/damage_mech(obj/mecha/target)
if(!istype(target))
return
if(target in hit_things)
return
hit_things |= target
if(target.occupant)
if(friendly_fire_check && caster && caster.faction_check_mob(target.occupant))
return
to_chat(target.occupant, "<span class='userdanger'>Your [target.name] is struck by \a [name]!</span>")
playsound(target, 'sound/weapons/sear.ogg', 50, TRUE, -4)
target.take_damage(damage, BURN, 0, 0)
/obj/effect/temp_visual/hierophant/blast/proc/do_damage(turf/T)
if(!damage)
return
for(var/mob/living/L in T.contents - hit_things) //find and damage mobs...
hit_things += L
if((friendly_fire_check && caster && L.faction_check_mob(caster)) || L.stat == DEAD)
continue
L.flash_screen_color("#660099", 1)
playsound(L,'sound/weapons/sear.ogg', 50, TRUE, -4)
to_chat(L, "<span class='userdanger'>You're struck by a [name]!</span>")
var/limb_to_hit = L.get_organ(pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG))
var/armor = L.run_armor_check(limb_to_hit, MELEE, "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 50, "Your armor was penetrated by [src]!")
L.apply_damage(damage, BURN, limb_to_hit, armor)
if(ishostile(L))
var/mob/living/simple_animal/hostile/H = L //mobs find and damage you...
if(H.stat == CONSCIOUS && !H.target && H.AIStatus != AI_OFF && !H.client)
if(!QDELETED(caster))
if(get_dist(H, caster) <= H.aggro_vision_range)
H.FindTarget(list(caster), 1)
else
H.Goto(get_turf(caster), H.move_to_delay, 3)
if(monster_damage_boost && (ismegafauna(L) || istype(L, /mob/living/simple_animal/hostile/asteroid)))
L.adjustBruteLoss(damage)
if(caster)
add_attack_logs(caster, L, "Struck with a [name]")
damage_living(L)
for(var/obj/mecha/M in T.contents - hit_things) //also damage mechs.
hit_things += M
if(M.occupant)
if(friendly_fire_check && caster && caster.faction_check_mob(M.occupant))
continue
to_chat(M.occupant, "<span class='userdanger'>Your [M.name] is struck by a [name]!</span>")
playsound(M,'sound/weapons/sear.ogg', 50, TRUE, -4)
M.take_damage(damage, BURN, 0, 0)
damage_mech(M)
/obj/effect/hierophant
name = "hierophant beacon"