From feeea1ab8c8060e1fb2bdb591142db150e5d7cb4 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 12 Jan 2019 10:40:16 -0800 Subject: [PATCH 1/4] Update reactive_armour.dm --- code/modules/clothing/suits/reactive_armour.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index 2516d446d6..eb5f0a3fb7 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -37,6 +37,7 @@ actions_types = list(/datum/action/item_action/toggle) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF hit_reaction_chance = 50 // Only on the chest yet blocks all attacks? + rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE /obj/item/clothing/suit/armor/reactive/attack_self(mob/user) active = !(active) @@ -65,7 +66,7 @@ name = "reactive teleport armor" desc = "Someone separated our Research Director from his own head!" var/tele_range = 6 - var/rad_amount= 15 + var/rad_amount= 120 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) @@ -93,7 +94,7 @@ if(!isturf(picked)) return H.forceMove(picked) - H.rad_act(rad_amount) + radiation_pulse(src, rad_amount) reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration return 1 return 0 From fc090a462e98ea7bbb01196e95fa01e40a957d62 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 12 Jan 2019 10:45:00 -0800 Subject: [PATCH 2/4] Update reactive_armour.dm --- code/modules/clothing/suits/reactive_armour.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index eb5f0a3fb7..ef4f4b085e 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -65,8 +65,9 @@ /obj/item/clothing/suit/armor/reactive/teleport name = "reactive teleport armor" desc = "Someone separated our Research Director from his own head!" - var/tele_range = 6 - var/rad_amount= 120 + var/tele_range = 8 + var/rad_amount = 30 + var/rad_amount_before = 90 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) @@ -80,6 +81,7 @@ owner.visible_message("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() + var/turf/old = get_turf(src) for(var/turf/T in orange(tele_range, H)) if(T.density) continue @@ -94,6 +96,7 @@ if(!isturf(picked)) return H.forceMove(picked) + radiation_pulse(old, rad_amount_before) radiation_pulse(src, rad_amount) reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration return 1 From ac870486784f57527f42f25a1bbdfc9d5cd5f250 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 12 Jan 2019 10:45:52 -0800 Subject: [PATCH 3/4] Update reactive_armour.dm --- code/modules/clothing/suits/reactive_armour.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index ef4f4b085e..ce59392351 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -66,8 +66,8 @@ name = "reactive teleport armor" desc = "Someone separated our Research Director from his own head!" var/tele_range = 8 - var/rad_amount = 30 - var/rad_amount_before = 90 + var/rad_amount = 60 + var/rad_amount_before = 120 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) From a37684aae20f091ab5e2e0223b941f650b145864 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 12 Jan 2019 10:47:35 -0800 Subject: [PATCH 4/4] Update reactive_armour.dm --- code/modules/clothing/suits/reactive_armour.dm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index ce59392351..5b2291e59c 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -161,6 +161,8 @@ var/tesla_power = 25000 var/tesla_range = 20 var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE + var/legacy = FALSE + var/legacy_dmg = 30 /obj/item/clothing/suit/armor/reactive/tesla/dropped(mob/user) ..() @@ -183,7 +185,15 @@ owner.visible_message("The tesla capacitors on [owner]'s reactive tesla armor are still recharging! The armor merely emits some sparks.") return owner.visible_message("[src] blocks [attack_text], sending out arcs of lightning!") - tesla_zap(owner, tesla_range, tesla_power, tesla_flags) + if(!legacy) + tesla_zap(owner, tesla_range, tesla_power, tesla_flags) + else + for(var/mob/living/M in view(7, owner)) + if(M == owner) + continue + owner.Beam(M,icon_state="purple_lightning",icon='icons/effects/effects.dmi',time=5) + M.adjustFireLoss(legacy_dmg) + playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1) reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration return TRUE