Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

makes tele armor use do_teleport #15587

Merged
JamieD1 merged 1 commit into from
Sep 4, 2022
Merged

makes tele armor use do_teleport #15587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions code/modules/clothing/suits/reactive_armour.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,22 +79,7 @@
owner.visible_message(span_danger("The reactive teleport system is still recharging! It fails to teleport [H]!"))
return
owner.visible_message(span_danger("The reactive teleport system flings [H] clear of [attack_text], shutting itself off in the process!"))
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)
continue
if(T.x>world.maxx-tele_range || T.x<tele_range)
continue
if(T.y>world.maxy-tele_range || T.y<tele_range)
continue
turfs += T
if(!turfs.len)
turfs += pick(/turf in orange(tele_range, H))
var/turf/picked = pick(turfs)
if(!isturf(picked))
return
H.forceMove(picked)
do_teleport(H, get_turf(H), tele_range, asoundin = 'sound/magic/blink.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
H.rad_act(rad_amount)
reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration
return 1
Expand Down