diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 5ce793536a4..e21e573fa2a 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -849,7 +849,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/stealthy_weapons/martialarts name = "Martial Arts Scroll" desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat, \ - deflecting all ranged weapon fire, but you also refuse to use dishonorable ranged weaponry. \ + deflecting ranged weapon fire when we are in a defensive stance, but you also refuse to use dishonorable ranged weaponry. \ Unable to be understood by vampire and changeling agents." reference = "SCS" item = /obj/item/sleeping_carp_scroll 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 edd850baa1d..98f1836b601 100644 --- a/code/modules/martial_arts/combos/sleeping_carp/crashing_kick.dm +++ b/code/modules/martial_arts/combos/sleeping_carp/crashing_kick.dm @@ -4,12 +4,14 @@ explaination_text = "Kicks the target square in the chest, sending them flying." /datum/martial_combo/sleeping_carp/crashing_kick/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) - user.do_attack_animation(target, ATTACK_EFFECT_KICK) - target.visible_message("[user] kicks [target] square in the chest, sending them flying!", + if(target != user) // no you cannot kick yourself across rooms + user.do_attack_animation(target, ATTACK_EFFECT_KICK) + target.visible_message("[user] kicks [target] square in the chest, sending them flying!", "You are kicked square in the chest by [user], sending you flying!",) - playsound(get_turf(target), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) - var/atom/throw_target = get_edge_target_turf(target, user.dir) - target.throw_at(throw_target, 7, 14, user) - target.apply_damage(15, BRUTE, BODY_ZONE_CHEST) - add_attack_logs(user, target, "Melee attacked with martial-art [src] : Crashing Waves Kick", ATKLOG_ALL) - return MARTIAL_COMBO_DONE + playsound(get_turf(target), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) + var/atom/throw_target = get_edge_target_turf(target, user.dir) + target.throw_at(throw_target, 7, 14, user) + target.apply_damage(15, BRUTE, BODY_ZONE_CHEST) + add_attack_logs(user, target, "Melee attacked with martial-art [MA] : Crashing Waves Kick", ATKLOG_ALL) + return MARTIAL_COMBO_DONE + return MARTIAL_COMBO_DONE_BASIC_HIT diff --git a/code/modules/martial_arts/combos/sleeping_carp/gnashing_teeth.dm b/code/modules/martial_arts/combos/sleeping_carp/gnashing_teeth.dm index 8d5f07149ce..4711a0115de 100644 --- a/code/modules/martial_arts/combos/sleeping_carp/gnashing_teeth.dm +++ b/code/modules/martial_arts/combos/sleeping_carp/gnashing_teeth.dm @@ -1,7 +1,7 @@ /datum/martial_combo/sleeping_carp/gnashing_teeth name = "Gnashing Teeth" steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_HARM) - explaination_text = "Every second, consecutive, punch will deal extra damage and you will shout to send fear into your opponents heart" + explaination_text = "Every second consecutive punch deals extra damage, and you will shout to strike fear into your opponent's heart." /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) @@ -9,9 +9,9 @@ target.visible_message("[user] [atk_verb]s [target]!", "[user] [atk_verb]s you!") playsound(get_turf(target), 'sound/weapons/punch1.ogg', 35, TRUE, -1) - add_attack_logs(user, target, "Melee attacked with martial-art [src] : 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.stat) + 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 diff --git a/code/modules/martial_arts/combos/sleeping_carp/keehaul.dm b/code/modules/martial_arts/combos/sleeping_carp/keehaul.dm index 6aad38bfb6a..031920791e2 100644 --- a/code/modules/martial_arts/combos/sleeping_carp/keehaul.dm +++ b/code/modules/martial_arts/combos/sleeping_carp/keehaul.dm @@ -1,9 +1,9 @@ -/datum/martial_combo/sleeping_carp/keehaul - name = "Keehaul" +/datum/martial_combo/sleeping_carp/keelhaul + name = "Keelhaul" steps = list(MARTIAL_COMBO_STEP_HARM, MARTIAL_COMBO_STEP_GRAB) - explaination_text = "Kick an opponent to the floor, knocking them down and dealing stamina damage to them!" + explaination_text = "Kicks an opponent to the floor, knocking them down and dealing stamina damage to them!" -/datum/martial_combo/sleeping_carp/keehaul/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) +/datum/martial_combo/sleeping_carp/keelhaul/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) user.do_attack_animation(target, ATTACK_EFFECT_KICK) playsound(get_turf(target), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) target.apply_damage(10, BRUTE, BODY_ZONE_HEAD) @@ -11,5 +11,5 @@ target.Weaken(2) target.visible_message("[user] kicks [target] in the head, sending them face first into the floor!", "You are kicked in the head by [user], sending you crashing to the floor!",) - add_attack_logs(user, target, "Melee attacked with martial-art [src] : Kneehaul", ATKLOG_ALL) + add_attack_logs(user, target, "Melee attacked with martial-art [MA] : Keelhaul", ATKLOG_ALL) return MARTIAL_COMBO_DONE diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index cb477d409f8..6a2abc4e84e 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -273,12 +273,6 @@ to_chat(user, "Your blood lust distracts you too much to be able to concentrate on the contents of the scroll!") return - to_chat(user, "You have learned the ancient martial art of the Sleeping Carp! \ - Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles directed toward you. \ - However, you are also unable to use any ranged weaponry. \ - You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab.") - - var/datum/martial_art/the_sleeping_carp/theSleepingCarp = new(null) theSleepingCarp.teach(user) user.drop_item() diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm index 416adc89ebe..6636e95b979 100644 --- a/code/modules/martial_arts/sleeping_carp.dm +++ b/code/modules/martial_arts/sleeping_carp.dm @@ -6,7 +6,7 @@ no_guns = TRUE no_guns_message = "Use of ranged weaponry would bring dishonor to the clan." has_explaination_verb = TRUE - combos = list(/datum/martial_combo/sleeping_carp/crashing_kick, /datum/martial_combo/sleeping_carp/keehaul, /datum/martial_combo/sleeping_carp/gnashing_teeth) + combos = list(/datum/martial_combo/sleeping_carp/crashing_kick, /datum/martial_combo/sleeping_carp/keelhaul, /datum/martial_combo/sleeping_carp/gnashing_teeth) /datum/martial_art/the_sleeping_carp/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) MARTIAL_ARTS_ACT_CHECK @@ -33,6 +33,10 @@ /datum/martial_art/the_sleeping_carp/teach(mob/living/carbon/human/H, make_temporary) . = ..() H.faction |= "carp"// :D + to_chat(H, "You have learned the ancient martial art of the Sleeping Carp! \ + Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles directed toward you when in throw mode. \ + However, you are also unable to use any ranged weaponry. \ + You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab.") /datum/martial_art/the_sleeping_carp/remove(mob/living/carbon/human/H) . = ..()