Merge pull request #7678 from Trilbyspaceclone/patch-5

[Ready] Nerfs reactive armor a bit.
This commit is contained in:
deathride58
2018-11-18 07:42:42 -05:00
committed by GitHub
@@ -36,7 +36,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
actions_types = list(/datum/action/item_action/toggle)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
hit_reaction_chance = 50
hit_reaction_chance = 50 // Only on the chest yet blocks all attacks?
/obj/item/clothing/suit/armor/reactive/attack_self(mob/user)
active = !(active)
@@ -126,6 +126,7 @@
/obj/item/clothing/suit/armor/reactive/stealth
name = "reactive stealth armor"
reactivearmor_cooldown_duration = 300
desc = "An experimental suit of armor that renders the wearer invisible on detection of imminent harm, and creates a decoy that runs away from the owner. You can't fight what you can't see."
/obj/item/clothing/suit/armor/reactive/stealth/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
@@ -139,7 +140,7 @@
E.Copy_Parent(owner, 50)
E.GiveTarget(owner) //so it starts running right away
E.Goto(owner, E.move_to_delay, E.minimum_distance)
owner.alpha = 0
owner.alpha = 30
owner.visible_message("<span class='danger'>[owner] is hit by [attack_text] in the chest!</span>") //We pretend to be hit, since blocking it would stop the message otherwise
spawn(40)
owner.alpha = initial(owner.alpha)
@@ -152,6 +153,7 @@
name = "reactive tesla armor"
desc = "An experimental suit of armor with sensitive detectors hooked up to a huge capacitor grid, with emitters strutting out of it. Zap."
siemens_coefficient = -1
reactivearmor_cooldown_duration = 150
var/tesla_power = 25000
var/tesla_range = 20
var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE
@@ -185,6 +187,7 @@
/obj/item/clothing/suit/armor/reactive/repulse
name = "reactive repulse armor"
reactivearmor_cooldown_duration = 200
desc = "An experimental suit of armor that violently throws back attackers."
/obj/item/clothing/suit/armor/reactive/repulse/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
@@ -210,6 +213,7 @@
/obj/item/clothing/suit/armor/reactive/table
name = "reactive table armor"
reactivearmor_cooldown_duration = 500
desc = "If you can't beat the memes, embrace them."
var/tele_range = 10