-
Notifications
You must be signed in to change notification settings - Fork 428
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
QOL: Перевод sleeping carp #5967
Open
pilygun
wants to merge
24
commits into
ss220-space:master220
Choose a base branch
from
pilygun:CarpCarpCarp!
base: master220
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
bf2d069
Update head_kick.dm
pilygun 2b4f54f
Update back_kick.dm
pilygun 13a1a58
Update elbow_drop.dm
pilygun 037f5e6
Update head_kick.dm
pilygun c660723
Update head_kick.dm
pilygun 97ac1b5
Update stomach_knee.dm
pilygun 2f45940
Update head_kick.dm
pilygun 98297f3
Update wrist_wrench.dm
pilygun 0bcfe2e
Update back_kick.dm
pilygun efd7b93
Update back_kick.dm
pilygun f2a477d
Update stomach_knee.dm
pilygun 8a8b955
Update martial.dm
pilygun 1420e2b
Update sleeping_carp.dm
pilygun 3732a01
Update code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm
pilygun d8a3338
Update code/modules/martial_arts/combos/sleeping_carp/head_kick.dm
pilygun 05f5412
Update code/modules/martial_arts/combos/sleeping_carp/wrist_wrench.dm
pilygun dcf567b
Update code/modules/martial_arts/martial.dm
pilygun 85efd32
фиксы
pilygun 500351f
Update sleeping_carp.dm
pilygun 1bc0622
Update code/modules/martial_arts/martial.dm
pilygun ae56e35
Update martial.dm
pilygun 1298439
Update stomach_knee.dm
pilygun bf442fe
Update elbow_drop.dm
pilygun c180766
Update back_kick.dm
pilygun File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,18 @@ | ||
/datum/martial_combo/sleeping_carp/back_kick | ||
name = "Back Kick" | ||
steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_GRAB) | ||
explaination_text = "Opponent must be facing away. Knocks down." | ||
explaination_text = "Пинает оппонента в спину, заставляя его скорчиться от боли." | ||
|
||
/datum/martial_combo/sleeping_carp/back_kick/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) | ||
if(user.dir == target.dir && !target.stat && !target.IsWeakened()) | ||
user.do_attack_animation(target, ATTACK_EFFECT_KICK) | ||
target.visible_message("<span class='warning'>[user] kicks [target] in the back!</span>", \ | ||
"<span class='userdanger'>[user] kicks you in the back, making you stumble and fall!</span>") | ||
target.visible_message("<span class='warning'>[user] пинает [target] в спину!</span>", \ | ||
"<span class='userdanger'>[user] ударяет вас в спину, заставляя споткнуться и упасть!</span>") | ||
step_to(target,get_step(target,target.dir),1) | ||
target.Weaken(6 SECONDS) | ||
playsound(get_turf(target), 'sound/weapons/punch1.ogg', 50, 1, -1) | ||
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Back Kick", ATKLOG_ALL) | ||
if(prob(80)) | ||
user.say(pick("SURRPRIZU!","BACK STRIKE!","WOPAH!", "WATAAH", "ZOTA!", "Never turn your back to the enemy!")) | ||
user.say(pick("СЮРПРИЗ!","УДАР В СПИНУ!","КУААА!", "ВАТААА", "СКИДЫЩ!", "НИКОГДА НЕ ПОВОРАЧИВАЙСЯ СПИНОЙ К ПРОТИВНИКУ!")) | ||
return MARTIAL_COMBO_DONE | ||
return MARTIAL_COMBO_DONE_BASIC_HIT |
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,20 @@ | ||
/datum/martial_combo/sleeping_carp/head_kick | ||
name = "Head Kick" | ||
steps = list(MARTIAL_COMBO_STEP_DISARM, MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_HARM) | ||
explaination_text = "Decent damage, forces opponent to drop item in hand." | ||
explaination_text = "Пинает оппонента в голову, нанося ему приличный урон и заставляя его выбросить вещь из активной руки." | ||
|
||
/datum/martial_combo/sleeping_carp/head_kick/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) | ||
if(!target.stat && !target.IsWeakened()) | ||
user.do_attack_animation(target, ATTACK_EFFECT_KICK) | ||
target.visible_message("<span class='warning'>[user] kicks [target] in the head!</span>", \ | ||
"<span class='userdanger'>[user] kicks you in the jaw!</span>") | ||
target.visible_message("<span class='warning'>[user] бьет [target] в голову!</span>", \ | ||
"<span class='userdanger'>[user] бьет вас ногой в челюсть!</span>") | ||
target.apply_damage(20, BRUTE, "head") | ||
objective_damage(user, target, 20, BRUTE) | ||
target.drop_from_active_hand() | ||
playsound(get_turf(target), 'sound/weapons/punch1.ogg', 50, 1, -1) | ||
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Head Kick", ATKLOG_ALL) | ||
if(prob(60)) | ||
user.say(pick("OOHYOO!", "OOPYAH!", "HYOOAA!", "WOOAAA!", "SHURYUKICK!", "HIYAH!")) | ||
user.say(pick("УАХУААА!", "КИЯ!", "БИИИЯ!", "ПЛАВНИКОМ В ЛИЦО!", "УКУС В ГОЛОВУ!", "УДАР ПО ГОООЛОВЕ!")) | ||
target.Weaken(6 SECONDS) | ||
return MARTIAL_COMBO_DONE | ||
return MARTIAL_COMBO_DONE_BASIC_HIT |
8 changes: 4 additions & 4 deletions
8
code/modules/martial_arts/combos/sleeping_carp/stomach_knee.dm
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,21 @@ | ||
/datum/martial_combo/sleeping_carp/stomach_knee | ||
name = "Stomach Knee" | ||
steps = list(MARTIAL_COMBO_STEP_GRAB, MARTIAL_COMBO_STEP_HARM) | ||
explaination_text = "Knocks the wind out of opponent and stuns." | ||
explaination_text = "Вы пинаете оппонента по животу, заставляя его скорчится от боли и неровно дышать." | ||
combo_text_override = "Grab, switch hands, Harm" | ||
|
||
/datum/martial_combo/sleeping_carp/stomach_knee/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) | ||
if(!target.stat && !target.IsWeakened()) | ||
user.do_attack_animation(target, ATTACK_EFFECT_KICK) | ||
target.visible_message("<span class='warning'>[user] knees [target] in the stomach!</span>", \ | ||
"<span class='userdanger'>[user] winds you with a knee in the stomach!</span>") | ||
target.visible_message("<span class='warning'>[user] пинает коленом [target] прямо в живот!</span>", \ | ||
"<span class='userdanger'>[user] ударяет вас коленом в живот!</span>") | ||
target.audible_message("<b>[target]</b> gags!") | ||
target.AdjustLoseBreath(20 SECONDS) | ||
target.Weaken(6 SECONDS) | ||
target.adjustStaminaLoss(15) | ||
playsound(get_turf(target), 'sound/weapons/punch1.ogg', 50, 1, -1) | ||
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Stomach Knee", ATKLOG_ALL) | ||
if(prob(80)) | ||
user.say(pick("HWOP!", "KUH!", "YAKUUH!", "KYUH!", "KNEESTRIKE!")) | ||
user.say(pick("ВОХОП!", "КУХ!", "ДЫШИ ЖАБРАМИ!", "ЗАДЕРЖИ ДЫХАНИЕ!", "УДАР КОЛЕНОМ!")) | ||
return MARTIAL_COMBO_DONE | ||
return MARTIAL_COMBO_DONE_BASIC_HIT |
8 changes: 4 additions & 4 deletions
8
code/modules/martial_arts/combos/sleeping_carp/wrist_wrench.dm
This file contains 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
This file contains 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
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Спаны перепиши на дефайны.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
каво?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Вот такие штуки. Желательно во всём задетом коде.