Commit Graph

  • 47ff13c539 apply the overlay timothyteakettle 2020-07-21 02:37:21 +01:00
  • 1ed035e4a3 move timothyteakettle 2020-07-21 02:29:41 +01:00
  • 8adfe633e3 Fixes MK YakumoChen 2020-07-21 01:27:22 +00:00
  • 3e0403a7e9 BEEPSKY FASHION timothyteakettle 2020-07-21 02:22:42 +01:00
  • d5301c095d Merge pull request #7 from Citadel-Station-13/master YakumoChen 2020-07-20 21:21:49 -04:00
  • c92abfe2ce bruh kappa-sama 2020-07-20 21:18:39 -04:00
  • 6e08865b36 Update topic.dm silicons 2020-07-20 17:30:35 -07:00
  • c27f339049 Automatic changelog generation for PR #12824 [ci skip] CitadelStationBot 2020-07-20 19:25:57 -05:00
  • aa3cc9fae8 Merge pull request #12824 from kappa-sama/patch-35 silicons 2020-07-20 17:25:53 -07:00
  • 75a2035774 Merge branch 'master' into wound-port Timothy Teakettle 2020-07-21 01:10:51 +01:00
  • f4c5796b6d Automatic changelog compile [ci skip] Changelogs 2020-07-21 00:10:06 +00:00
  • b6f689b06d Merge pull request #12843 from Citadel-Station-13/silicons-patch-40 Lin 2020-07-20 19:05:28 -05:00
  • 9a798c7ba8 Automatic changelog generation for PR #12787 [ci skip] CitadelStationBot 2020-07-20 19:01:36 -05:00
  • 3d2995b4e8 Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh silicons 2020-07-20 17:01:32 -07:00
  • 9ea17928a5 Automatic changelog generation for PR #12829 [ci skip] CitadelStationBot 2020-07-20 18:59:40 -05:00
  • a7144d2404 Merge pull request #12829 from timothyteakettle/fried-component silicons 2020-07-20 16:59:36 -07:00
  • 8c254744bf Automatic changelog generation for PR #12811 [ci skip] CitadelStationBot 2020-07-20 18:58:05 -05:00
  • 7df369e5d7 Merge pull request #12811 from kappa-sama/patch-33 silicons 2020-07-20 16:58:01 -07:00
  • 3efe9c8c00 Automatic changelog generation for PR #12807 [ci skip] CitadelStationBot 2020-07-20 18:57:27 -05:00
  • 1d99591b6b Merge pull request #12807 from kappa-sama/patch-32 silicons 2020-07-20 16:57:24 -07:00
  • 12a09bee52 Automatic changelog generation for PR #12805 [ci skip] CitadelStationBot 2020-07-20 18:56:59 -05:00
  • 9bb92f8d4d Merge pull request #12805 from SiliconMain/patch-1 silicons 2020-07-20 16:56:57 -07:00
  • 53e18d0314 Automatic changelog generation for PR #12826 [ci skip] CitadelStationBot 2020-07-20 18:56:25 -05:00
  • 3f2cab02eb Merge pull request #12826 from Kraseo/instastuns-bad silicons 2020-07-20 16:56:22 -07:00
  • 38557d0b29 Automatic changelog generation for PR #12804 [ci skip] CitadelStationBot 2020-07-20 18:55:41 -05:00
  • 947b050c47 Merge pull request #12804 from Arturlang/decal_painter_fix silicons 2020-07-20 16:55:38 -07:00
  • ef9a757a82 Automatic changelog generation for PR #12800 [ci skip] CitadelStationBot 2020-07-20 18:55:03 -05:00
  • c7022445b5 Merge pull request #12800 from DeltaFire15/swarmer-fix silicons 2020-07-20 16:55:00 -07:00
  • fefc0530b8 Merge pull request #12795 from TheSpaghetti/patch-3 silicons 2020-07-20 16:54:43 -07:00
  • 2e09ecee4c Automatic changelog generation for PR #12749 [ci skip] CitadelStationBot 2020-07-20 18:54:28 -05:00
  • 448706d540 Merge pull request #12749 from TheSpaghetti/patch-2 silicons 2020-07-20 16:54:25 -07:00
  • 4d4133a8da Merge pull request #12819 from Arturlang/bloodsucker_typo silicons 2020-07-20 16:53:42 -07:00
  • 2ec64f3e05 Update wizard.dm silicons 2020-07-20 16:50:56 -07:00
  • 210b7b281c Merge pull request #12727 from Citadel-Station-13/silicons-patch-19 Lin 2020-07-20 18:25:01 -05:00
  • 7adae61ade Merge pull request #12773 from Citadel-Station-13/silicons-patch-28 Lin 2020-07-20 18:22:42 -05:00
  • ffde1709ea Automatic changelog generation for PR #12823 [ci skip] CitadelStationBot 2020-07-20 18:21:59 -05:00
  • 923b4cbb4f Merge pull request #12823 from Citadel-Station-13/gravity_update Lin 2020-07-20 18:21:55 -05:00
  • f0df3689dc Merge pull request #12790 from Citadel-Station-13/silicons-patch-30 Lin 2020-07-20 18:20:27 -05:00
  • a810a1dc63 Automatic changelog generation for PR #12786 [ci skip] CitadelStationBot 2020-07-20 18:20:12 -05:00
  • 67a6330e77 Merge pull request #12786 from silicons/survivalists Lin 2020-07-20 18:20:08 -05:00
  • 401eeafa82 Automatic changelog generation for PR #12766 [ci skip] CitadelStationBot 2020-07-20 18:18:24 -05:00
  • 0186112357 Merge pull request #12766 from Citadel-Station-13/silicons-patch-25 Lin 2020-07-20 18:18:20 -05:00
  • 0ef5753a92 Automatic changelog generation for PR #12728 [ci skip] CitadelStationBot 2020-07-20 18:17:48 -05:00
  • f7355dde62 Merge pull request #12728 from silicons/vote Lin 2020-07-20 18:17:45 -05:00
  • 2351e464d6 Automatic changelog generation for PR #12646 [ci skip] CitadelStationBot 2020-07-20 18:15:42 -05:00
  • 267186a5d3 Merge pull request #12646 from Chiirno/emi silicons 2020-07-20 16:15:38 -07:00
  • 944a91e44d Update subsystems.dm silicons 2020-07-20 15:55:41 -07:00
  • 5c189b310e ok, snaxi silicons 2020-07-20 15:43:48 -07:00
  • ecb9a430eb Stable gateways and integration cog QoL by DeltaFire Keate Senior 2020-07-20 11:16:30 -04:00
  • 692656b02d Whew silicons 2020-07-20 11:53:33 -07:00
  • 3676b03f28 experiment kappa-sama 2020-07-20 14:53:22 -04:00
  • 526d257410 fix silicons 2020-07-20 11:48:08 -07:00
  • 4b70e29e36 let the fry smite work Timothy Teakettle 2020-07-20 19:42:07 +01:00
  • 416b989e12 changes silicons 2020-07-20 11:35:10 -07:00
  • 98d3ac80d9 :pika: silicons 2020-07-20 11:25:17 -07:00
  • 82284ae381 Go away changelog changes. Winter Flare 2020-07-20 14:24:14 -04:00
  • 641dc1f012 Merge pull request #5 from Citadel-Station-13/master Heretical Lizard 2020-07-20 14:23:24 -04:00
  • 54e117d7d6 Revert "Merge pull request #4 from DeltaFire15/COGGERS" Heretical Lizard 2020-07-20 03:04:44 -04:00
  • d43a5cae26 let's refactor attack_hand. silicons 2020-07-20 11:19:20 -07:00
  • 924309aab8 changeS silicons 2020-07-20 11:11:12 -07:00
  • 57126cba74 Automatic changelog generation for PR #12830 [ci skip] CitadelStationBot 2020-07-20 12:49:12 -05:00
  • dec84af233 Merge pull request #12830 from Funce/genetic-spider-fix silicons 2020-07-20 10:49:10 -07:00
  • 984796b8c6 sigh silicons 2020-07-20 10:46:52 -07:00
  • 58e26c540c merge from master silicons 2020-07-20 10:18:44 -07:00
  • 6ab250dd03 sigh silicons 2020-07-20 10:13:50 -07:00
  • b06948bed4 fry smite Timothy Teakettle 2020-07-20 17:48:37 +01:00
  • a0c166c490 badmin safeguarding Timothy Teakettle 2020-07-20 17:43:58 +01:00
  • c68f0559d9 old instant eating speed Timothy Teakettle 2020-07-20 17:29:09 +01:00
  • eab0ae8af0 small changes Timothy Teakettle 2020-07-20 17:20:54 +01:00
  • 30e96eb062 makes various structures work better for a station based mode Keate Senior 2020-07-20 03:26:41 -04:00
  • 21af6d4805 same as last commit but I actually stage all the right files Keate Senior 2020-07-20 03:20:13 -04:00
  • beb6dd6e08 scripture changes and new marauder variant Keate Senior 2020-07-20 03:16:03 -04:00
  • 7e836837f9 Merge pull request #4 from DeltaFire15/COGGERS Heretical Lizard 2020-07-20 03:04:44 -04:00
  • 166ad02d6b Update OmegaStation.dmm EmeraldSundisk 2020-07-19 22:26:35 -07:00
  • 6ac765eca5 Update subsystems.dm silicons 2020-07-19 20:08:56 -07:00
  • 512174b782 Update subsystems.dm silicons 2020-07-19 20:07:16 -07:00
  • ae83a6df02 fix silicons 2020-07-19 19:51:17 -07:00
  • 64d5bd0030 switches around messages Chiirno 2020-07-19 21:38:44 -03:00
  • 0c07faa3e0 For future reference, '.' return overrides 'return' statements Funce 2020-07-20 12:22:18 +12:00
  • 809b9d8d35 Automatic changelog compile [ci skip] Changelogs 2020-07-20 00:10:32 +00:00
  • 2af449a3c7 Fixes genewebs being impossibly impassable Funce 2020-07-20 11:55:23 +12:00
  • e2b68797b7 bugfixes timothyteakettle 2020-07-20 00:49:00 +01:00
  • c052e79e85 Automatic changelog generation for PR #12810 [ci skip] CitadelStationBot 2020-07-19 18:43:03 -05:00
  • f265b85d3b Merge pull request #12810 from lolman360/master BlackMajor 2020-07-20 11:42:59 +12:00
  • 8709a72fc0 fry everything timothyteakettle 2020-07-20 00:40:18 +01:00
  • e416a2377e Merge branch 'master' into foodport-p2-7/12/20 Winter Flare 2020-07-19 18:58:52 -04:00
  • f6550b99b3 Merge remote-tracking branch 'upstream/master' Winter Flare 2020-07-19 18:57:05 -04:00
  • 1ebb81e44c Fixes, final tweaks. Winter Flare 2020-07-19 18:52:20 -04:00
  • 037cec508e fixes a math mistake Timothy Teakettle 2020-07-19 21:43:17 +01:00
  • ba15c17e02 here kappa-sama 2020-07-19 15:14:44 -04:00
  • 26a240ddb9 bye kappa-sama 2020-07-19 15:14:12 -04:00
  • 1b99cb9201 everything has the bonesetter Timothy Teakettle 2020-07-19 18:32:44 +01:00
  • fdfee756b7 you can enter stamcrit now Timothy Teakettle 2020-07-19 18:18:22 +01:00
  • a8d2f558bc use old table pushing Timothy Teakettle 2020-07-19 17:53:25 +01:00
  • ca6b289da6 fix tables and some minor thing Timothy Teakettle 2020-07-19 17:49:22 +01:00
  • b47872c079 Merge pull request #12802 from Citadel-Station-13/silicons-patch-31 Lin 2020-07-19 11:12:32 -05:00
  • f2e0e5c247 Merge pull request #12814 from Citadel-Station-13/silicons-patch-35 Lin 2020-07-19 11:10:51 -05:00
  • 7094649881 don't like this Kraseo 2020-07-19 11:30:55 +02:00
  • 38f05bf230 6 because i feel like it kappa-sama 2020-07-19 04:37:51 -04:00
  • 6075af8eb0 nerfies kappa-sama 2020-07-19 04:28:44 -04:00