Commit Graph

  • eb96fe9d02 Update bottle.dm LetterJay 2018-05-17 23:44:27 -05:00
  • bfcaceb4e1 Merge pull request #6785 from Citadel-Station-13/upstream-merge-37838 LetterJay 2018-05-17 22:50:19 -05:00
  • b4d0a29fab Merge pull request #6783 from Citadel-Station-13/upstream-merge-37877 LetterJay 2018-05-17 22:49:25 -05:00
  • 62ec82b092 Query debug logging letterjay 2018-05-17 21:38:41 -05:00
  • a61457cd47 Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox Jordan Brown 2018-05-17 22:38:32 -04:00
  • 7e081ec34a Deltastation edits/fixes letterjay 2018-05-17 21:16:03 -05:00
  • 21b9f72e49 Deltastation edits/fixes (#37876) Mark9013100 2018-05-17 22:15:39 -04:00
  • c57467cde2 Merge pull request #6749 from deathride58/poojgone LetterJay 2018-05-17 20:56:18 -05:00
  • 048c9d1682 Capitalizes Current Quirks letterjay 2018-05-17 20:54:23 -05:00
  • abc57b0e53 Capitalized Current Quirks (#37877) ShizCalev 2018-05-17 21:53:20 -04:00
  • 649314c455 Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429 deathride58 2018-05-17 18:14:54 +00:00
  • 8118bd3ff8 Automatic changelog generation for PR #6686 [ci skip] CitadelStationBot 2018-05-17 13:13:30 -05:00
  • 986ea603e9 Merge pull request #6686 from Citadel-Station-13/upstream-merge-37719 deathride58 2018-05-17 18:13:28 +00:00
  • 146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423 deathride58 2018-05-17 18:12:57 +00:00
  • 290a4ef1de Merge pull request #6757 from Citadel-Station-13/upstream-merge-37850 deathride58 2018-05-17 18:12:33 +00:00
  • 44ca1dd5b9 Automatic changelog generation for PR #6758 [ci skip] CitadelStationBot 2018-05-17 13:12:18 -05:00
  • 97b72c0289 Merge pull request #6758 from Citadel-Station-13/upstream-merge-37853 deathride58 2018-05-17 18:12:16 +00:00
  • baec90fe11 Merge pull request #6759 from Citadel-Station-13/upstream-merge-37840 deathride58 2018-05-17 18:11:57 +00:00
  • 39515a04e9 Automatic changelog generation for PR #6760 [ci skip] CitadelStationBot 2018-05-17 13:11:26 -05:00
  • cee67a7706 Merge pull request #6760 from Citadel-Station-13/upstream-merge-37602 deathride58 2018-05-17 18:11:24 +00:00
  • 4e5514ff97 Automatic changelog generation for PR #6762 [ci skip] CitadelStationBot 2018-05-17 13:10:32 -05:00
  • 5398828bb9 Merge pull request #6762 from Citadel-Station-13/upstream-merge-37860 deathride58 2018-05-17 18:10:29 +00:00
  • 583de894f3 Merge pull request #6763 from Citadel-Station-13/upstream-merge-37863 deathride58 2018-05-17 18:10:01 +00:00
  • 93a9afcf88 Merge pull request #6764 from Citadel-Station-13/upstream-merge-37839 deathride58 2018-05-17 18:09:31 +00:00
  • 5242d1ad4b Merge pull request #6768 from Citadel-Station-13/upstream-merge-37866 deathride58 2018-05-17 18:09:00 +00:00
  • cbac22ccb7 Merge pull request #6769 from Citadel-Station-13/upstream-merge-37868 deathride58 2018-05-17 18:08:40 +00:00
  • aa1747bf07 Automatic changelog generation for PR #6771 [ci skip] CitadelStationBot 2018-05-17 13:08:25 -05:00
  • b1d0d14834 Merge pull request #6771 from Citadel-Station-13/upstream-merge-37872 deathride58 2018-05-17 18:08:16 +00:00
  • 98dba850da Automatic changelog generation for PR #6773 [ci skip] CitadelStationBot 2018-05-17 13:07:48 -05:00
  • db6fdc0f48 Merge pull request #6773 from Citadel-Station-13/upstream-merge-37836 deathride58 2018-05-17 18:07:46 +00:00
  • 24d87f2884 Merge pull request #6774 from Citadel-Station-13/upstream-merge-37871 deathride58 2018-05-17 18:06:45 +00:00
  • c8fa81e395 Automatic changelog generation for PR #6775 [ci skip] CitadelStationBot 2018-05-17 13:06:28 -05:00
  • d151f367cf Merge pull request #6775 from Citadel-Station-13/upstream-merge-37834 deathride58 2018-05-17 18:06:26 +00:00
  • df9184cce2 Merge pull request #6776 from Citadel-Station-13/upstream-merge-37887 deathride58 2018-05-17 18:06:05 +00:00
  • 31efb16a1e Merge pull request #6777 from Citadel-Station-13/upstream-merge-37888 deathride58 2018-05-17 18:05:35 +00:00
  • 77f897e91c Fixes soulstone runtime ShizCalev 2018-05-17 11:57:33 -04:00
  • 3e99f73249 Fixes container_resist runtimes letterjay 2018-05-17 10:57:49 -05:00
  • 0e819cb1fc Fixes container_resist runtimes (#37888) ShizCalev 2018-05-17 11:57:06 -04:00
  • eb84f2dde0 Fixes vent_clog bad chem id runtime letterjay 2018-05-17 10:56:35 -05:00
  • 394fbf09e3 Fixes vent_clog bad chem id runtime (#37887) ShizCalev 2018-05-17 11:55:58 -04:00
  • 7ffc7e2b33 The crashed abductor ship is now fully deconstructable letterjay 2018-05-17 10:32:55 -05:00
  • 8dab7deb9a The crashed abductor ship is now fully deconstructable (#37834) iksyp 2018-05-17 08:31:21 -07:00
  • a9664ac343 Fixes sharp weapons deconverting revs letterjay 2018-05-17 10:28:38 -05:00
  • e425a8514e Fixes sharp weapons deconverting revs (#37871) ShizCalev 2018-05-17 11:27:29 -04:00
  • f0f2ca75c9 Circuit gun inhands and grabber fix letterjay 2018-05-17 10:27:25 -05:00
  • 61e1529e18 Circuit gun inhands and grabber fix (#37836) Trevor Serpas 2018-05-17 10:26:08 -05:00
  • 9037a9745a Fixes decon message pronouns ShizCalev 2018-05-17 11:26:36 -04:00
  • ea8cd1f16f Fixes Adminorazine killing ash lizards letterjay 2018-05-17 10:24:59 -05:00
  • a7f13f15cf Fixes Adminorazine killing ash lizards (#37872) ShizCalev 2018-05-17 11:24:48 -04:00
  • e2bcf82341 Adds Fernet, a digestif that reduces your satiety. ThePainkiller 2018-05-17 12:19:19 -03:00
  • 08f00022f8 Fixes parallax runtime letterjay 2018-05-17 10:17:26 -05:00
  • a00fc47d1e Update parallax.dm (#37868) CitrusGender 2018-05-17 11:16:54 -04:00
  • 05426ad041 Client topics only check for deleted objects when an object was actually passed letterjay 2018-05-17 10:15:12 -05:00
  • 085066d555 Client topics only check for deleted objects when an object was actually passed (#37866) Kyle Spier-Swenson 2018-05-17 08:14:27 -07:00
  • 1b592ba4db Fixes minor cleanbot runtime. letterjay 2018-05-16 14:37:03 -05:00
  • 7429a7ef6a Merge pull request #37839 from AnturK/rr1 vuonojenmustaturska 2018-05-16 22:36:07 +03:00
  • db93253168 Fixes changeling team objectives (a bit) letterjay 2018-05-16 14:35:49 -05:00
  • aa7a27420c Merge pull request #37863 from AnturK/rr4 vuonojenmustaturska 2018-05-16 22:35:25 +03:00
  • 46dcabfed0 [s] Fixes bioware surgery exploit letterjay 2018-05-16 14:34:36 -05:00
  • 48c37df7cd [s] Fixes bioware surgery exploit (#37860) Dax Dupont 2018-05-16 21:34:08 +02:00
  • 0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 81Denton 2018-05-16 19:17:41 +02:00
  • 8efc7711a7 Merge branch 'master' into upstream-merge-37423 LetterJay 2018-05-16 12:17:57 -05:00
  • 4879701b19 Fixes meteors hitting qdeleted stuff. letterjay 2018-05-16 12:06:06 -05:00
  • b111088140 Fixes meteors hitting qdeleted stuff. (#37840) AnturK 2018-05-16 19:04:26 +02:00
  • 7c0182da95 Fixes wrong circuits letterjay 2018-05-16 12:04:54 -05:00
  • eb29d86c5f Fixes wrong circuits (#37853) Dax Dupont 2018-05-16 19:03:18 +02:00
  • 9e37488827 Fixes fireaxe butchering. letterjay 2018-05-16 12:04:45 -05:00
  • 593919a85a Fixes fireaxe butchering. (#37850) AnturK 2018-05-16 19:03:57 +02:00
  • 4d3ead744a Update wallets.dm deathride58 2018-05-16 12:15:29 -04:00
  • 56544307ec Automatic changelog generation for PR #6754 [ci skip] CitadelStationBot 2018-05-16 11:09:23 -05:00
  • ca36def4e6 Merge pull request #6754 from Citadel-Station-13/upstream-merge-37823 deathride58 2018-05-16 16:09:21 +00:00
  • a87acf9b02 Automatic changelog generation for PR #6756 [ci skip] CitadelStationBot 2018-05-16 11:08:40 -05:00
  • 61c606c602 Merge pull request #6756 from Citadel-Station-13/upstream-merge-37846 deathride58 2018-05-16 16:08:37 +00:00
  • 3103119f6b Update soulstone.dm LetterJay 2018-05-16 09:04:51 -05:00
  • fe93e1ccbd Update cult_items.dm LetterJay 2018-05-16 09:04:39 -05:00
  • a95c91da45 Small cult nerf do not be alarmed robustin think about your heart letterjay 2018-05-16 04:47:00 -05:00
  • 5e48fcd275 Merge pull request #37846 from DaxDupont/axe-time vuonojenmustaturska 2018-05-16 12:46:30 +03:00
  • 2b789b29b8 Automatic changelog generation for PR #6660 [ci skip] CitadelStationBot 2018-05-15 15:53:07 -05:00
  • bb1fe6cba2 Merge pull request #6660 from GrayRachnid/add-dorms-to-ninja-capture deathride58 2018-05-15 20:53:05 +00:00
  • 79b5e412f1 Makes cult items less of a vomit coaster Dax Dupont 2018-05-14 18:41:24 +02:00
  • 5a67cd83ca Merge pull request #6753 from Citadel-Station-13/gate-keeper deathride58 2018-05-15 16:41:28 +00:00
  • 08fab3adaa Update client_procs.dm LetterJay 2018-05-15 10:25:58 -05:00
  • 24b6ee5a6c should make life simpler LetterJay 2018-05-15 10:05:56 -05:00
  • 173d4fadae Update subsystems.dm LetterJay 2018-05-15 09:06:36 -05:00
  • d421ad846a Merge pull request #6751 from Citadel-Station-13/upstream-merge-37715 LetterJay 2018-05-15 06:53:54 -05:00
  • 60292976a0 Automatic changelog generation for PR #6746 [ci skip] CitadelStationBot 2018-05-15 06:53:27 -05:00
  • ce98f9c444 Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785 LetterJay 2018-05-15 06:53:25 -05:00
  • 072e0b5951 Automatic changelog generation for PR #6745 [ci skip] CitadelStationBot 2018-05-15 06:53:13 -05:00
  • 49b22d2673 Merge pull request #6745 from Citadel-Station-13/upstream-merge-37810 LetterJay 2018-05-15 06:53:11 -05:00
  • 61a3270907 Automatic changelog generation for PR #6744 [ci skip] CitadelStationBot 2018-05-15 06:52:55 -05:00
  • e99045054b Merge pull request #6744 from Citadel-Station-13/upstream-merge-37824 LetterJay 2018-05-15 06:52:53 -05:00
  • f86af0ab41 Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818 LetterJay 2018-05-15 06:52:32 -05:00
  • a580ea7544 Merge pull request #6742 from Citadel-Station-13/upstream-merge-37743 LetterJay 2018-05-15 06:51:52 -05:00
  • 8c626ffb4e Automatic changelog generation for PR #6731 [ci skip] CitadelStationBot 2018-05-15 06:51:42 -05:00
  • 691cc34ebf Merge pull request #6731 from Citadel-Station-13/upstream-merge-37749 LetterJay 2018-05-15 06:51:39 -05:00
  • 68fcab96a5 Splits up round table initialize, start, end and shutdown Jordie 2018-05-15 17:11:39 +10:00
  • 7c3c270e2a Merge branch 'master' into upstream-merge-37749 LetterJay 2018-05-15 00:50:13 -05:00
  • 19306a2d9b Automatic changelog generation for PR #6663 [ci skip] CitadelStationBot 2018-05-15 00:48:01 -05:00
  • 0877bdd4e5 Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646 LetterJay 2018-05-15 00:47:59 -05:00
  • f4e00f39ca Cleans up touch spells letterjay 2018-05-15 00:35:41 -05:00