Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Module fix #32096

Closed
wants to merge 162 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
162 commits
Select commit Hold shift + click to select a range
9527389
Update Rules.txt
KeldWolf Jun 2, 2024
56d67f4
Merge branch 'master' of https://github.com/ss14-harmony/space-statio…
invalid-email-address Jun 5, 2024
c29c7a6
Merged from upstream
invalid-email-address Jun 6, 2024
1c4b8b1
Merge remote-tracking branch 'upstream/master'
invalid-email-address Jun 8, 2024
724d34b
Merge remote-tracking branch 'upstream/master'
invalid-email-address Jun 9, 2024
1b8a2be
Merge remote-tracking branch 'upstream/master'
invalid-email-address Jun 13, 2024
79aba26
Added server pins and make them starting trinkets.
invalid-email-address Jun 14, 2024
911fcba
Fixed a deleted section for golden autism pin
invalid-email-address Jun 14, 2024
6629195
Merge branch 'space-wizards:master' into server-pins
KeldWolf Jun 14, 2024
30b0967
Merge pull request #1 from ss14-harmony/server-pins
KeldWolf Jun 14, 2024
4481f51
pins meta file update
invalid-email-address Jun 17, 2024
a46d866
Merge remote-tracking branch 'upstream/master'
invalid-email-address Jun 17, 2024
8b72df5
Update pins.yml
KeldWolf Jun 17, 2024
126ef67
Update trinkets.yml
KeldWolf Jun 17, 2024
8f74198
Update publish.yml
KeldWolf Jun 21, 2024
8e3308b
Remove schedule for publish
KeldWolf Jun 21, 2024
78bb4c5
Spacing fix
KeldWolf Jun 22, 2024
afdea87
Fixed Golden Autism Pin fail I made
KeldWolf Jun 22, 2024
f8b8d34
Again... with the pins.
KeldWolf Jun 22, 2024
79e54b1
Merge remote-tracking branch 'upstream/master'
invalid-email-address Jun 22, 2024
965af99
pins loadout
liltenhead Jun 23, 2024
1e1b2f3
Merge remote-tracking branch 'upstream/master'
invalid-email-address Jun 30, 2024
754567f
Merge pull request #2 from ss14-harmony/pins
KeldWolf Jul 1, 2024
a8cdd7a
Merge remote-tracking branch 'upstream/master'
invalid-email-address Jul 4, 2024
be5c6cc
Merge remote-tracking branch 'upstream/master'
invalid-email-address Jul 7, 2024
0836b5c
Attempting some proper workflow for CDN and Manifest update stuff.
invalid-email-address Jul 8, 2024
276e003
Merge pull request #3 from ss14-harmony/publish-stuff
KeldWolf Jul 8, 2024
966b49c
Update gen_build_info.py
KeldWolf Jul 8, 2024
8a8a0c2
removed not needed part of the gen script
invalid-email-address Jul 8, 2024
c1f844f
Update publish.yml
KeldWolf Jul 8, 2024
04e3232
Update publish.yml
KeldWolf Jul 8, 2024
b5717be
Update publish.yml
KeldWolf Jul 8, 2024
eb09b86
Update gen_build_info.py
KeldWolf Jul 9, 2024
d19fdbc
Update gen_build_info.py
KeldWolf Jul 11, 2024
0a9aca0
Big upstream update
invalid-email-address Jul 14, 2024
92011d7
Update publish_github_artifact.py
KeldWolf Jul 14, 2024
3a108e1
Re-added publish.
invalid-email-address Jul 14, 2024
f7e7136
Just moving the rules to the new location. This isn't taking into aco…
invalid-email-address Jul 15, 2024
0f4c900
Merge pull request #4 from ss14-harmony/add_rules
KeldWolf Jul 15, 2024
7bcd838
Merge remote-tracking branch 'upstream/master'
invalid-email-address Jul 18, 2024
2860040
Merge remote-tracking branch 'upstream/master'
invalid-email-address Jul 22, 2024
60b51a6
Merge remote-tracking branch 'upstream/master'
invalid-email-address Jul 23, 2024
3e46e38
Merge remote-tracking branch 'upstream/master' into upstream20242707
invalid-email-address Jul 27, 2024
b3e1bd0
Merge pull request #5 from ss14-harmony/upstream20242707
KeldWolf Jul 27, 2024
09b8ffe
Added new lobby art and took revs out of rotation.
invalid-email-address Jul 28, 2024
7bf2d81
Update attributions.yml
KeldWolf Jul 28, 2024
da7b37d
Update attributions.yml
KeldWolf Jul 28, 2024
f2d3cbe
Update attributions.yml
KeldWolf Jul 28, 2024
eff0bb1
Update attributions.yml
KeldWolf Jul 28, 2024
c92b407
Merge pull request #6 from ss14-harmony/art-and-revs
KeldWolf Jul 28, 2024
b771603
Merge remote-tracking branch 'upstream/master'
invalid-email-address Aug 2, 2024
f030e61
Merge branch 'master' of https://github.com/ss14-harmony/space-statio…
invalid-email-address Aug 2, 2024
31b65d2
Merge remote-tracking branch 'upstream/master'
invalid-email-address Aug 3, 2024
6584514
Merge remote-tracking branch 'upstream/master'
invalid-email-address Aug 5, 2024
501fc19
Merge remote-tracking branch 'upstream/master'
invalid-email-address Aug 8, 2024
42b90d5
Removed clown and syndi evac shuttle from rotation. Updated lobby art…
invalid-email-address Aug 9, 2024
3dc3ef3
Merge pull request #7 from ss14-harmony/de-clown-shuttle
KeldWolf Aug 9, 2024
432b07d
Merge for 20240812
invalid-email-address Aug 13, 2024
dce928d
Merge remote-tracking branch 'upstream/master'
invalid-email-address Aug 15, 2024
3b2c064
Update FoodSequenceSystem.cs
KeldWolf Aug 15, 2024
52e6a46
Update SliceableFoodSystem.cs
KeldWolf Aug 15, 2024
7b5e105
Update leaves.yml
KeldWolf Aug 15, 2024
58db5fc
Update toys.yml
KeldWolf Aug 15, 2024
dda9bdd
Update skewer.yml
KeldWolf Aug 15, 2024
33ae7e6
Update produce.yml
KeldWolf Aug 15, 2024
fdbac61
Update meat.yml
KeldWolf Aug 15, 2024
e50d973
Update ingredients.yml
KeldWolf Aug 15, 2024
d21209a
Update burger.yml
KeldWolf Aug 15, 2024
e507d57
Update mantles.yml
KeldWolf Aug 15, 2024
3b9e7a2
Update human.yml
KeldWolf Aug 15, 2024
f829d8a
Update food-sequence.ftl
KeldWolf Aug 15, 2024
3e2dec7
Update bounties.ftl
KeldWolf Aug 15, 2024
0b24ae5
Update Changelog.yml
KeldWolf Aug 15, 2024
b49632f
Update FoodSequenceStartPointComponent.cs
KeldWolf Aug 15, 2024
fff73b6
Update FoodSequenceElementComponent.cs
KeldWolf Aug 15, 2024
5a4679f
Update ClientFoodSequenceSystem.cs
KeldWolf Aug 15, 2024
651fd9d
Merge pull request #8 from ss14-harmony/FixBadMerge
KeldWolf Aug 15, 2024
7bd5702
Create secret_weights.yml
KeldWolf Aug 15, 2024
c22209a
Merge pull request #9 from ss14-harmony/Remove_SecretBug
KeldWolf Aug 15, 2024
9703bee
Update loadout_groups.yml
KeldWolf Aug 15, 2024
98f5f96
Merge pull request #11 from ss14-harmony/KeldWolf-patch-1
KeldWolf Aug 15, 2024
1d8b399
Update trinkets.yml
KeldWolf Aug 15, 2024
2b311c1
Update pins.yml
KeldWolf Aug 15, 2024
8835755
Create secret_weights.yml
KeldWolf Aug 15, 2024
92e4ffe
Merge pull request #12 from ss14-harmony/PinFixes
KeldWolf Aug 15, 2024
4455b36
202408252 Upstream merge
invalid-email-address Aug 22, 2024
af71048
Merge branch 'master' of https://github.com/ss14-harmony/space-statio…
invalid-email-address Aug 22, 2024
91ab9fb
Update publish.yml
KeldWolf Aug 22, 2024
722639a
Fixed the yaml... maybe
invalid-email-address Aug 22, 2024
9be0b05
Found the stupid extra file. AHHHHHHH
invalid-email-address Aug 23, 2024
e4c56f6
Merge pull request #14 from ss14-harmony/keld-fixyml
KeldWolf Aug 23, 2024
50d79c7
Pins but put in the right place.
invalid-email-address Aug 23, 2024
c5662dd
Fix Server Pins in wrong folder
KeldWolf Aug 23, 2024
ed23f27
Update loadout_groups.yml
KeldWolf Aug 23, 2024
97855e9
Update trinkets.yml
KeldWolf Aug 23, 2024
69dfac2
Update trinkets.yml
KeldWolf Aug 23, 2024
53ae183
Update loadout_groups.yml
KeldWolf Aug 23, 2024
9a217ba
Merge pull request #15 from ss14-harmony/keld-HarmonyFolders
KeldWolf Aug 23, 2024
72450dd
Madness grows
invalid-email-address Aug 23, 2024
3a288a4
Merge pull request #16 from ss14-harmony/keld-pinhell
KeldWolf Aug 23, 2024
eb92846
Vulture Pins
DieselMohawk Aug 23, 2024
b33fe33
Merge pull request #17 from ss14-harmony/Vulture-Pin-Try-2
KeldWolf Aug 24, 2024
edadce0
Merge for 20240825
invalid-email-address Aug 25, 2024
1ab9782
More merging
invalid-email-address Aug 26, 2024
11c5592
submodule update
invalid-email-address Aug 26, 2024
fd904cf
Removed all but Vulture pin. Also organized it more specifically inst…
invalid-email-address Aug 26, 2024
fe3e628
Even more simplification
invalid-email-address Aug 26, 2024
138e577
Update pins.yml
KeldWolf Aug 26, 2024
0faa954
Update pins.yml
KeldWolf Aug 26, 2024
9ab7325
Merge pull request #19 from ss14-harmony/keld-onlyvulture
KeldWolf Aug 26, 2024
0c8428f
Removed all custom pin code
invalid-email-address Aug 27, 2024
f44caab
Merge pull request #20 from ss14-harmony/keld-simplified
KeldWolf Aug 27, 2024
6aa59a1
20240827 Merge
invalid-email-address Aug 27, 2024
5384a15
trying to fix master
invalid-email-address Aug 28, 2024
af71b14
Maybe fixed it now?
invalid-email-address Aug 28, 2024
f4abb56
RobustToolbox nowe?
invalid-email-address Aug 28, 2024
4347fd5
Emergency merge to fix whitelist issue
invalid-email-address Aug 28, 2024
b72110a
Made most timelocked clothing 1-3 hours to unlock with few exceptions
invalid-email-address Sep 1, 2024
aa65d52
Re-adding clown shuttle as it's less... aggro now. Also re-added synd…
invalid-email-address Sep 1, 2024
02051e8
Merge pull request #22 from ss14-harmony/keld-reducetimers
KeldWolf Sep 1, 2024
2d6943f
Merge for 20240901
invalid-email-address Sep 1, 2024
edf6d1e
Update Changelog.yml
KeldWolf Sep 2, 2024
cb6c250
Re-added the golden autism pin I accidentally blew away when messing …
invalid-email-address Sep 2, 2024
0262d99
Re-adding the vulture pin while we're here.
invalid-email-address Sep 2, 2024
da41f09
Fuck it. All the servers pins are back now. We cocky today.
invalid-email-address Sep 2, 2024
6a71b9d
Merge pull request #23 from ss14-harmony/keld-ymlfixin
KeldWolf Sep 2, 2024
406c397
Adding two new shuttles to load in by spanky
invalid-email-address Sep 4, 2024
f791008
Merge pull request #25 from ss14-harmony/SpankysShuttleExtravaganza
KeldWolf Sep 4, 2024
3226ca4
Merge for September 4, 2024
invalid-email-address Sep 4, 2024
f928f8d
Merge pull request #26 from ss14-harmony/upstream20240904
KeldWolf Sep 4, 2024
e317b4c
Added more solid versions of the shuttles from feedback.
invalid-email-address Sep 5, 2024
a622580
Got a fixed version of the CC Graniteflea as well.
invalid-email-address Sep 6, 2024
bcff118
Merge pull request #28 from ss14-harmony/SpankyShuttleFixes
KeldWolf Sep 6, 2024
cf93576
upstream merge for September 6, 2024
invalid-email-address Sep 6, 2024
6b47d5d
Update rsi-diff.yml
KeldWolf Sep 6, 2024
0a37aeb
Merge pull request #29 from ss14-harmony/upstream20240906
KeldWolf Sep 6, 2024
7c74c15
Set role timers for sensitive roles to 3 hours and Captain 3 hours of…
invalid-email-address Sep 7, 2024
d8c3fb4
Update borg.yml
KeldWolf Sep 7, 2024
d5cf8a0
Merge pull request #30 from ss14-harmony/timerRevamp
KeldWolf Sep 7, 2024
9cbf5ca
Final touches on the shuttles based on feedback from WizDen mappers.
invalid-email-address Sep 7, 2024
149206a
Merge pull request #31 from ss14-harmony/SpankyShuttlesMk3
KeldWolf Sep 7, 2024
029e3a5
Upsteam merge for September 7 2024
invalid-email-address Sep 7, 2024
85011b2
Merge pull request #32 from ss14-harmony/Upstream20240907
KeldWolf Sep 7, 2024
3e3c845
Modified weights for Dragon and Ninja
TheCrimsonJupiter Sep 7, 2024
76007f8
Update events.yml
TheCrimsonJupiter Sep 7, 2024
fece651
Upstream merge for September 9, 2024
invalid-email-address Sep 9, 2024
c776256
Merge pull request #34 from ss14-harmony/upstream20240909
KeldWolf Sep 9, 2024
87f3ca2
Robust Changes
invalid-email-address Sep 9, 2024
b2feaa8
Merge pull request #35 from ss14-harmony/upstream20240909
KeldWolf Sep 9, 2024
a776b73
Merge pull request #33 from TheCrimsonJupiter/midround-antag-weights
KeldWolf Sep 9, 2024
8b7d71a
Upstream?
invalid-email-address Sep 11, 2024
5a66906
Fixed maybe. Maybe...
invalid-email-address Sep 11, 2024
91c215b
Merge pull request #36 from ss14-harmony/upstream20240910
KeldWolf Sep 11, 2024
2c667d3
Upstream changes
invalid-email-address Sep 11, 2024
de31d62
Update events.yml
KeldWolf Sep 11, 2024
821909c
Merge pull request #37 from ss14-harmony/masterFixin
KeldWolf Sep 11, 2024
724756e
Robust?
invalid-email-address Sep 11, 2024
97a6731
Merge pull request #38 from ss14-harmony/fixSubmodules
KeldWolf Sep 11, 2024
3e26be8
Upstream merge for starting fresh
invalid-email-address Sep 12, 2024
8c64ea3
Update Changelog.yml
KeldWolf Sep 12, 2024
692d340
Merge pull request #40 from ss14-harmony/StartingFresh
KeldWolf Sep 12, 2024
2a1943d
fully remove these from the branch so I can pull them fresh with no t…
invalid-email-address Sep 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ concurrency:

