* 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>
* High five!
* Add in-hand use
* use in hand too
* closing remarks
* better looking
* Fixes daps
* grab my hand fat man
* hand shake
* Implement missed messages
* i can spell
* Update code/modules/mob/living/carbon/human/human_emote.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Review concerns
* Add some auto-doc, minor changes
* more cleverly handles pointing
* Update code/modules/point/point.dm
Path clarity
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>