Commit Graph

  • 2fc5c3785a Merge pull request #1782 from Citadel-Station-13/upstream-merge-28789 LetterJay 2017-06-26 06:18:36 -05:00
  • 49e1c3f2b6 Merge pull request #1689 from Citadel-Station-13/upstream-merge-28591 LetterJay 2017-06-26 06:15:45 -05:00
  • 55fe5afabd Automatic changelog generation for PR #1664 [ci skip] CitadelStationBot 2017-06-26 06:15:20 -05:00
  • d138c56781 Merge pull request #1664 from Citadel-Station-13/upstream-merge-28505 LetterJay 2017-06-26 06:15:19 -05:00
  • f1937eb1fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-06-26 06:14:55 -05:00
  • 5571cca37c .rej cleanup LetterJay 2017-06-26 06:14:42 -05:00
  • faa0849b4b Merge pull request #1663 from Citadel-Station-13/upstream-merge-28573 LetterJay 2017-06-26 06:13:59 -05:00
  • 43d4a06266 Merge pull request #1662 from Citadel-Station-13/upstream-merge-28543 LetterJay 2017-06-26 06:13:46 -05:00
  • 4eb281523f Automatic changelog generation for PR #1761 [ci skip] CitadelStationBot 2017-06-26 06:13:27 -05:00
  • 89bc574cb9 Merge pull request #1761 from Citadel-Station-13/upstream-merge-28708 LetterJay 2017-06-26 06:13:26 -05:00
  • 68c45f5569 Merge pull request #1661 from Citadel-Station-13/upstream-merge-28539 LetterJay 2017-06-26 06:07:53 -05:00
  • 04dd1ffdbd Fixes resin attack message CitadelStationBot 2017-06-26 06:03:44 -05:00
  • 5f4e1ed721 Improves Ahelp feedback CitadelStationBot 2017-06-26 06:01:38 -05:00
  • bebda394f4 Automatic changelog generation for PR #1636 [ci skip] CitadelStationBot 2017-06-26 05:58:00 -05:00
  • b4473bedb2 Merge pull request #1636 from Citadel-Station-13/upstream-merge-28382 LetterJay 2017-06-26 05:57:59 -05:00
  • 5587f72510 Automatic changelog generation for PR #1766 [ci skip] CitadelStationBot 2017-06-26 04:54:52 -05:00
  • 78d3f91e67 Merge pull request #1766 from Citadel-Station-13/upstream-merge-28755 LetterJay 2017-06-26 04:54:51 -05:00
  • 5494d1e0b5 Automatic changelog generation for PR #1508 [ci skip] CitadelStationBot 2017-06-26 04:29:09 -05:00
  • ed6c0b042e Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227 LetterJay 2017-06-26 04:29:08 -05:00
  • cb6400deba Update basemap.dm LetterJay 2017-06-26 03:51:50 -05:00
  • fd9b9608ce Delete cerestation.dmm LetterJay 2017-06-26 03:40:30 -05:00
  • 609ccb554c Delete cerestation.dmm LetterJay 2017-06-26 03:27:00 -05:00
  • 4fff59df02 Update large_objects.dm LetterJay 2017-06-26 02:35:58 -05:00
  • 53afc150f9 Merge pull request #1581 from Citadel-Station-13/upstream-merge-28398 LetterJay 2017-06-26 02:30:58 -05:00
  • 0178323fe1 Makes goonchat robust. CitadelStationBot 2017-06-26 00:03:57 -05:00
  • 1982321419 Robotic legs are not weak to glass shards CitadelStationBot 2017-06-25 23:47:38 -05:00
  • 1a38b6fd6f Shuttle engines affecting travel time CitadelStationBot 2017-06-25 20:53:00 -05:00
  • e57a753701 Exporting mechs! CitadelStationBot 2017-06-25 11:35:00 -05:00
  • d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] CitadelStationBot 2017-06-25 11:03:27 -05:00
  • 0c2bf7e5ea Station Engineers Spawn With Industrial Welder CitadelStationBot 2017-06-25 09:17:52 -05:00
  • 72e7632fa8 [s] Fixes TK remote grab exploit CitadelStationBot 2017-06-25 07:41:23 -05:00
  • 4293607509 Merge pull request #1758 from Citadel-Station-13/upstream-merge-28735 LetterJay 2017-06-25 01:05:41 -05:00
  • 5854f15442 Automatic changelog generation for PR #1763 [ci skip] CitadelStationBot 2017-06-25 01:03:27 -05:00
  • 5b84b92277 Merge pull request #1763 from Citadel-Station-13/upstream-merge-28527 LetterJay 2017-06-25 01:03:26 -05:00
  • 67e1b0fda7 Merge pull request #1765 from Citadel-Station-13/upstream-merge-28753 LetterJay 2017-06-25 01:02:47 -05:00
  • 15362206dd Fixes the server taking for fucking ever to initialize for local test CitadelStationBot 2017-06-24 22:22:44 -05:00
  • 919f9f0cfc Turns the maid costume's apron into a detachable accessory. CitadelStationBot 2017-06-24 15:40:03 -05:00
  • bef1ffc086 Robotic legs let you use pockets without a jumpsuit, robotic chest lets you wear an ID/belt without jumpsuit CitadelStationBot 2017-06-24 14:49:11 -05:00
  • acc03ae85e Fixes bad del runtime CitadelStationBot 2017-06-24 11:48:05 -05:00
  • 9e9e8c323e Automatic changelog generation for PR #1757 [ci skip] CitadelStationBot 2017-06-24 11:11:51 -05:00
  • b7d8fea575 Fixes nuclear bombs being radioactive (#1757) CitadelStationBot 2017-06-24 11:11:49 -05:00
  • 5806c7198e Automatic changelog generation for PR #1751 [ci skip] CitadelStationBot 2017-06-23 22:55:33 -05:00
  • 68604eeb63 Merge pull request #1751 from Citadel-Station-13/upstream-merge-28713 LetterJay 2017-06-23 22:55:32 -05:00
  • 4dd1449640 Merge pull request #1750 from Citadel-Station-13/upstream-merge-28714 LetterJay 2017-06-23 22:54:48 -05:00
  • 7a4c337146 Automatic changelog generation for PR #1749 [ci skip] CitadelStationBot 2017-06-23 22:54:28 -05:00
  • 2259f604d6 Merge pull request #1749 from Citadel-Station-13/upstream-merge-28659 LetterJay 2017-06-23 22:54:27 -05:00
  • 62295cc85b Automatic changelog generation for PR #1745 [ci skip] CitadelStationBot 2017-06-23 22:53:54 -05:00
  • ad128ae06c Merge pull request #1745 from ganglyalexander/locker_reset LetterJay 2017-06-23 22:53:52 -05:00
  • 68d8b76dec PDA Refactor Part 1: Phantom Blood Menace CitadelStationBot 2017-06-23 21:59:22 -05:00
  • 9b5f343906 Fixes goliath hide stacks having no sprite at high amounts CitadelStationBot 2017-06-23 13:51:43 -05:00
  • 384234a7d9 Fixes the kinetic crusher not emitting light CitadelStationBot 2017-06-23 13:49:37 -05:00
  • 2530d8a09a Intercoms are now constructable CitadelStationBot 2017-06-23 13:40:25 -05:00
  • 6558f31395 Adding Locker reset function Matthew 2017-06-22 23:53:02 -05:00
  • ea84ff14f0 Merge pull request #1 from Citadel-Station-13/master Matthew 2017-06-22 23:50:14 -05:00
  • 161fcf69d5 Automatic changelog generation for PR #1743 [ci skip] CitadelStationBot 2017-06-22 22:46:31 -05:00
  • 26f3450f77 Merge pull request #1743 from Citadel-Station-13/upstream-merge-28670 LetterJay 2017-06-22 22:46:30 -05:00
  • eaa36299ae Create browserOutput.html LetterJay 2017-06-22 22:24:34 -05:00
  • f81aff681b Update browserOutput.dm LetterJay 2017-06-22 22:15:28 -05:00
  • 3d84f4bdbb Fixes the sprite for the nullrod clown dagger skin CitadelStationBot 2017-06-22 20:07:34 -05:00
  • 9ee0d6aa6d Makes oldchat show while goonchat loads, sends preload messages there. CitadelStationBot 2017-06-22 19:50:15 -05:00
  • 42b910b768 Merge pull request #1742 from Citadel-Station-13/upstream-merge-28682 LetterJay 2017-06-22 19:22:57 -05:00
  • 5168f5d03f Merge pull request #1740 from Citadel-Station-13/upstream-merge-28674 LetterJay 2017-06-22 19:22:38 -05:00
  • b81b9a4f61 Merge pull request #1739 from Citadel-Station-13/upstream-merge-28673 LetterJay 2017-06-22 19:22:23 -05:00
  • 84cd74bc4b Merge pull request #1738 from Citadel-Station-13/upstream-merge-28677 LetterJay 2017-06-22 19:21:59 -05:00
  • 9f52f1cea2 Merge pull request #1737 from Citadel-Station-13/upstream-merge-28486 LetterJay 2017-06-22 19:21:30 -05:00
  • 61e8a6a290 Merge pull request #1736 from Citadel-Station-13/upstream-merge-28664 LetterJay 2017-06-22 19:20:14 -05:00
  • cf430b694e Merge pull request #1735 from Citadel-Station-13/upstream-merge-28665 LetterJay 2017-06-22 19:20:01 -05:00
  • fd3cc10b55 Fixes a comment typo CitadelStationBot 2017-06-22 14:34:12 -05:00
  • 8375a2dcf9 Fixes an error message CitadelStationBot 2017-06-22 11:03:29 -05:00
  • d0d1ae1e01 Readds sprites for grey & nanotrasen bedsheets CitadelStationBot 2017-06-22 11:03:26 -05:00
  • 7ce0be3ab6 Areas.dm cleanup + new icons CitadelStationBot 2017-06-22 11:02:21 -05:00
  • f919e995dc Stamina projectiles no longer set off grenades and flamethrowers CitadelStationBot 2017-06-22 11:00:13 -05:00
  • c98248cf7e Fixes swarmers dying to radiation CitadelStationBot 2017-06-22 10:59:03 -05:00
  • 389203023f Fixes spriteless empty paperbins CitadelStationBot 2017-06-22 10:58:57 -05:00
  • c18d9027d8 Automatic changelog generation for PR #1732 [ci skip] CitadelStationBot 2017-06-22 09:09:46 -05:00
  • 9cdda1cb9e Merge pull request #1732 from Citadel-Station-13/olawd LetterJay 2017-06-22 09:09:45 -05:00
  • 20486e0184 🆑 sounddel: Removes oof /🆑 LetterJay 2017-06-22 08:59:33 -05:00
  • 19dba1751c Merge pull request #1729 from Citadel-Station-13/BigSync LetterJay 2017-06-21 18:26:44 -05:00
  • d04001c09d another huge sync LetterJay 2017-06-21 18:00:00 -05:00
  • 0719541100 Merge pull request #1721 from Citadel-Station-13/upstream-merge-28640 LetterJay 2017-06-21 15:45:34 -05:00
  • d6b44f5605 Automatic changelog generation for PR #1725 [ci skip] CitadelStationBot 2017-06-21 15:45:10 -05:00
  • a059c0ca06 Merge pull request #1725 from Citadel-Station-13/upstream-merge-28546 LetterJay 2017-06-21 15:45:08 -05:00
  • f36853ea75 Adds custom lighting support to modular computers, and a flashlight to tablets CitadelStationBot 2017-06-21 15:43:05 -05:00
  • d587d692c6 Flame thrower plasma tanks can be removed easily. CitadelStationBot 2017-06-21 13:21:31 -05:00
  • df815e99bd Lavaland's default atmos is now a define CitadelStationBot 2017-06-21 08:32:00 -05:00
  • ce21809692 Fixes random runtime CitadelStationBot 2017-06-21 07:47:09 -05:00
  • df64469de1 Removed vore sound falloff Poojawa 2017-06-21 07:27:54 -05:00
  • bac0b96000 Changes to the Atmos Watertank Backpack CitadelStationBot 2017-06-20 20:49:11 -05:00
  • b84426d8fa Merge pull request #1712 from Citadel-Station-13/upstream-merge-28618 LetterJay 2017-06-20 20:30:24 -05:00
  • 8ae2ceda05 Merge pull request #1713 from Citadel-Station-13/panicbunkerhotfix LetterJay 2017-06-20 20:29:18 -05:00
  • b6fcf2b262 Automatic changelog generation for PR #1704 [ci skip] CitadelStationBot 2017-06-20 20:17:54 -05:00
  • 0260116a8f Merge pull request #1704 from Citadel-Station-13/upstream-merge-28612 LetterJay 2017-06-20 20:17:53 -05:00
  • b1df8322b2 remove double set LetterJay 2017-06-20 20:08:59 -05:00
  • 4102d88802 Fixes shining lights into peoples eyes CitadelStationBot 2017-06-20 20:06:25 -05:00
  • 173e3dcf1c Merge pull request #1703 from Citadel-Station-13/IconStateGrammar LetterJay 2017-06-20 16:21:22 -05:00
  • 39ad327fab Fixes grenade belt and bandolier UI obscuring half the screen CitadelStationBot 2017-06-20 15:37:20 -05:00
  • 4b79e996da icon name fixes LetterJay 2017-06-20 15:25:22 -05:00
  • 50a4f61663 Adds a heavily-damaged ripley as a lavaland ruin CitadelStationBot 2017-06-20 12:09:15 -05:00
  • 8809db8230 Disablers now have an in-hand sprite (Fixes #28582) CitadelStationBot 2017-06-20 10:31:24 -05:00
  • c7066449c2 Automatic changelog generation for PR #1651 [ci skip] CitadelStationBot 2017-06-20 10:04:36 -05:00