on:
workflow_dispatch:
schedule:
- cron: '0 10 * * *'
# schedule:
# - cron: '0 10 * * *'

jobs:
build:
Expand Down Expand Up @@ -58,16 +58,16 @@ jobs:
ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}

- name: Publish changelog (Discord)
run: Tools/actions_changelogs_since_last_run.py
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
# - name: Publish changelog (Discord)
# run: Tools/actions_changelogs_since_last_run.py
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}

- name: Publish changelog (RSS)
run: Tools/actions_changelog_rss.py
env:
CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
# - name: Publish changelog (RSS)
# run: Tools/actions_changelog_rss.py
# env:
# CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}

- uses: geekyeggo/delete-artifact@v5
if: always()
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/rsi-diff.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: Diff RSIs

on:
pull_request_target:
paths:
- '**.rsi/**.png'
workflow_dispatch:
# pull_request_target:
# paths:
# - '**.rsi/**.png'

jobs:
diff:
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,3 @@ private void OnComponentStartup(Entity<SliceableFoodComponent> entity, ref Compo
_solutionContainer.EnsureSolution(entity.Owner, foodComp.Solution, out _);
}
}

2 changes: 1 addition & 1 deletion Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Entries:
Entries:
- author: lzk228
changes:
- message: Space Law book added to the game.
Expand Down
Loading
Loading