cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix mech crusher and mining bombs not working on basic mobs (#31085)

Browse Source
This commit is contained in:
Toastical
2025-11-25 14:23:49 +00:00
committed by GitHub
parent a4a5dea72a
commit b38b0203bc
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/equipment/tools/work_tools.dm
+4 -1
View File
@@ -501,7 +501,10 @@
chassis.occupant.changeNext_click(equip_cooldown)
var/proximate = chassis.Adjacent(target)
if(proximate)
target.attackby__legacy__attackchain(internal_crusher, chassis.occupant)
if(target.new_attack_chain)
target.attack_by(internal_crusher, chassis.occupant)
else
target.attackby__legacy__attackchain(internal_crusher, chassis.occupant)
internal_crusher.afterattack__legacy__attackchain(target, chassis.occupant, proximate, null)
#undef MECH_RCD_MODE_DECONSTRUCT
code/modules/mod/modules/modules_supply.dm
+1 -1
View File
@@ -557,7 +557,7 @@
var/turf/simulated/mineral/mineral_turf = T
mineral_turf.gets_drilled(firer)
for(var/mob/living/mob in range(power, src))
mob.apply_damage(damage * (ishostile(mob) ? fauna_boost : 1), BRUTE, spread_damage = TRUE)
mob.apply_damage(damage * ((ishostile(mob) || istype(mob, /mob/living/basic/mining)) ? fauna_boost : 1), BRUTE, spread_damage = TRUE)
if(!ishostile(mob) || !firer || mob.stat != CONSCIOUS)
continue
var/mob/living/simple_animal/hostile/hostile_mob = mob