Fermi
|
614a462176
|
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
This reverts commit 1509d9d183.
|
2019-11-24 03:33:02 +00:00 |
|
Fermi
|
ba4fa1ef67
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 03:06:08 +00:00 |
|
Fermi
|
aeb8606ce0
|
Revert "Revert "PLASE""
This reverts commit 00601a0c87.
|
2019-11-24 03:04:52 +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
|
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 |
|
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 |
|
Lin
|
3979079fde
|
Merge pull request #9518 from Ghommie/Ghommie-cit243
Ports "You can now click on objects and mobs below flaps and signs"
|
2019-11-22 01:36:47 +00:00 |
|
Putnam
|
ab87fd32ed
|
Adds extended voting to dynamic.
|
2019-11-20 02:23:53 -08:00 |
|
kevinz000
|
6bee2721cc
|
Merge pull request #9838 from Ghommie/Ghommie-cit366
Ports "restores legacy sends to SSChat"
|
2019-11-19 21:32:05 -07:00 |
|
Ghommie
|
9a65803e04
|
Ports "#47709"
|
2019-11-17 03:59:57 +01:00 |
|
Ghommie
|
3e6a298a6d
|
one line shuttle fix port
|
2019-11-16 17:18:26 +01:00 |
|
Putnam
|
f3c4897b48
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-14 22:31:48 -08:00 |
|
Putnam
|
e68ad13983
|
Reduced RNG a bit more
|
2019-11-14 22:24:43 -08:00 |
|
kevinz000
|
02e8a73265
|
Merge pull request #9737 from Ghommie/Ghommie-cit326
Ports techweb backend refactor & co.
|
2019-11-14 16:45:09 -07:00 |
|
kevinz000
|
6909857e04
|
Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
|
2019-11-14 15:58:53 -07:00 |
|
kevinz000
|
2f4562a63b
|
Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
|
2019-11-14 15:55:04 -07:00 |
|
kevinz000
|
09e5cd95a3
|
Merge pull request #9690 from Ghommie/Ghommie-cit308
Unmodularize configuration, _globalvars and subsystems.
|
2019-11-14 15:50:20 -07:00 |
|
kevinz000
|
af0962088c
|
Merge pull request #9453 from Ghommie/Ghommie-cit226
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
|
2019-11-14 15:47:18 -07:00 |
|
Putnam
|
304ce37d6c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-14 02:23:48 -08:00 |
|
Putnam
|
5e51cc63f9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-13 16:58:44 -08:00 |
|
kappa-sama
|
17d8998fef
|
emergent gameplay
|
2019-11-13 16:58:51 -05:00 |
|
Putnam
|
8a02c1a0a1
|
Made results of vote semi-public
|
2019-11-13 04:30:45 -08:00 |
|
Ghommie
|
c5a7c28a1b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
|
2019-11-12 16:04:05 +01:00 |
|
Ghommie
|
4c1eba0d81
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226
|
2019-11-10 23:52:48 +01:00 |
|
Ghommie
|
e977ba6729
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
|
2019-11-10 23:17:58 +01:00 |
|
kevinz000
|
d47f1f0518
|
Merge pull request #9756 from Ghommie/Ghommie-cit332
turns on the chat subsystem (#47653)
|
2019-11-10 11:03:53 -07:00 |
|
Putnam
|
139e9a9da8
|
reobfuscates dynamic vote
|
2019-11-09 16:03:40 -08:00 |
|
tralezab
|
354a257641
|
turns on the chat subsystem (#47653)
|
2019-11-10 00:05:59 +01:00 |
|
Putnam
|
392e628f3f
|
lowered maximum curve width a good deal
|
2019-11-09 14:58:38 -08:00 |
|
Putnam
|
d10a317b42
|
Made vote consensus way stronger
|
2019-11-08 21:09:24 -08:00 |
|
Putnam
|
be464a38b1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-08 20:37:29 -08:00 |
|
Putnam
|
912ca97d29
|
Added a preference that auto-votes at extremely low weight.
|
2019-11-08 03:44:22 -08:00 |
|
Putnam
|
8e00f633b8
|
Made curve width formula be less stupid, less admin spam
|
2019-11-07 23:38:51 -08:00 |
|
Putnam
|
518eb1419c
|
wrong paren placement wowee
|
2019-11-07 22:53:47 -08:00 |
|
BlackMajor
|
a6bbe75c36
|
Merge pull request #9611 from Citadel-Station-13/supply-passive-gen
Adds passive point generation to cargo. Nerfs miasma selling. Increases mindshield crate price.
|
2019-11-08 14:17:17 +13:00 |
|
Putnam
|
1df51d29f1
|
make it calm vs chaotic again.
|
2019-11-07 16:41:51 -08:00 |
|
Putnam
|
9a8fb3e0d2
|
4-'ing twice
|
2019-11-07 03:50:49 -08:00 |
|
Putnam
|
b25b2cdf29
|
tweaked the numbers and choices a little.
|
2019-11-07 01:48:03 -08:00 |
|
Putnam
|
c94c6295ab
|
let's try making the votes SWING
|
2019-11-06 22:37:16 -08:00 |
|
Putnam
|
85fd53d615
|
actually let's add the extended voting back in, see how that does
|
2019-11-06 22:19:57 -08:00 |
|
Ghommie
|
2f76c9a8fc
|
weird.
|
2019-11-07 06:51:55 +01:00 |
|
Ghommie
|
25eaf0f684
|
WARNING doesn't output infos on travis runs, damnit.
|
2019-11-07 05:52:56 +01:00 |
|
Ghommie
|
b2b1390bd3
|
Ports techweb backend refactor & co.
|
2019-11-07 05:07:38 +01:00 |
|