Ghom
|
3f573fb611
|
Merge pull request #11814 from kappa-sama/patch-19
fixes stomping and increases Stam damage from krav
|
2020-04-12 06:24:57 +02:00 |
|
necromanceranne
|
b6d079f91f
|
fixes rising bass and sleeping carp not dodging
|
2020-04-11 13:00:32 +10:00 |
|
kappa-sama
|
2afda4c216
|
forgot oop
|
2020-04-10 14:24:20 -04:00 |
|
kappa-sama
|
91726f340a
|
Update krav_maga.dm
|
2020-04-10 14:08:16 -04: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
|
353c6f1348
|
forgot this bit
|
2020-04-07 23:35:10 +10: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
|
60c8aab520
|
the damage_roll proc needs to always be before check_streak
|
2020-04-06 16:51:26 +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
|
a6bd6d23fe
|
Some cleanup with help from rohesie, hopefully I figured it out
|
2020-04-06 12:28:14 +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
|
71e19aead2
|
ports over my krav changes from tg and also hooked in pugilist gloves to summon equipment for cultists and gave all that shit a sprite ye
|
2020-04-04 16:29:29 +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
|
b5f1cbd3d0
|
Merge pull request #11683 from timothyteakettle/wrestling_holodeck
holodeck WRESTLING
|
2020-03-31 18:03:00 -07:00 |
|
timothyteakettle
|
e2d02beedf
|
refactors the code to be less awful
i was told my code was bad so maybe its less bad now
|
2020-03-31 00:20:44 +01:00 |
|
Timothy Teakettle
|
c6163e2349
|
this time it will work, right?
|
2020-03-29 15:02:36 +01:00 |
|
Timothy Teakettle
|
a68ce82060
|
woops
|
2020-03-29 14:13:16 +01:00 |
|
timothyteakettle
|
b89a6b0398
|
makes everything work
|
2020-03-29 02:44:44 +01:00 |
|
timothyteakettle
|
5afe5aab3f
|
fixes the map, adds subtype of martial art
|
2020-03-29 00:46:18 +00:00 |
|
necromanceranne
|
5341bdf008
|
BOXERS CAN ONLY KNOCK OUT OTHER BOXERS
|
2020-03-25 09:08:15 +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
|
2d02ae0077
|
oops
|
2020-03-03 21:06:29 -07:00 |
|
kevinz000
|
6354b48659
|
fix
|
2020-03-03 20:58:06 -07:00 |
|
Seris02
|
8c4c2842d0
|
fixes and code improvements
|
2020-03-03 19:27:09 +08:00 |
|
Seris02
|
de6e8012f3
|
balances yee
|
2020-02-26 17:49:37 +08:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
Ghom
|
6a88e37ff2
|
Merge pull request #10801 from Seris02/risingbasschanges
changes to rising bass
|
2020-02-04 05:14:07 +01:00 |
|
Kraseo
|
d70665a0c3
|
got asked to do this
|
2020-02-01 19:03:35 +01:00 |
|
Kraseo
|
aa2e4299e2
|
my grug brain took more than 10 attempts to get this to work
|
2020-02-01 18:51:18 +01:00 |
|
Seris02
|
6304ddbc9e
|
one fix
|
2020-01-31 12:44:38 +08:00 |
|
Seris02
|
5f1a2bed76
|
rising bass changes
|
2020-01-31 12:42:22 +08:00 |
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07: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
|
162a0def29
|
parentheses
|
2020-01-15 19:09:38 -07:00 |
|
kevinz000
|
45c92bcb6f
|
s
|
2020-01-15 19:07:47 -07:00 |
|
kevinz000
|
02841f8e92
|
compile
|
2020-01-15 18:49:37 -07:00 |
|
kevinz000
|
b341818f04
|
mobility flags
|
2020-01-12 11:00:12 -08:00 |
|