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-27 02:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,249 Commits 55 Branches 0 Tags
f945deb3f73a5b51ff9afd66e15346aeddb7aae3
Commit Graph

2421 Commits

Author SHA1 Message Date
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
deathride58
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
Lin
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
Lin
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
BongaTheProto
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
deathride58
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
deathride58
e577995c69 Merge pull request #15231 from Tupinambis/Assistantagging 
Antag roles will now respect your backup role preferences if none of the enabled roles are available
 2022-05-24 14:48:34 -04:00
Putnam3145
16137c31eb Switches transfer vote to approval voting 2022-05-21 22:07:25 -07:00
deathride58
b34cfa6485 free speed, fwee! - caches a sound for each playing jukebox to avoid datum creation overhead every fire 2022-05-22 00:53:52 -04:00
deathride58
ccc5c6cf75 small warning to all future code divers 2022-05-21 21:26:52 -04:00
deathride58
087602711f makes SOUND_MUTE actually FUCKING WORK when deaf. thanks azarak for helping with debugging! 2022-05-21 20:48:37 -04:00
deathride58
5d648fcf6a makes jukeboxes deal hearing loss when too loud, makes being deaf temporarily mute jukebox 2022-05-21 19:23:10 -04:00
deathride58
113981b5a8 Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more! 2022-05-21 00:21:58 -04:00
deathride58
14d885093e yknow lets just add a linebreak there it looks better with it 2022-05-19 15:32:48 -04:00
deathride58
ccc5ea1758 Bot refresh - Makes bot output channels configurable, makes the bot capable of pinging the reboot role 2022-05-19 15:19:21 -04:00
Putnam3145
33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
BongaTheProto
f4b9585c12 Merge remote-tracking branch 'upstream/master' 2022-05-12 20:47:56 -05:00
SandPoot
5c5bb3c5c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-12 18:09:56 -03:00
deathride58
40730237f2 Hub refresh - Cleans up update_status(), adds more hub-related config options, and more! 2022-05-05 14:52:53 -04:00
BongaTheProto
783ae63c30 Merge remote-tracking branch 'upstream/master' 2022-05-02 19:47:29 -05:00
SandPoot
61679d8141 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-02 21:05:34 -03:00
Putnam3145
e41f0461d9 Fixes the round time thing 2022-04-30 17:45:56 -07:00
BongaTheProto
6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
SandPoot
05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
silicons
73d39db3c1 Merge pull request #15343 from SandPoot/deadmin-prefs 
Ports Automatic Deadminning from TG
 2022-04-15 17:44:55 -07:00
BongaTheProto
a4fac709c3 Merge remote-tracking branch 'upstream/master' 2022-04-09 11:43:45 -05:00
SandPoot
2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot
9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot
ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles 
/obj/mecha ➡ /obj/vehicle/sealed/mecha
 2022-04-08 18:26:47 -07:00
BongaTheProto
10eb587407 Merge remote-tracking branch 'upstream/master' 2022-04-08 13:46:43 -05:00
SandPoot
31a179f95d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-08 13:57:46 -03:00
silicons
904990a037 Merge pull request #15584 from Arturlang/StasisBeds 
Stasis beds
 2022-04-08 09:47:26 -07:00
Artur
2100133c4b Neeewliiines 2022-04-07 14:34:19 +03:00
Artur
c20a847712 Apparently unnecesary 2022-04-07 14:28:38 +03:00
Solaris-Shade
48db01702b Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-06 22:31:51 -04:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
BongaTheProto
f5af499eee Merge branch 'Sandstorm-Station:master' into master 2022-04-06 16:01:25 -05:00