cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

couple fixes, spellings, styling changes.

Browse Source
This commit is contained in:
hal9000PR
2021-04-14 21:31:12 +01:00
parent d55d6759ad
commit e2bd977238
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink_item.dm
+1 -1
View File
@@ -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
code/modules/martial_arts/combos/sleeping_carp/crashing_kick.dm
+10 -8
View File
@@ -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("<span class='warning'>[user] kicks [target] square in the chest, sending them flying!</span>",
if(target != user) // no you cannot kick yourself across rooms
user.do_attack_animation(target, ATTACK_EFFECT_KICK)
target.visible_message("<span class='warning'>[user] kicks [target] square in the chest, sending them flying!</span>",
"<span class='userdanger'>You are kicked square in the chest by [user], sending you flying!</span>",)
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
code/modules/martial_arts/combos/sleeping_carp/gnashing_teeth.dm
+3 -3
View File
@@ -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("<span class='danger'>[user] [atk_verb]s [target]!</span>",
"<span class='userdanger'>[user] [atk_verb]s you!</span>")
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
code/modules/martial_arts/combos/sleeping_carp/keehaul.dm
+5 -5
View File
@@ -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("<span class='warning'>[user] kicks [target] in the head, sending them face first into the floor!</span>",
"<span class='userdanger'>You are kicked in the head by [user], sending you crashing to the floor!</span>",)
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
code/modules/martial_arts/martial.dm
-6
View File
@@ -273,12 +273,6 @@
to_chat(user, "<span class ='warning'>Your blood lust distracts you too much to be able to concentrate on the contents of the scroll!</span>")
return
to_chat(user, "<span class='sciradio'>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.</span>")
var/datum/martial_art/the_sleeping_carp/theSleepingCarp = new(null)
theSleepingCarp.teach(user)
user.drop_item()
code/modules/martial_arts/sleeping_carp.dm
+5 -1
View File
@@ -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, "<span class='sciradio'>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.</span>")
/datum/martial_art/the_sleeping_carp/remove(mob/living/carbon/human/H)
. = ..()