Goob port martial arts - #2822
Merged
Merged
Conversation
- Delete old ADT combo system (ComboComponent, ComboWeaponComponent, ComboCounterComponent, etc.) - Delete old ADT grab system (PullingSystem.Grab.cs, old grab events/stages) - Port Goob GrabIntentSystem with GrabbableComponent/GrabIntentComponent - Port GrabThrownSystem, GrabModifierSystem, GrabbingItemSystem, GrabReleaseBindSystem - Port new grab events: GrabAttemptEvent, GrabAttemptReleaseEvent, CheckGrabOverridesEvent - Update PullingSystem: TryStartPull raises GrabAttemptEvent, TryStopPull has ignoreGrab flag - Port full martial arts system: CQC, SleepingCarp, CorporateJudo, Capoeira, KungFuDragon, Ninjutsu, HellRip, KravMaga - Add GrabStagesOverrideComponent for martial arts grab stage overrides - Update YAML: kravmaga, belts, tonfa, swords, cane, fireaxe, blueshieldofficer - Replace old combo locale strings with new grab popup strings - Port RSI textures for martial arts intents/actions/alerts
github-actions
Bot
added
Status: Needs Review
size/L
Changes: Sprites
Contributor
|
RSI Diff Bot; head commit ed4a84e merging into f9bbdf4 Resources/Textures/ADT/Actions/kravmaga.rsi
Resources/Textures/ADT/Clothing/Hands/Gloves/guerrilla.rsi
Resources/Textures/ADT/Interface/Alerts/dragonpower.rsi
Resources/Textures/ADT/Interface/Misc/faction_icons.rsi
Resources/Textures/ADT/Interface/Misc/intents.rsi
Resources/Textures/ADT/Interface/Misc/intents_big.rsi
Resources/Textures/ADT/Objects/Misc/martial_arts.rsi
Resources/Textures/Objects/Weapons/Melee/cane_blade.rsi
|
Contributor
|
@Armorkillerd что вообще думаешь, мне кажется ПР готов к мерджу |
…TimeSS14/space_station_ADT into goob-port-martial-arts
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…TimeSS14/space_station_ADT into goob-port-martial-arts
Cethet
approved these changes
Jul 9, 2026
MinokaaUWU
approved these changes
Jul 9, 2026
|
Вновь на старое. |
Collaborator
Author
|
В прогресс мизинца. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Описание PR
Портировали систему боевых исскуств и комбо с https://github.com/Goob-Station/Goob-Station
Почему / Баланс
Наше было сломано и играть было невозможно нормально, теперь же все круто работает.
Техническая информация
Медиа
Чейнджлог
🆑 Minokaa & CrimeMoot