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

Update reactive_armour.dm

Browse Source
This commit is contained in:
kevinz000
2019-01-12 10:45:00 -08:00
committed by GitHub
parent feeea1ab8c
commit fc090a462e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/reactive_armour.dm
+5 -2
View File
@@ -65,8 +65,9 @@
/obj/item/clothing/suit/armor/reactive/teleport /obj/item/clothing/suit/armor/reactive/teleport
name = "reactive teleport armor" name = "reactive teleport armor"
desc = "Someone separated our Research Director from his own head!" desc = "Someone separated our Research Director from his own head!"
var/tele_range = 6 var/tele_range = 8
var/rad_amount= 120 var/rad_amount = 30
var/rad_amount_before = 90
reactivearmor_cooldown_duration = 100 reactivearmor_cooldown_duration = 100
/obj/item/clothing/suit/armor/reactive/teleport/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) /obj/item/clothing/suit/armor/reactive/teleport/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
@@ -80,6 +81,7 @@
owner.visible_message("<span class='danger'>The reactive teleport system flings [H] clear of [attack_text], shutting itself off in the process!</span>") 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) playsound(get_turf(owner),'sound/magic/blink.ogg', 100, 1)
var/list/turfs = new/list() var/list/turfs = new/list()
var/turf/old = get_turf(src)
for(var/turf/T in orange(tele_range, H)) for(var/turf/T in orange(tele_range, H))
if(T.density) if(T.density)
continue continue
@@ -94,6 +96,7 @@
if(!isturf(picked)) if(!isturf(picked))
return return
H.forceMove(picked) H.forceMove(picked)
radiation_pulse(old, rad_amount_before)
radiation_pulse(src, rad_amount) radiation_pulse(src, rad_amount)
reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration
return 1 return 1