cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-19 22:23:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

TG Upstream Part 1

Browse Source 
3591 individual conflicts

Update build.js

Update install_node.sh

Update byond.js

oh my fucking god

hat

slow

huh

holy shit

we all fall down

2 more I missed

2900 individual conflicts

2700 Individual conflicts

replaces yarn file with tg version, bumping us down to 2200-ish

Down to 2000 individual conflicts

140 down

mmm

aaaaaaaaaaaaaaaaaaa

not yt

575

soon

900 individual conflicts

600 individual conflicts, 121 file conflicts

im not okay

160 across 19 files

29 in 4 files

0 conflicts, compiletime fix time

some minor incap stuff

missed ticks

weird dupe definition stuff

missed ticks 2

incap fixes

undefs and pie fix

Radio update and some extra minor stuff

returns a single override

no more dupe definitions, 175 compiletime errors

Unticked file fix

sound and emote stuff

honk and more radio stuff
This commit is contained in:
Waterpig
2024-09-08 10:49:28 +02:00
committed by Majkl-J
parent 67e8dba34a
commit bb70889f6e
1578 changed files with 384 additions and 52713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/WebhookProcessor/github_webhook_processor.php
View File

@@ -44,16 +44,11 @@ $discordWebHooks = array();
// Only these repositories will announce in game.
// Any repository that players actually care about.
$game_announce_whitelist = array(
<<<<<<< HEAD
/* SKYRAT EDIT - We want it to announce to us - ORIGINAL:
"tgstation",
"TerraGov-Marine-Corps",
// ORIGINAL END - SKYRAT EDIT: */
"Skyrat-tg",
=======
"tgstation",
"TerraGov-Marine-Corps",
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
);
// Any repository that matches in this blacklist will not appear on Discord.