diff --git a/code/modules/martial_arts/combos/sleeping_carp/crashing_kick.dm b/code/modules/martial_arts/combos/sleeping_carp/crashing_kick.dm index 61103f8fbcf..80765922114 100644 --- a/code/modules/martial_arts/combos/sleeping_carp/crashing_kick.dm +++ b/code/modules/martial_arts/combos/sleeping_carp/crashing_kick.dm @@ -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("[user] kicks [target] in the chest!", \ + target.visible_message("[user] kicks [target] in the chest!", "[user] kicks you in the chest, making you stumble and fall!") - 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 diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index cd14b9a6191..7c0ef9ab00a 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -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("[src] lights up in fire and quickly burns to ash.") new /obj/effect/decal/cleanable/ash(get_turf(src)) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index a781c292f67..2d7fe622df2 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -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("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons!", "You deflect the projectile!") - 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