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
4faa0d6104
Merge branch 'master' into upstream-merge-30244
2017-08-29 20:06:07 -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
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
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
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
LetterJay
47aa97b847
Merge pull request #2523 from Citadel-Station-13/upstream-merge-30207
...
[MIRROR] Adds separate log for sql errors with no config check
2017-08-28 09:00:19 -05:00
LetterJay
e34367c41b
Merge pull request #2521 from Citadel-Station-13/upstream-merge-30225
...
[MIRROR] Switched dirtystation to use typecaches for checks
2017-08-28 08:57:52 -05:00
LetterJay
3a8cf01e65
Merge pull request #2520 from Citadel-Station-13/upstream-merge-30231
...
[MIRROR] Adds logging cause of microbomb activation in admin logs
2017-08-28 08:57:36 -05:00
LetterJay
02ba44a8eb
Merge pull request #2505 from Citadel-Station-13/upstream-merge-30169
...
[MIRROR] Allows disabling shuttle purchases per map.
2017-08-28 08:56:33 -05:00
LetterJay
a17ed054d6
Merge pull request #2503 from Citadel-Station-13/upstream-merge-30172
...
[MIRROR] Maintains that weird entire-tcomms-setup-in-one-machine thing
2017-08-28 08:56:11 -05:00
LetterJay
2fe2912fa3
Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173
...
[MIRROR] Traitor, a traitor is a traitor.
2017-08-28 08:46:53 -05:00
CitadelStationBot
12ff0e7406
Removes the suppose-to-be unused shuttle wall path
2017-08-28 02:20:45 -05:00
CitadelStationBot
2d4bd6f6f0
Fixes survival_pods being a valid_territory for gangs sprays & dominations/blob takeovers/cult summons/ect
2017-08-28 02:20:30 -05:00
CitadelStationBot
ed1a06a9ed
Adds separate log for sql errors with no config check
2017-08-28 02:20:16 -05:00
CitadelStationBot
0a4efdcc8f
Switched dirtystation to use typecaches for checks
2017-08-28 02:20:06 -05:00
CitadelStationBot
bdf2fff8d9
Adds logging cause of microbomb activation in admin logs
2017-08-28 02:19:59 -05:00
CitadelStationBot
94429bdccc
Cleaned up environment_smash vars with bitflag defines ( #2515 )
2017-08-27 05:55:07 -07:00
CitadelStationBot
4c4bd22578
[MIRROR] Some more tweaks to Geis ( #2487 )
...
fixes clockcult conversion being :b:roken, as well as some geis tweaks that you won't care about
2017-08-27 01:36:17 -07:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
CitadelStationBot
94400c4d38
Allows disabling shuttle purchases per map.
2017-08-26 11:08:12 -05:00
CitadelStationBot
18904f2f0f
Maintains that weird entire-tcomms-setup-in-one-machine thing
2017-08-26 11:08:01 -05:00
CitadelStationBot
3a6a277f08
Traitor, a traitor is a traitor.
2017-08-26 11:07:24 -05:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
