f3486be292
permafat damage
2024-12-19 15:07:57 -05:00
f9bfd0d3f0
under 100 now
2024-09-13 16:25:53 -04:00
fbc80cf829
initial port
2022-09-09 00:29:20 -07:00
33affb4f10
THREE SECONDS
2021-06-09 15:14:07 -04:00
11a7e118fe
Puts off balance duration to 2 seconds
...
Might be better at 2.
2021-05-07 23:58:09 -04:00
7947258e51
Off balance disarm
...
If it hits a wall or a person while under the effect of off balance.
2021-05-05 23:57:01 -04:00
be2e962983
Off Balance for Guns only again
...
Was intended for guns
2021-05-04 00:51:16 -04:00
45340ef1ac
Makes shove off-balancing remove any active item, not just guns. Makes baton knockdowns not go on cooldown from normal hits, makes baton offbalance trait share a duration. Gives the stunprod a little more oomph to keep it comparable to unarmed.
2021-03-25 09:27:33 +11:00
34f2a94d1b
Update combat.dm
2020-12-11 02:23:26 -07:00
ed08983b97
syscorruption framework
...
Adds a framework for systems corruption instead of toxins damage for use in synthetic species. No ways to deal / heal it yet, nor effects, or actual uses. Soon.
2020-11-01 04:56:31 +01:00
1b1efce556
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-06 17:11:21 -07:00
31791df2bd
fixes
2020-09-21 20:38:43 -07:00
8a54395f1a
fixes
2020-09-20 04:33:49 -07:00
1ea0dd9f76
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-19 15:56:13 -07:00
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
0a36f9fbb5
changes
2020-08-04 22:40:28 -07:00
42db990836
why am i doing this
2020-08-03 13:37:37 -07:00
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
06f5ce6401
buffs shoving ( #12925 )
...
* ^w^
* ok
* ok
2020-08-02 18:30:09 +02:00
caaedce6e2
end our suffering
2020-07-30 02:33:39 +01:00
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
7c5d4f863d
click cd breakout
2020-07-18 18:10:21 -07:00
2f5d351d70
Just ups stamina cost for bashing people.
2020-06-28 18:47:55 +02:00
6e90560173
Nerfs natural stamina recovery outside of stam-crit.
2020-06-28 02:40:16 +02:00
eba1e8f301
fixes the merge conflicts
2020-06-15 23:29:49 +01:00
8162303bad
Merge remote-tracking branch 'citadel/master' into pp_fix
2020-06-13 12:03:01 -07:00
180b7d31d9
sigh
2020-06-13 09:24:22 -07:00
77c428479e
changes the inefficient attack message string and threshold. ( #12498 )
2020-06-12 17:08:10 -07:00
1a9787a9c2
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-06-02 21:49:43 -07:00
a41f40503d
More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. ( #12347 )
...
* A more lenient soft stamina crit.
* Yea, your shots are gonna go straight toh.
* accuracy whacks (leaves the bow as is for now).
* Fixing stam penalties calculations, spread the range.
* aaaaaah
* 1.4 seconds delay vs 1.2
* Thanks, linter.
* Missed one.
2020-06-02 15:22:06 -07:00
05fe0c7dcc
ok
2020-05-30 00:59:29 -07:00
ae9fc5789d
adds more support to stuff
2020-05-30 00:35:17 -07:00
433bd1af79
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-27 18:11:15 -07:00
968426fd48
Combat mode component. ( #12338 )
...
* Combat mode component.
* Whoops.
* test.
* Oh
* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
e4eb49050c
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-24 15:03:06 -07:00
dd7db603d2
Merge pull request #12159 from Ghommie/Ghommie-cit732
...
'mob_run_block' and 'mob_check_block' macros
2020-05-10 18:25:16 +00:00
05cede4e4d
fixes xenomorphs not being in combat mode ( #12193 )
...
* ok
* Update combat.dm
2020-05-10 17:38:07 +02:00
ffd5dd9615
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732
2020-05-08 19:01:28 +02:00
a412e840f7
'mob_run_block' and 'mob_check_block' macros
2020-05-08 18:52:32 +02:00
f034c7c536
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-05 17:38:43 -07:00
001109cfcd
About ready.
2020-05-05 20:58:44 +02:00
4689e2aeb6
Merge pull request #11980 from Ghommie/Ghommie-cit700
...
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
63870cc9d1
Movespeed modifiers refactor port.
2020-04-22 22:01:39 +02:00
e3fb978465
Shielded element.
2020-04-19 01:48:51 +02:00
3c4c397c46
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-04-08 04:04:45 -07:00
8379169b81
Merge pull request #11476 from kevinz000/shield_refactor
...
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
13a8e7a777
k
2020-03-25 21:06:01 -07:00
cbb5d52ca1
Melee Stagger ( #11443 )
...
* combat refactoring
* i hate this
* mobility flags part 2 time xd
* whew
* stuff
* a
* ok
* changes
* Wew
* k
* add flags
* FUCKYOUVORE
* fixes
* typo
* no using this in hard stamcrit
* update icon
* woopsy
* . = ..()
* sigh
* Update living_combat.dm
* wew
* wups
* fix
* wack
* animation is now shorter
* linter save me
* i hate you
* k
* k
* k
* i hate you
* wrong button
* k
* ok
* bet
* bet
* bet
* Update item_attack.dm
* k
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* early returns
* skreee
* agony
* k
* k
* k
* k
* wack
* compile
* wack
* fix
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-25 18:37:39 +01:00
300c8e3c6d
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-21 09:53:39 -07:00
Metis