Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Plasmeme Martial Art Buff + Bugfix? #17353

Merged
merged 2 commits into from
Jan 7, 2023
Merged

Plasmeme Martial Art Buff + Bugfix? #17353

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eae9fb7
Fire Immunity
Moltijoe Jan 5, 2023
21bc0db
other tweaks
Moltijoe Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 24 additions & 2 deletions yogstation/code/datums/martial/explosive_fist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#define ALMOST_LIFEFORCE_TRADE_COMBO "LD" //Sets streak to "M"
#define PRE_LIFEFORCE_TRADE_COMBO "DG" //Sets streak to "L"


#define IMMOLATE_COMBO "JG"
#define ALMOST_IMMOLATE_COMBO "ID" //Sets streak to "J"
#define PRE_IMMOLATE_COMBO "DH" //Sets strak to "I"
Expand Down Expand Up @@ -364,4 +363,27 @@
to_chat(usr, "[span_notice("Explosive disarm")]: Disarm Disarm. Finishing this combo will deal 10 damage to you and 18 to your target, aswell as throwing your target away and knocking down for three seconds.")
to_chat(usr, "[span_notice("Detonate")]: Harm Harm Disarm Harm. Second strike will deal 12/12 brute/burn and apply 2 fire stacks to the target. Third strike will apply 4 fire stacks and deal some stamina damage if the target has less then 50 stamina damage. The final strike will ignite the target, make a light explosion and deal 15 damage to you.")
to_chat(usr, "[span_notice("Life force trade")]: Disarm Grab Disarm Grab. Second strike will deal 20 damage to the target and 5 damage to you. Third strike will deall 20 stamina and 5 burn damage to the target, and will make it unable to use ranged weapons for 2 second as well as a more long shove slowdown. Finishing the combo with a headwear on will just deal 25/25 brute/burn damage to the target, and if you don't wear a helmet, you will instantly grab the target by a neck, aswell as start to drain life from them.")
to_chat(usr, "[span_notice("Immolate")]: Disarm Harm Disarm Grab. Second strike will deal 25 burn damage to the target and 5 burn damage to you. Third strike will apply 5 fire stacks to EVERYONE in the range of 2 tiles. Finishing the combo will, if you don't wear any headwear, will deal 30 burn damage to anyone except you in the range of 2 tiles, or ignite them if they are close enough to you. You target will get additional 10 burn damage and get blurry vision.")
to_chat(usr, "[span_notice("Immolate")]: Disarm Harm Disarm Grab. Second strike will deal 25 burn damage to the target and 5 burn damage to you. Third strike will apply 5 fire stacks to EVERYONE in the range of 2 tiles. Finishing the combo will, if you don't wear any headwear, will deal 30 burn damage to anyone except you in the range of 2 tiles, or ignite them if they are close enough to you. You target will get additional 10 burn damage and get blurry vision.")

/datum/martial_art/explosive_fist/teach(mob/living/carbon/human/H, make_temporary=0)
..()
ADD_TRAIT(H, TRAIT_RESISTHEAT, "explosive_fist")

/datum/martial_art/explosive_fist/on_remove(mob/living/carbon/human/H)
..()
REMOVE_TRAIT(H, TRAIT_RESISTHEAT, "explosive_fist")

//these aren't needed elsewhere
#undef EXPLOSIVE_DISARM_COMBO

#undef DETONATE_COMBO
#undef ALMOST_DETONATE_COMBO
#undef PRE_DETONATE_COMBO

#undef LIFEFORCE_TRADE_COMBO
#undef ALMOST_LIFEFORCE_TRADE_COMBO
#undef PRE_LIFEFORCE_TRADE_COMBO

#undef IMMOLATE_COMBO
#undef ALMOST_IMMOLATE_COMBO
#undef PRE_IMMOLATE_COMBO