Commit Graph

  • ecd0723fd4 Merge pull request #811 from Citadel-Station-13/upstream-merge-26985 kevinz000 2017-05-06 14:19:02 -07:00
  • d4057bf862 Merge pull request #731 from Citadel-Station-13/upstream-merge-26814 kevinz000 2017-05-06 14:18:45 -07:00
  • f605aae61e Automatic changelog generation for PR #733 [ci skip] CitadelStationBot 2017-05-06 16:12:59 -05:00
  • d6993f42dc Merge pull request #733 from Citadel-Station-13/upstream-merge-26789 kevinz000 2017-05-06 14:12:58 -07:00
  • 24e6a9c80b Merge pull request #777 from Citadel-Station-13/upstream-merge-26879 kevinz000 2017-05-06 14:12:13 -07:00
  • 638250993c Merge pull request #770 from Citadel-Station-13/upstream-merge-26873 kevinz000 2017-05-06 14:11:18 -07:00
  • 760ab46274 Merge pull request #783 from Citadel-Station-13/upstream-merge-26896 kevinz000 2017-05-06 14:10:58 -07:00
  • 8fd36540ef Automatic changelog generation for PR #682 [ci skip] CitadelStationBot 2017-05-06 16:08:52 -05:00
  • b6231af063 Merge pull request #682 from Citadel-Station-13/upstream-merge-26731 kevinz000 2017-05-06 14:08:51 -07:00
  • 353aa9573a Merge pull request #778 from Citadel-Station-13/upstream-merge-26928 kevinz000 2017-05-06 14:06:06 -07:00
  • cc8d113c0f Merge branch 'master' into upstream-merge-26928 kevinz000 2017-05-06 14:05:16 -07:00
  • abb5e2d016 Automatic changelog generation for PR #805 [ci skip] CitadelStationBot 2017-05-06 16:04:57 -05:00
  • 3e1a1588b5 Merge pull request #805 from Citadel-Station-13/upstream-merge-26927 kevinz000 2017-05-06 14:04:56 -07:00
  • bf5a9a5037 Update mob.dm kevinz000 2017-05-06 14:04:17 -07:00
  • d3d335d835 Update mob.dm kevinz000 2017-05-06 14:03:52 -07:00
  • 8af1d05cc4 Delete mob.dm.rej kevinz000 2017-05-06 14:02:42 -07:00
  • 5aff0de6dd Merge pull request #737 from Citadel-Station-13/upstream-merge-26811 kevinz000 2017-05-06 14:02:14 -07:00
  • d1a8f643d6 Merge pull request #738 from Citadel-Station-13/upstream-merge-26774 kevinz000 2017-05-06 13:59:33 -07:00
  • 28f6096503 Merge pull request #788 from Citadel-Station-13/upstream-merge-26911 kevinz000 2017-05-06 13:59:05 -07:00
  • ec8a5f713b Merge pull request #782 from Citadel-Station-13/upstream-merge-26895 kevinz000 2017-05-06 13:58:28 -07:00
  • e9ff2203cf Fixes really long Ratvar shuttle calls CitadelStationBot 2017-05-06 15:13:33 -05:00
  • e0b2a0f1eb Follow links on adamantine vocal cords now work CitadelStationBot 2017-05-06 15:12:29 -05:00
  • 6f90d11a38 Merge pull request #787 from Citadel-Station-13/upstream-merge-26913 kevinz000 2017-05-06 12:21:57 -07:00
  • 30f7e170a3 Makes medbay vending machines buildable CitadelStationBot 2017-05-06 13:52:12 -05:00
  • b440ba70b0 Delete suicide.dm.rej kevinz000 2017-05-06 11:49:26 -07:00
  • c5f7644452 Update suicide.dm kevinz000 2017-05-06 11:48:24 -07:00
  • 6a855bcee3 Merge pull request #804 from Citadel-Station-13/upstream-merge-26929 kevinz000 2017-05-06 11:43:19 -07:00
  • 231e87ee2e Automatic changelog generation for PR #747 [ci skip] CitadelStationBot 2017-05-06 13:41:37 -05:00
  • 3f67f8bf24 Merge pull request #747 from Citadel-Station-13/upstream-merge-26798 kevinz000 2017-05-06 11:41:36 -07:00
  • 6b0daad4eb Automatic changelog generation for PR #746 [ci skip] CitadelStationBot 2017-05-06 13:39:02 -05:00
  • 62b8f929bb Merge pull request #746 from Citadel-Station-13/upstream-merge-26794 kevinz000 2017-05-06 11:39:01 -07:00
  • 5af090a9d0 Automatic changelog generation for PR #745 [ci skip] CitadelStationBot 2017-05-06 13:35:30 -05:00
  • 332733f90a Merge pull request #745 from Citadel-Station-13/upstream-merge-26784 kevinz000 2017-05-06 11:35:29 -07:00
  • f85a44ed52 2017 Cult Overhaul P1: Cult Master and Datum Cult CitadelStationBot 2017-05-06 11:56:16 -05:00
  • 10846d5d37 Replaces stun/weaken from Miner's salve CitadelStationBot 2017-05-06 10:48:07 -05:00
  • 310f23db5c Fixes HTTPSGet being unprotected CitadelStationBot 2017-05-06 10:46:00 -05:00
  • 0972689cfc Updated: Reduces dominator timer ceiling, changes territory scaling CitadelStationBot 2017-05-06 10:44:56 -05:00
  • 8a3b280ede Preliminary tesla projectile refactor (also insults vcordie because I'm mean.) CitadelStationBot 2017-05-06 10:42:51 -05:00
  • 32651c31cb Merge pull request #743 from Citadel-Station-13/upstream-merge-26806 LetterJay 2017-05-06 10:26:16 -05:00
  • b72f4102a1 Internal affairs upgrades [READY] CitadelStationBot 2017-05-06 10:16:24 -05:00
  • 2922a9fee8 Seed vault lavaland ruin can only spawn once CitadelStationBot 2017-05-06 08:09:25 -05:00
  • d0335b6d07 Blorble CitadelStationBot 2017-05-06 05:12:39 -05:00
  • a084031dc4 hm CitadelStationBot 2017-05-06 05:12:36 -05:00
  • 4d8f80efaf Fixes roundstart spawning CitadelStationBot 2017-05-06 04:09:32 -05:00
  • 09655ed5e8 Adds player age and byond account age to player panel CitadelStationBot 2017-05-05 20:08:07 -05:00
  • 358046709f Various Deltastation Map Fixes/Edits CitadelStationBot 2017-05-05 20:08:03 -05:00
  • b993d9ad23 Holy water will now properly make you jittery CitadelStationBot 2017-05-05 18:33:34 -05:00
  • 122c791138 Patches the new cleanbot bug CitadelStationBot 2017-05-05 18:14:13 -05:00
  • 877acc972a Fixes dead mobs being initialized twice CitadelStationBot 2017-05-05 18:12:07 -05:00
  • 0fb29b2650 Improves vending machine user feedback CitadelStationBot 2017-05-05 18:10:01 -05:00
  • 7288549dec Players may no longer commite suicide CitadelStationBot 2017-05-05 18:08:56 -05:00
  • 1fe053064f Fixes log files not generating with default config CitadelStationBot 2017-05-05 16:46:37 -05:00
  • 39876074ca Automatic changelog generation for PR #781 [ci skip] CitadelStationBot 2017-05-05 15:37:22 -05:00
  • bd90067ed1 Merge pull request #781 from Citadel-Station-13/upstream-merge-26899 LetterJay 2017-05-05 15:37:20 -05:00
  • e6625425b2 Merge pull request #767 from Citadel-Station-13/upstream-merge-26876 LetterJay 2017-05-05 11:04:36 -05:00
  • c489186c3f message code LetterJay 2017-05-05 10:38:03 -05:00
  • 684c4a5244 Fixes answering a holocall not disconnecting other calls CitadelStationBot 2017-05-05 10:28:26 -05:00
  • 426430369e Sigils of Transgression are slightly more visible and glow very faintly CitadelStationBot 2017-05-05 10:28:22 -05:00
  • 55c71ff5a9 Tesla light CitadelStationBot 2017-05-05 10:27:18 -05:00
  • acf8cb1597 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26876 LetterJay 2017-05-05 10:26:02 -05:00
  • 1bb43eb7ae woo LetterJay 2017-05-05 10:21:53 -05:00
  • d0e6790993 Merge pull request #761 from kevinz000/patch-3 LetterJay 2017-05-05 10:20:39 -05:00
  • d2612eaaaf Automatic changelog generation for PR #701 [ci skip] CitadelStationBot 2017-05-05 10:20:13 -05:00
  • 811c74b45d Merge pull request #701 from Citadel-Station-13/upstream-merge-26477 LetterJay 2017-05-05 10:20:11 -05:00
  • a873459fa4 Automatic changelog generation for PR #698 [ci skip] CitadelStationBot 2017-05-05 10:19:29 -05:00
  • caaf0fc2ee Merge pull request #698 from Citadel-Station-13/upstream-merge-25743 LetterJay 2017-05-05 10:19:28 -05:00
  • bbf43a464a yey LetterJay 2017-05-05 10:00:17 -05:00
  • 20f3280c96 this one time i ate boiled peanuts LetterJay 2017-05-05 09:52:47 -05:00
  • f7572e62cf Merge pull request #769 from Citadel-Station-13/upstream-merge-26860 LetterJay 2017-05-05 09:46:23 -05:00
  • fbdbd67f1d Automatic changelog generation for PR #771 [ci skip] CitadelStationBot 2017-05-05 09:45:32 -05:00
  • 7700171f3f Merge pull request #771 from Citadel-Station-13/upstream-merge-26872 LetterJay 2017-05-05 09:45:31 -05:00
  • 590aaf4cc2 Merge pull request #773 from Citadel-Station-13/upstream-merge-26807 LetterJay 2017-05-05 09:44:36 -05:00
  • c38d507791 Merge pull request #779 from Citadel-Station-13/upstream-merge-26880 LetterJay 2017-05-05 09:44:16 -05:00
  • f6f56a8b8f Merge pull request #728 from Citadel-Station-13/upstream-merge-26823 LetterJay 2017-05-05 09:43:17 -05:00
  • f2f42091f3 Merge branch 'master' into upstream-merge-26685 LetterJay 2017-05-05 09:42:36 -05:00
  • 5d0f7eafaa Merge pull request #719 from Citadel-Station-13/upstream-merge-26771 LetterJay 2017-05-05 09:40:28 -05:00
  • f902c11f3b Automatic changelog generation for PR #717 [ci skip] CitadelStationBot 2017-05-05 09:40:09 -05:00
  • 2f44824951 Merge pull request #717 from Citadel-Station-13/upstream-merge-26767 LetterJay 2017-05-05 09:40:08 -05:00
  • 5d82e4e729 Automatic changelog generation for PR #714 [ci skip] CitadelStationBot 2017-05-05 09:39:55 -05:00
  • cd1d049c18 Merge pull request #714 from Citadel-Station-13/upstream-merge-26707 LetterJay 2017-05-05 09:39:54 -05:00
  • c3f2e08304 Automatic changelog generation for PR #708 [ci skip] CitadelStationBot 2017-05-05 09:39:20 -05:00
  • 1198a3cbb4 Merge pull request #708 from Citadel-Station-13/upstream-merge-26752 LetterJay 2017-05-05 09:39:17 -05:00
  • da4e4bbefe Merge pull request #707 from Citadel-Station-13/upstream-merge-26746 LetterJay 2017-05-05 09:39:04 -05:00
  • 9b3aaa4526 merge LetterJay 2017-05-05 09:36:27 -05:00
  • 91f3059be1 Merge pull request #693 from Citadel-Station-13/upstream-merge-26722 LetterJay 2017-05-05 09:33:45 -05:00
  • 56d5e12263 Moves languages to a holder datum, gives mind its own language holder CitadelStationBot 2017-05-05 08:13:04 -05:00
  • 933a8646ba Only one successful Gang Tool recall per gang CitadelStationBot 2017-05-05 06:05:05 -05:00
  • 745c74c18b Fixes spinning (Woops I used a <= instead of a <) CitadelStationBot 2017-05-05 00:04:35 -05:00
  • aa13c4f148 Corrects docking port name for escape pods CitadelStationBot 2017-05-04 23:16:48 -05:00
  • a5cb93e874 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' deathride58 2017-05-04 23:31:49 -04:00
  • 1da6f676f0 Fixes SM Tesla admin log spam, adds containment field count to investigate logs. CitadelStationBot 2017-05-04 20:59:33 -05:00
  • d67618815c Mobs that are faking death won't bleed. CitadelStationBot 2017-05-04 20:59:29 -05:00
  • 73bef0b6c8 Fixes the most annoying thing about admin helping. CitadelStationBot 2017-05-04 20:40:09 -05:00
  • 01d80a0cc0 Takes out an airlock in xenobiology's kill room [Pubby] CitadelStationBot 2017-05-04 20:40:05 -05:00
  • 5de94c22e7 Fixes grammar error on spawner grenades CitadelStationBot 2017-05-04 20:25:46 -05:00
  • 067e0b46ed Removes changeling genetic damage CitadelStationBot 2017-05-04 19:45:08 -05:00
  • f7d45f3010 Fixes say verbs not working CitadelStationBot 2017-05-04 18:41:04 -05:00
  • b5a14bb6ab New dirt sprites and jungle chasms CitadelStationBot 2017-05-04 18:38:58 -05:00
  • 95495ffbcb Makes dental implants move through dismemberment CitadelStationBot 2017-05-04 18:21:36 -05:00
  • 3b84fcb9c2 Playar byound accunt age storid in db CitadelStationBot 2017-05-04 18:14:23 -05:00