Commit Graph

2351 Commits

Author SHA1 Message Date
LetterJay
28cd2d6164 Merge pull request #1783 from Citadel-Station-13/upstream-merge-28644
[MIRROR] Ninja Dash
2017-06-26 10:09:16 -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
CitadelStationBot
5f4e1ed721 Improves Ahelp feedback 2017-06-26 06:01:38 -05:00
LetterJay
b4473bedb2 Merge pull request #1636 from Citadel-Station-13/upstream-merge-28382
[MIRROR] Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
2017-06-26 05:57:59 -05:00
LetterJay
78d3f91e67 Merge pull request #1766 from Citadel-Station-13/upstream-merge-28755
[MIRROR] [s] Fixes TK remote grab exploit
2017-06-26 04:54:51 -05:00
LetterJay
ed6c0b042e Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227
[MIRROR] Clown Toy Box + Wooden Crates
2017-06-26 04:29:08 -05:00
LetterJay
4fff59df02 Update large_objects.dm 2017-06-26 02:35:58 -05:00
LetterJay
53afc150f9 Merge pull request #1581 from Citadel-Station-13/upstream-merge-28398
[MIRROR] Changes config tag for secret extended
2017-06-26 02:30:58 -05:00
CitadelStationBot
0178323fe1 Makes goonchat robust. 2017-06-26 00:03:57 -05:00
CitadelStationBot
1982321419 Robotic legs are not weak to glass shards 2017-06-25 23:47:38 -05:00
CitadelStationBot
1a38b6fd6f Shuttle engines affecting travel time 2017-06-25 20:53:00 -05:00
CitadelStationBot
e57a753701 Exporting mechs! 2017-06-25 11:35:00 -05:00
CitadelStationBot
72e7632fa8 [s] Fixes TK remote grab exploit 2017-06-25 07:41:23 -05:00
LetterJay
4293607509 Merge pull request #1758 from Citadel-Station-13/upstream-merge-28735
[MIRROR] Fixes bad del runtime
2017-06-25 01:05:41 -05:00
LetterJay
5b84b92277 Merge pull request #1763 from Citadel-Station-13/upstream-merge-28527
[MIRROR] Turns the maid costume's apron into a detachable accessory.
2017-06-25 01:03:26 -05:00
CitadelStationBot
15362206dd Fixes the server taking for fucking ever to initialize for local test 2017-06-24 22:22:44 -05:00
CitadelStationBot
919f9f0cfc Turns the maid costume's apron into a detachable accessory. 2017-06-24 15:40:03 -05:00
CitadelStationBot
bef1ffc086 Robotic legs let you use pockets without a jumpsuit, robotic chest lets you wear an ID/belt without jumpsuit 2017-06-24 14:49:11 -05:00
CitadelStationBot
acc03ae85e Fixes bad del runtime 2017-06-24 11:48:05 -05:00
CitadelStationBot
b7d8fea575 Fixes nuclear bombs being radioactive (#1757) 2017-06-24 09:11:49 -07:00
LetterJay
4dd1449640 Merge pull request #1750 from Citadel-Station-13/upstream-merge-28714
[MIRROR] Fixes the kinetic crusher not emitting light
2017-06-23 22:54:48 -05:00
LetterJay
2259f604d6 Merge pull request #1749 from Citadel-Station-13/upstream-merge-28659
[MIRROR] Intercoms are now constructable
2017-06-23 22:54:27 -05:00
CitadelStationBot
384234a7d9 Fixes the kinetic crusher not emitting light 2017-06-23 13:49:37 -05:00
CitadelStationBot
2530d8a09a Intercoms are now constructable 2017-06-23 13:40:25 -05:00
Matthew
6558f31395 Adding Locker reset function 2017-06-22 23:53:02 -05:00
LetterJay
eaa36299ae Create browserOutput.html 2017-06-22 22:24:34 -05:00
LetterJay
f81aff681b Update browserOutput.dm 2017-06-22 22:15:28 -05:00
CitadelStationBot
9ee0d6aa6d Makes oldchat show while goonchat loads, sends preload messages there. 2017-06-22 19:50:15 -05:00
LetterJay
42b910b768 Merge pull request #1742 from Citadel-Station-13/upstream-merge-28682
[MIRROR] Fixes a comment typo
2017-06-22 19:22:57 -05:00
LetterJay
5168f5d03f Merge pull request #1740 from Citadel-Station-13/upstream-merge-28674
[MIRROR] Fixes an error message
2017-06-22 19:22:38 -05:00