 keronshb
|
f1ca283318
|
Merge branch 'master' into familyport
|
2022-02-11 14:04:57 -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 |
|
|
LetterN
|
fab4b07be5
|
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
|
2021-12-21 07:59:33 +08:00 |
|
|
LetterN
|
8dcfea5817
|
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
|
2021-11-21 10:34:14 +08:00 |
|
|
keronshb
|
af83fb9611
|
FestiveMap 2021
|
2021-11-20 12:04:35 -05:00 |
|
|
LetterN
|
49940c373e
|
tgui backend
|
2021-10-28 12:51:31 +08:00 |
|
|
keronshb
|
3cfea7eb92
|
Ball2021
|
2021-10-16 00:02:05 -04:00 |
|
|
keronshb
|
6b23d177c8
|
Merge remote-tracking branch 'upstream/master'
|
2021-10-15 19:25:41 -04:00 |
|
|
keronshb
|
1427157df3
|
Fixes space cops and adds config for dynamic
|
2021-10-15 00:12:46 -04:00 |
|
|
SandPoot
|
f03b83e89b
|
Update server.txt
|
2021-10-13 15:12:52 -03: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 |
|
|
Putnam3145
|
3cfaad31c1
|
Merge pull request #15149 from keronshb/dynamicport
(Probably ready for test merge) DYNAMIC 2021
|
2021-10-07 18:14:59 -07:00 |
|
|
keronshb
|
af2777a604
|
Citadel weight adjustments and config
|
2021-09-25 17:56:15 -04:00 |
|
|
zeroisthebiggay
|
5366a09c8b
|
Update spaceRuinBlacklist.txt
|
2021-09-24 18:38:58 -04:00 |
|
|
keronshb
|
c8814e8cc8
|
Merge remote-tracking branch 'upstream/master' into dynamicport
|
2021-09-19 18:09:18 -04:00 |
|
|
keronshb
|
13323d2597
|
Merge branch 'master' into dynamicport
|
2021-09-19 17:59:09 -04:00 |
|
|
silicons
|
ae513d3114
|
feautre
|
2021-09-17 21:58:26 -07:00 |
|
|
keronshb
|
a0e1d9f977
|
Family replacing clock cult
|
2021-09-18 00:04:34 -04: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 |
|
|
Putnam3145
|
9a8698230b
|
Added a config entry for monstermos
|
2021-09-14 14:18:14 -07:00 |
|
|
Putnam3145
|
1c24f65e59
|
fixed a typo
|
2021-09-14 14:17:56 -07:00 |
|
|
zerothebigboy
|
68e2eb1d7a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
|
2021-09-10 12:12:57 -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 |
|
|
zerothebigboy
|
ccfde52b0d
|
code
|
2021-09-02 23:45:03 -04:00 |
|
|
silicons
|
d9b70b1f1c
|
woo
|
2021-07-18 15:04:30 -07:00 |
|
|
silicons
|
0df58c878e
|
more
|
2021-07-18 14:01:43 -07:00 |
|
|
silicons
|
bdad78147c
|
changes
|
2021-06-28 18:20:44 -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 |
|
|
Timothy Teakettle
|
1c7c56b66e
|
Update config.txt (#14596)
|
2021-04-11 04:48:59 +02: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
|
0b109929c0
|
Adds recommended configs
|
2021-03-09 21:07:41 -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
|
50c1a83c6a
|
Adds a pAI policy config
|
2021-02-26 00:34:13 -08:00 |
|
|
Letter N
|
7d39949a2f
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-02-19 12:38:32 +08:00 |
|
|
Letter N
|
a2419f760a
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-12 13:18:09 +08:00 |
|
|
Letter N
|
8a0c932d55
|
oops! All Refactors!
|
2021-02-12 11:07:58 +08:00 |
|
|
silicons
|
34473c2ac7
|
fix
|
2021-01-20 16:55:19 -07:00 |
|
|
Letter N
|
125cd17cee
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-01-20 15:40:41 +08:00 |
|
|
silicons
|
89fd802b8f
|
Update respawns.txt
|
2021-01-15 02:55:28 -07:00 |
|
|
Letter N
|
cd5d558fad
|
safety? what's that?
* maybe table-breaking change
|
2021-01-04 11:57:12 +08:00 |
|
|
silicons
|
a6ae0fe5c2
|
ok
|
2020-12-26 20:56:48 -08:00 |
|