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 2026-08-24 05:06:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph
2108 Commits
Author SHA1 Message Date
SandPoot 550db1b6ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-20 17:27:19 -03:00
siliconsandGitHub 18b797d0f4 Merge pull request #15758 from LetterN/patch-12 
fix pod not unlocking on code delta
 2022-08-20 12:27:11 -07:00
BongaTheProtoandGitHub b2b78d7db8 Merge branch 'Sandstorm-Station:master' into master 2022-08-17 01:27:55 -05:00
SandPoot 7fef29cbb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-16 21:14:05 -03:00
LinandGitHub 357f266e30 Merge pull request #15774 from deathride58/firewallfix 
[S] fixes small fail2topic vulnerability
 2022-08-16 21:02:10 +00:00
BongaTheProto 66026ccc07 Merge remote-tracking branch 'upstream/master' 2022-08-16 11:05:20 -05:00
SandPoot 1e29739a34 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-16 03:23:37 -03:00
Putnam3145 c6cf921e7a Makes station trait on round start work 2022-08-14 23:29:40 -07:00
deathride58 2f4a095363 blacklists rule_name varedits 2022-08-09 18:40:02 -04:00
deathride58 f7ae896aeb fixes small fail2topic vulnerability 2022-08-09 18:22:02 -04:00
BongaTheProto 9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
SandPoot 00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -03:00
Letter NandGitHub a529575819 Update security_level.dm 2022-08-08 09:00:05 +08:00
Putnam3145 b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Letter NandGitHub 29324f5e47 lazy implementation 2022-08-05 22:29:11 -07:00
BongaTheProtoandGitHub 74797a79be Merge branch 'Sandstorm-Station:master' into master 2022-08-05 23:15:43 -05:00
SandPoot bf0c0f530d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-05 19:09:18 -03:00
Hatterhat 2155a8bdce funny ammo 2022-08-03 06:11:04 -05:00
BongaTheProto 9e980f825f Merge remote-tracking branch 'upstream/master' 2022-08-01 17:19:36 -05:00
SandPoot c7088af077 doesn't work 2022-08-01 12:44:40 -03:00
BongaTheProto e72c2886ae Merge remote-tracking branch 'upstream/master' 2022-07-29 22:07:41 -05:00
SandPoot 9f32accd41 no 2022-07-29 18:15:50 -03:00
SandPoot 8220c3bc10 round timer test 2022-07-29 18:15:03 -03:00
BongaTheProto 811c1df810 Merge remote-tracking branch 'upstream/master' 2022-07-24 12:05:49 -05:00
SandPoot 0a0e4de14b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-24 02:59:28 -03:00
deathride58 fc74dd8a69 maps, filenames, and DME 2022-07-20 17:19:27 -04:00
deathride58 578eb440c1 If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix 2022-07-20 16:51:38 -04:00
BongaTheProto 8a45cb89fa Merge remote-tracking branch 'upstream/master' 2022-06-13 21:33:35 -05:00
SandPoot bc25a077ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-13 12:01:51 -03:00
deathride58 4ea1a44e85 fixes jukebox audio not coming through containers 2022-06-11 00:48:35 -04:00
BongaTheProto 6d385f2b2e Merge remote-tracking branch 'upstream/master' 2022-06-07 19:10:13 -05:00
SandPoot 78b4d94c96 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:00:44 -03:00
LinandGitHub 0429ff2b99 Merge pull request #15658 from deathride58/admindeobfuscationfix 
Fixes a bug in admin vote deobfuscation
 2022-06-07 05:42:36 +00:00
BongaTheProto 488e0a295f You mfs can't be pleased 
makes the new menu a toggle
 2022-06-05 14:58:49 -05:00
BongaTheProto ec12aeaabf Merge remote-tracking branch 'upstream/master' 2022-06-05 02:00:30 -05:00
SandPoot 6bff4b4165 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-05 01:38:42 -03:00
deathride58andGitHub e75c413d42 Merge pull request #15652 from SandPoot/title-screen 
Updates the title screen
 2022-06-05 00:27:44 -04:00
BongaTheProto 53fa6873d1 Merge remote-tracking branch 'upstream/master' 2022-06-02 09:57:31 -05:00
deathride58 76144282c9 fixes admin vote deobfuscation - options that were never voted for now properly display as 0 2022-06-01 23:07:08 -04:00
SandPoot d1c44afdae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-01 19:21:46 -03:00
LinandGitHub becb035529 Merge pull request #15632 from deathride58/botrefresh 
Bot refresh - Makes bot output channels configurable, makes the bot capable of pinging the reboot role
 2022-06-01 21:18:10 +00:00
LinandGitHub 37cd25109e Merge pull request #15634 from deathride58/jukeboxrefresh 
Jukebox refresh - Jukebox queue, working volume knob, emagging, preliminary multiz support, and more!
 2022-06-01 21:18:02 +00:00
BongaTheProtoandGitHub 8f55fb3ca0 Merge branch 'Sandstorm-Station:master' into master 2022-06-01 05:56:13 -07:00
SandPoot 2189328672 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-01 00:11:19 -03:00
deathride58andGitHub f34e268a1c Merge pull request #15636 from Putnam3145/approval-for-transfer 
Switches transfer vote to approval voting
 2022-05-30 21:53:56 -04:00
SandPoot 688fac740a icons/runtime? 2022-05-30 02:07:49 -03:00
SandPoot 8bb1c2b32a Upload files 2022-05-30 01:31:54 -03:00
BongaTheProto 1f741c6a00 Merge remote-tracking branch 'upstream/master' 2022-05-26 23:11:02 -05:00
SandPoot d046c26513 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-27 00:28:17 -03:00
deathride58 d2466e5ac3 Inlines the bulk of playsound_local, fixing several jukebox audio bugs in one fell swoop 2022-05-25 20:41:32 -04:00