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-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,384 Commits 55 Branches 0 Tags
fce73c84c70c75eb37d108a4b3b6e3c12f01bc93
Commit Graph

1267 Commits

Author SHA1 Message Date
Putnam
4c4c965e86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into score-instead 2020-01-12 17:36:56 -08:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Putnam
82d8900e5d aaand move this over 2020-01-12 03:36:47 -08:00
Putnam
3f5e68765e am i fucking stupid? 2020-01-12 03:10:42 -08:00
Putnam
295c134243 i'm so dumb dude 2020-01-12 03:06:17 -08:00
Putnam
5dc5ddaa76 daddy compiler please stop hating me 2020-01-11 22:17:18 -08:00
Putnam
0c64ea1351 wow that was fucking dumb 2020-01-11 18:37:16 -08:00
Putnam
37c6119708 Sanity 
this is a commit by jimmy buffett
 2020-01-11 18:26:32 -08:00
Putnam
85f6367df5 weh 2020-01-11 03:50:19 -08:00
Putnam
9d3873f26f traitor always available 2020-01-11 03:32:14 -08:00
Putnam
e0587aeac0 another dumb patch 2020-01-10 23:33:26 -08:00
Putnam
c6507d47e2 bad patches, ugh 2020-01-10 20:06:35 -08:00
Letter N
6ec3fde836 better-signalers 2020-01-10 18:06:55 +08:00
Putnam
896df2ace3 score instead of ranked choice 2020-01-09 04:47:14 -08:00
Putnam3145
3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08:00
deathride58
0b9d566076 Merge pull request #10469 from kevinz000/fail2topic 
Ports fail2topic from Aurora
 2020-01-08 22:19:22 -05:00
kevinz000
652cf6e60c Merge pull request #10440 from Putnam3145/weird-secret 
Allows users to vote their least favorite game modes in secret/extended vote
 2020-01-08 13:41:26 -08:00
Putnam
fdce8e2b69 dang 2020-01-08 03:55:23 -08:00
deathride58
686601334e suggested changes 2020-01-07 08:52:13 -05:00
kevinz000
0114f9e223 whitelist 2020-01-07 04:54:32 -08:00
kevinz000
fa7dcad49a compile 2020-01-07 04:54:11 -08:00
kevinz000
ab2292dfd5 Fail2Topic 2020-01-07 04:48:39 -08:00
Putnam
70a1a0a9c1 better way to do it tbh 2020-01-07 00:39:14 -08:00
Putnam
f728c4746f Allowed random engines to be weighted. 2020-01-06 16:25:17 -08:00
Putnam
da830d3449 Added scores for my own dastardly reasons 2020-01-05 19:49:54 -08:00
Ghom
14ec7d963a Merge pull request #10224 from Seris02/traitblacklisting 
Makes trait blacklisting remove random positives instead of removing every quirk (new and improved)
 2020-01-05 21:29:51 +01:00
Putnam
be98704abe weird super secret vote 2020-01-05 04:19:21 -08:00
Ghom
ca8d93ad17 Merge branch 'master' into alcohol-intolerance 2020-01-04 23:17:55 +01:00
Ghom
e85c710962 Merge pull request #10399 from Citadel-Station-13/kevinz000-patch-4 
Knocks down cargo passive gen 750 -> 500
 2020-01-04 21:48:48 +01:00
Ghom
499907f9b7 Merge pull request #10191 from Citadel-Station-13/michael_labs 
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
 2020-01-04 14:07:25 +01:00
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
Seris02
a6a110bca3 nopenopenope 2020-01-02 19:29:11 +08:00
Putnam
12680566b7 fixed voting. 
FUCK
 2020-01-01 23:37:14 -08:00
kevinz000
b5b00102a0 Update shuttle.dm 2020-01-01 22:04:34 -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
094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
kevinz000
ec67a38093 Merge pull request #10330 from keronshb/keronnanite 
More nanites from /tg/station
 2019-12-31 19:32:05 -08:00
Seris02
551e9f540d yee 2020-01-01 10:54:56 +08:00