 kevinz000
|
17142cc247
|
Merge pull request #2530
|
2017-08-29 22:39:57 -07:00 |
|
|
kevinz000
|
f70fd6a980
|
Merge pull request #2536
|
2017-08-29 22:39:54 -07:00 |
|
|
kevinz000
|
039aea1724
|
Merge pull request #2541
|
2017-08-29 22:39:48 -07:00 |
|
|
kevinz000
|
00362331d3
|
Merge pull request #2543
|
2017-08-29 22:39:43 -07:00 |
|
|
kevinz000
|
7239a44ef1
|
Merge pull request #2545
|
2017-08-29 22:39:08 -07:00 |
|
|
kevinz000
|
d4c23fdcd1
|
Merge pull request #2546
|
2017-08-29 22:39:06 -07:00 |
|
|
kevinz000
|
7c7da67169
|
Merge pull request #2547
|
2017-08-29 22:39:03 -07:00 |
|
|
kevinz000
|
44c3aecb3b
|
Merge pull request #2549
|
2017-08-29 22:38:57 -07:00 |
|
|
kevinz000
|
f982cd1d5a
|
Merge pull request #2550
|
2017-08-29 22:38:54 -07:00 |
|
|
kevinz000
|
e7a3586ab4
|
Merge pull request #2464
|
2017-08-29 22:27:30 -07:00 |
|
|
kevinz000
|
0f37872fb5
|
Merge pull request #2463
|
2017-08-29 22:27:27 -07:00 |
|
|
kevinz000
|
2cce781728
|
Merge pull request #2430
|
2017-08-29 22:27:24 -07:00 |
|
|
kevinz000
|
9cb65df70d
|
Merge pull request #2426
|
2017-08-29 22:27:21 -07:00 |
|
|
kevinz000
|
4b32cf2e0f
|
Merge pull request #2415
|
2017-08-29 22:27:15 -07:00 |
|
|
kevinz000
|
5c7b743cfa
|
Merge pull request #2405
|
2017-08-29 22:27:10 -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
|
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
|
4faa0d6104
|
Merge branch 'master' into upstream-merge-30244
|
2017-08-29 20:06:07 -07:00 |
|
|
kevinz000
|
9572f4b298
|
Merge branch 'master' into upstream-merge-30098
|
2017-08-29 20:04:55 -07:00 |
|
|
kevinz000
|
1dc4e09682
|
Merge branch 'master' into upstream-merge-30250
|
2017-08-29 20:04:01 -07: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
|
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 |
|
|
kevinz000
|
df24243113
|
pentawew
|
2017-08-29 10:04:39 -07:00 |
|
|
kevinz000
|
e4ae2c8021
|
wew
|
2017-08-29 09:44:30 -07:00 |
|
|
kevinz000
|
911e1fa194
|
sync
|
2017-08-29 09:43:10 -07:00 |
|
|
kevinz000
|
301a581e64
|
sync
|
2017-08-29 09:41:11 -07:00 |
|
|
CitadelStationBot
|
b753909958
|
Cult ghosts can no longer be potentially deconverted or debrained
|
2017-08-29 10:25:31 -05:00 |
|
|
CitadelStationBot
|
54c68decde
|
Fixes clowns blowing shit up not being logged 50% of the time
|
2017-08-29 09:32:06 -05:00 |
|
|
LetterJay
|
292f5d5d35
|
Update boxes.dm
|
2017-08-29 01:46:21 -05:00 |
|
|
CitadelStationBot
|
f191f5c827
|
Fixes ingredients-box sprite.
|
2017-08-28 14:39:03 -05:00 |
|
|
LetterJay
|
6c76ae2395
|
clean up
|
2017-08-28 10:34:31 -05:00 |
|
|
LetterJay
|
b39bd24aaa
|
Merge branch 'master' into upstream-merge-30218
|
2017-08-28 09:03:46 -05:00 |
|
|
LetterJay
|
472e39693f
|
Update allinone.dm
|
2017-08-28 09:02:35 -05:00 |
|
|
LetterJay
|
27750d91d6
|
Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214
[MIRROR] Removes the suppose-to-be unused shuttle wall path
|
2017-08-28 09:01:47 -05:00 |
|
|
LetterJay
|
792c509827
|
Merge pull request #2526 from Citadel-Station-13/upstream-merge-30200
[MIRROR] Fixes survival_pods being a valid_territory for gangs sprays & dominations/blob takeovers/cult summons/ect
|
2017-08-28 09:01:06 -05:00 |
|