cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

sabre review

Browse Source 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
This commit is contained in:
hal9000PR
2021-07-25 14:25:16 +01:00
committed by GitHub
parent 795b941ba3
commit 6fa31d2f72
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/martial_arts/combos/sleeping_carp/gnashing_teeth.dm
+5 -5
View File
@@ -5,14 +5,14 @@
/datum/martial_combo/sleeping_carp/gnashing_teeth/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA)
user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
var/atk_verb = pick("precisely kick", "brutally chop", "cleanly hit", "viciously slam")
target.visible_message("<span class='danger'>[user] [atk_verb]s [target]!</span>",
"<span class='userdanger'>[user] [atk_verb]s you!</span>")
var/atk_verb = pick("precisely kicks", "brutally chops", "cleanly hits", "viciously slams")
target.visible_message("<span class='danger'>[user] [atk_verb] [target]!</span>",
"<span class='userdanger'>[user] [atk_verb] you!</span>")
playsound(get_turf(target), 'sound/weapons/punch1.ogg', 35, TRUE, -1)
add_attack_logs(user, target, "Melee attacked with martial-art [MA] : Gnashing Teeth", ATKLOG_ALL)
add_attack_logs(user, target, "Melee attacked with martial-art [MA] : Gnashing Teeth", ATKLOG_ALL)
target.apply_damage(20, BRUTE)
if(target.health >= 0)
user.say(pick("HUAH!", "HYA!", "CHOO!", "WUO!", "KYA!", "HUH!", "HIYOH!", "CARP STRIKE!", "CARP BITE!"))
else
user.say(pick("BANZAIII!", "KIYAAAA!", "OMAE WA MOU SHINDEIRU!", "YOU CAN'T SEE ME!", "MY TIME IS NOW!", "COWABUNGA")) // COWABUNGA
user.say(pick("BANZAIII!", "KIYAAAA!", "OMAE WA MOU SHINDEIRU!", "YOU CAN'T SEE ME!", "MY TIME IS NOW!", "COWABUNGA!")) // COWABUNGA
return MARTIAL_COMBO_DONE
code/modules/martial_arts/martial.dm
+2 -2
View File
@@ -15,9 +15,9 @@
///Chance to block melee attacks using items while on throw mode.
var/block_chance = 0
var/help_verb = null
///set to TRUE to prevent users of this style from using guns (sleeping carp, highlander). They can still pick them up, but not fire them.
/// Set to TRUE to prevent users of this style from using guns (sleeping carp, highlander). They can still pick them up, but not fire them.
var/no_guns = FALSE
///message to tell the style user if they try and use a gun while no_guns = TRUE (DISHONORABRU!)
/// Message to tell the style user if they try and use a gun while no_guns = TRUE (DISHONORABRU!)
var/no_guns_message = ""
/// If the martial art has it's own explaination verb
code/modules/martial_arts/sleeping_carp.dm
+2 -2
View File
@@ -22,7 +22,7 @@
var/atk_verb = pick("punches", "kicks", "chops", "hits", "slams")
D.visible_message("<span class='danger'>[A] [atk_verb] [D]!</span>",
"<span class='userdanger'>[A] [atk_verb] you!</span>")
D.apply_damage(rand(10,15), BRUTE)
D.apply_damage(rand(10, 15), BRUTE)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, TRUE, -1)
add_attack_logs(A, D, "Melee attacked with martial-art [src] : Punched", ATKLOG_ALL)
return TRUE
@@ -46,4 +46,4 @@
to_chat(user, "<b><i>In addition, by having your throw mode on when being shot at, you enter an active defensive mode where you will block and deflect all projectiles fired at you!</i></b>")
/datum/martial_art/the_sleeping_carp/try_deflect(mob/user)
return ..() && user.in_throw_mode // in case an admin wants to var edit carp to have less deflection chance
return user.in_throw_mode && ..() // in case an admin wants to var edit carp to have less deflection chance
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -37,7 +37,7 @@ emp_act
return 2
if(mind?.martial_art?.deflection_chance) //Some martial arts users can deflect projectiles!
if(!lying && !HAS_TRAIT(src, TRAIT_HULK) && mind?.martial_art?.try_deflect(src)) //But only if they're not lying down, and hulks can't do it
if(!lying && !HAS_TRAIT(src, TRAIT_HULK) && mind.martial_art.try_deflect(src)) //But only if they're not lying down, and hulks can't do it
add_attack_logs(P.firer, src, "hit by [P.type] but got deflected by martial arts '[mind.martial_art]'")
visible_message("<span class='danger'>[src] deflects the projectile; [p_they()] can't be hit with ranged weapons!</span>", "<span class='userdanger'>You deflect the projectile!</span>")
playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE)