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.

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

Already on GitHub? Sign in to your account

[Bounty] Graytide Sectorwide #4428

Merged
merged 4 commits into from
Dec 29, 2024
Merged

Conversation

ven1883
Copy link
Collaborator

@ven1883 ven1883 commented Nov 30, 2024

the khans awaken.

About The Pull Request

Ports the april fools martial art, The Tunnel Arts, from TG.

Why It's Good For The Game

I was offered a lot of schmoney for this one....
It is exclusive to traitor assistants and is fairly anime oriented. You even get a cool jacket.

Khans are resistant to batons, don't experience softcrit, are resistant to wounds, and cannot miss attacks. However, like scarp, they cannot use guns.

List of moves:
moves

The poor syndicate cargo technicians suffered.
rmPZOu8seK

A Khan in action.
https://github.com/user-attachments/assets/ac964b63-c051-416e-abb4-8e87df1ad7fa

Changelog

🆑
add: Adds The Tunnel Arts, a traitor assistant exclusive martial arts with some anime-esque style.
add: Also adds a cool new jacket available in the bundle.
code: Martial Arts module now has a misc folder for Stuff.
code: There is a new status effect, No Gravity, which temporarily disables gravity for the victim. It's only used in TTA.
/:cl:

@F-e-r-n
Copy link
Collaborator

F-e-r-n commented Dec 1, 2024

this is fucking hilarious i love it merge now

/datum/status_effect/amok/proc/exclusion_check(mob/living/potential_target)
return IS_HERETIC_OR_MONSTER(potential_target)

/datum/status_effect/amok/tunnel_madness
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no duration or effect?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idk lol

@Kitsunemitsu Kitsunemitsu added Minor Feature A big new thing labels Dec 9, 2024
woopsie doodle
@ThePooba ThePooba merged commit 31824a1 into Monkestation:master Dec 29, 2024
24 checks passed
github-actions bot added a commit that referenced this pull request Dec 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature A big new thing Minor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants