Commit Graph

  • 3bb8902846 Merge pull request #6518 from Citadel-Station-13/upstream-merge-37413 deathride58 2018-04-27 09:36:44 +00:00
  • 5172d2ae09 Merge pull request #6517 from Citadel-Station-13/upstream-merge-37416 deathride58 2018-04-27 09:36:23 +00:00
  • 2ee4d3e77d Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326 deathride58 2018-04-27 09:35:43 +00:00
  • 927b3787bf Merge pull request #6514 from Citadel-Station-13/upstream-merge-37412 deathride58 2018-04-27 09:35:10 +00:00
  • 13c28b9ff1 Merge pull request #6513 from Citadel-Station-13/upstream-merge-37403 deathride58 2018-04-27 09:34:49 +00:00
  • 505458cfc9 Update riding.dm deathride58 2018-04-27 05:34:06 -04:00
  • 6d8ade932d Update lockon_aiming.dm deathride58 2018-04-27 05:33:37 -04:00
  • d37ff6135a Merge branch 'master' into upstream-merge-37389 deathride58 2018-04-27 09:32:54 +00:00
  • bf26599ac3 Merge pull request #6512 from Citadel-Station-13/upstream-merge-37391 deathride58 2018-04-27 09:32:21 +00:00
  • 62d64a8647 Merge pull request #6509 from Citadel-Station-13/upstream-merge-37402 deathride58 2018-04-27 09:32:05 +00:00
  • 48a5639f8a Merge pull request #6508 from Citadel-Station-13/upstream-merge-37390 deathride58 2018-04-27 09:31:23 +00:00
  • f8406d1bfe Merge pull request #6507 from Citadel-Station-13/upstream-merge-37375 deathride58 2018-04-27 09:31:04 +00:00
  • 5a399f4ce9 Merge pull request #6506 from Citadel-Station-13/upstream-merge-37411 deathride58 2018-04-27 09:30:18 +00:00
  • 909be55c5f Merge pull request #6497 from Citadel-Station-13/upstream-merge-37341 deathride58 2018-04-27 09:29:04 +00:00
  • a44347f6e8 Merge pull request #6496 from Citadel-Station-13/upstream-merge-37365 deathride58 2018-04-27 09:28:16 +00:00
  • e33dc09b83 Merge pull request #6495 from Citadel-Station-13/upstream-merge-37308 deathride58 2018-04-27 09:27:58 +00:00
  • 35cc70dd04 Merge pull request #6494 from Citadel-Station-13/upstream-merge-37263 deathride58 2018-04-27 09:27:29 +00:00
  • 634e896e11 Merge branch 'master' into upstream-merge-37299 deathride58 2018-04-27 09:22:31 +00:00
  • 35e8ac1240 Merge pull request #6492 from Citadel-Station-13/upstream-merge-37364 deathride58 2018-04-27 09:21:07 +00:00
  • 848d0564d1 Merge branch 'master' into upstream-merge-37381 deathride58 2018-04-27 09:19:52 +00:00
  • 00ef1a9f84 Merge pull request #6488 from Citadel-Station-13/upstream-merge-37362 deathride58 2018-04-27 09:18:15 +00:00
  • c17d48affe Merge pull request #6485 from Citadel-Station-13/upstream-merge-37359 deathride58 2018-04-27 09:17:43 +00:00
  • 5f42989d4b [s]fixes significant invulnerability exploit CitadelStationBot 2018-04-27 04:14:11 -05:00
  • e2aa213a52 BADBADBADBADBADBADBADBADBADBAD (#37452) imsxz 2018-04-27 05:13:37 -04:00
  • 294b6d7f84 Fixes missing augmentation hands CitadelStationBot 2018-04-27 02:42:14 -05:00
  • 9e3f99092f Fixes missing augmentation hands (#37373) ShizCalev 2018-04-27 03:41:56 -04:00
  • 57d128624a Ignores more generated files CitadelStationBot 2018-04-27 02:38:56 -05:00
  • 3850e64bbb Ignores more generated files (#37425) Jordan Brown 2018-04-27 03:37:42 -04:00
  • 6d7f388bca Updates syndicate hardsuit uplink description to not say it's unremovable CitadelStationBot 2018-04-27 02:37:44 -05:00
  • 8c9f4b9208 desc (#37435) kevinz000 2018-04-27 00:37:07 -07:00
  • 36fd9705c6 Analyzers show temperature in Kelvin as well as Celsius now CitadelStationBot 2018-04-27 02:28:22 -05:00
  • 18716c03a5 Analyzers show temperature in Kelvin as well as Celsius now (#37441) MrDoomBringer 2018-04-27 03:27:13 -04:00
  • 114c76de3b admins can now var edit the sound frogs make when they are stepped on CitadelStationBot 2018-04-27 02:28:13 -05:00
  • da1ac395c2 ok! (#37439) Armhulen 2018-04-27 00:27:41 -07:00
  • f8480eb7d5 Paperwork Error Event CitadelStationBot 2018-04-27 00:58:24 -05:00
  • ec080ab80b Paperwork Error Event (#37443) KorPhaeron 2018-04-27 00:57:16 -05:00
  • d679d27766 Merge pull request #6505 from Citadel-Station-13/upstream-merge-37378 LetterJay 2018-04-27 00:12:14 -05:00
  • 4647168c78 Merge pull request #6504 from Citadel-Station-13/upstream-merge-37379 LetterJay 2018-04-27 00:11:59 -05:00
  • df90ab6fb9 Merge pull request #6503 from Citadel-Station-13/upstream-merge-37371 LetterJay 2018-04-27 00:11:11 -05:00
  • 72ddaee4a3 Merge pull request #6502 from Citadel-Station-13/upstream-merge-37363 LetterJay 2018-04-27 00:10:52 -05:00
  • 32b5e75135 Merge pull request #6501 from Citadel-Station-13/upstream-merge-37404 LetterJay 2018-04-27 00:09:43 -05:00
  • a4bc2c0b95 Merge pull request #6500 from Citadel-Station-13/upstream-merge-37398 LetterJay 2018-04-27 00:09:17 -05:00
  • d496d78169 Merge pull request #6486 from Poojawa/4-22-sync LetterJay 2018-04-27 00:08:38 -05:00
  • 08e030b06c Renames praisenarsie to Frozenguy5 in credits CitadelStationBot 2018-04-26 15:28:02 -05:00
  • 482e83ce89 Merge pull request #37463 from praisenarsie/patch-39 Jordan Brown 2018-04-26 16:26:49 -04:00
  • 92f1f7ce8c Adds a picker tool to advanced buildmode CitadelStationBot 2018-04-26 15:26:48 -05:00
  • 4254104676 Merge pull request #37337 from ninjanomnom/buildmode-picker Jordan Brown 2018-04-26 16:26:20 -04:00
  • 81a9c894ff Makes it possible to see tiles past z transitions CitadelStationBot 2018-04-26 15:25:36 -05:00
  • 5994a9fd0b Merge pull request #37342 from ninjanomnom/vis-border Jordan Brown 2018-04-26 16:24:19 -04:00
  • f55c9c0042 Removes Acid from Remaining Circuits CitadelStationBot 2018-04-26 15:24:26 -05:00
  • 4838bfec4e Merge pull request #37407 from Fox-McCloud/circuits-reagents Jordan Brown 2018-04-26 16:23:31 -04:00
  • de481ab91e New Trait: Acute Blood Deficiency CitadelStationBot 2018-04-26 15:21:11 -05:00
  • 354dc0bcf9 Merge pull request #37431 from Mickyan/anemic Jordan Brown 2018-04-26 16:19:38 -04:00
  • 04e190a45c Adds note about correct usage of the dlls section of tgs3.json CitadelStationBot 2018-04-26 15:20:58 -05:00
  • 0844993357 Adds note about correct usage of the dlls section of tgs3.json Kyle Spier-Swenson 2018-04-24 02:18:49 -07:00
  • 132ae3a657 what the fuck is this shitcode deathride58 2018-04-26 09:28:34 -04:00
  • a0b1f79051 Makes the experimentor only output one copy of something. CitadelStationBot 2018-04-26 08:01:47 -05:00
  • 9015cdf172 Makes the experimentor only output one copy of something. (#37313) Dax Dupont 2018-04-26 15:01:13 +02:00
  • 918e4c50eb ensures tails reset taur mode Poojawa 2018-04-26 07:37:49 -05:00
  • 110878de18 Update jellypeople.dm Poojawa 2018-04-26 07:27:47 -05:00
  • f29859ddbd fixes my shitcode Poojawa 2018-04-26 07:27:09 -05:00
  • 95e3a2b266 Fixes shitcode Poojawa 2018-04-26 07:14:42 -05:00
  • 89e34cb0cc Gives admins the D(say) hotkey + fixes buildmode permissions CitadelStationBot 2018-04-25 21:40:05 -05:00
  • d0266b01cd Gives admins the D(say) hotkey + fixes buildmode permissions (#37413) Dax Dupont 2018-04-26 04:39:07 +02:00
  • 5b035581f0 Merge pull request #6516 from Citadel-Station-13/upstream-merge-37427 deathride58 2018-04-25 19:10:05 +00:00
  • 096ddb70ba Fixes the stock market having random, spontaneous exponential value spikes. CitadelStationBot 2018-04-25 13:44:43 -05:00
  • c340d2c9aa Merge pull request #37416 from deathride58/fixesexponentialstockmarket Jordan Brown 2018-04-25 14:44:08 -04:00
  • cab5a3dce1 [S] Fixes an exploit that allows you to print any object using the circuit printer CitadelStationBot 2018-04-25 13:29:13 -05:00
  • 2a40af1bf2 Fixes a thing (#37427) Nich 2018-04-25 20:28:27 +02:00
  • 09f245ae90 Removes SCP_294 CitadelStationBot 2018-04-25 10:05:57 -05:00
  • 17aa0acef8 Removes SCP_294 (#37326) Armhulen 2018-04-25 08:05:41 -07:00
  • fa34c339c3 Adds ckey to some of the ban prompts. CitadelStationBot 2018-04-25 09:23:46 -05:00
  • 2d95013981 Adds ckey to some of the ban prompts. (#37412) Dax Dupont 2018-04-25 16:22:20 +02:00
  • 52afbb9570 Adds grind_results to coins and diamonds CitadelStationBot 2018-04-25 06:04:19 -05:00
  • d2885c84b7 adds grind_results to coins and diamonds (#37403) 81Denton 2018-04-25 13:04:06 +02:00
  • 6f65262e6e Improves messaging for blood contracts CitadelStationBot 2018-04-25 05:58:59 -05:00
  • 4504014303 Improves messaging for blood contracts (#37391) Dax Dupont 2018-04-25 12:58:48 +02:00
  • f0a259d3e5 Removes redundant COMPONENT_INCOMPATIBLE crashes Jordan Brown 2018-04-25 06:53:43 -04:00
  • 8ccd61f6bc Fixes autosurgeon icon CitadelStationBot 2018-04-24 16:03:34 -05:00
  • e50b647ea4 Fixes autosurgeon icon (#37402) AnturK 2018-04-24 23:02:57 +02:00
  • b3316f6b02 Adds salt to chips and jerky CitadelStationBot 2018-04-24 15:55:13 -05:00
  • 651b9510f9 Merge pull request #37390 from Mickyan/snacks_contents Jordan Brown 2018-04-24 16:55:00 -04:00
  • e9b00c6ac0 fixes cqc working outside chef assigned areas CitadelStationBot 2018-04-24 10:23:34 -05:00
  • 42d0541a28 fixes cqc working outside chef assigned areas (#37375) kevinz000 2018-04-24 08:23:32 -07:00
  • 5df9e140d2 Improves logging/messaging for singularities. CitadelStationBot 2018-04-24 10:19:15 -05:00
  • 5014bdf6ee Improves logging/messaging for singularities. (#37411) Dax Dupont 2018-04-24 17:18:57 +02:00
  • 2f9f2684dd Fixes brain tumor. Again. CitadelStationBot 2018-04-24 09:58:37 -05:00
  • 1ba045e5f5 Fixes brain tumor. Again. (#37378) AnturK 2018-04-24 16:58:19 +02:00
  • 1a5e46ca1e Fixes duplicate logic causing doors to be perma stuck on shock mode. CitadelStationBot 2018-04-24 08:14:12 -05:00
  • e748439b15 Fixes duplicate logic causing doors to be perma stuck on mike pence mode. (#37379) Dax Dupont 2018-04-24 15:14:05 +02:00
  • 3bc56f5723 GetFlatIcon fix CitadelStationBot 2018-04-24 07:20:40 -05:00
  • 3c36c1acfc GetFlatIcon fix (#37371) kevinz000 2018-04-24 05:21:04 -07:00
  • 5299a24587 Makes radiation collectors buildable CitadelStationBot 2018-04-24 07:13:16 -05:00
  • d5c2d37e39 Makes radiation collectors buildable (#37363) Dax Dupont 2018-04-24 14:13:13 +02:00
  • 0702ed85d7 Remove rusty from tgs3.json CitadelStationBot 2018-04-24 04:21:37 -05:00
  • da527e2742 Remove rusty from tgs3.json (#37404) Kyle Spier-Swenson 2018-04-24 02:21:34 -07:00
  • 45b1869666 fixes some rushed mapping issues. Poojawa 2018-04-23 20:47:11 -05:00
  • 4d3ebbc02e Fixes cargo scanner being invis. CitadelStationBot 2018-04-23 18:28:41 -05:00
  • a88caf87aa Fixes cargo scanner being invis. Dax Dupont 2018-04-24 01:00:57 +02:00
  • c6436ff3ac Adds multilayer pipe subtypes for mapping CitadelStationBot 2018-04-23 10:33:20 -05:00