Commit Graph

61 Commits

Author SHA1 Message Date
keronshb
99a890b355 Adds block_parry_data
Ooops forgot one line of code
2020-12-29 09:30:29 -05:00
keronshb
3d7c896100 Scarp Changes and Bundle
This should really fix it now.
2020-12-15 20:10:21 -05:00
silicons
42db990836 why am i doing this 2020-08-03 13:37:37 -07:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
necromanceranne
9919a23966 This fixes everyone being a pugilist holy fuck 2020-04-21 00:36:54 +10:00
necromanceranne
97bd52f03e haha me too 2020-04-19 04:49:11 +10:00
necromanceranne
cb39ba3491 Replaces the Scarp stamina mod, adds tased resistance which I forgot to do for almost a month even though I kind of made it with scarp in mind, fixes the capitalization of armwraps 2020-04-19 04:25:41 +10:00
necromanceranne
80ce9b70af hecc 2020-04-15 19:48:18 +10:00
necromanceranne
d0d766efb5 Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts 2020-04-15 19:00:01 +10:00
necromanceranne
b6d079f91f fixes rising bass and sleeping carp not dodging 2020-04-11 13:00:32 +10:00
kevinz000
956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
Punch Changes 2: The Quickening
2020-04-09 02:09:51 -07:00
necromanceranne
2becb6d74f not really relevant given I literally decided to axe the mod 2020-04-09 00:44:01 +10:00
necromanceranne
ad09cb6790 This needs to go, there is just no way to reasonably have this mod as of the moment while it is basically giving a universal stamina discount. 2020-04-09 00:07:54 +10:00
necromanceranne
f0a738ef21 I'm sneaking in a nerf to scarp here shush shush 2020-04-08 22:53:51 +10: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
necromanceranne
b494aa3370 Fixed up how the proc is used, made northstar gloves give you no_softcrit instead of no_hardcrit, you altclick to change the warcry since they're no_drop now 2020-04-07 17:51:25 +10:00
necromanceranne
ff4847b441 Adds the damage roll into a proc checked on each of the harm, disarm and grab acts and before a combo is complete, and also checks for whether we are in combat mode, lying down or if the target is in combat mode 2020-04-06 15:01:59 +10:00
necromanceranne
cefd212a50 I hecc'd (#11739) 2020-04-04 14:59:10 +02:00
necromanceranne
333a3f7c0c This was also not the right way to do this so these values may be slightly stronger overall but will mean hitting with that second punch is all the more critical. 2020-04-04 19:49:22 +11:00
necromanceranne
856eca772d this is all still super broken 2020-04-04 18:05:02 +11:00
necromanceranne
0c46c151f9 Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage. 2020-04-03 19:42:25 +11:00
kevinz000
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
644273beca k 2020-03-16 04:09:25 -07:00
necromanceranne
e3f6f07e73 some adjustments for now 2020-03-11 15:26:21 +11:00
necromanceranne
f41f78b162 Massively refactors martial arts, ports New Sleeping Carp 2020-03-10 20:09:31 +11:00
Ghommie
0c4af362bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605 2020-03-06 04:00:36 +01:00
Ghommie
e484f72d7b Ports movespeed modifiers code updates. 2020-03-06 03:35:56 +01:00
kevinz000
9ef4cbfa76 refactor tags 2020-01-16 20:58:00 -07:00
kevinz000
350c5aa060 compile 2020-01-16 00:18:40 -07:00
kevinz000
26525b8fa7 s 2020-01-16 00:14:03 -07:00
kevinz000
02841f8e92 compile 2020-01-15 18:49:37 -07:00
kevinz000
0fc6d0e891 compile 2020-01-11 11:28:03 -08:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
Ghommie
6b7dcbceb0 Porting a few martial art code updates. 2019-12-17 03:19:07 +01:00
Ghommie
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
Ghommie
aab7ad192b Martial arts pacifism fixes and boxing buff, more ported pacifist fixes. 2019-11-20 21:00:17 +01:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
TrilbySpaceClone
7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
Arturlang
69a62314e9 Defines so carp reroutes the deflects 2019-06-28 11:37:12 +03:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Poojawa
b6430559e9 datums 2018-09-11 02:49:41 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00
deathride58
2e84b30841 Makes martial arts use Knockdown() instead of Stun() for their stuns (#5617) 2018-02-23 19:19:23 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00