Skip to content

Commit

Permalink
Fixes reactive repulse armour (tgstation#37999)
Browse files Browse the repository at this point in the history
  • Loading branch information
KorPhaeron authored and SpaceManiac committed May 24, 2018
1 parent b1d8117 commit ce4065c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion code/modules/clothing/suits/reactive_armour.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
owner.visible_message("<span class='danger'>The reactive teleport system is still recharging! It fails to teleport [H]!</span>")
return
owner.visible_message("<span class='danger'>The reactive teleport system flings [H] clear of [attack_text], shutting itself off in the process!</span>")
playsound(get_turf(owner),'sound/magic/blink.ogg', 100, 1)
var/list/turfs = new/list()
for(var/turf/T in orange(tele_range, H))
if(T.density)
Expand Down Expand Up @@ -111,6 +112,7 @@
owner.visible_message("<span class='danger'>The reactive incendiary armor on [owner] activates, but fails to send out flames as it is still recharging its flame jets!</span>")
return
owner.visible_message("<span class='danger'>[src] blocks [attack_text], sending out jets of flame!</span>")
playsound(get_turf(owner),'sound/magic/fireball.ogg', 100, 1)
for(var/mob/living/carbon/C in range(6, owner))
if(C != owner)
C.fire_stacks += 8
Expand Down Expand Up @@ -192,13 +194,14 @@
if(world.time < reactivearmor_cooldown)
owner.visible_message("<span class='danger'>The repulse generator is still recharging!</span>")
return 0
playsound(get_turf(owner),'sound/magic/repulse.ogg', 100, 1)
owner.visible_message("<span class='danger'>[src] blocks [attack_text], converting the attack into a wave of force!</span>")
var/turf/T = get_turf(owner)
var/list/thrown_items = list()
for(var/atom/movable/A in range(T, 7))
if(A == owner || A.anchored || thrown_items[A])
continue
var/throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(A, src)))
var/throwtarget = get_edge_target_turf(T, get_dir(T, get_step_away(A, T)))
A.throw_at(throwtarget,10,1)
thrown_items[A] = A

Expand Down

0 comments on commit ce4065c

Please sign in to comment.