 kevinz000
|
25e1a78b51
|
Merge pull request #2407
|
2017-08-29 22:27:13 -07:00 |
|
|
kevinz000
|
5c7b743cfa
|
Merge pull request #2405
|
2017-08-29 22:27:10 -07:00 |
|
|
kevinz000
|
5dc670e282
|
Merge pull request #2401
|
2017-08-29 22:27:07 -07:00 |
|
|
kevinz000
|
8ce807deb6
|
Merge pull request #2280
|
2017-08-29 22:27:01 -07:00 |
|
|
kevinz000
|
fcddd32703
|
Merge pull request #2195
|
2017-08-29 22:26:58 -07:00 |
|
|
kevinz000
|
f33f543d8a
|
Merge branch 'master' into upstream-merge-30254
|
2017-08-29 22:12:34 -07:00 |
|
|
kevinz000
|
0925cb108b
|
wew
|
2017-08-29 22:09:42 -07:00 |
|
|
kevinz000
|
a0758720ce
|
Merge branch 'master' into upstream-merge-30251
|
2017-08-29 22:06:28 -07:00 |
|
|
kevinz000
|
8530808d72
|
wew
|
2017-08-29 22:06:14 -07:00 |
|
|
kevinz000
|
408acdd66d
|
sync
|
2017-08-29 22:05:16 -07:00 |
|
|
kevinz000
|
175224c5de
|
Merge branch 'master' into upstream-merge-29859
|
2017-08-29 21:14:45 -07:00 |
|
|
kevinz000
|
b9c58a2914
|
wew
|
2017-08-29 21:14:33 -07:00 |
|
|
kevinz000
|
9b71e967d2
|
Merge branch 'master' into upstream-merge-29964
|
2017-08-29 21:07:01 -07:00 |
|
|
kevinz000
|
f9c0c6df3d
|
update master
|
2017-08-29 20:46:38 -07:00 |
|
|
kevinz000
|
41c1f939ab
|
gdi
|
2017-08-29 20:21:41 -07:00 |
|
|
kevinz000
|
92a2ac0ae3
|
soft sync
|
2017-08-29 20:20:11 -07:00 |
|
|
kevinz000
|
61159d6361
|
Merge branch 'master' into upstream-merge-30256
|
2017-08-29 20:17:03 -07:00 |
|
|
kevinz000
|
632fd9771a
|
Merge branch 'master' into upstream-merge-30221
|
2017-08-29 20:16:47 -07:00 |
|
|
kevinz000
|
eebe84681f
|
sync
|
2017-08-29 20:16:25 -07:00 |
|
|
kevinz000
|
705427f05d
|
Merge branch 'master' into upstream-merge-30218
|
2017-08-29 20:15:47 -07:00 |
|
|
kevinz000
|
2b5d584c67
|
sync
|
2017-08-29 20:15:33 -07:00 |
|
|
kevinz000
|
343b508774
|
Merge branch 'master' into upstream-merge-30175
|
2017-08-29 20:14:56 -07:00 |
|
|
kevinz000
|
17f3ce92b6
|
Merge branch 'master' into upstream-merge-29960
|
2017-08-29 20:14:22 -07:00 |
|
|
kevinz000
|
bf5d1fc159
|
sync
|
2017-08-29 20:14:08 -07:00 |
|
|
kevinz000
|
ec2993289e
|
sync
|
2017-08-29 20:07:36 -07:00 |
|
|
kevinz000
|
4faa0d6104
|
Merge branch 'master' into upstream-merge-30244
|
2017-08-29 20:06:07 -07:00 |
|
|
kevinz000
|
76e05ad88e
|
Merge branch 'master' into upstream-merge-30203
|
2017-08-29 20:05:42 -07:00 |
|
|
kevinz000
|
4848a1fbf1
|
Merge branch 'master' into upstream-merge-30259
|
2017-08-29 20:05:25 -07:00 |
|
|
kevinz000
|
9572f4b298
|
Merge branch 'master' into upstream-merge-30098
|
2017-08-29 20:04:55 -07:00 |
|
|
kevinz000
|
2df062f583
|
Merge branch 'master' into upstream-merge-30186
|
2017-08-29 20:04:22 -07:00 |
|
|
kevinz000
|
1dc4e09682
|
Merge branch 'master' into upstream-merge-30250
|
2017-08-29 20:04:01 -07:00 |
|
|
kevinz000
|
1b0bbb8c86
|
Merge branch 'master' into upstream-merge-30113
|
2017-08-29 20:02:14 -07:00 |
|
|
kevinz000
|
3f16272717
|
line endings ree
|
2017-08-29 19:57:58 -07:00 |
|
|
kevinz000
|
8d0c29f9da
|
ok
|
2017-08-29 19:56:27 -07:00 |
|
|
LetterJay
|
0970653382
|
adds missing var preventing guilmon bodymarkings from being displayed
|
2017-08-29 21:26:50 -05:00 |
|
|
LetterJay
|
b2114a7b81
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-08-29 21:19:22 -05:00 |
|
|
CitadelStationBot
|
3e1031d6b9
|
Adds a ghost verb to see all available ghost spawners
|
2017-08-29 17:45:50 -05:00 |
|
|
CitadelStationBot
|
1caba77431
|
Server tools versioning and fix to displayed testmerges
|
2017-08-29 17:16:17 -05:00 |
|
|
CitadelStationBot
|
605963d45c
|
AltClick Improvements
|
2017-08-29 17:15:12 -05:00 |
|
|
CitadelStationBot
|
9c63ab2d39
|
Shadow Walk/New Shadowling movement spell
|
2017-08-29 17:14:07 -05:00 |
|
|
CitadelStationBot
|
719717934c
|
Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it
|
2017-08-29 17:10:59 -05:00 |
|
|
CitadelStationBot
|
4dc8a1adbc
|
Workaround to prevent slippery components from flooding SSgarbage
|
2017-08-29 17:09:53 -05:00 |
|
|
CitadelStationBot
|
5f3775388c
|
Gives cult blades updated item and inhand sprites
|
2017-08-29 17:08:43 -05:00 |
|
|
CitadelStationBot
|
38284056df
|
Fix rare AI tracking bug
|
2017-08-29 17:06:37 -05:00 |
|
|
CitadelStationBot
|
6f013d3d47
|
Stealth Option for RadioactiveMicro
|
2017-08-29 17:05:32 -05:00 |
|
|
CitadelStationBot
|
5bdf18b861
|
Makes playtitlemusic() waitfor = FALSE
|
2017-08-29 17:03:22 -05:00 |
|
|
CitadelStationBot
|
6882163ef6
|
Moves comms settings into a new config file
|
2017-08-29 17:01:16 -05:00 |
|
|
kevinz000
|
7ac45355e1
|
Merge branch 'master' into upstream-merge-30250
|
2017-08-29 10:11:28 -07:00 |
|
|
kevinz000
|
d8e4f44a39
|
Merge branch 'master' into upstream-merge-30175
|
2017-08-29 10:10:23 -07:00 |
|
|
kevinz000
|
f344c5edf2
|
Merge branch 'master' into upstream-merge-30084
|
2017-08-29 10:09:13 -07:00 |
|