LetterJay
|
bdbedd33f4
|
Merge branch 'master' into upstream-merge-26776
|
2017-05-17 05:14:18 -04:00 |
|
CitadelStationBot
|
59b609c79d
|
Reverts favoring empty positions
|
2017-05-15 10:36:56 -05:00 |
|
LetterJay
|
d307da185a
|
Merge pull request #956 from Citadel-Station-13/upstream-merge-27197
[MIRROR] Job assign at roundstart now favors empty positions first
|
2017-05-14 16:26:45 -04:00 |
|
CitadelStationBot
|
abc74c8b06
|
Fixes engraved messages
|
2017-05-14 14:50:49 -05:00 |
|
CitadelStationBot
|
7b0532089f
|
Job assign at roundstart now favors empty positions first
|
2017-05-14 07:34:50 -05:00 |
|
CitadelStationBot
|
ff7125efb6
|
pAI requests now tell ghosts who is making the request. (#900)
|
2017-05-11 18:27:05 -07:00 |
|
LetterJay
|
b7acf503eb
|
rej cleanup
|
2017-05-10 22:35:01 -05:00 |
|
LetterJay
|
3c131800b6
|
Merge pull request #722 from Citadel-Station-13/upstream-merge-26645
[MIRROR] Persistent investigate and game logs separated by round ID
|
2017-05-10 21:12:08 -04:00 |
|
LetterJay
|
57372ebdb0
|
merge
|
2017-05-10 19:41:55 -05:00 |
|
CitadelStationBot
|
1e1e0f7f6e
|
More /vg/lighting tweaks (#884)
|
2017-05-10 16:11:22 -07:00 |
|
kevinz000
|
48d9e2e349
|
fixes rejects
|
2017-05-07 22:24:26 -07:00 |
|
kevinz000
|
5d2f131d07
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26822
|
2017-05-07 22:22:24 -07:00 |
|
LetterJay
|
1bb43eb7ae
|
woo
|
2017-05-05 10:21:53 -05:00 |
|
LetterJay
|
d0e6790993
|
Merge pull request #761 from kevinz000/patch-3
Switches off flightsuit processing because lag
|
2017-05-05 10:20:39 -05:00 |
|
LetterJay
|
caaf0fc2ee
|
Merge pull request #698 from Citadel-Station-13/upstream-merge-25743
[MIRROR] Holocalls
|
2017-05-05 10:19:28 -05:00 |
|
LetterJay
|
91f3059be1
|
Merge pull request #693 from Citadel-Station-13/upstream-merge-26722
[MIRROR] Moves tips from config to strings tree
|
2017-05-05 09:33:45 -05:00 |
|
CitadelStationBot
|
56d5e12263
|
Moves languages to a holder datum, gives mind its own language holder
|
2017-05-05 08:13:04 -05:00 |
|
kevinz000
|
e8fe273cc0
|
Update flightpacks.dm
|
2017-05-04 16:07:53 -07:00 |
|
LetterJay
|
d5ade71ea9
|
Merge pull request #706 from Citadel-Station-13/upstream-merge-26745
[MIRROR] Adds persistent trophy cases
|
2017-05-03 22:49:50 -05:00 |
|
CitadelStationBot
|
49990d0c05
|
Persistent investigate and game logs separated by round ID
|
2017-05-02 18:47:58 -05:00 |
|
CitadelStationBot
|
ce302f4fe7
|
Trophy case hotfixes
|
2017-05-02 14:37:11 -05:00 |
|
LetterJay
|
4ecbec1406
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720
|
2017-05-02 11:36:27 -05:00 |
|
LetterJay
|
6310292531
|
woo
|
2017-05-02 11:19:14 -05:00 |
|
LetterJay
|
fd6df15f93
|
Merge branch 'master' into upstream-merge-26131
|
2017-05-02 09:19:49 -05:00 |
|
LetterJay
|
c6e0c95f42
|
heh.
|
2017-05-02 09:17:52 -05:00 |
|
LetterJay
|
fd251eb56a
|
oops
|
2017-05-02 08:43:10 -05:00 |
|
LetterJay
|
f7fe20887a
|
manual merge
|
2017-05-02 08:40:10 -05:00 |
|
LetterJay
|
3b8484b52b
|
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
[MIRROR] Unorphans the blackbox
|
2017-05-02 05:13:49 -05:00 |
|
LetterJay
|
4a6ffec412
|
rej cleanup
|
2017-05-02 04:56:46 -05:00 |
|
CitadelStationBot
|
ea3ee7accc
|
Adds persistent trophy cases
|
2017-05-01 17:31:24 -05:00 |
|
CitadelStationBot
|
36dfc5a4db
|
Holocalls
|
2017-05-01 12:53:40 -05:00 |
|
CitadelStationBot
|
529125d3dd
|
Moves tips from config to strings tree
|
2017-05-01 11:51:27 -05:00 |
|
CitadelStationBot
|
7a4f1496e9
|
Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
|
2017-05-01 07:24:45 -05:00 |
|
LetterJay
|
06bfa8770e
|
Merge branch 'master' into upstream-merge-26129
|
2017-04-29 11:45:37 -05:00 |
|
LetterJay
|
991fb8335c
|
manual merge
|
2017-04-29 11:42:28 -05:00 |
|
LetterJay
|
a39b40d879
|
Merge pull request #578 from Citadel-Station-13/upstream-merge-25981
[MIRROR] Initialize Refactor
|
2017-04-28 09:29:00 -05:00 |
|
LetterJay
|
085b421348
|
rej fixes
|
2017-04-28 09:03:56 -05:00 |
|
LetterJay
|
d34b65da86
|
Merge pull request #610 from Citadel-Station-13/upstream-merge-26612
[MIRROR] Even admin-called shuttles will be affected by alert level
|
2017-04-28 08:19:09 -05:00 |
|
LetterJay
|
4873b565a4
|
Merge pull request #614 from Citadel-Station-13/upstream-merge-26521
[MIRROR] Fixes templates/ruins not updating area list
|
2017-04-28 08:18:31 -05:00 |
|
LetterJay
|
fcb2a3aaf3
|
Merge pull request #586 from Citadel-Station-13/upstream-merge-26570
[MIRROR] Fixes some edges cases in the garbage controller
|
2017-04-28 08:15:34 -05:00 |
|
CitadelStationBot
|
a0c1f979dc
|
Fixes templates/ruins not updating area list
|
2017-04-27 17:02:33 -05:00 |
|
CitadelStationBot
|
57a0e05679
|
Even admin-called shuttles will be affected by alert level
|
2017-04-27 16:55:12 -05:00 |
|
LetterJay
|
0ebbadbe6c
|
Merge pull request #603 from Citadel-Station-13/upstream-merge-26581
[MIRROR] Small fix
|
2017-04-27 12:47:18 -05:00 |
|
CitadelStationBot
|
1f2c0e898e
|
Small fix
|
2017-04-27 09:36:25 -05:00 |
|
CitadelStationBot
|
0d58175118
|
Fixes map rotation with disabled voting
|
2017-04-27 09:20:53 -05:00 |
|
CitadelStationBot
|
1fcfd0338a
|
Fixes some edges cases in the garbage controller
|
2017-04-26 17:44:27 -05:00 |
|
CitadelStationBot
|
08a01aa11b
|
Refactors roundstart checks slightly
|
2017-04-26 17:06:29 -05:00 |
|
CitadelStationBot
|
bde5d6253a
|
Unorphans the blackbox
|
2017-04-26 17:05:23 -05:00 |
|
CitadelStationBot
|
cea81a3357
|
Initialize Refactor
|
2017-04-26 16:03:17 -05:00 |
|
CitadelStationBot
|
a905c15dad
|
Replaces /image with /mutable_appearance (#556)
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
|
2017-04-26 08:18:35 -05:00 |
|