Commit Graph

207 Commits

Author SHA1 Message Date
Putnam
dd3520896a wow there's an else 2020-02-19 11:45:37 -08:00
Putnam
6aec971b4e haha i'm dumb 2020-02-18 21:41:00 -08:00
kevinz000
4345f01322 Merge pull request #11021 from Ghommie/Ghommie-cit571
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
2020-02-13 04:11:01 -07:00
Putnam
7795e1609d why did i do that 2020-02-11 15:32:43 -08:00
Ghommie
0caabe8018 Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM. 2020-02-11 15:23:03 +01:00
Ghom
f27ce86769 Merge pull request #10942 from Putnam3145/map-vote-options
Added a config for map voting types
2020-02-08 23:31:33 +01:00
Putnam
c45dab8ebd uhh? 2020-02-07 20:37:22 -08:00
Putnam
84a9f2f058 make the fallback majority judgement 2020-02-07 19:54:15 -08:00
Ghom
9c14d03051 Merge pull request #10774 from Citadel-Station-13/kevinz000-patch-2
nuke explosion is 512 dev which is actually less laggy than heavy + light
2020-02-07 22:44:20 +01:00
Putnam
edcdb531cc kwargs 2020-02-06 15:57:42 -08:00
Putnam
e6d353dd01 that's not how switch works... 2020-02-06 15:56:58 -08:00
Putnam
d05c2426a8 Added a config for map voting types. 2020-02-06 15:47:04 -08:00
kevinz000
b26d6c443f Update ticker.dm 2020-01-29 02:23:54 -07:00
Putnam
06c66617e6 m o r e traitor objectives 2020-01-19 18:58:10 -08:00
Putnam
82d8900e5d aaand move this over 2020-01-12 03:36:47 -08:00
Putnam
fdce8e2b69 dang 2020-01-08 03:55:23 -08:00
Putnam
70a1a0a9c1 better way to do it tbh 2020-01-07 00:39:14 -08:00
Putnam
be98704abe weird super secret vote 2020-01-05 04:19:21 -08:00
nik707
0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers
n word
2020-01-02 22:01:19 -06:00
Putnam
9b0e27cbc3 2 minute vote time 2019-12-31 23:11:34 -08:00
Putnam
850a407cf4 majority judgement time 2019-12-31 16:37:33 -08:00
Seris02
3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
Putnam
24e5bf0d18 reobfuscated dynamic vote 2019-12-23 20:16:43 -08:00
Putnam
9e1f3b18b8 god i'm removing this extension completely 2019-12-22 13:14:42 -08:00
Putnam
33d182d49a made it nag you a bit, added logging 2019-12-21 19:53:48 -08:00
Putnam
9dce30a3a5 fixes 2019-12-21 16:24:41 -08:00
Putnam
ecc34b1de1 make vote last longer, too 2019-12-21 13:24:13 -08:00
Putnam
d42ed1ca49 Added extended, deobfuscated, made "how many to vote" bigger 2019-12-21 12:52:35 -08:00
Putnam
e38396e984 Made vote not fire every tick, added "force" option that pops as soon as vote starts 2019-12-21 08:59:48 -08:00
Putnam
fab65a3dbc actually condorcet not IRV 2019-12-17 20:12:23 -08:00
Putnam
04f82f3153 it works 2019-12-17 15:48:28 -08:00
Putnam
e6e68ae1a3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers 2019-12-17 14:18:19 -08:00
Putnam
9f21fca798 workin on IRV 2019-12-17 14:18:13 -08:00
Putnam
b96d36e719 alright that's that 2019-12-14 20:01:30 -08:00
Ghommie
b39ae815f3 Porting several quirks code updates. 2019-12-13 16:12:04 +01:00
Putnam
139e9a9da8 reobfuscates dynamic vote 2019-11-09 16:03:40 -08:00
Putnam
f3afc5de1b Merge branch 'malf-dynamic' into super-special-awesome-dynamic 2019-11-06 16:03:04 -08:00
Putnam
c354b17afe Also deobfuscates dynamic vote 2019-11-06 00:13:39 -08:00
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
Putnam
07064298b0 Dynamic voting (draft) 2019-10-20 18:54:17 -07:00
Poojawa
2922f08ef6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-08-17 23:41:28 -05:00
Poojawa
8c63ea7b6d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-26 17:36:46 -05:00
kevinz000
d976dd016a Merge remote-tracking branch 'origin/master' into trait_blacklisting 2019-07-25 15:20:46 -07:00
kevinz000
08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114
Ports the toggleable dark mode to the game!
2019-07-20 11:57:13 -07:00
kevinz000
628244c0ba Merge pull request #8869 from Ghommie/Ghommie-cit129
Ports "Show codewords on round end screen"
2019-07-14 14:49:11 -07:00
kevinz000
570fa0cd3b fix 2019-07-14 03:53:15 -07:00
Poojawa
245bd3e650 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into last-word-hearing-psychics 2019-07-13 10:18:13 -05:00
Poojawa
4d895ae6c0 Gang victory news report and last words for discord bot
also slight improvement to gangster greetings
2019-07-13 08:38:19 -05:00
Ghommie
bef0027287 In a haste, we forget thousand things. 2019-07-11 08:50:47 +02:00
Poojawa
c4f736eb94 Merge branch 'master' into job-menu-improvements 2019-07-10 18:55:29 -05:00