shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

140 Commits

Author SHA1 Message Date
silicons
02b40589fe conflict gone 2021-04-26 22:46:16 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
necromanceranne
75e0e893a2 Merge branch 'master' into baton_change_pr 2021-04-19 10:55:33 +10:00
Putnam
4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
necromanceranne
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
silicons
604a6efeca baton change 2021-03-20 13:45:39 -07:00
necromanceranne
6a752cfd5d Not quite right 2021-03-20 04:28:20 +11:00
necromanceranne
a61ac1fc68 Applies off balance on right click, allowing you to shove a weapon out of someones hands 2021-03-20 04:23:23 +11:00
necromanceranne
1de69e0dec uuuuh if you say so boss 2021-03-16 06:14:49 +11:00
necromanceranne
832fb7a6f8 oops, this should fix that failed check...I hope 2021-03-16 06:03:22 +11:00
necromanceranne
29a28d4ed8 keeps knockdown on rng throw, because you deserve it if you land it 2021-03-16 05:52:38 +11:00
necromanceranne
6ebc911937 Batons knockdown and slowdown on rightclick, otherwise they stagger, but always do damage. Damage respects melee armor, but power cells grant armor pen based on max charge. 2021-03-16 04:48:55 +11:00
silicons
e43838739d changes 2021-02-28 00:37:39 -07:00
silicons
8e249eed4f changes 2021-02-28 00:33:10 -07:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK 
[READY]Gives the revenant TK
 2021-01-25 23:17:09 -07:00
Artur
91cd7378ca Give Improved 2021-01-24 16:05:42 +02:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur
3737c52df8 Funny actions 2021-01-20 15:23:34 +02:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
DeltaFire
d331dd4b1e Merge pull request #14046 from Citadel-Station-13/silicons-patch-10 
buffs and fixes BOOMERANG STUNBATONS
 2021-01-15 18:30:32 +01:00
silicons
06bc57580a Update stunbaton.dm 2021-01-13 15:22:41 -07:00
silicons
701bacd355 Update stunbaton.dm 2021-01-13 15:06:35 -07:00
zerothebigboy
ff937e249f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe 2020-10-11 03:14:02 -04:00
zeroisthebiggay
36b1e0b613 uh 
uh
 2020-10-11 00:20:03 -04:00
zerothebigboy
ef073167df crepe 2020-10-10 21:39:45 -04:00
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
silicons
8ebe765d70 fixes 2020-09-20 02:03:18 -07:00
silicons
97f373a199 whew 2020-09-19 16:17:26 -07:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
silicons
d3e808f0e1 fix 2020-07-26 00:18:42 -07:00
silicons
2a29f73ac8 ok 2020-07-25 17:34:12 -07:00
silicons
0e1574bf77 sigh 2020-07-24 23:34:47 -07:00
silicons
184e3992f3 fixes 2020-07-21 11:56:23 -07:00
kevinz000
bad809ffce fixes 2020-06-04 19:56:06 -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
Ghom
ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -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
kevinz000
5a716bfcfd Merge pull request #12143 from Ghommie/Ghommie-cit729 
Demodularizing a few sprite assets.
 2020-05-08 23:29:34 -07: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
Ghommie
aaa31c24ce Demodularizing a few sprite assets. 2020-05-08 04:02:31 +02:00
Ghommie
001109cfcd About ready. 2020-05-05 20:58:44 +02: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
Feasel
fd70734eee [Balance Pass] - Stunbaton (Because no one wants to do a single line change to make this not shit) 
I'm putting it at 35 as Kevinz suggest, rather it be 49 but w/e.

The "Intuitive" system will be staying, but now it won't suck ass to actually be used as a stamina draining weapon.
 2020-03-23 23:16:37 -05:00
kevinz000
a6ca854e5c Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-22 15:07:41 -07:00
kevinz000
0b71b51360 Update stunbaton.dm (#11559) 2020-03-22 13:37:16 +01:00
kevinz000
300c8e3c6d Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-21 09:53:39 -07:00