cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,779 Commits 55 Branches 0 Tags
0f9c3350cde1bcc6a1cbfb14e7f8b631b986b388
Commit Graph

1227 Commits

Author SHA1 Message Date
nik707
0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers 
n word
 2020-01-02 22:01:19 -06:00
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478 
Brings in some mapping code updates.
 2020-01-03 00:01:54 +00:00
Putnam
12680566b7 fixed voting. 
FUCK
 2020-01-01 23:37:14 -08:00
Putnam
21fc6d1d2b saving is back 2020-01-01 19:24:13 -08:00
Putnam
00bc8dbc97 actually no 2020-01-01 15:06:37 -08:00
Putnam
b69950ac2b wow good thing this was impossible to check 2020-01-01 13:47:51 -08:00
Putnam
1acb499929 moved a thing to prevent a runtime 2020-01-01 13:26:43 -08:00
Putnam
d0b1c442a0 tweaks 2020-01-01 13:15:13 -08:00
Putnam
607109e0d2 also added individual ballot gathering 2020-01-01 12:29:13 -08:00
Putnam
444f862a4d Renamed the options to make clear this isn't scoring? 2020-01-01 11:37:40 -08:00
Putnam
bf752ab2e6 more extreme. 2020-01-01 00:30:34 -08:00
Putnam
6bbdd5d576 try recent round removal again 2020-01-01 00:26:55 -08:00
Putnam
42347fd5ea more conveyance on how the voting works 2019-12-31 23:19:39 -08:00
Putnam
9b0e27cbc3 2 minute vote time 2019-12-31 23:11:34 -08:00
Putnam
51a7c7776a 1-5 -> -2 to 2 2019-12-31 23:03:58 -08:00
kevinz000
ec67a38093 Merge pull request #10330 from keronshb/keronnanite 
More nanites from /tg/station
 2019-12-31 19:32:05 -08:00
Putnam
850a407cf4 majority judgement time 2019-12-31 16:37:33 -08:00
Putnam
67fcdeebb3 Made loading saved votes not automatic 2019-12-31 12:43:37 -08:00
Putnam
cc087b990c Code improvements 2019-12-29 21:01:55 -08:00
Putnam
fb9b6dcc10 SCORING WRONG THE WHOLE TIME 2019-12-29 18:25:11 -08:00
Putnam
eb9e27a497 actually screw this "remove if recent" thing it's too much trouble 2019-12-29 11:23:37 -08:00
Seris02
3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
Putnam
dda7c832f1 Fixes a runtime, almost definitely 2019-12-28 18:14:02 -08:00
keronshb
390cfd8b64 Nanite ports from /tg/ 
Ports a couple of the newer nanite features from /tg/
 2019-12-28 16:56:17 -05:00
Putnam
25d4b53f94 wow how'd i leave that in 2019-12-27 22:46:32 -08:00
Putnam
f8557c8ae4 v o t e s a v i n g 2019-12-26 12:13:02 -08:00
Putnam
a471e26d9c WOW WHOOPS 2019-12-25 22:53:49 -08:00
Putnam
63112c2f49 while we're at it let's make it work for all of 'em 2019-12-25 18:30:25 -08:00
Putnam
5764ccef1b Allowed preventing dynamic storytellers if too common recently 2019-12-25 16:16:11 -08:00
Putnam
02bfab6bf3 made it Taller 2019-12-25 00:25:59 -08:00
Putnam
5cd9edb37f also make weight adjustment round-to-round work, probs 2019-12-24 22:05:04 -08:00
Putnam
124ea51c09 Revert "vote overhaul start" 
This reverts commit 232811dd18.
 2019-12-24 17:52:33 -08:00
Putnam
232811dd18 vote overhaul start 2019-12-23 22:43:54 -08:00
Putnam
ea85a3e521 Storytellers do more things now 2019-12-23 22:09:29 -08:00
Putnam
24e5bf0d18 reobfuscated dynamic vote 2019-12-23 20:16:43 -08:00
Putnam
7f1ff37eca yeah conveyance 2019-12-23 09:59:32 -08:00
Ghom
9a022f21eb Merge pull request #10245 from r4d6/substationV2 
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
 2019-12-23 18:58:26 +01:00
Putnam
778747927c Con vey ance 2019-12-23 09:57:56 -08:00
r4d6
0a3e370a93 Move the config up to avoid conflict 2019-12-23 12:45:40 -05:00
r4d6
01a8fe1cd6 Add config options 2019-12-23 12:41:52 -05:00
r4d6
b909f54ba5 Revert "Revert "Add the option to restrict the Engine that spawn"" 
This reverts commit d851beea16.
 2019-12-23 10:25:37 -05:00
r4d6
d851beea16 Revert "Add the option to restrict the Engine that spawn" 
This reverts commit e3e1f91635.
 2019-12-23 10:23:55 -05:00
r4d6
e3e1f91635 Add the option to restrict the Engine that spawn 2019-12-23 10:06:35 -05:00
Putnam
0392145900 linter u right 2019-12-22 22:42:56 -08:00
Putnam
309e1db1e2 more logging 2019-12-22 20:19:35 -08:00
Putnam
19c5bde3d0 WHOOP FUCK 2019-12-22 20:19:01 -08:00
Putnam
dec97a26d5 renamed the storytellers and added secret to voting 2019-12-22 18:44:09 -08:00
Putnam
f1b1910833 clarity 2019-12-22 14:58:11 -08:00
Putnam
f4296bb02d fixed the logging 2019-12-22 13:56:05 -08:00
Putnam
b257857fd3 nagging people is annoying 2019-12-22 13:17:58 -08:00