cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 11:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,041 Commits 7 Branches 0 Tags
b801f6d8469795b811d88cb1563d53ce8cc1cbda
Commit Graph

1099 Commits

Author SHA1 Message Date
Seris02
cf690461db ip whitelists 2023-06-16 16:47:05 +08:00
Raeschen
ca19ab2abd Fix a merge conflict 2023-06-13 22:46:01 +02:00
Heroman3003
ea455fdedd Adds artists/genres to entries missing them in jukebox 2023-06-03 19:08:27 +00:00
Razgriz
63a59c18c7 Fix jukebox song duration 
From 0 to 2490. 0 was causing a runtime
 2023-04-04 22:28:24 -07:00
Razgriz
68fa0ff505 LOBBY MUSIC FALSE PLS 2023-02-15 16:38:04 -07:00
Bib Bob
1cf5bc09de sisters! Below below, we're going where the wind dont blow. 2023-02-12 22:35:17 -06:00
Bib Bob
9a97489aac time 2023-02-12 22:14:21 -06:00
Bib Bob
a8830c84bb Jukebox carepackage 2023-02-12 22:13:05 -06:00
Razgriz
b8b93ab10d git gud at editing json 2023-02-12 18:21:12 -07:00
Razgriz
c565d187fb Merge branch 'master' into upstream-merge-14467 2023-02-12 18:20:10 -07:00
Razgriz
6bccdcc527 Update jukebox.json 2023-02-12 17:54:56 -07:00
Novacat
74d23471f5 Succlet adjust 2023-02-09 13:22:31 +00:00
Casey
9a1087486a jukebox 2023-02-07 21:22:15 +00:00
Gittsyyy
0ed975ea21 Update jukebox.json 2022-12-27 01:19:55 -05:00
Gittsyyy
0b27737535 Update jukebox.json 2022-12-24 17:28:27 -05:00
Nadyr
c184658b53 powder that makes you say yes 2022-08-14 17:37:31 -04:00
Casey
b4dae2dca6 Condenses all the animal languages and deletes unused/unwanted languages 2022-08-14 05:44:51 +00:00
Nadyr
f6459be162 powder that makes you say yes 2022-08-07 18:45:12 -04:00
Casey
beac7813d8 RUSS Sprite Import 2022-08-07 19:58:35 +00:00
Razgriz
e7b3478b59 powder that makes you say yes 2022-07-22 00:51:16 -07:00
Casey
128e0d6e69 Add song to jukebox.json 2022-07-15 22:32:07 +00:00
Razgriz
ef3e059335 Update .gitignore 2022-07-07 01:54:50 -07:00
Razgriz
79dd22e420 Update .gitignore 2022-07-07 01:53:54 -07:00
Bib Bob
f32ec0e2f1 Adds more jukebox music and replaces dead links. 
Songs Added:
Danny Baranowsky - Disco-Descent
Danny Baranowsky - Konga Conga Kappa

Songs Fixed and replaced with alive links:

X-Ceed - Flip Flap (Title One)
Robocop Theme (Title Two)
Earthcrusher - Phoron Will Make Us Rich
Leslie Fish - Spaceman's Dilemma
 2022-07-04 10:06:55 -05:00
Razgriz
2ca0d42829 1:1 the jukebox file with what's on the serb 
We can now edit this file to change what is on the serb too, btw
 2022-05-31 00:40:04 -07:00
Nadyr
a8e4fb9d00 powder that makes you say yes 2021-08-27 18:28:13 -04:00
Nadyr
3c7fa05f6c powder that makes you say yes 2021-08-27 18:26:52 -04:00
Chompstation Bot
714e18bbc7 Version hell warnings 2021-08-27 04:40:06 +00:00
Shadowfire
b1186e0f25 Actual all jukebox fixing 
Turns out all jukeboxes were broken and fixed the issues with enabling config path and ensuring the old songs were merged into new system, as well as making a sorting system to ensure casino and non-casino tracks aren't mixed together.
 2021-07-05 23:44:03 +02:00
Nadyr
eae90a8412 Merge branch 'master' into upstream-merge-10840 2021-07-03 21:00:21 -04:00
Razgriz
88f9712565 powder that makes you say yes 2021-07-03 16:48:28 -07:00
Chompstation Bot
ecfa52682c Add discord button to top 2021-07-03 21:20:55 +00:00
Chompstation Bot
06159fd31f Update character slot limits, load dialog 2021-07-03 20:43:58 +00:00
Razgriz
02973d67da Merge branch 'master' into upstream-merge-10393 2021-06-12 18:06:47 -05:00
Razgriz
4dd91c87d8 Update config.txt 2021-06-12 16:02:43 -07:00
Razgriz
a74b1e1742 Update game_options.txt 2021-06-12 15:30:14 -07:00
ResidentCody
3e0af97986 Update jukebox.json - Add 1ea secret song. (#10560) 
* Update jukebox.json - Add 1ea secret song.

Adds the song "I Wupped Batman's Ass" to the secret songlist on the jukebox on behalf of another user.

* Adds a comma

Adds a comma that was missed.
 2021-06-09 00:40:58 +00:00
Nadyr
4e39cb8cfc Merge pull request #2110 from CHOMPStationBot/upstream-merge-10521 
[MIRROR] Media tracks subsystem, jukebox UI genres
 2021-06-02 02:55:34 -04:00
Nadyr
f672e73848 powder that makes you say yes 2021-06-01 23:32:18 -04:00
Chompstation Bot
701ddb7bc7 Media tracks subsystem, jukebox UI genres 2021-06-01 20:53:39 +00:00
Aronai Sieyes
2980da63df Merge pull request #10519 from Enzo-Leon/jukebox 
Jukebox Music Adjustments
 2021-06-01 20:47:26 +00:00
Chompstation Bot
34143b83cf [MIRROR] Ports Nebula's Discord Webhook Integration 2021-05-27 16:35:07 +00:00
Novacat
7f484bf4d7 Merge pull request #10393 from VOREStation/Arokha/configup 
Update example configs from live server (sani)
 2021-05-24 19:59:05 +00:00
Novacat
7cd77ae8e4 Merge pull request #10392 from ShadowLarkens/patch-1 
Update minimal access config to match server
 2021-05-23 16:31:07 +00:00
Nadyr
1fb1b3e72c powder that makes you say yes 2021-05-22 16:58:15 -04:00
Nadyr
a09a9b0836 powder that makes you say yes 2021-05-22 16:48:45 -04:00
Chompstation Bot
5b147760bd Split jukebox into two files, commit one 2021-05-22 19:32:15 +00:00
Nadyr
960e9ed746 Merge pull request #1893 from CHOMPStationBot/upstream-merge-9552 
[MIRROR] [HOST] Create Dockerfile and docker-compose.yml for Docker deployment
 2021-05-08 08:04:33 -04:00
Novacat
74f2bb1d81 Merge pull request #9552 from mel-byond/docker-deploy 
[HOST] Create Dockerfile and docker-compose.yml for Docker deployment
 2021-05-05 18:46:49 +00:00
Chompstation Bot
606e2e757c [MIRROR] Adds config option to control loadout whitelist strictness 2021-04-28 16:46:12 +00:00