shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Melee Stagger (#11443)

Browse Source 
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* wack

* animation is now shorter

* linter save me

* i hate you

* k

* k

* k

* i hate you

* wrong button

* k

* ok

* bet

* bet

* bet

* Update item_attack.dm

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

* fix

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
kevinz000
2020-03-25 10:37:39 -07:00
committed by GitHub
parent 66c3f6e1be
commit cbb5d52ca1
8 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/living/carbon/carbon_defense.dm
View File

@@ -97,6 +97,7 @@
affecting = bodyparts[1]
SEND_SIGNAL(I, COMSIG_ITEM_ATTACK_ZONE, src, user, affecting)
send_item_attack_message(I, user, affecting.name)
I.do_stagger_action(src, user)
if(I.force)
apply_damage(totitemdamage, I.damtype, affecting) //CIT CHANGE - replaces I.force with totitemdamage
if(I.damtype == BRUTE && affecting.status == BODYPART_ORGANIC)

1
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -121,7 +121,6 @@
// the attacked_by code varies among species
return dna.species.spec_attacked_by(I, user, affecting, a_intent, src)
/mob/living/carbon/human/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
if(user.a_intent == INTENT_HARM)
. = ..(user, TRUE)

1
code/modules/mob/living/carbon/human/human_defines.dm
View File

@@ -8,6 +8,7 @@
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
/// Enable stamina combat
combat_flags = COMBAT_FLAGS_DEFAULT
status_flags = CANSTUN|CANKNOCKDOWN|CANUNCONSCIOUS|CANPUSH|CANSTAGGER
//Hair colour and style
var/hair_color = "000"

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

@@ -1695,6 +1695,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
H.send_item_attack_message(I, user, hit_area)
I.do_stagger_action(H, user)
if(!I.force)
return 0 //item force is zero