Commit Graph

  • 75d5e324ec Merge pull request #10379 from Hatterhat/tg-47443-shotgunpbs nik707 2020-01-01 20:32:16 -06:00
  • 0f8234b20d Automatic changelog generation for PR #10369 [ci skip] CitadelStationBot 2020-01-01 20:28:38 -06:00
  • e232b13119 Merge pull request #10369 from Hatterhat/patch-4 nik707 2020-01-01 20:28:35 -06:00
  • 6abcb5ad50 Automatic changelog generation for PR #10372 [ci skip] CitadelStationBot 2020-01-01 20:28:18 -06:00
  • be9912227f Merge pull request #10372 from Hatterhat/the-one-with-the-forcefields nik707 2020-01-01 20:28:15 -06:00
  • 6222b41204 Update forcefieldprojector.dm chefferz 2020-01-01 20:44:16 -05:00
  • 8390334d1e mirrors tgstation 48524 deathride58 2020-01-01 18:59:05 -05:00
  • 00bc8dbc97 actually no Putnam 2020-01-01 15:06:37 -08:00
  • 9a54467064 Robots can now view the crew manifest CameronWoof 2020-01-01 14:38:46 -08:00
  • b69950ac2b wow good thing this was impossible to check Putnam 2020-01-01 13:47:51 -08:00
  • 1acb499929 moved a thing to prevent a runtime Putnam 2020-01-01 13:26:43 -08:00
  • 58241b704e Automatic changelog generation for PR #10370 [ci skip] CitadelStationBot 2020-01-01 15:21:42 -06:00
  • c836889944 Merge pull request #10370 from Hatterhat/blood-drunk-cripple-bad Lin 2020-01-01 21:21:39 +00:00
  • d0b1c442a0 tweaks Putnam 2020-01-01 13:15:13 -08:00
  • 607109e0d2 also added individual ballot gathering Putnam 2020-01-01 12:29:13 -08:00
  • 37ce6e9336 honk Ghommie 2020-01-01 20:47:36 +01:00
  • 444f862a4d Renamed the options to make clear this isn't scoring? Putnam 2020-01-01 11:37:40 -08:00
  • 200de62b8e tweaks transfer amounts, uncucks hypovials Hatterhat 2020-01-01 08:50:15 -06:00
  • f425c42e72 Automatic changelog generation for PR #10383 [ci skip] CitadelStationBot 2020-01-01 07:36:12 -06:00
  • 66a7821696 Merge pull request #10383 from Citadel-Station-13/kevinz000-patch-4 Ghom 2020-01-01 14:36:10 +01:00
  • 46da6604a4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stunglasses Seris02 2020-01-01 19:28:56 +08:00
  • 68bc6dcc2a Update megafauna.dm kevinz000 2020-01-01 02:43:43 -08:00
  • 96cbc2704f Made random always available. Putnam 2020-01-01 00:32:49 -08:00
  • bf752ab2e6 more extreme. Putnam 2020-01-01 00:30:34 -08:00
  • d6fece9a57 removed extended weighting on intrigue Putnam 2020-01-01 00:28:39 -08:00
  • 6bbdd5d576 try recent round removal again Putnam 2020-01-01 00:26:55 -08:00
  • 0374870c41 bulldogs knockback too Hatterhat 2020-01-01 02:04:03 -06:00
  • 42347fd5ea more conveyance on how the voting works Putnam 2019-12-31 23:19:39 -08:00
  • 9b0e27cbc3 2 minute vote time Putnam 2019-12-31 23:11:34 -08:00
  • 51a7c7776a 1-5 -> -2 to 2 Putnam 2019-12-31 23:03:58 -08:00
  • 094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs kevinz000 2019-12-31 19:54:01 -08:00
  • ef36b9df75 i love democracy Hatterhat 2019-12-31 21:44:03 -06:00
  • 318a6812c3 manually copied tgstation#47443 Hatterhat 2019-12-31 21:38:11 -06:00
  • 12c099c23e Automatic changelog generation for PR #10330 [ci skip] CitadelStationBot 2019-12-31 21:32:07 -06:00
  • ec67a38093 Merge pull request #10330 from keronshb/keronnanite kevinz000 2019-12-31 19:32:05 -08:00
  • b592af1745 Automatic changelog generation for PR #10356 [ci skip] CitadelStationBot 2019-12-31 21:29:50 -06:00
  • c222ea0bb3 Merge pull request #10356 from deathride58/sprintprefs kevinz000 2019-12-31 19:29:47 -08:00
  • 0d42d9356b Automatic changelog generation for PR #10361 [ci skip] CitadelStationBot 2019-12-31 21:28:58 -06:00
  • 1051d99fdf Merge pull request #10361 from CameronWoof/fashion-ghosts kevinz000 2019-12-31 19:28:55 -08:00
  • 551e9f540d yee Seris02 2020-01-01 10:54:56 +08:00
  • 8255cb82aa C'mon now... EmeraldSundisk 2019-12-31 18:06:05 -08:00
  • 3d88fabfb4 Merge pull request #14 from Citadel-Station-13/master EmeraldSundisk 2019-12-31 17:59:22 -08:00
  • 58e50de434 grampa ghommles doesn't like kids and their newfangled technology and also the VA denied his claim and now he hates bureaucracy CameronWoof 2019-12-31 17:44:18 -08:00
  • 850a407cf4 majority judgement time Putnam 2019-12-31 16:37:33 -08:00
  • be62bbc96d Lowering price and change description r4d6 2019-12-31 18:17:07 -05:00
  • 811f1f3768 Automatic changelog generation for PR #9856 [ci skip] CitadelStationBot 2019-12-31 16:54:56 -06:00
  • 2796719399 Merge pull request #9856 from Ghommie/Ghommie-cit367 Lin 2019-12-31 22:54:53 +00:00
  • b651bbcdb3 Merge branch 'master' into Ghommie-cit367 Lin 2019-12-31 22:37:59 +00:00
  • 67fcdeebb3 Made loading saved votes not automatic Putnam 2019-12-31 12:43:37 -08:00
  • 7b83ee7d8b Update the description. r4d6 2019-12-31 13:35:30 -05:00
  • 81a39aa324 Add the space radsuit and the crate r4d6 2019-12-31 13:25:09 -05:00
  • dc2f9f2289 Revert "Merge branch 'master' of https://github.com/r4d6/Citadel-Station-13" r4d6 2019-12-31 13:20:41 -05:00
  • 95c96ed99c Merge branch 'master' of https://github.com/r4d6/Citadel-Station-13 r4d6 2019-12-31 13:20:25 -05:00
  • 12a01d1656 update (#9) r4d6 2019-12-31 13:12:23 -05:00
  • f920e7b73c changes kevinz000 2019-12-31 10:08:14 -08:00
  • a3ee3fe826 Automatic changelog generation for PR #10349 [ci skip] CitadelStationBot 2019-12-31 11:01:26 -06:00
  • cba4bc27ef Merge pull request #10349 from KathrinBailey/CE-locker Ghom 2019-12-31 18:01:23 +01:00
  • 243aebe12a dab 2x KathrinBailey 2019-12-31 16:54:59 +00:00
  • 0a19f62fa9 dab KathrinBailey 2019-12-31 16:45:06 +00:00
  • f2e9ba2a8e Makes lockers into subtypes KathrinBailey 2019-12-31 16:41:23 +00:00
  • 99c3358d61 Fixing a whacky female clothing caching related issue. Ghommie 2019-12-31 17:13:01 +01:00
  • 98e9196cfe Automatic changelog generation for PR #10309 [ci skip] CitadelStationBot 2019-12-31 07:43:42 -06:00
  • 93e090d229 Merge pull request #10309 from Seris02/disablerglasses Ghom 2019-12-31 14:43:39 +01:00
  • c25605f7e6 Automatic changelog generation for PR #10362 [ci skip] CitadelStationBot 2019-12-31 07:39:37 -06:00
  • 4660465115 Merge pull request #10362 from Trilbyspaceclone/patch-258 Ghom 2019-12-31 14:39:34 +01:00
  • 4349371b0b Automatic changelog generation for PR #10345 [ci skip] CitadelStationBot 2019-12-31 07:36:56 -06:00
  • 0453363d4c Merge pull request #10345 from Trilbyspaceclone/patch-256 Ghom 2019-12-31 14:36:53 +01:00
  • 3589803caf Automatic changelog generation for PR #10319 [ci skip] CitadelStationBot 2019-12-31 06:16:10 -06:00
  • 78e4c608ad Merge pull request #10319 from Seris02/coconutsyep Ghom 2019-12-31 13:16:07 +01:00
  • cf77f7b18e Balance pass (see description) Putnam 2019-12-31 02:40:50 -08:00
  • 8085022d97 Couple of changes. Starting on the point bank. BlackMajor 2019-12-31 23:28:30 +13:00
  • c81d0e8b66 Update energy.dm Trilbyspaceclone 2019-12-31 05:25:12 -05:00
  • 17a181b121 fixed Seris02 2019-12-31 18:02:22 +08:00
  • 54f859fe06 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics Seris02 2019-12-31 17:52:49 +08:00
  • 5a497b02ac hey i'm WALKIN here Hatterhat 2019-12-31 01:56:01 -06:00
  • c0bc53ea81 more kappa-sama 2019-12-31 01:43:42 -05:00
  • 970814adbc it begins kappa-sama 2019-12-31 01:42:07 -05:00
  • 76e789d3d1 getting limb crippled is a 4head bruh Hatterhat 2019-12-31 00:14:52 -06:00
  • 4c5f6f895b tgstation 42481 Hatterhat 2019-12-31 00:07:36 -06:00
  • ff8a86d05a squashing is hell but orm lasers work Hatterhat 2019-12-30 23:28:14 -06:00
  • dcb5c58784 hypovial users dont deserve rights Hatterhat 2019-12-30 22:33:40 -06:00
  • dc339b6962 beaker capacity buff Hatterhat 2019-12-30 22:24:41 -06:00
  • 8ac23f41e6 Automatic changelog generation for PR #10365 [ci skip] CitadelStationBot 2019-12-30 22:12:58 -06:00
  • b3144c7570 Merge pull request #10365 from Putnam3145/fix-prefs Lin 2019-12-31 04:12:55 +00:00
  • 0b60b121c2 afwafwadjiwao Putnam 2019-12-30 19:34:57 -08:00
  • 5f9666d866 Automatic changelog generation for PR #10364 [ci skip] CitadelStationBot 2019-12-30 20:10:32 -06:00
  • 1fc7722421 Merge pull request #10364 from Citadel-Station-13/kevinz000-patch-3-1 Putnam3145 2019-12-30 18:10:30 -08:00
  • 79c609aa40 Update telescopic_iv.dm kevinz000 2019-12-30 17:55:59 -08:00
  • bcaaaba396 Merge pull request #10363 from Arturlang/patch-4 nik707 2019-12-30 19:34:38 -06:00
  • 46c68f8fd8 Update code/modules/hydroponics/gene_modder.dm Seris02 2019-12-31 09:34:22 +08:00
  • 2e8c671a2f Update code/modules/hydroponics/seeds.dm Seris02 2019-12-31 09:34:15 +08:00
  • 5e403dd0a7 Update code/modules/hydroponics/seeds.dm Seris02 2019-12-31 09:34:03 +08:00
  • c4caa54608 Oh god oh fuck Arturlang 2019-12-31 03:23:14 +02:00
  • 018904694f caps Putnam 2019-12-30 17:03:06 -08:00
  • d2027c9abf Automatic changelog generation for PR #10344 [ci skip] CitadelStationBot 2019-12-30 18:31:37 -06:00
  • 70d03a7870 Merge pull request #10344 from Ghommie/Ghommie-cit495 nik707 2019-12-30 18:31:34 -06:00
  • 9538b7e664 Automatic changelog generation for PR #10338 [ci skip] CitadelStationBot 2019-12-30 18:31:09 -06:00
  • 5c13fa64e3 Merge pull request #10338 from Seris02/marshmallow nik707 2019-12-30 18:31:06 -06:00
  • 2271246910 Automatic changelog generation for PR #10165 [ci skip] CitadelStationBot 2019-12-30 18:28:51 -06:00
  • 8a4e44758f Merge pull request #10165 from Ghommie/Ghommie-cit456 nik707 2019-12-30 18:28:48 -06:00