mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-25 17:02:04 +00:00
5751f6e1ff
* 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 commit30ea29a6a8. * Revert "try to remember the advanced lessons of CQC" This reverts commite8daeb4d1a. * 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>