 kevinz000
|
ec752aabb4
|
curator --> librarian
|
2017-05-07 22:33:39 -07:00 |
|
|
kevinz000
|
335b6cde56
|
Merge branch 'master' into upstream-merge-26813
|
2017-05-07 22:31:16 -07:00 |
|
|
kevinz000
|
a87cee8a05
|
copy-paste-this-from-tg
|
2017-05-07 22:30:43 -07:00 |
|
|
kevinz000
|
68f7ea7fd0
|
handled rejects
|
2017-05-07 22:30:28 -07:00 |
|
|
kevinz000
|
2e0dd27978
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813
|
2017-05-07 22:28:00 -07:00 |
|
|
kevinz000
|
066c8e8de8
|
Merge pull request #720 from Citadel-Station-13/upstream-merge-26822
[MIRROR] Trophy case hotfixes
|
2017-05-07 22:27:05 -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 |
|
|
CitadelStationBot
|
67742f6f8d
|
Automatic changelog generation for PR #829 [ci skip]
|
2017-05-07 21:39:25 -05:00 |
|
|
kevinz000
|
30934570b8
|
Merge pull request #829 from Citadel-Station-13/upstream-merge-26988
[MIRROR] Corrects Baseturfs from Lava to Space
|
2017-05-07 19:39:24 -07:00 |
|
|
CitadelStationBot
|
023ee52e52
|
Automatic changelog generation for PR #676 [ci skip]
|
2017-05-07 21:37:36 -05:00 |
|
|
kevinz000
|
13b0ae2b45
|
Merge pull request #676 from Citadel-Station-13/upstream-merge-26725
[MIRROR] Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass
|
2017-05-07 19:37:35 -07:00 |
|
|
kevinz000
|
03a52b2bc9
|
Merge pull request #836 from Citadel-Station-13/upstream-merge-26984
[MIRROR] Fixes clockwork obelisk logic
|
2017-05-07 19:21:56 -07:00 |
|
|
kevinz000
|
e3f123d5bb
|
Merge pull request #821 from Citadel-Station-13/upstream-merge-26970
[MIRROR] Fixes an inconsistency with the Banana Honk drink
|
2017-05-07 19:19:44 -07:00 |
|
|
kevinz000
|
68e1087825
|
Merge pull request #823 from Citadel-Station-13/upstream-merge-26959
[MIRROR] Mega arachnid
|
2017-05-07 19:17:10 -07:00 |
|
|
kevinz000
|
6c293e3e3d
|
Merge pull request #716 from Citadel-Station-13/upstream-merge-26768
[MIRROR] Species-locked inventory slots are now indicated.
|
2017-05-07 19:15:02 -07:00 |
|
|
kevinz000
|
eb9caea261
|
Merge pull request #658 from Citadel-Station-13/upstream-merge-26670
[MIRROR] The least surprising nerf: Null Crates & Emagged Plasma Export Bonus
|
2017-05-07 19:14:06 -07:00 |
|
|
kevinz000
|
2f55a67b7a
|
Delete packs.dm.rej
|
2017-05-07 19:13:39 -07:00 |
|
|
kevinz000
|
18abfb70c9
|
Update packs.dm
|
2017-05-07 19:13:29 -07:00 |
|
|
kevinz000
|
2a8acb13d2
|
Merge pull request #840 from Citadel-Station-13/upstream-merge-26966
[MIRROR] Fixes being able to stand on chasms
|
2017-05-07 19:07:59 -07:00 |
|
|
kevinz000
|
09dbd467bb
|
Merge pull request #820 from Citadel-Station-13/upstream-merge-26976
[MIRROR] Fixes away gateway
|
2017-05-07 19:07:41 -07:00 |
|
|
CitadelStationBot
|
c91aa2e66e
|
Automatic changelog generation for PR #841 [ci skip]
|
2017-05-07 21:06:31 -05:00 |
|
|
kevinz000
|
cab4c53f06
|
Merge pull request #841 from Citadel-Station-13/upstream-merge-26940
[MIRROR] Plastic sheet production - Chemistry recipe
|
2017-05-07 19:06:30 -07:00 |
|
|
CitadelStationBot
|
3e593c4f7d
|
Automatic changelog generation for PR #824 [ci skip]
|
2017-05-07 21:05:51 -05:00 |
|
|
kevinz000
|
cb77797bd5
|
Merge pull request #824 from Citadel-Station-13/upstream-merge-26290
[MIRROR] Add watertank, shower, sink to mining station and gulag
|
2017-05-07 19:05:50 -07:00 |
|
|
kevinz000
|
bdbc1ecb5c
|
no admins txt changing
|
2017-05-07 19:05:19 -07:00 |
|
|
LetterJay
|
be3a06e801
|
Merge pull request #843 from Citadel-Station-13/revert-767-upstream-merge-26876
Revert "[MIRROR] Fixes say verbs not working"
|
2017-05-07 19:49:47 -04:00 |
|
|
LetterJay
|
2efe90055f
|
Revert "[MIRROR] Fixes say verbs not working"
|
2017-05-07 19:41:33 -04:00 |
|
|
CitadelStationBot
|
61a7897962
|
Plastic sheet production - Chemistry recipe
|
2017-05-07 18:23:05 -05:00 |
|
|
CitadelStationBot
|
884338d048
|
Fixes being able to stand on chasms
|
2017-05-07 18:06:44 -05:00 |
|
|
CitadelStationBot
|
e3b3921bf2
|
Fixes clockwork obelisk logic
|
2017-05-07 17:15:22 -05:00 |
|
|
CitadelStationBot
|
a69b9c1b18
|
Corrects Baseturfs from Lava to Space
|
2017-05-07 17:01:36 -05:00 |
|
|
CitadelStationBot
|
dc7dbc5ec9
|
Automatic changelog generation for PR #827 [ci skip]
|
2017-05-07 15:41:33 -05:00 |
|
|
LetterJay
|
75ca44a767
|
Merge pull request #827 from LetterJay/snap
Snap Emote
|
2017-05-07 15:41:32 -05:00 |
|
|
kevinz000
|
482ac95873
|
Merge pull request #822 from Citadel-Station-13/upstream-merge-26987
[MIRROR] Sigils of Transgression are brighter
|
2017-05-07 13:07:14 -07:00 |
|
|
CitadelStationBot
|
92f8a8b1b0
|
Automatic changelog generation for PR #825 [ci skip]
|
2017-05-07 14:59:11 -05:00 |
|
|
kevinz000
|
78d64cbeed
|
Merge pull request #825 from Citadel-Station-13/upstream-merge-26941
[MIRROR] C4 planting takes 3 seconds, down from 5
|
2017-05-07 12:59:10 -07:00 |
|
|
kevinz000
|
0d0cebb1fd
|
Merge pull request #826 from Citadel-Station-13/upstream-merge-26938
[MIRROR] Fixes his grace CtrlClick
|
2017-05-07 12:58:57 -07:00 |
|
|
LetterJay
|
659139ca1c
|
finger snap emote
|
2017-05-07 12:41:45 -05:00 |
|
|
LetterJay
|
1410fbc19c
|
Merge branch 'master' of https://github.com/LetterJay/Citadel-Station-13
|
2017-05-07 11:52:25 -05:00 |
|
|
CitadelStationBot
|
1a5050692b
|
Fixes his grace CtrlClick
|
2017-05-07 11:33:55 -05:00 |
|
|
CitadelStationBot
|
b0cceb8766
|
C4 planting takes 3 seconds, down from 5
|
2017-05-07 09:31:51 -05:00 |
|
|
kevinz000
|
cd95e42b69
|
Merge pull request #753 from Citadel-Station-13/upstream-merge-26870
[MIRROR] Adds an effect to Mending Mantra to show who is chanting it
|
2017-05-07 07:08:06 -07:00 |
|
|
CitadelStationBot
|
d8d49803b7
|
Add watertank, shower, sink to mining station and gulag
|
2017-05-07 08:59:19 -05:00 |
|
|
CitadelStationBot
|
617bb4ed38
|
Mega arachnid
|
2017-05-07 08:55:11 -05:00 |
|
|
CitadelStationBot
|
281f382605
|
Sigils of Transgression are brighter
|
2017-05-07 08:54:06 -05:00 |
|
|
CitadelStationBot
|
27e7434320
|
Fixes an inconsistency with the Banana Honk drink
|
2017-05-07 08:54:02 -05:00 |
|
|
CitadelStationBot
|
164b830f23
|
Fixes away gateway
|
2017-05-07 08:52:57 -05:00 |
|
|
CitadelStationBot
|
086ea81785
|
Automatic changelog generation for PR #748 [ci skip]
|
2017-05-07 08:24:51 -05:00 |
|
|
kevinz000
|
d9908a74a7
|
Merge pull request #748 from Citadel-Station-13/upstream-merge-26808
[MIRROR] Adds aesthetic basalt floor tiles
|
2017-05-07 06:24:50 -07:00 |
|