Allows mech drills to drill through blobs (#12119)

This commit is contained in:
JustSumBody
2016-10-15 20:15:47 -04:00
committed by clusterfack
parent d2029cce5c
commit aa5e0b12db
4 changed files with 16 additions and 3 deletions

View File

@@ -449,7 +449,10 @@ its easier to just keep the beam vertical.
/atom/proc/mech_drill_act(var/severity, var/child=null) /atom/proc/mech_drill_act(var/severity, var/child=null)
return ex_act(severity, child) return ex_act(severity, child)
/atom/proc/can_mech_drill()
return acidable()
/atom/proc/blob_act(destroy = 0) /atom/proc/blob_act(destroy = 0)
//DEBUG to_chat(pick(player_list),"blob_act() on [src] ([src.type])") //DEBUG to_chat(pick(player_list),"blob_act() on [src] ([src.type])")
if(flags & INVULNERABLE) if(flags & INVULNERABLE)

View File

@@ -174,7 +174,10 @@ var/list/blob_looks
apply_beam_damage(B) apply_beam_damage(B)
update_health() update_health()
update_icon() update_icon()
/obj/effect/blob/can_mech_drill()
return TRUE
/obj/effect/blob/process() /obj/effect/blob/process()
handle_beams() handle_beams()
Life() Life()

View File

@@ -131,7 +131,7 @@
if(!action_checks(target)) if(!action_checks(target))
return return
if(isobj(target)) if(isobj(target))
if(!target.acidable()) if(!target.can_mech_drill())
return return
set_ready_state(0) set_ready_state(0)
chassis.visible_message("<font color='red'><b>[chassis] starts to drill [target]!</b></font>", "You hear a drill.") chassis.visible_message("<font color='red'><b>[chassis] starts to drill [target]!</b></font>", "You hear a drill.")

View File

@@ -0,0 +1,7 @@
author: JustSumGuy
delete-after: True
changes:
- rscadd: "Mech drills can now drill through blobs."