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
45,928 Commits 55 Branches 0 Tags
3ea22f97a6d2a55738b8fb0fb9cfe5f080e8fb3f
Commit Graph

387 Commits

Author SHA1 Message Date
keronshb
3ea22f97a6 Merge remote-tracking branch 'upstream/master' into ambitioncheck 2022-02-22 17:10:25 -05:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
DeltaFire
2940d141cf please-dont-smite-us-lummox 2022-01-01 07:10:35 +01:00
keronshb
83a62ace04 Ambitioncheck 2021-12-23 21:15:31 -05:00
LetterN
49940c373e tgui backend 2021-10-28 12:51:31 +08:00
SandPoot
5153dba0f2 Upload files 2021-10-13 15:11:25 -03:00
Putnam3145
3209917830 Merge pull request #15173 from silicons/vpn_block 
adds PANIC_BUNKER_LIVING_VPN option (READ, THIS IS NOT A VPN BAN)
 2021-10-11 15:51:52 -07:00
keronshb
a6bfff92cc Fixes pirates, re adds extended, re adds voting 2021-09-24 19:40:56 -04:00
keronshb
cd00d1589e fucking hell 2021-09-19 18:06:24 -04:00
silicons
ae513d3114 feautre 2021-09-17 21:58:26 -07:00
keronshb
408517fb1d SHOULD? FIX? 2021-09-16 20:53:46 -04:00
keronshb
372725c1f4 Fixes everything???? 2021-09-16 15:40:21 -04:00
keronshb
792dc073b3 Final fixes? 2021-09-16 13:28:34 -04:00
keronshb
7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00
LetterN
6739e349a0 heretics LOVES this - Also ian's birthday! 2021-09-08 09:50:07 +08:00
LetterN
c25dc84da0 what the cat doing with the yarn dependencies?? 2021-09-08 09:25:38 +08:00
silicons
d9b70b1f1c woo 2021-07-18 15:04:30 -07:00
silicons
0df58c878e more 2021-07-18 14:01:43 -07:00
silicons
55608737fa more.. 2021-06-28 14:51:55 -07:00
silicons
711e250e26 AAAA 2021-06-28 14:18:56 -07:00
silicons
805b931fb8 config reorganize start 2021-06-28 13:35:52 -07:00
Fabian
63d910c79c Merge branch 'master' into the-fuck-am-i-doing 2021-05-05 17:26:41 +02:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
Putnam
899b94f0f3 Made threat a subsystem instead of dynamic-attached. 2021-03-24 23:44:37 -07:00
silicons
5b2a42f254 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-03-20 14:13:23 -07:00
GrayRachnid
5201cf6ac5 stops racism 2021-03-17 21:58:41 -04:00
silicons
5d51025ad6 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-03-15 14:39:16 -07:00
Fabian
91fc66e98d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into the-fuck-am-i-doing 2021-03-15 14:32:50 +01:00
Fabian
7e50d878ca Merge branch 'master' into the-fuck-am-i-doing 2021-03-15 14:09:30 +01: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
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
Fabian
8178b7073a It's done, atleast the code is 2021-03-05 21:50:29 +01:00
Fabian
2f1aba4f80 Revert "i can't believe kevin made me code" 
This reverts commit 7f38564838.
 2021-03-05 21:19:59 +01:00
Fabian
7f38564838 i can't believe kevin made me code 
im taking severe offense to this
 2021-03-05 19:55:53 +01:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons
519c694252 removes combat mode effects 2021-02-28 00:44:56 -07:00
silicons
70b8d833c0 changes 2021-02-28 00:00:14 -07:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
Lin
142be853dc Merge pull request #14245 from silicons/sprint_staging 
adds config entry for sprint removal that works prettier than just setting sprint speed to 0
 2021-02-14 22:52:44 -06:00
silicons
43174501de final tweaks 2021-02-13 20:47:38 -07:00
silicons
d6a3c2d003 update 2021-02-13 20:30:44 -07:00
silicons
2ef33c5c88 sprint updates 2021-02-13 20:24:26 -07:00
Lin
b42ca71b00 Merge branch 'master' into virus_logging 2021-02-13 21:20:09 -06:00
silicons
61ab2a5a53 logging fixes 2021-02-13 19:47:17 -07:00
silicons
3b441bfd28 kay 2021-02-13 19:03:27 -07:00
Letter N
a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00