 LetterJayandGitHub
|
2158ea1e67
|
Merge branch 'master' into upstream-merge-28681
|
2017-06-27 05:14:45 -05:00 |
|
|
LetterJayandGitHub
|
8875fbefc5
|
Delete cart.dm.rej
|
2017-06-27 05:12:25 -05:00 |
|
|
LetterJayandGitHub
|
9d6dec8975
|
Update cart.dm
|
2017-06-27 05:12:05 -05:00 |
|
|
LetterJayandGitHub
|
163bcf0189
|
Delete PDA.dm.rej
|
2017-06-27 05:11:20 -05:00 |
|
|
LetterJayandGitHub
|
926589fd58
|
Update PDA.dm
|
2017-06-27 05:11:06 -05:00 |
|
|
LetterJayandGitHub
|
45b6931d9b
|
Update computer.dm
|
2017-06-27 00:28:52 -05:00 |
|
|
CitadelStationBot
|
07599125ef
|
Automatic changelog generation for PR #1790 [ci skip]
|
2017-06-27 00:27:48 -05:00 |
|
|
LetterJayandGitHub
|
95a77e9dc1
|
Merge pull request #1790 from Citadel-Station-13/upstream-merge-28831
[MIRROR] Fix modular consoles
|
2017-06-27 00:27:47 -05:00 |
|
|
CitadelStationBot
|
3d1b8be7ce
|
Automatic changelog generation for PR #1728 [ci skip]
|
2017-06-26 23:37:03 -05:00 |
|
|
LetterJayandGitHub
|
fdf216bf48
|
Merge pull request #1728 from Citadel-Station-13/upstream-merge-28645
[MIRROR] Adds custom lighting support to modular computers, and a flashlight to tablets
|
2017-06-26 23:37:01 -05:00 |
|
|
LetterJayandGitHub
|
b79fdf0839
|
Delete tgstation.dme.rej
|
2017-06-26 23:21:33 -05:00 |
|
|
LetterJay
|
ccf4306224
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-06-26 23:19:54 -05:00 |
|
|
LetterJay
|
e2ccf1f52f
|
rej cleanup
|
2017-06-26 23:19:17 -05:00 |
|
|
LetterJayandGitHub
|
039dcb464f
|
Delete tgui.js.rej
|
2017-06-26 23:18:08 -05:00 |
|
|
LetterJayandGitHub
|
b44d1d721b
|
Update tgui.js
|
2017-06-26 23:15:48 -05:00 |
|
|
LetterJayandGitHub
|
8022bc9046
|
Merge pull request #1792 from Citadel-Station-13/upstream-merge-28752
[MIRROR] Replaces old midi2piano with a new version
|
2017-06-26 23:04:18 -05:00 |
|
|
CitadelStationBot
|
d99ccf36a2
|
Replaces old midi2piano with a new version
|
2017-06-26 22:06:15 -05:00 |
|
|
CitadelStationBot
|
d97bb2d85d
|
Fix modular consoles
|
2017-06-26 22:02:01 -05:00 |
|
|
LetterJayandGitHub
|
bd0f0c794b
|
Merge pull request #1789 from Citadel-Station-13/upstream-merge-28822
[MIRROR] Fixes the Hierophant's walls runtiming
|
2017-06-26 21:17:16 -05:00 |
|
|
LetterJayandGitHub
|
89b2b47a83
|
Merge pull request #1788 from Citadel-Station-13/upstream-merge-28821
[MIRROR] Fixes PAIs deleting their card on death
|
2017-06-26 21:17:05 -05:00 |
|
|
CitadelStationBot
|
0f23003c2f
|
Fixes the Hierophant's walls runtiming
|
2017-06-26 15:59:25 -05:00 |
|
|
CitadelStationBot
|
abeac9d2ae
|
Fixes PAIs deleting their card on death
|
2017-06-26 15:55:15 -05:00 |
|
|
LetterJayandGitHub
|
ba2e896d8c
|
Merge pull request #1719 from Citadel-Station-13/upstream-merge-28636
[MIRROR] Fixes random runtime
|
2017-06-26 10:53:07 -05:00 |
|
|
CitadelStationBot
|
2434b27582
|
Automatic changelog generation for PR #1744 [ci skip]
|
2017-06-26 10:52:23 -05:00 |
|
|
LetterJayandGitHub
|
914434891a
|
Merge pull request #1744 from Citadel-Station-13/upstream-merge-28685
[MIRROR] Fixes the sprite for the nullrod clown dagger skin
|
2017-06-26 10:52:21 -05:00 |
|
|
CitadelStationBot
|
718aa79f50
|
Automatic changelog generation for PR #1768 [ci skip]
|
2017-06-26 10:51:53 -05:00 |
|
|
LetterJayandGitHub
|
090b8b5055
|
Merge pull request #1768 from Citadel-Station-13/upstream-merge-28740
[MIRROR] Station Engineers Spawn With Industrial Welder
|
2017-06-26 10:51:51 -05:00 |
|
|
LetterJayandGitHub
|
edcadfe83e
|
Merge pull request #1787 from Citadel-Station-13/upstream-merge-28765
[MIRROR] Small jungle trees
|
2017-06-26 10:10:34 -05:00 |
|
|
LetterJayandGitHub
|
a076b8c54d
|
Merge pull request #1786 from Citadel-Station-13/upstream-merge-28814
[MIRROR] Fixes the AI core being flammable
|
2017-06-26 10:10:17 -05:00 |
|
|
LetterJayandGitHub
|
9803f24547
|
Merge pull request #1785 from Citadel-Station-13/upstream-merge-28760
[MIRROR] Adds some neat tiles and walls for use on lavaland
|
2017-06-26 10:10:00 -05:00 |
|
|
LetterJayandGitHub
|
89fc77521e
|
Merge pull request #1784 from Citadel-Station-13/upstream-merge-28770
[MIRROR] Fixes piggybacking giving person on top projectile density instead of the person on the bottom.
|
2017-06-26 10:09:34 -05:00 |
|
|
CitadelStationBot
|
90c1542e4b
|
Automatic changelog generation for PR #1783 [ci skip]
|
2017-06-26 10:09:18 -05:00 |
|
|
LetterJayandGitHub
|
28cd2d6164
|
Merge pull request #1783 from Citadel-Station-13/upstream-merge-28644
[MIRROR] Ninja Dash
|
2017-06-26 10:09:16 -05:00 |
|
|
CitadelStationBot
|
b16aa00517
|
Small jungle trees
|
2017-06-26 09:42:52 -05:00 |
|
|
CitadelStationBot
|
10f3b3db50
|
Fixes the AI core being flammable
|
2017-06-26 09:38:44 -05:00 |
|
|
CitadelStationBot
|
ac33b9defb
|
Adds some neat tiles and walls for use on lavaland
|
2017-06-26 09:19:17 -05:00 |
|
|
CitadelStationBot
|
06e536de4f
|
Fixes piggybacking giving person on top projectile density instead of the person on the bottom.
|
2017-06-26 09:01:53 -05:00 |
|
|
LetterJayandGitHub
|
028752c3de
|
Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564
[MIRROR] Shuttle engines affecting travel time
|
2017-06-26 09:00:54 -05:00 |
|
|
CitadelStationBot
|
5cf2065432
|
Ninja Dash
|
2017-06-26 08:57:46 -05:00 |
|
|
LetterJayandGitHub
|
165e684e9b
|
Update shuttle.dm
|
2017-06-26 08:01:38 -05:00 |
|
|
LetterJayandGitHub
|
61a8d76122
|
Update shuttle.dm
|
2017-06-26 06:36:09 -05:00 |
|
|
LetterJay
|
7d7078e7a6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-06-26 06:32:33 -05:00 |
|
|
LetterJay
|
a4526e8c39
|
cerestation.dmm
|
2017-06-26 06:32:22 -05:00 |
|
|
CitadelStationBot
|
37aba60771
|
Automatic changelog generation for PR #1772 [ci skip]
|
2017-06-26 06:28:23 -05:00 |
|
|
LetterJayandGitHub
|
46c3108267
|
Merge pull request #1772 from Citadel-Station-13/upstream-merge-28749
[MIRROR] Exporting mechs!
|
2017-06-26 06:28:22 -05:00 |
|
|
CitadelStationBot
|
f4172fe029
|
Automatic changelog generation for PR #1778 [ci skip]
|
2017-06-26 06:26:47 -05:00 |
|
|
LetterJayandGitHub
|
d3c2f5aee6
|
Merge pull request #1778 from Citadel-Station-13/upstream-merge-28766
[MIRROR] Robotic legs are not weak to glass shards
|
2017-06-26 06:26:46 -05:00 |
|
|
LetterJayandGitHub
|
ec966f6814
|
Merge pull request #1779 from Citadel-Station-13/upstream-merge-28750
[MIRROR] Makes goonchat robust.
|
2017-06-26 06:26:11 -05:00 |
|
|
LetterJayandGitHub
|
e3b1838e63
|
Merge pull request #1697 from Citadel-Station-13/upstream-merge-28600
[MIRROR] Adds a heavily-damaged ripley as a lavaland ruin
|
2017-06-26 06:24:31 -05:00 |
|
|
CitadelStationBot
|
2552a1715f
|
Automatic changelog generation for PR #1649 [ci skip]
|
2017-06-26 06:23:26 -05:00 |
|