Commit Graph

299 Commits

Author SHA1 Message Date
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 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 372725c1f4 Fixes everything???? 2021-09-16 15:40:21 -04:00
keronshb 792dc073b3 Final fixes? 2021-09-16 13:28:34 -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
silicons 5d51025ad6 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-03-15 14:39:16 -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 5f6d478509 Added a "desired mode chaos" system 2021-03-07 20:14:11 -08: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
Letter N 3167dd8e22 atmos cc, cpl 2021-02-12 11:50:39 +08:00
Letter N 8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
Putnam 7a6ed7f500 Added a config to disallow unreadied players from voting on modes/storytellers 2021-02-08 22:59:49 -08:00
Letter N 125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
Letter N cd5d558fad safety? what's that?
* maybe table-breaking change
2021-01-04 11:57:12 +08:00
silicons 753c1389cc fix 2020-12-26 22:04:05 -08:00
silicons a6ae0fe5c2 ok 2020-12-26 20:56:48 -08:00
silicons bfb3d087c3 ok 2020-12-26 20:50:28 -08:00
silicons dafc6bf89f fix 2020-12-26 20:41:21 -08:00
silicons 5e66e4509f wew 2020-12-25 16:07:17 -08:00
DeltaFire d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
silicons 7da6979b54 ok 2020-12-21 00:28:03 -07:00
silicons ce10278c5a changes 2020-12-20 19:25:49 -07:00
Putnam c47761fa58 Added a DYNAMIC_THREAT_BASELINE config option.
why didn't i do this sooner
2020-12-19 19:30:16 -08:00
Putnam 5e8f76792e Readjusted weight; added min/max config options 2020-12-18 20:24:30 -08:00
silicons e87cc27803 modifications 2020-12-15 07:21:06 -07:00
silicons 45a7c68da1 wow 2020-12-11 15:05:00 -07:00