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 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,497 Commits 55 Branches 0 Tags
b60c1b01e3cfae70b4f728c65489b948fb2ca71a
Commit Graph

1961 Commits

Author SHA1 Message Date
LetterN
e950bfcbe4 A gone 2021-03-31 08:58:36 +08:00
LetterN
a94e319acf bwob allowed 2021-03-31 08:22:27 +08:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
Putnam
899b94f0f3 Made threat a subsystem instead of dynamic-attached. 2021-03-24 23:44:37 -07:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
silicons
bfb122d706 Merge pull request #14475 from qweq12yt/black-market-fixes 
Black Market: The return
 2021-03-22 21:14:57 -06:00
Lin
715f86ef5c Merge pull request #14447 from LetterN/fixes-2 
Fixes laptop and tweaks stacks
 2021-03-22 19:52:42 -05:00
LetterN
760a7de229 Merge remote-tracking branch 'origin/master' into fixes-2 2021-03-22 09:32:21 +08:00
silicons
4e22ad7484 Update job.dm 2021-03-21 02:07:03 -07:00
silicons
661ed14c83 Update job.dm 2021-03-21 02:05:43 -07:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
kappa-sama
524bb79f0e tgui machine broke 2021-03-19 15:32:53 -03:00
GrayRachnid
5201cf6ac5 stops racism 2021-03-17 21:58:41 -04:00
LetterN
69982f6315 fixes https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14452 
and-might-have fi-x-ed https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14450
 2021-03-17 11:49:50 +08:00
DeltaFire
be41ead215 Merge pull request #14319 from silicons/async_2 
enforces SHOULD_NOT_SLEEP on Life(), fixes some more process() sleeps that might be causing controller lockups
 2021-03-15 17:01:42 +01:00
Lin
907ac9fc8a Merge pull request #14423 from Putnam3145/mode-chaos 
makes the chaos thing actually work (whoops)
 2021-03-12 18:21:40 -06:00
Putnam
49e1673047 how did i mess up a copypasta like this 2021-03-12 15:44:15 -08:00
Putnam
4fb560ea98 makes the chaos thing actually work (whoops) 2021-03-12 14:46:58 -08:00
Letter N
935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
silicons
7e3d72eddb Merge pull request #14376 from Putnam3145/mode-chaos 
Adds recent-chaos weighting for secret
 2021-03-10 14:02:11 -07:00
silicons
939a493334 Merge pull request #14306 from Putnam3145/supernova 
Adds a supernova event, with tweaks to allow this
 2021-03-10 01:32:52 -07:00
Putnam
25b021a343 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into mode-chaos 2021-03-10 00:06:40 -08:00
Putnam
40dfd40bcd Made it not weight almost entirely based on chaos. 2021-03-10 00:04:35 -08:00
silicons
9110ebcac1 Merge pull request #14375 from Putnam3145/repeated-mode-adjust-buff 
Allows repeated mode adjust to be >100 total
 2021-03-09 00:20:29 -07:00
silicons
771809a6d0 Merge branch 'master' into async_2 2021-03-09 00:17:26 -07:00
Putnam
5f6d478509 Added a "desired mode chaos" system 2021-03-07 20:14:11 -08:00
Putnam
a651b629c9 Allows repeated mode adjust to be >100 total 2021-03-07 19:28:50 -08:00
Letter N
a43309a097 shuttle pog 2021-03-05 22:26:55 +08:00
Letter N
ea4cb2c14d stop spamming text pls 2021-03-04 10:26:41 +08:00
Letter N
a87e4533e5 support for tgs4 noconfigs needed*** 2021-03-03 17:33:14 +08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons
8989394742 Merge pull request #14270 from LetterN/rustsql 
Removes bsql 2
 2021-03-03 00:53:46 -07:00
Putnam
291fc2add6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into supernova 2021-03-02 01:33:22 -08:00
Letter N
1fdb7fd639 cleanup 2021-03-02 09:49:49 +08:00
silicons
50f7d89367 whew 2021-02-25 23:29:23 -07:00
silicons
37eaebe54a fix 2021-02-25 23:22:46 -07:00
Putnam
23eaf250a9 Make sure to hit the funny tick 2021-02-24 03:12:01 -08:00
Putnam
311d766bd5 Adds a supernova event, with tweaks to allow this 2021-02-24 02:56:14 -08:00
SmArtKar
e925aea454 Fixes 2021-02-23 12:44:11 +03:00
Letter N
2be4c76add THIS FIXES IT (well it should :) ) 2021-02-22 21:05:07 +08:00
Letter N
7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
Letter N
0bb5ec3316 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-21 09:55:36 +08:00
Letter N
6abad913ff the sqel 2021-02-19 14:52:18 +08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SmArtKar
b2b7b4ca9a Fucking finally 2021-02-18 14:17:43 +03:00
SmArtKar
fecf879b0c Fixed 2021-02-17 18:54:59 +03:00
SmArtKar
756be084bc Decks are saveable! 2021-02-17 18:50:23 +03:00
silicons
e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game 
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
 2021-02-17 01:30:13 -07:00
SmArtKar
3e95e28f85 Illegal cards will now permanently be marked, not for just one round 2021-02-16 20:05:59 +03:00