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

big update

Browse Source 
removes all counter/blocking related code and the related sound effect
makes krav maga use action buttons instead of verbs
renamed quick choke to lung punch
reduced stun time on leg sweep
removed head elbow, removed the help button (obsoleted by tooltips)
This commit is contained in:
PKPenguin321
2016-04-15 17:32:05 -07:00
parent 2ecb556e94
commit 3dd20078ae
4 changed files with 57 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/living/carbon/human/species.dm
View File

@@ -875,9 +875,7 @@
var/armor_block = H.run_armor_check(affecting, "melee")
playsound(H.loc, M.dna.species.attack_sound, 25, 1, -1)
var/datum/martial_art/MA = H.martial_art
if(MA.on_hit(H,M)) // they countered with something
return
H.visible_message("<span class='danger'>[M] has [atk_verb]ed [H]!</span>", \
"<span class='userdanger'>[M] has [atk_verb]ed [H]!</span>")
@@ -954,10 +952,7 @@
user.do_attack_animation(H)
if(H.check_shields(I.force, "the [I.name]", I, MELEE_ATTACK, I.armour_penetration))
return 0
var/datum/martial_art/MA = H.martial_art
if(MA.on_hit(H,user)) // they countered with something
add_logs(user, H, "countered or blocked")
return 0
if(I.attack_verb && I.attack_verb.len)
H.visible_message("<span class='danger'>[user] has [pick(I.attack_verb)] [H] in the [hit_area] with [I]!</span>", \
"<span class='userdanger'>[user] has [pick(I.attack_verb)] [H] in the [hit_area] with [I]!</span>")
@@ -1394,4 +1389,3 @@
#undef COLD_GAS_DAMAGE_LEVEL_1
#undef COLD_GAS_DAMAGE_LEVEL_2
#undef COLD_GAS_DAMAGE_LEVEL_3