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

sabre review

Browse Source
This commit is contained in:
hal9000PR
2021-01-22 20:28:00 +00:00
parent 202ff60a87
commit 32cdead5c6
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/martial_arts/combos/sleeping_carp/crashing_kick.dm
+4 -4
View File
@@ -6,13 +6,13 @@
/datum/martial_combo/sleeping_carp/crashing_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 chest!</span>", \
target.visible_message("<span class='warning'>[user] kicks [target] in the chest!</span>",
"<span class='userdanger'>[user] kicks you in the chest, making you stumble and fall!</span>")
step_to(target,get_step(target,target.dir),1)
step_to(target, get_step (target, target.dir), 1)
target.Weaken(4)
playsound(get_turf(target), 'sound/weapons/punch1.ogg', 50, 1, -1)
playsound(target, 'sound/weapons/punch1.ogg', 50, TRUE, -1)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Crashing Kick", ATKLOG_ALL)
if(prob(80))
user.say(pick("SURRPRIZU!","WOPAH!", "WATAAH", "ZOTA!", "SOLE STRIKE!"))
user.say(pick("SURRPRIZU!", "WOPAH!", "WATAAH", "ZOTA!", "SOLE STRIKE!"))
return MARTIAL_COMBO_DONE
return MARTIAL_COMBO_DONE_BASIC_HIT
code/modules/martial_arts/martial.dm
+1 -1
View File
@@ -275,7 +275,7 @@
var/datum/martial_art/the_sleeping_carp/theSleepingCarp = new(null)
theSleepingCarp.teach(user)
user.faction += list("carp") //makes space carp peaceful to sleeping carp users
user.faction |= list("carp") //makes space carp peaceful to sleeping carp users
user.drop_item()
visible_message("<span class='warning'>[src] lights up in fire and quickly burns to ash.</span>")
new /obj/effect/decal/cleanable/ash(get_turf(src))
code/modules/mob/living/carbon/human/human_defense.dm
+2 -2
View File
@@ -40,10 +40,10 @@ emp_act
if(!lying && !(HULK in mutations) && prob(mind.martial_art.deflection_chance)) //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, 1)
playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE)
if(mind.martial_art.reroute_deflection)
P.firer = src
P.setAngle(rand(0,360))
P.setAngle(rand(0, 360))
return -1
else
return FALSE