Commit Graph

121 Commits

Author SHA1 Message Date
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
kevinz000
0fc6d0e891 compile 2020-01-11 11:28:03 -08: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
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Ghommie
edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
Lin
d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
2019-12-28 04:07:03 +00:00
Seris02
a106fde6cc a few fixes here and there and updating it 2019-12-24 23:38:27 +08:00
Seris02
85c5a5dfa1 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-12-24 22:29:46 +08:00
Seris02
9e6f0762b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass 2019-12-24 22:27:41 +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
9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +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
Seris02
4a68a5c33f fixes combo text 2019-12-16 12:59:19 +08:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie
84d1315a05 heck. 2019-11-20 21:33:35 +01:00
Ghommie
16d850ecfc chain stunning yay 2019-11-20 21:17:31 +01:00
Ghommie
236f22096a run 2019-11-20 21:13:08 +01:00
Ghommie
2fddf343ad Run 2019-11-20 21:12:44 +01:00
Ghommie
67a48e0417 typo 2019-11-20 21:03:27 +01:00
Ghommie
aab7ad192b Martial arts pacifism fixes and boxing buff, more ported pacifist fixes. 2019-11-20 21:00:17 +01:00
Ghommie
6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Seris02
2d9f463fd7 fixes a typo 2019-11-10 15:48:40 +08:00
Seris02
99ea3f9b71 more fixes + fixes the last fixes. 2019-11-10 15:09:17 +08:00
Seris02
7dc22e3ae0 makes rising bass a little less hacky with code 2019-11-10 10:25:23 +08:00
Seris02
68014392ca Fixes the fork? 2019-11-09 21:38:17 +08:00
Seris02
8a4197bbf5 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-11-09 21:15:54 +08:00
Seris02
8dfbc652cb ADDS THE NEW MARTIAL ART - RISING BASS!! 2019-11-09 21:11:36 +08:00
Seris02
b9238d0290 copying my file from my mac
henk
2019-11-08 20:14:41 +08:00