* areas
* progress...
* death hatred and murder
* get current master maps
* hoooly shit i can load up the maps
* it compiles now
* map changes
* fixes some unintended stuff
* make the .dme right
* fix mixed space+tab indents
* more space-tab fixes
* CI, please show me more than 1 CI fail at a time
* UPDATE PATHS!!!
* none of the stations had it anyways, but fixed
* mint wasnt actually deleted, my bad
* epic random CI fail for no reason
* i beg you, CI
* dont delete anything
* okay THAT should work now
* okay get master maps and rerun
* okay THEN run update paths
* actually done now
* oops
* martial arts have a weight system now
* remove unneeded variable
* carp cannot be deactivated once learned
* i love documentingtation
* krav can no longer delete other combos
* now ill be embarassed if i dont make it better
* i know how istype works i promise
* implement sirryan's changes
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* 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>
* Legsweep now picks you up from resting
* Makes the description more descriptive
* Buffs damage numbers all around
* Makes CQC much quieter and stealthier
* Okay maybe 25 is a bit too much
* Restrain won't just instantly break anymore
* Various tweaks after discussing with others
* Update code/modules/martial_arts/combos/cqc/restrain.dm
One day I'll learn spacing guidelines
Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
* Changes most instances of brute to stamina, combos
* Adds CQC back into uplink
* Updates chokeholds so it takes time to knock out
* Adds cqc back to tot uplink, gives nukies discount
* Tweaks base grabs and disarms
* Tweaks combos some
* I am a mild idiot
* Charlie's suggestions
* I don't like these numbers, nerf head kick
* Removes blocking and countering
* More kicking tweaks
* Update code/datums/uplink_item.dm
commit charlie's changes pt. 2
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* stop kicking yourself
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* crawling?
* knockdown. CONTAINS CHANGES THAT NEED REVERTING
* plotting can_moves death
* CANMOVE IS DEAD
* mappers are insane
* removes todos as the are todone
* decreases crawling speed
* silly-con fixes
* surgery fixes
* fixes death
* pAI fixes
* removes var/lying
* runtime fix
* decreases default crawling speed
* correct crawling dir
* some more fixes
* stunbaton tweak, revert later
* rejuv fix
* restraint and incapacitated refactor
* crawling dir in line with TG
* fixes vehicle movement and grabs
* alien rest fixes
* antistun fixes
* fixed fall sounds
* forgor to stage this
* first review
* canmove zombie dispersal
* fix
* lots of fixes
* defines
* fixes the trait helper
* if you got no legs you can still crawl
* sillyconfix
* no reverty keepy
* jaunt fix
* hopefully fixes perma sleepy zzz
* admin rejuv temp fix
* rest canceling
* antistun chems now remove knockdown
* buckle offset fix
* fixes some stuff
* crawling delay = 4
* descuffs bed
* sleeping hotfix
* fixes simple mob resting
* V is the macro for resting
* projectiles no dodgy
* refines the projectile check
* god I hate strings
* MORE FIXES
* I hate buckling
* fixes capulettium plus
* winding down
* farie review
* bugs did stop showing up
* SEAN
* todo
* sean review
* ed209
* i HATE cyborgs
* steel review
* laaaaaast things
* reverts stun baton changes
* and done
* refactors stinky krav disarms
* refactors the refactor of disarm messages
maybe it shouldn't say it disarmed when it didn't for NODROP, and it should definitely not duplicate DROPDEL items...
* do the same for CQC
* Apply suggestions from code review
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
* Update code/modules/martial_arts/krav_maga.dm
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
* first commit. combos, CQC started
* CQC working
* All transfered to new system
* The actual bug fix
* add time in between combos
* time between combos limit and minor explaination tweak
* Krav maga fixes, time change. Minor text changes
* Move martial_art to mind
* Merge mistake fixed
* Steels review changes
Added missing spacings
Added attack logging
Raised cost to 9 TC, made it tator and nukies, added to surplus, allowed
nukies to have gloves of north star, and updated description
Added a check preventing usage of CQC with gloves of north star
Fix a bug where attacks would not go through if a combo was done but the
target was critically injured (regular attacks now done instead)
Changed disarm logic, now always hits for 5 damage and use regular
disarm logic for disarming/pushing
Replaced "Big Bossed" attack verb by "neck chopped" and "gut punched"
because nofunallowed
