shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,303 Commits 5 Branches 0 Tags
b3afed69f44f6b8564951ebeef06f7acf8beefaf
Commit Graph

97 Commits

Author SHA1 Message Date
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
kevinz000
300c8e3c6d Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-21 09:53:39 -07:00
kevinz000
0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376) 
* 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

* i hate you

* wrong button

* k

* ok

* bet

* 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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-21 16:04:26 +01:00
kevinz000
d3724d5fbd f 2020-03-16 10:59:34 -07:00
kevinz000
2113b63428 o boy 2020-03-14 21:42:23 -07:00
necromanceranne
49c0aba205 bleeding out from a toolbox smack is not cool gamers 2020-03-14 04:25:12 +11:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
kevinz000
481f038e01 Update item_attack.dm 2020-02-13 05:40:36 -07:00
kevinz000
863ce5152b Merge remote-tracking branch 'citadel/master' into stuff 2020-02-13 04:14:44 -07:00
kevinz000
a8a071851a s 2020-02-13 00:32:26 -07:00
kevinz000
28697a375f Update item_attack.dm 2020-01-27 17:43:21 -07:00
kevinz000
e50eb495df pre attack refactor 2020-01-27 16:30:23 -07:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000
ded4d1bed6 compile 2020-01-15 18:58:26 -07:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie
e1949b0131 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-23 19:02:20 +01:00
Artur
9773b530f8 More fixes. Urgh 2019-12-08 21:47:25 +02:00
Linzolle
19b004edab update butchering 2019-12-01 14:35:11 -06:00
Ghommie
b560ff8284 refactoring code to allow all living mobs to use shields. 2019-11-17 06:23:12 +01:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
deathride58
18f1dc53cc Merge pull request #9532 from MrJWhit/stam-cost-reduction 
Reduces stamloss of melee weapons by 20%
 2019-10-30 00:46:38 -04:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00