Skip to content

Commit

Permalink
eh
Browse files Browse the repository at this point in the history
  • Loading branch information
MrCastmer committed Feb 3, 2024
1 parent 8b21afc commit 295e2f4
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 3 deletions.
1 change: 0 additions & 1 deletion modular_dripstation/code/datums/martial/cqc.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
///CQC counter: attacker's weapon is placed in the defender's offhand and they are knocked down
/datum/martial_art/cqc/handle_counter(mob/living/carbon/human/user, mob/living/carbon/human/attacker)
SIGNAL_HANDLER
if(!can_use(user))
return
user.adjustStaminaLoss(10) //Can't block forever. Really, if this becomes a problem you're already screwed.
Expand Down
1 change: 0 additions & 1 deletion modular_dripstation/code/datums/martial/sleeping_carp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ block_chance = 100 //Carp evades freak shit like shoves and hands, 50% dodges ot

///Carp conter: carp evades freak shit like shoves and hands, 50% dodges other unarmed attacks
/datum/martial_art/the_sleeping_carp/handle_counter(mob/living/carbon/human/user, mob/living/carbon/human/attacker)
SIGNAL_HANDLER
if(!can_use(user))
return
var/obj/item/I = attacker.get_active_held_item()
Expand Down
1 change: 0 additions & 1 deletion modular_dripstation/code/datums/martial/trained.dm
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@

///CQC-like counter: attacker's weapon is placed in the defender's offhand and they are knocked down
/datum/martial_art/trained/handle_counter(mob/living/carbon/human/user, mob/living/carbon/human/attacker)
SIGNAL_HANDLER
if(!can_use(user))
return
user.adjustStaminaLoss(35) //Can't block forever. Not so effective as real CQC, can do it only a few times before screw up
Expand Down

0 comments on commit 295e2f4

Please sign in to comment.