 CitadelStationBot
|
8a221b9637
|
Ports pastries to Initialize
|
2017-05-03 05:55:15 -05:00 |
|
|
LetterJay
|
2926b7e8b1
|
Merge pull request #723 from Citadel-Station-13/revert-690-upstream-merge-26739
Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts"
|
2017-05-02 20:03:13 -05:00 |
|
|
CitadelStationBot
|
121df4527b
|
Automatic changelog generation for PR #685 [ci skip]
|
2017-05-02 19:04:29 -05:00 |
|
|
LetterJay
|
9ef6e00ccc
|
Merge pull request #685 from Citadel-Station-13/upstream-merge-26735
[MIRROR] Fixes the 'stuffed legion' recipie
|
2017-05-02 19:04:28 -05:00 |
|
|
LetterJay
|
007281a51c
|
Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts"
|
2017-05-02 18:53:59 -05:00 |
|
|
LetterJay
|
8ab3f4fe39
|
Travis
|
2017-05-02 18:51:06 -05:00 |
|
|
LetterJay
|
0cb4d54194
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26735
|
2017-05-02 18:49:35 -05:00 |
|
|
LetterJay
|
368a2e82c1
|
Merge pull request #709 from Citadel-Station-13/upstream-merge-26762
[MIRROR] Fixes cult datum giving the action button to the mind instead of mob
|
2017-05-02 18:47:55 -05:00 |
|
|
CitadelStationBot
|
5edd88cd07
|
Automatic changelog generation for PR #705 [ci skip]
|
2017-05-02 18:47:24 -05:00 |
|
|
LetterJay
|
92f96986b9
|
Merge pull request #705 from Citadel-Station-13/upstream-merge-26743
[MIRROR] Fixes Biogenerator
|
2017-05-02 18:47:23 -05:00 |
|
|
LetterJay
|
84db006ea9
|
Merge pull request #711 from Citadel-Station-13/upstream-merge-26799
[MIRROR] Fixes cult and clockcult icons
|
2017-05-02 18:46:38 -05:00 |
|
|
LetterJay
|
337e9ca937
|
Merge pull request #715 from Citadel-Station-13/upstream-merge-26769
[MIRROR] Fixes proximity sensors not tracking correctly
|
2017-05-02 18:45:21 -05:00 |
|
|
CitadelStationBot
|
c6f4d299f2
|
Automatic changelog generation for PR #699 [ci skip]
|
2017-05-02 18:44:55 -05:00 |
|
|
LetterJay
|
91cb42cf60
|
Merge pull request #699 from Citadel-Station-13/upstream-merge-26556
[MIRROR] Saline-glucose changes
|
2017-05-02 18:44:53 -05:00 |
|
|
LetterJay
|
8a5c180dd3
|
Update recipes_misc.dm
|
2017-05-02 13:41:10 -05:00 |
|
|
LetterJay
|
a57190b9c5
|
Merge pull request #694 from Citadel-Station-13/upstream-merge-26708
[MIRROR] Ore redemption machine cleanup
|
2017-05-02 12:26:28 -05:00 |
|
|
LetterJay
|
1eb0617037
|
Merge pull request #692 from Citadel-Station-13/upstream-merge-26738
[MIRROR] Small fixes to spatial gateways
|
2017-05-02 12:24:53 -05:00 |
|
|
CitadelStationBot
|
4a914a5e67
|
Automatic changelog generation for PR #718 [ci skip]
|
2017-05-02 12:24:26 -05:00 |
|
|
LetterJay
|
fe5e1db512
|
Merge pull request #718 from Citadel-Station-13/upstream-merge-26765
[MIRROR] Makes golems able to transfer into empty shells
|
2017-05-02 12:24:24 -05:00 |
|
|
LetterJay
|
4412b68e26
|
Merge pull request #680 from Citadel-Station-13/upstream-merge-26720
[MIRROR] Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
|
2017-05-02 11:45:14 -05:00 |
|
|
LetterJay
|
4e620e54e6
|
fix
|
2017-05-02 11:38:06 -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
|
c62fc3886a
|
Merge pull request #671 from Citadel-Station-13/upstream-merge-26715
[MIRROR] [FUN REMOVAL] Makes fire not able to become ice.
|
2017-05-02 11:18:05 -05:00 |
|
|
LetterJay
|
818940cbc3
|
Merge pull request #645 from Citadel-Station-13/upstream-merge-26598
[MIRROR] Cult Construct Non-Balance Update
|
2017-05-02 11:16:12 -05:00 |
|
|
CitadelStationBot
|
85c9b40ede
|
Automatic changelog generation for PR #641 [ci skip]
|
2017-05-02 11:15:55 -05:00 |
|
|
LetterJay
|
73b105ffe6
|
Merge pull request #641 from Citadel-Station-13/upstream-merge-26541
[MIRROR] Gives Backup Shuttle Lighting and Fixes Auxiliary Tool Storage Plating on Delta
|
2017-05-02 11:15:54 -05:00 |
|
|
LetterJay
|
b4782e24af
|
Merge pull request #636 from Citadel-Station-13/upstream-merge-26594
[MIRROR] Blood Cult removals and tweaks
|
2017-05-02 11:15:14 -05:00 |
|
|
LetterJay
|
2abd7da7c4
|
Merge pull request #628 from Citadel-Station-13/upstream-merge-26642
[MIRROR] Fixes Linux buildscript chime when server ready
|
2017-05-02 11:14:56 -05:00 |
|
|
LetterJay
|
2bef665038
|
Merge pull request #613 from Citadel-Station-13/upstream-merge-26563
[MIRROR] Renames generic armor and athletic shorts
|
2017-05-02 11:14:47 -05:00 |
|
|
CitadelStationBot
|
284fc2f43a
|
Automatic changelog generation for PR #602 [ci skip]
|
2017-05-02 11:14:15 -05:00 |
|
|
LetterJay
|
159f7f8d90
|
Merge pull request #602 from Citadel-Station-13/upstream-merge-26373
[MIRROR] Fixes being unable to empty an emagged cloning pod via manual ejection.
|
2017-05-02 11:14:14 -05:00 |
|
|
CitadelStationBot
|
e4c4176874
|
Automatic changelog generation for PR #591 [ci skip]
|
2017-05-02 11:10:15 -05:00 |
|
|
LetterJay
|
8af590f075
|
Merge pull request #591 from Citadel-Station-13/upstream-merge-26601
[MIRROR] When jumpsuits take severe damage, their suit sensors break.
|
2017-05-02 11:10:13 -05:00 |
|
|
CitadelStationBot
|
25f1b24f62
|
Makes golems able to transfer into empty shells
|
2017-05-02 10:00:33 -05:00 |
|
|
CitadelStationBot
|
913a0c7c7f
|
Fixes proximity sensors not tracking correctly
|
2017-05-02 09:55:15 -05:00 |
|
|
LetterJay
|
587043f1e8
|
pls
|
2017-05-02 09:44:19 -05:00 |
|
|
LetterJay
|
d1cfd21e26
|
Merge pull request #580 from Citadel-Station-13/upstream-merge-26131
[MIRROR] Refactors roundstart checks slightly
|
2017-05-02 09:36:15 -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
|
a8e6de5795
|
manual merge
|
2017-05-02 05:06:13 -05:00 |
|
|
LetterJay
|
4a6ffec412
|
rej cleanup
|
2017-05-02 04:56:46 -05:00 |
|
|
LetterJay
|
7ab8ee8cae
|
Merge pull request #581 from Citadel-Station-13/upstream-merge-26524
[MIRROR] Admin proc calls are now serialized per admin
|
2017-05-02 04:51:43 -05:00 |
|
|
LetterJay
|
d3850bde68
|
Merge pull request #691 from Citadel-Station-13/upstream-merge-26740
[MIRROR] Port SM shards to initialize
|
2017-05-02 03:04:54 -05:00 |
|
|
LetterJay
|
9036e8c63a
|
Merge pull request #690 from Citadel-Station-13/upstream-merge-26739
[MIRROR] You can no longer queue up ahelps by queing up prompts
|
2017-05-02 03:04:37 -05:00 |
|
|
CitadelStationBot
|
596a4e5a9c
|
Automatic changelog generation for PR #689 [ci skip]
|
2017-05-02 03:04:26 -05:00 |
|
|
LetterJay
|
e4bb3ebfb7
|
Merge pull request #689 from Citadel-Station-13/upstream-merge-25603
[MIRROR] Gaining Vanguard will remove existing stuns
|
2017-05-02 03:04:25 -05:00 |
|