Commit Graph

26186 Commits

Author SHA1 Message Date
Fermi 994c01c8ec Revert "Revert "Trust your insincts""
This reverts commit 82c3e3cd9d.
2019-11-24 03:04:23 +00:00
Fermi 3155e3ffb3 Revert "Revert "Removes the random love""
This reverts commit ce7e9ac452.
2019-11-24 03:04:20 +00:00
Fermi 1509d9d183 Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
2019-11-24 03:04:13 +00:00
Fermi c8b206a4cf Revert "pls"
This reverts commit 8c97511871.
2019-11-24 03:04:04 +00:00
Fermi 4c1c257035 Revert "Revert "pls""
This reverts commit b23f2a4460.
2019-11-24 03:02:21 +00:00
Fermi 9eaed4ea8e Revert "pls2"
This reverts commit 0eb635b908.
2019-11-24 03:02:04 +00:00
Fermi 8ea6618f5d Revert "ARGH"
This reverts commit f0f52ce3f8.
2019-11-24 03:01:59 +00:00
Fermi cb4bfa65d1 Revert "?"
This reverts commit 05d18171e0.
2019-11-24 03:01:55 +00:00
Fermi 1f7e9d8ab5 Revert "please"
This reverts commit ac53c26d87.
2019-11-24 03:01:51 +00:00
Fermi ac53c26d87 please 2019-11-24 02:58:15 +00:00
Fermi 05d18171e0 ? 2019-11-24 02:57:46 +00:00
Fermi f0f52ce3f8 ARGH 2019-11-24 02:55:50 +00:00
Fermi 0eb635b908 pls2
ugh
2019-11-24 02:52:17 +00:00
Fermi b23f2a4460 Revert "pls"
This reverts commit 8c97511871.
2019-11-24 02:49:20 +00:00
Fermi 8c97511871 pls
ugh
2019-11-24 02:47:52 +00:00
Fermi 135608551f Merge remote-tracking branch 'upstream/master' 2019-11-24 02:45:28 +00:00
Fermi ce7e9ac452 Revert "Removes the random love"
This reverts commit b056d91ea5.
2019-11-24 02:45:06 +00:00
Fermi 82c3e3cd9d Revert "Trust your insincts"
This reverts commit 7a605b4ba6.
2019-11-24 02:44:52 +00:00
Fermi df5814c30e Revert "Well"
This reverts commit e44c8c0a4a.
2019-11-24 02:44:36 +00:00
Fermi fb2c29caff Revert "Okay"
This reverts commit 37ac0ccb66.
2019-11-24 02:44:32 +00:00
Fermi 3d713b6c96 Revert "I can't spell"
This reverts commit 0fed6d49e4.
2019-11-24 02:44:28 +00:00
Fermi f4b54f15d2 Revert "hark"
This reverts commit 89bcb00ef1.
2019-11-24 02:44:19 +00:00
Fermi 505e15a3e1 Revert "Alright"
This reverts commit b756f37ff6.
2019-11-24 02:44:10 +00:00
Fermi 00601a0c87 Revert "PLASE"
This reverts commit 8af225e6e3.
2019-11-24 02:44:00 +00:00
Fermi 8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00
CitadelStationBot 63e96a1402 Automatic changelog generation for PR #9874 [ci skip] 2019-11-23 12:49:35 -06:00
kevinz000 f0996208a3 Merge pull request #9874 from Ghommie/Ghommie-cit379
Honkbot slip and slide fun ride.
2019-11-23 11:49:32 -07:00
CitadelStationBot 40d787133d Automatic changelog generation for PR #9891 [ci skip] 2019-11-23 12:46:30 -06:00
kevinz000 aba39f0b36 Merge pull request #9891 from Putnam3145/dynamic-traitor-fix
[DYNAMIC] Reverted making latejoiners count for roundstart rulesets
2019-11-23 11:46:28 -07:00
CitadelStationBot 589055628a Automatic changelog generation for PR #9881 [ci skip] 2019-11-23 12:46:00 -06:00
kevinz000 f28a6feb5f Merge pull request #9881 from Putnam3145/persistent-dynamic-weights
Allows extended voting on dynamic if recent rounds too chaotic
2019-11-23 11:45:58 -07:00
kevinz000 be679b97a6 Merge pull request #9885 from Commandersand/cuckcult
Makes the brass skewer more ouchie than ouchie~
2019-11-23 11:45:24 -07:00
CitadelStationBot 0700b050e1 Automatic changelog generation for PR #9909 [ci skip] 2019-11-23 12:44:54 -06:00
kevinz000 f88ed98ee4 Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert
Anthromorphic Insect Revert
2019-11-23 11:44:52 -07:00
CitadelStationBot 6b19420a83 Automatic changelog generation for PR #9749 [ci skip] 2019-11-23 12:42:40 -06:00
kevinz000 75510d8da9 Merge pull request #9749 from Trilbyspaceclone/patch-238
What do you mean I cant hold the armory on my back? -BOH nerf
2019-11-23 11:42:37 -07:00
CitadelStationBot c8235def34 Automatic changelog generation for PR #9864 [ci skip] 2019-11-23 12:39:38 -06:00
kevinz000 88762c5d89 Merge pull request #9864 from Knouli/Legioncore-Use-In-Hand
Able to use Legion Cores in-hand
2019-11-23 11:39:35 -07:00
CitadelStationBot c8fe354e91 Automatic changelog generation for PR #9898 [ci skip] 2019-11-22 23:52:46 -06:00
Lin e954cec58c Merge pull request #9898 from Ghommie/Ghommie-cit387
Dreamchecker compatibility changes, part 3.
2019-11-23 05:52:44 +00:00
CitadelStationBot 88d126794c Automatic changelog generation for PR #9896 [ci skip] 2019-11-22 23:52:13 -06:00
Lin 592dcdb6fd Merge pull request #9896 from Ghommie/Ghommie-cit386
Fixing cyborg camera interaction for real
2019-11-23 05:52:11 +00:00
Lin 028fa518e4 Merge pull request #9879 from Ghommie/Ghommie-cit383
Unmodularize closets.
2019-11-23 05:39:33 +00:00
Putnam3145 037b278e9e Merge pull request #9918 from Ghommie/Ghommie-cit384
[S] Makes it compile.
2019-11-22 18:14:41 -08:00
Ghommie 77800cf720 Oh yea it's a list 2019-11-23 03:02:29 +01:00
Ghommie 2d1edf661b Fixes travis. 2019-11-23 02:58:03 +01:00
Putnam3145 ea4fdf727b Merge pull request #9917 from Ghommie/Ghommie-cit384
[S] bikehorn fix 2: sound() doesn't accept double quotes i think, my bad.
2019-11-22 17:06:50 -08:00
Fermi b756f37ff6 Alright 2019-11-23 01:05:42 +00:00
Fermi 89bcb00ef1 hark 2019-11-23 00:54:40 +00:00
Ghommie 82d97ff4a7 This way is better 2019-11-23 01:51:31 +01:00