shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6864 from Citadel-Station-13/upstream-merge-37999

Browse Source 
[MIRROR] Fixes reactive repulse armour not throwing people
This commit is contained in:
LetterJay
2018-05-25 02:36:49 -05:00
committed by GitHub
parent 098e0f8a38 fe24ef6bab
commit 567118067f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/reactive_armour.dm
+4 -1
View File
@@ -75,6 +75,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)
@@ -109,6 +110,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
@@ -182,13 +184,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