Commit Graph

  • e3ba2e60c6 Not supported Artur 2020-07-08 20:31:08 +03:00
  • ba9a6cbbf3 Automatic changelog generation for PR #12648 [ci skip] CitadelStationBot 2020-07-08 05:10:48 -05:00
  • 6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar silicons 2020-07-08 03:10:44 -07:00
  • 2d447019c5 woops Letter N 2020-07-08 16:59:22 +08:00
  • 05684e7196 no config filter thing yet, but the code for it is "ready" Letter N 2020-07-08 16:36:58 +08:00
  • f757e54db9 muh immursion Letter N 2020-07-08 15:59:44 +08:00
  • 45a3c47608 removes fun Letter N 2020-07-08 15:10:49 +08:00
  • fa8ea6c430 Merge remote-tracking branch 'upstream/master' into hoodieFix Sneakyrat6 2020-07-07 23:48:59 -05:00
  • 6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry silicons 2020-07-07 21:07:58 -07:00
  • 22c3d9fe3e ok silicons 2020-07-07 21:07:13 -07:00
  • bd8cc4791f whew silicons 2020-07-07 21:02:23 -07:00
  • 5246408622 fix silicons 2020-07-07 20:51:34 -07:00
  • 6ee63f66aa whew silicons 2020-07-07 20:48:54 -07:00
  • 3569e8da1e Fixes hair falling out of hoodies Sneakyrat6 2020-07-07 22:31:00 -05:00
  • bfa54f7e23 Automatic changelog compile [ci skip] Changelogs 2020-07-08 00:09:46 +00:00
  • 150a31a584 new and improved, less jarring poster Keate Senior 2020-07-07 19:56:46 -04:00
  • f0935a784d two missing traits woops Timothy Teakettle 2020-07-07 23:24:25 +01:00
  • e07909ebe2 does it in a far superior way Timothy Teakettle 2020-07-07 23:12:36 +01:00
  • 7dd37cad34 Kilo fix Artur 2020-07-07 23:29:21 +03:00
  • 062d514ac2 Update legion.dm Trilbyspaceclone 2020-07-07 14:30:09 -04:00
  • b2dd2a1053 Update necropolis_chests.dm Trilbyspaceclone 2020-07-07 14:28:40 -04:00
  • 33f56fd168 Merge pull request #12694 from Ghommie/Ghommie-cit833 Lin 2020-07-07 13:23:25 -05:00
  • 023dcc0019 Update spellcard.dm Trilbyspaceclone 2020-07-07 14:22:41 -04:00
  • ddeb564c80 Legion fix Trilbyspaceclone 2020-07-07 14:21:16 -04:00
  • f479a8622e Update spell_book.dm Trilbyspaceclone 2020-07-07 14:11:46 -04:00
  • c21011c64c Update spellcard.dm Trilbyspaceclone 2020-07-07 14:09:31 -04:00
  • f7dbce0cd0 Update spellcard.dm Trilbyspaceclone 2020-07-07 13:55:02 -04:00
  • dae3110100 Update wand.dm Trilbyspaceclone 2020-07-07 13:52:41 -04:00
  • 8aceeb0c43 Update spell_book.dm Trilbyspaceclone 2020-07-07 13:50:42 -04:00
  • 49b0d38112 Apply suggestions from code review Trilbyspaceclone 2020-07-07 13:47:56 -04:00
  • f230e2bb06 fIXES KILO Artur 2020-07-07 20:29:21 +03:00
  • 37f4022bfc Changed slime core to slime nucleus Cirno 2020-07-07 13:35:30 -03:00
  • e0a0d0bed8 Add files via upload EmeraldSundisk 2020-07-07 09:05:31 -07:00
  • 2158278a6f Fixes cog Artur 2020-07-07 18:44:54 +03:00
  • 280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 Artur 2020-07-07 18:37:45 +03:00
  • fe45971e43 Added a slime core in the place of brains for jelly people Cirno 2020-07-07 12:05:06 -03:00
  • 6634e43be4 fix silicons 2020-07-07 07:41:33 -07:00
  • cee15792b7 ok silicons 2020-07-07 07:25:10 -07:00
  • 9910867345 Update SDQL_2.dm silicons 2020-07-07 06:19:17 -07:00
  • 96f48c8237 Update PubbyStation.dmm EmeraldSundisk 2020-07-07 00:01:25 -07:00
  • 168a179bfb Merge pull request #48 from Citadel-Station-13/master EmeraldSundisk 2020-07-06 22:05:40 -07:00
  • 8eda04bc60 Merge branch 'tray-and-jar' of https://github.com/timothyteakettle/Citadel-Station-13 into tray-and-jar timothyteakettle 2020-07-07 03:03:32 +01:00
  • ab5795b3d3 Update pet_carrier.dm timothyteakettle 2020-07-07 03:03:09 +01:00
  • 23d00ea671 stops double applied damage and stuns Timothy Teakettle 2020-07-07 01:44:28 +01:00
  • 1d791c4808 Automatic changelog generation for PR #12702 [ci skip] CitadelStationBot 2020-07-06 19:38:27 -05:00
  • 5b09b68c6d Merge pull request #12702 from DeltaFire15/actually-kill-once silicons 2020-07-06 17:38:24 -07:00
  • 0c0bf46f7f Merge pull request #12696 from Chiirno/emichemmastertweak silicons 2020-07-06 17:34:50 -07:00
  • 94825ec073 Automatic changelog generation for PR #12697 [ci skip] CitadelStationBot 2020-07-06 19:34:40 -05:00
  • fb23905f42 Merge pull request #12697 from EmeraldSundisk/cogmedsci silicons 2020-07-06 17:34:36 -07:00
  • 00f1818dbc Automatic changelog generation for PR #12684 [ci skip] CitadelStationBot 2020-07-06 19:19:10 -05:00
  • 4fa7a461ef Merge pull request #12684 from Owai-Seek/foodport-p1-7/1/20 silicons 2020-07-06 17:19:07 -07:00
  • 24e6cf4656 Automatic changelog compile [ci skip] Changelogs 2020-07-07 00:12:23 +00:00
  • b3b04f02e3 Automatic changelog compile [ci skip] Changelogs 2020-07-07 00:09:53 +00:00
  • 0432eaf6d9 Automatic changelog generation for PR #12698 [ci skip] CitadelStationBot 2020-07-06 17:22:37 -05:00
  • c2746c723e Merge pull request #12698 from Owai-Seek/beebalmfix-7-4-20 Ghom 2020-07-07 00:22:33 +02:00
  • eeadc9a0e7 fixes the kill once objective DeltaFire 2020-07-06 23:00:36 +02:00
  • e7d19f512e Merge pull request #12397 from Rohesie/cooldown Ghom 2020-07-06 22:54:58 +02:00
  • 18d8b5b0a8 Merge remote-tracking branch 'upstream/master' DeltaFire 2020-07-06 22:54:04 +02:00
  • d6364259d5 Automatic changelog generation for PR #12688 [ci skip] CitadelStationBot 2020-07-06 15:48:12 -05:00
  • bc5e7d1513 Merge pull request #12688 from Weblure/small-strides-fix Ghom 2020-07-06 22:48:09 +02:00
  • 028f4d11e8 Automatic changelog generation for PR #12699 [ci skip] CitadelStationBot 2020-07-06 15:47:50 -05:00
  • af1f715b3e Merge pull request #12699 from KasparoVy/silverlwraps-fix Ghom 2020-07-06 22:47:48 +02:00
  • afb5b5237c linter & stuff. Ghommie 2020-07-06 22:42:32 +02:00
  • 4ee72305d0 Post This Justiciar Keate Senior 2020-07-06 06:34:38 -04:00
  • 8cbe248465 Updates paper to TG Artur 2020-07-06 13:09:02 +03:00
  • 3154e8c596 Updates components to TG and fixes can Artur 2020-07-06 10:58:48 +03:00
  • b41ed4c9f5 Shifts South Dir of Silver LWraps Right 1px KasparoVy 2020-07-05 21:28:57 -04:00
  • 482785d922 Fixes Bee Balm Winter Flare 2020-07-05 19:14:03 -04:00
  • 7ebc785437 fIXES UPLINK Artur 2020-07-05 21:52:24 +03:00
  • 672f86a318 Add files via upload EmeraldSundisk 2020-07-05 09:39:53 -07:00
  • 75b2a7dad5 Update CogStation.dmm EmeraldSundisk 2020-07-05 09:18:26 -07:00
  • 45d97b2251 increased the amount of stuff the chem master can dispense from 10 to 20 Cirno 2020-07-05 11:17:37 -03:00
  • d9f269280b Update CogStation.dmm EmeraldSundisk 2020-07-04 23:45:08 -07:00
  • 45a14f16d4 Revert "?" EmeraldSundisk 2020-07-04 21:39:23 -07:00
  • c6b5bac0d8 ? EmeraldSundisk 2020-07-04 21:33:29 -07:00
  • 2553ef6dd8 Am I finally free? Cirno 2020-07-05 00:46:56 -03:00
  • bd289d0edb more map changes... Cirno 2020-07-05 00:08:33 -03:00
  • e12c3382de undefined variable. Ghommie 2020-07-05 03:48:41 +02:00
  • 562b57095d mowing down the experimental cloner copypasta. Ghommie 2020-07-05 03:04:53 +02:00
  • 767290d8e9 Trashbag Whitelist Update Winter Flare 2020-07-04 21:03:31 -04:00
  • 99168e3ed0 Merge pull request #47 from Citadel-Station-13/master EmeraldSundisk 2020-07-04 17:19:06 -07:00
  • 8753680cf9 Automatic changelog compile [ci skip] Changelogs 2020-07-05 00:10:19 +00:00
  • adcc30c6d8 Forgooot to rebuild Artur 2020-07-05 00:38:57 +03:00
  • 4f5d262ee3 Automatic changelog generation for PR #12651 [ci skip] CitadelStationBot 2020-07-04 14:16:09 -05:00
  • 703d03453b Merge pull request #12651 from Citadel-Station-13/silicons-patch-9 Lin 2020-07-04 14:16:06 -05:00
  • 3200bbb6db Automatic changelog generation for PR #12650 [ci skip] CitadelStationBot 2020-07-04 14:13:21 -05:00
  • 4d29aa9148 Merge pull request #12650 from Citadel-Station-13/silicons-patch-7 Lin 2020-07-04 14:13:18 -05:00
  • 27d4bcab18 Automatic changelog generation for PR #12652 [ci skip] CitadelStationBot 2020-07-04 14:12:46 -05:00
  • d04b335d1a Merge pull request #12652 from silicons/cool Lin 2020-07-04 14:12:43 -05:00
  • 3ba077be71 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit833 Ghommie 2020-07-04 21:04:33 +02:00
  • 780f30bd4d Fixing cloning Ghommie 2020-07-04 21:01:44 +02:00
  • c2ba973c88 Merge remote-tracking branch 'origin' into emi Cirno 2020-07-04 15:59:47 -03:00
  • 020da9fa07 i hope this works Cirno 2020-07-04 15:47:38 -03:00
  • 2fa1b3e095 Merge branch 'tray-and-jar' of https://github.com/timothyteakettle/Citadel-Station-13 into tray-and-jar Timothy Teakettle 2020-07-04 18:44:51 +01:00
  • 5c5746c04c less air Timothy Teakettle 2020-07-04 18:44:47 +01:00
  • 21209ada03 Automatic changelog generation for PR #12593 [ci skip] CitadelStationBot 2020-07-04 11:37:02 -05:00
  • 871993ce14 Merge pull request #12593 from silicons/autobunker Ghom 2020-07-04 18:36:59 +02:00
  • c5a88f1cb7 Automatic changelog generation for PR #12660 [ci skip] CitadelStationBot 2020-07-04 11:35:25 -05:00
  • 17ee8c5960 Merge pull request #12660 from YakumoChen/master Ghom 2020-07-04 18:35:22 +02:00
  • 5864f7de95 Merge pull request #12691 from Citadel-Station-13/silicons-patch-16 Ghom 2020-07-04 18:30:14 +02:00