 CitadelStationBot
|
9e90d582e5
|
Fixes dummy unequip runtimes.
|
2017-08-31 08:39:56 -05:00 |
|
|
kevinz000
|
28ea6f3ad2
|
Merge pull request #2499
|
2017-08-29 22:43:54 -07:00 |
|
|
kevinz000
|
874bad1203
|
Merge pull request #2524
|
2017-08-29 22:40:05 -07:00 |
|
|
kevinz000
|
cf93e511ce
|
Merge pull request #2527
|
2017-08-29 22:40:02 -07:00 |
|
|
kevinz000
|
bd8a9dc435
|
Merge pull request #2528
|
2017-08-29 22:40:00 -07:00 |
|
|
kevinz000
|
fa91df9ef8
|
Merge pull request #2548
|
2017-08-29 22:39:00 -07:00 |
|
|
kevinz000
|
f982cd1d5a
|
Merge pull request #2550
|
2017-08-29 22:38:54 -07:00 |
|
|
kevinz000
|
b340bb0851
|
Merge pull request #2551
|
2017-08-29 22:38:51 -07:00 |
|
|
kevinz000
|
ae59532c0d
|
Merge pull request #2552
|
2017-08-29 22:38:30 -07:00 |
|
|
kevinz000
|
d5296e65a8
|
Merge pull request #2554
|
2017-08-29 22:38:20 -07:00 |
|
|
kevinz000
|
8693a933b4
|
Merge pull request #2482
|
2017-08-29 22:27:42 -07:00 |
|
|
kevinz000
|
b7e74bd3ab
|
Merge pull request #2473
|
2017-08-29 22:27:39 -07:00 |
|
|
kevinz000
|
967dd49261
|
Merge pull request #2467
|
2017-08-29 22:27:36 -07:00 |
|
|
kevinz000
|
9cb65df70d
|
Merge pull request #2426
|
2017-08-29 22:27:21 -07:00 |
|
|
kevinz000
|
7549fb09fa
|
Merge pull request #2416
|
2017-08-29 22:27:19 -07:00 |
|
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
|
kevinz000
|
f344c5edf2
|
Merge branch 'master' into upstream-merge-30084
|
2017-08-29 10:09:13 -07:00 |
|
|
kevinz000
|
301a581e64
|
sync
|
2017-08-29 09:41:11 -07:00 |
|
|
kevinz000
|
064ade469f
|
sync
|
2017-08-29 09:35:55 -07:00 |
|
|
kevinz000
|
88093698f2
|
sync
|
2017-08-29 09:33:37 -07:00 |
|
|
kevinz000
|
80221fa874
|
sync
|
2017-08-29 09:32:40 -07:00 |
|
|
kevinz000
|
498bd61928
|
sync
|
2017-08-29 09:12:56 -07:00 |
|
|
CitadelStationBot
|
3fe08c3cc7
|
Prevents medbeams from crossing themselves
|
2017-08-29 09:50:47 -05:00 |
|
|
CitadelStationBot
|
2ff65a8e39
|
[MIRROR] Lowers the chance for monkeys to become gorillas (#2476)
* Lowers the chance for monkeys to become gorillas
* Delete life.dm.rej
* Update life.dm
|
2017-08-29 00:59:34 -07:00 |
|
|
LetterJay
|
97bee315bf
|
Update living_defense.dm
|
2017-08-29 01:50:46 -05:00 |
|
|
LetterJay
|
6c76ae2395
|
clean up
|
2017-08-28 10:34:31 -05:00 |
|