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

Adds parrying to CQC (#20634)

Browse Source 
* heh, almost made me use ten percent of my power

* appeasing the GC gods (GDN)

* hee hoo

* Update code/modules/martial_arts/cqc.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/items/hand_item.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* more return styling

* Update code/modules/martial_arts/cqc.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* no more wrapper

* the extent of my spriting skills

* fixes double slap sound

* slap emote also works

* try to remember the advanced lessons of CQC

* i hope this fixes the merge conflict

* Chefs are no longer perma-combat trained

* Chef CQC now uses signals to activate parrying

* Makes it easier to add it to other martial arts

* resolving merge conflict from ParadiseSS13#20620

* Revert "resolving merge conflict from ParadiseSS13#20620"

This reverts commit 30ea29a6a8.

* Revert "try to remember the advanced lessons of CQC"

This reverts commit e8daeb4d1a.

* try to not conflict the basics of CQC

* Update code/modules/martial_arts/cqc.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/martial_arts/cqc.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* lol, lmao even

* GDN was right, this is funny

* Update code/modules/martial_arts/cqc.dm

farie review pt. 1

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Update code/modules/martial_arts/martial.dm

farie review pt. 2

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/human_emote.dm

farie review pt. 3

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
BiancaWilkson
2023-04-15 22:18:18 +02:00
committed by GitHub
co-authored by Luc Charlie Farie82 Contrabang
parent 34c6fb602c
commit 5751f6e1ff
6 changed files with 79 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/hand_item.dm
+19
View File
@@ -56,3 +56,22 @@
table_smacks_left--
if(table_smacks_left <= 0)
qdel(src)
/obj/item/slapper/get_clamped_volume() //Without this, you would hear the slap twice if it has force.
return 0
/obj/item/slapper/parry
desc = "This is how real men win fights."
force = 5
attack_verb = list("slapped", "backhanded", "smacked", "discombobulated")
table_smacks_left = 10 //Much more smackitude
/obj/item/slapper/parry/Initialize(mapload)
AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = NON_PROJECTILE_ATTACKS, _parry_cooldown = (1 / 3) SECONDS) //75% uptime
return ..()
/obj/item/slapper/parry/attack(mob/M, mob/living/carbon/human/user)
if(isliving(M))
var/mob/living/creature = M
creature.Confused(10 SECONDS) //SMACK CAM
return ..()