LetterJay
|
bb916b6040
|
Merge branch 'master' into upstream-merge-28681
|
2017-06-27 06:16:34 -05:00 |
|
LetterJay
|
83fead2492
|
Merge pull request #1673 from Citadel-Station-13/upstream-merge-28567
[MIRROR] Refactors PDA cartridge permissions
|
2017-06-27 06:14:42 -05:00 |
|
LetterJay
|
f85de2ddd5
|
Update PDA_types.dm
|
2017-06-27 05:58:34 -05:00 |
|
LetterJay
|
2158ea1e67
|
Merge branch 'master' into upstream-merge-28681
|
2017-06-27 05:14:45 -05:00 |
|
LetterJay
|
8875fbefc5
|
Delete cart.dm.rej
|
2017-06-27 05:12:25 -05:00 |
|
LetterJay
|
9d6dec8975
|
Update cart.dm
|
2017-06-27 05:12:05 -05:00 |
|
LetterJay
|
163bcf0189
|
Delete PDA.dm.rej
|
2017-06-27 05:11:20 -05:00 |
|
LetterJay
|
926589fd58
|
Update PDA.dm
|
2017-06-27 05:11:06 -05:00 |
|
LetterJay
|
45b6931d9b
|
Update computer.dm
|
2017-06-27 00:28:52 -05:00 |
|
LetterJay
|
95a77e9dc1
|
Merge pull request #1790 from Citadel-Station-13/upstream-merge-28831
[MIRROR] Fix modular consoles
|
2017-06-27 00:27:47 -05:00 |
|
LetterJay
|
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 |
|
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 |
|
CitadelStationBot
|
d97bb2d85d
|
Fix modular consoles
|
2017-06-26 22:02:01 -05:00 |
|
LetterJay
|
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 |
|
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 |
|
LetterJay
|
ba2e896d8c
|
Merge pull request #1719 from Citadel-Station-13/upstream-merge-28636
[MIRROR] Fixes random runtime
|
2017-06-26 10:53:07 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
edcadfe83e
|
Merge pull request #1787 from Citadel-Station-13/upstream-merge-28765
[MIRROR] Small jungle trees
|
2017-06-26 10:10:34 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
LetterJay
|
165e684e9b
|
Update shuttle.dm
|
2017-06-26 08:01:38 -05:00 |
|
LetterJay
|
61a8d76122
|
Update shuttle.dm
|
2017-06-26 06:36:09 -05:00 |
|
LetterJay
|
46c3108267
|
Merge pull request #1772 from Citadel-Station-13/upstream-merge-28749
[MIRROR] Exporting mechs!
|
2017-06-26 06:28:22 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
ec966f6814
|
Merge pull request #1779 from Citadel-Station-13/upstream-merge-28750
[MIRROR] Makes goonchat robust.
|
2017-06-26 06:26:11 -05:00 |
|
LetterJay
|
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 |
|
LetterJay
|
260ee23be8
|
Merge pull request #1649 from Citadel-Station-13/upstream-merge-28490
[MIRROR] The Hierophant is a little less chaotic and murdery on average
|
2017-06-26 06:23:25 -05:00 |
|
LetterJay
|
77295c30d4
|
Merge pull request #1695 from Citadel-Station-13/upstream-merge-28599
[MIRROR] Disablers now have an in-hand sprite (Fixes #28582)
|
2017-06-26 06:21:50 -05:00 |
|
LetterJay
|
75339a25c4
|
Merge pull request #1781 from Citadel-Station-13/upstream-merge-28782
[MIRROR] Improves Ahelp feedback
|
2017-06-26 06:19:03 -05:00 |
|
LetterJay
|
2fc5c3785a
|
Merge pull request #1782 from Citadel-Station-13/upstream-merge-28789
[MIRROR] Fixes resin attack message
|
2017-06-26 06:18:36 -05:00 |
|
LetterJay
|
49e1c3f2b6
|
Merge pull request #1689 from Citadel-Station-13/upstream-merge-28591
[MIRROR] Changes tooltip verbs to be on preferences tab
|
2017-06-26 06:15:45 -05:00 |
|
LetterJay
|
d138c56781
|
Merge pull request #1664 from Citadel-Station-13/upstream-merge-28505
[MIRROR] Vending machines accept space cash.
|
2017-06-26 06:15:19 -05:00 |
|
LetterJay
|
f1937eb1fc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-06-26 06:14:55 -05:00 |
|
LetterJay
|
5571cca37c
|
.rej cleanup
|
2017-06-26 06:14:42 -05:00 |
|
LetterJay
|
faa0849b4b
|
Merge pull request #1663 from Citadel-Station-13/upstream-merge-28573
[MIRROR] Alien closets now correctly cost two alloy to make (Fixes #28561)
|
2017-06-26 06:13:59 -05:00 |
|
LetterJay
|
43d4a06266
|
Merge pull request #1662 from Citadel-Station-13/upstream-merge-28543
[MIRROR] Fixes crusher trophies not properly being added
|
2017-06-26 06:13:46 -05:00 |
|
LetterJay
|
89bc574cb9
|
Merge pull request #1761 from Citadel-Station-13/upstream-merge-28708
[MIRROR] Robotic legs let you use pockets without a jumpsuit, robotic chest lets you wear an ID/belt without jumpsuit
|
2017-06-26 06:13:26 -05:00 |
|
LetterJay
|
68c45f5569
|
Merge pull request #1661 from Citadel-Station-13/upstream-merge-28539
[MIRROR] Runes now innately support doing damage to their invokers
|
2017-06-26 06:07:53 -05:00 |
|
CitadelStationBot
|
04dd1ffdbd
|
Fixes resin attack message
|
2017-06-26 06:03:44 -05:00 |
|