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

Review stuff

Browse Source 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
This commit is contained in:
hal9000PR
2021-05-14 22:40:03 +01:00
committed by GitHub
parent e2bd977238
commit 795b941ba3
4 changed files with 5 additions and 5 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 ranged weapon fire when we are in a defensive stance, but you also refuse to use dishonorable ranged weaponry. \
deflecting ranged weapon fire when you are in a defensive stance (throw mode). Learning this art means you will 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
+2 -2
View File
@@ -7,8 +7,8 @@
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)
"<span class='userdanger'>You are kicked square in the chest by [user], sending you flying!</span>")
playsound(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)
code/modules/martial_arts/combos/sleeping_carp/keehaul.dm
+1 -1
View File
@@ -10,6 +10,6 @@
target.apply_damage(40, STAMINA)
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>",)
"<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 [MA] : Keelhaul", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
code/modules/martial_arts/sleeping_carp.dm
+1 -1
View File
@@ -43,7 +43,7 @@
H.faction -= "carp"// :C
/datum/martial_art/the_sleeping_carp/explaination_footer(user)
to_chat(user, "<b><i>In addition, by having your throw mode on when being shot at, you enter an active defense mode where you will block and deflect all projectiles fired at you!</i></b>")
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