cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,059 Commits 6 Branches 0 Tags
0151c0ad23b51a65bb3013d233d29026a022adc2
Commit Graph

1071 Commits

Author SHA1 Message Date
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
cadyn
7bb0f98955 a 2021-02-23 03:12:23 -08:00
cadyn
bcb0739676 aaa 2021-02-23 03:11:49 -08:00
cadyn
03fc250c8c goddamnit forgot about these 2021-02-23 03:10:45 -08:00
Cadyn
bbb338edba Auto stash before merge of "tgs4" and "origin/master" 2021-02-23 03:02:32 -08:00
Razgriz
99af5bc3da Update alienwhitelist.txt 2020-10-06 16:54:09 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
hynet-mel
f84e9fde4e Update my entry to be lowercase as ckey 
Apparently it needs to be lowercase and I didn't caught onto that
 2020-09-14 13:30:17 +02:00
hynet-mel
bda9343f9b Add myself to the Protean whitelist 
[My application for the Protean species recently got accepted](https://forum.vore-station.net/viewtopic.php?f=46&t=1815) and wanted to add myself to the whitelist
 2020-09-14 08:23:34 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Novacat
7356e13df7 Update config.txt 2020-08-31 23:56:55 -04:00
Atermonera
1fe31b3446 Adds ENGINE_MAP to example config 2020-08-31 23:37:31 -04:00
David Winters
42f2b58b25 Moved name change to define, removes legacy entries from alienwhitelist 2020-08-23 23:31:31 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Novacat
89b0fa6b79 Merge pull request #8708 from Rykka-Stormheart/shep-dev-persistence-megapatch 
Persistence Patch
 2020-08-21 01:14:04 -04:00
ontejbjoav
82cc9df4d3 Adds ontejbjoav to alienwhitelist.txt 
Updated whitelist after my Diona app was accepted

https://forum.vore-station.net/viewtopic.php?f=46&t=1803
 2020-08-17 14:10:26 +01:00
izac112
74d84d2cff Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-17 09:44:00 +02:00
Novacat
a70b2a53f8 Merge pull request #8421 from LunarFleet/Lun-Sprite 
Adds Lunar Fleet and Jademanique to whitelists
 2020-08-17 01:43:03 -04:00
Draycu
c39149f4d1 Update alienwhitelist.txt 
Making a quick whitelist change request after being approved to play as a vox~!

https://forum.vore-station.net/viewtopic.php?f=46&t=1793
 2020-08-17 00:24:25 -05:00
Novacat
2ca8206f56 Merge branch 'master' into Lun-Sprite 2020-08-17 01:19:47 -04:00
C.L
df08b9b08e Adds Pearl Prophet to the Alien Whitelist for Protean 
See: https://forum.vore-station.net/viewtopic.php?f=46&t=1795&sid=30eb3127d88231d79f429d269a696814
 2020-08-16 20:25:25 -04:00
Novacat
9ab92001e6 Merge pull request #8709 from Tenryumi/ryumi-protean-whitelist 
Adds myself to the Protean whitelist
 2020-08-16 17:58:59 -04:00
Amy
0916ea07c1 adds myself to the Protean whitelist 2020-08-16 11:23:54 -05:00
Rykka
ad6870c78d Persistence Patch 
- Fixes Paper and font tags stacking across rounds, as shown in: ![](https://cdn.discordapp.com/attachments/187013248309002240/741937939382141000/164fdd3a37fb22f18dfa9b5c431ffc04.png)

- Fixes Graffiti being persistent for over 50 rounds (10+ days)
- Sets Trash to be persistent for 4 rounds instead of 5
- Fixes Persistence being always-on because of if("persistence_enabled") config.persistence_enabled = 1. As explained: 
> it's on by default, which means config.txt will be read and if it's not there it stays at 1. If it is there,it gets set to 1. There is no way to disable it

- Adds config options to enable/disable **Persistence for Maploaded objects**, as well as a verb to toggle such.
- Adds Persistence to config.

Currently IGNORE_MAPLOAD for Persistance is **Disabled.**
Maploaded objects/dirt/etc will be saved by persistence, preserving current behavior.
 2020-08-16 09:48:46 -04:00
Victor Zisthus
a1d62f34fb Resuming where I left off 
More door updating.

(99,79,1) Made this place look a little less empty.
(96,83,3) Tide Bait.
(94,41,8) WHO PUT A CHAIR IN THE ENGINES? Removed.
(32,68,8) Added fluff text

Added R-walling to Mining processing and Mining shuttle at Level 8
 2020-08-15 20:25:03 -04:00
Victor Zisthus
69ac92250a Access Overhaul + Minor Map Tweaks 
Overhauled most doors with new access codes as a result of the code fixes intended to keep departments as pure as possible.

Other changes marked below.

(77,111,1) Added Intercom
(77,110,1) Changed Door Sprite
(43,60,1) Added Atmos Access
(105,32,1) Tider's greetings...
(100,38,2) Set starting pressure to match other tanks.
 2020-08-15 18:26:43 -04:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00