Timothy Teakettle
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
timothyteakettle
caaedce6e2
end our suffering
2020-07-30 02:33:39 +01:00
Timothy Teakettle
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
silicons
78312c23bf
sigh
2020-07-28 21:53:07 -07:00
silicons
5bf4afcade
sigh
2020-07-27 14:09:37 -07:00
silicons
67b518bf42
experimental
2020-07-27 13:09:54 -07:00
silicons
55dc0a1650
Fix
2020-07-26 00:36:52 -07:00
silicons
44d3a0aa27
fixes
2020-07-24 20:37:02 -07:00
silicons
46fc0b6ae5
epic
2020-07-24 20:22:44 -07:00
silicons
33d5ba788b
aight
2020-07-24 20:19:18 -07:00
timothyteakettle
3ca098fe98
bugfixes
2020-07-25 00:22:24 +01:00
Timothy Teakettle
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
silicons
692656b02d
Whew
2020-07-20 11:53:33 -07:00
silicons
416b989e12
changes
2020-07-20 11:35:10 -07:00
silicons
984796b8c6
sigh
2020-07-20 10:46:52 -07:00
silicons
910869d6bf
more
2020-07-18 19:44:12 -07:00
silicons
0c6368e3e7
e
2020-07-18 18:34:16 -07:00
silicons
0b98b0409b
sigh
2020-07-18 18:29:09 -07:00
Ghommie
f5ffd7d2a9
Easing fine tuning of the system.
2020-07-03 03:00:33 +02:00
Ghommie
396989f143
Fixes items' used skills list keys missing associated base traits.
2020-07-03 01:52:03 +02:00
Ghom
77c428479e
changes the inefficient attack message string and threshold. ( #12498 )
2020-06-12 17:08:10 -07:00
kevinz000
1a9787a9c2
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-06-02 21:49:43 -07:00
Ghom
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
kevinz000
5b6e797c4f
desword adjustments
2020-05-30 23:43:05 -07:00
kevinz000
05fe0c7dcc
ok
2020-05-30 00:59:29 -07:00
kevinz000
433bd1af79
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-27 18:11:15 -07:00
Ghom
968426fd48
Combat mode component. ( #12338 )
...
* Combat mode component.
* Whoops.
* test.
* Oh
* refs begone, and documentation.
2020-05-27 18:00:32 -07:00
kevinz000
e4eb49050c
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-24 15:03:06 -07:00
kevinz000
95c6c7345c
implementations
2020-05-24 14:56:01 -07:00
Ghom
7f38e0714b
Skill calculation fixes, tweaks, antag and brain damage modifiers. ( #12302 )
...
* Skill calculation fixes, tweaks, antag and brain damage modifiers.
* Experience through patience.
* Priority Fix etcetera.
2020-05-20 18:42:58 -07:00
kevinz000
616d104c23
Merge pull request #12189 from Ghommie/Ghommie-cit735
...
Skill modifier datums.
2020-05-14 04:46:24 -07:00
Lin
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
Ghommie
300331ccb7
Skill modifiers datum WIP.
2020-05-10 02:11:48 +02:00
Ghommie
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
Ghommie
a412e840f7
'mob_run_block' and 'mob_check_block' macros
2020-05-08 18:52:32 +02:00
Ghom
73d958649e
Update item_attack.dm
2020-05-08 17:12:13 +02:00
Ghommie
60bdbfaf61
Merge conflicts, procs instead of macros, mood signals.
2020-05-08 02:12:41 +02:00
Ghommie
91d6faaf21
more obligatory changes.
2020-05-05 21:06:53 +02:00
Ghommie
81dde7debd
Obligatory.
2020-05-05 21:04:19 +02:00
Ghommie
001109cfcd
About ready.
2020-05-05 20:58:44 +02:00
Ghommie
791b05871f
Hey.
2020-05-05 05:24:40 +02:00
Ghommie
0adca2d9b8
Oh.
2020-05-05 04:45:43 +02:00
Ghommie
643ef48f0e
Macros, generic skill implementations.
2020-05-05 04:42:34 +02:00
Ghommie
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
Artur
f910a0fd32
Conflict fixes
2020-04-14 09:27:54 +03:00
Lin
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
Artur
2cf7a1f6ba
Merge remote-tracking branch 'origin/master' into Garlic
2020-04-02 20:41:58 +03:00
kevinz000
0f4444b567
Nerfs piggyback and fireman carrying ( #11555 )
...
* ok
* daze duration increased, MOBILITY_USE now has.. a use.
* k
* @ghommie
2020-03-25 21:16:35 +01:00
kevinz000
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
Artur
fdc6a02eea
Hm
2020-03-25 12:46:42 +02:00
