shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,978 Commits 5 Branches 0 Tags
166370fb6c62beb8cc8488710c9ffbf9c511ff1c
Commit Graph

148 Commits

Author SHA1 Message Date
Arturlang
b40fb55539 Fixes mesmerzie and makes it work better (#11785) 
* Weh

* Mesmerize works a lot nicer now
 2020-04-10 15:41:35 +02: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
kevinz000
ddd00b1981 Merge pull request #11572 from DeltaFire15/clockies-vanguardstam 
Clockie Vanguard Spell - rebalance for stamcombat
 2020-03-23 10:37:42 -07:00
DeltaFire
513c499dec Vanguard: 30 stamregen / second, 50% stamlossfeedback 
Modifies vanguard to actually fit into a combat system with stamina, since it didn't have any real thing for stamregen despite explicitly stating it caused increased stamregen. Incredible.
 2020-03-22 00:44:59 +01:00
DeltaFire
277af2a7bf Vanguard heals stam too now 
2 stam per tick = 10 stam per second, going to add a tradeoff simillar to the stun absorb one too probably
 2020-03-21 17:14:22 +01: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
6e84781670 tasers are now as fast as disablers and 7 --> 14 tile range but do not have impact damage (#11351) 
* Update stun.dm

* Update stun.dm

* Update stun.dm

* Update debuffs.dm
 2020-03-20 03:15:03 +01:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics 
ports tg genetics
 2020-03-11 17:01:37 -07:00
necromanceranne
e0df350579 PD now isn't a HoS taser x3 and has reasonable damage, stimulants actually combat the taser effect instead of you just being completely fucked by the HoS even through adrenals. 2020-03-10 23:21:59 +11:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
kevinz000
56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
Ghom
954f03f4e0 Merge pull request #11150 from raspyosu/master 
Bloodsucker Abilities Tweaks/Rebalances
 2020-02-27 00:54:41 +01:00
kevinz000
d7949e810e Merge remote-tracking branch 'citadel/master' into staves 2020-02-18 02:20:58 -07:00
raspyosu
6e32a466af tweak mesmerize 
range increased
added a "windup"
hardstun length increased to counteract windup
windup allows target to attempt to avoid via breaking line of sight at the time the windup completes
initial stun reduced to major slowdown, user also recieves slowdown to prevent sprint memes from just letting them follow around a corner if there is one
 2020-02-17 17:24:09 -05:00
Seris02
2d9c8ce8fc fixing merge conflicts 2020-02-15 15:41:52 +08:00
kevinz000
eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000
79a72fac24 fix 2020-02-07 23:32:36 -07:00
kevinz000
8c737b6ce7 Update debuffs.dm 2020-02-05 00:43:42 -07:00
kevinz000
e9ec314cf6 yo this is a horrible idea 2020-02-03 13:15:12 -07:00
kevinz000
3e30c9409b riot staves 2020-02-03 13:11:26 -07:00
kevinz000
4c2b0a826a WEW LAD 2020-01-27 23:26:24 -07:00
kevinz000
57b977c2e5 why 2020-01-27 20:41:45 -07:00
kevinz000
7d53d6e162 s 2020-01-27 20:24:02 -07:00
Seris02
9761d68f4b more merge conflict fixes 2020-01-24 10:14:31 +08:00
kevinz000
f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
Ghom
536900a7ac Merge pull request #10520 from Hatterhat/tg-40920 
you like examining things? - port of tgstation 40920
 2020-01-19 16:37:40 +01:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000
02841f8e92 compile 2020-01-15 18:49:37 -07:00
Seris02
cb3a4caa63 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-14 23:42:37 +08:00
Arturlang
f98bc85db0 Merge branch 'master' into mesmerize_quickfiz 2020-01-13 09:44:17 +02:00
Artur
1b852b3a03 Fixes mesmerize 2020-01-13 09:34:40 +02:00
kevinz000
b341818f04 mobility flags 2020-01-12 11:00:12 -08:00
Seris02
ac4489c6a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-11 13:55:29 +08:00
Hatterhat
080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
kevinz000
830054c106 sigh 2020-01-10 13:25:47 -08:00
Ghommie
825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
kevinz000
ae73927b67 patches 2020-01-07 02:39:16 -08:00
kevinz000
3efdf013e6 mobility flags 2020-01-06 21:47:27 -08:00
Artur
b0cb6aab5c Final commit hopefully 2020-01-06 17:26:36 +01:00
kevinz000
c77005af8a changes 2020-01-06 04:17:53 -08:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
Hatterhat
76e789d3d1 getting limb crippled is a 4head bruh 2019-12-31 00:14:52 -06:00
Seris02
862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Putnam3145
b8c5290011 Merge pull request #10026 from Linzolle/neck-slice 
Neck slice
 2019-12-17 11:58:00 -08:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
Putnam3145
f33d4b3d18 Merge pull request #10108 from DeltaFire15/cbt-critical-fix 
Screaming no longer is a viable strategy against clockies
 2019-12-09 13:07:02 -08:00
DeltaFire
c0433ec944 I scream 
why can't I read
 2019-12-08 04:25:37 +01:00
DeltaFire
59e97989c0 I scream 
Hnnnnngh
 2019-12-08 04:20:04 +01:00