Commit Graph
17 Commits
Author SHA1 Message Date
cybercapitalismandGitHub f81e8db89e Buff sleeping carp keelhaul stamina damage (#19635)
* make keelhaul 2 hit to stamcrit

* increase damage to 60 to avoid armor
2022-11-09 23:23:42 +00:00
34593d2013 Gnashing Teeth buff - make it sharp (#18931)
* Sharpen the teeth

* Requested changes

Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
2022-09-08 13:21:18 +01:00
24248d0ccb Removes instant stuns from Sleeping Carp (#18219)
* open rp, kicks ur ass

* Stay down

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

* Get your fins off me!

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-06 19:50:13 +01:00
CharlieandGitHub bead47ea29 Adds crawling. (#17899)
* 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
2022-06-30 11:57:52 -05:00
0f7a8707ef [Ready] Refactors stuns and status effects. (#17579)
* Fixes reviver runtime

* Confusion status effect

* Dizzy status effect

* Drowsiness status effect

* decaying -> transient

* Drunkenness status effect

* why use timer when SSfastprocessing work good

* stuns (mostly)

* weaken and immobalise

* stun/weaken times

* update_flags redundancies.

* Slowed()

* Silence + fixes transient decay

* Jittery

* sleeping

* Paralyze -> weaken

* Cult sluring

* paralyse

* Stammer

* slurring + projectile cleanups

* losebreath

* Hallucination

* forgor this

* eyeblurry

* eye blind

* Druggy

* affected didn't like my spacing

* review pass

* second review pass

* some cleanups

* documentation and signal framework

* confusion fix

* Fixes spec_stun

* rejuv fix

* removes a TODO

* conflicted myself

* fixes

* self review

* review

* removes TODOs

* adminfreeze

* TM fixes

* hallucination fix + others

* tones down alchol and runtime fixes

* confusion overlay suggestion

* more fixes

* runtime fix

* losebreath fix

* clamp => directional bounded sum

* steel review

* oops

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* reduces the dizziness cycle rate

* borg hotfix

* sanctified decursening

Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-05-24 16:35:26 +01:00
hal9000PR 9aa3d12314 fox's requests 2021-07-26 23:11:19 +01:00
hal9000PR 86131efee5 one last thing. my bad. 2021-07-25 14:41:03 +01:00
hal9000PR 509d6075f8 review pt2 2021-07-25 14:28:55 +01:00
6fa31d2f72 sabre review
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-25 14:25:16 +01:00
795b941ba3 Review stuff
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
2021-05-14 22:40:03 +01:00
hal9000PR e2bd977238 couple fixes, spellings, styling changes. 2021-04-14 21:31:12 +01:00
hal9000PR 0059df1981 steel review 2021-04-03 13:09:00 +01:00
hal9000PR 8739799d84 TG carp 2021-04-01 13:03:25 +01:00
hal9000PR 32cdead5c6 sabre review 2021-01-22 20:28:00 +00:00
hal9000PR 3555fffa80 fixes elbow drop. 2021-01-10 12:41:38 +00:00
hal9000PR 31512f0102 buffs some combos, makes carps friendly 2021-01-09 22:08:00 +00:00
farie82andGitHub 229cf3e344 Martial arts rework/refactor. And you can't prepare combos now. Arts tied to the mind (#13341)
* 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
2020-09-18 11:07:19 -04:00