Skip to content

Commit

Permalink
Revert "TGUI 4.3 + TG Chat + Statusbar + New Assets System + CBT" (Fo…
Browse files Browse the repository at this point in the history
…undation-19#427)

Revert "TGUI 4.3 + TG Chat + Statusbar + New Assets System + CBT (Foundation-19#414)"

This reverts commit 5c63d9a.
  • Loading branch information
tichys authored Jul 15, 2022
1 parent 5c63d9a commit 871992d
Show file tree
Hide file tree
Showing 1,912 changed files with 29,487 additions and 433,543 deletions.
54 changes: 35 additions & 19 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,52 @@

<!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->

## Did you test it?

<!--
Please describe if you ran local tests to ensure compilation. If that is not the case, please make it abundantly clear so a maintainer knows they need to run local checks.
Note that this can include own balancing/gameplay tests, but does not need to.
-->

## Authorship

<!--
Please note down any individuals or otherwise inspirations/sources you have for this code if it is ported or adapted.
We recommend using the git blame.
-->

## Changelog

:cl:
add: Added new mechanics or gameplay changes
add: Added more things
del: Removed old things
qol: made something easier to use
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->

<!--
Common tags:
* rscadd - Adding a feature.
* rscdel - Removing a feature.
* tweak - Changing an existing feature.
* bugfix - Fixing an intended functionality that is not working, or correcting an oversight.
* maptweak - Changing something on a map, or adding a new away site. In 99% of cases, all map changes are maptweak.
* spellcheck - Spelling and grammar fixes.
Uncommon tags:
* admin - Adding, removing or changing administrative tools.
* balance - Changing an existing feature in such a way that it may broadly impact game balance; usually reserved for larger changes.
* soundadd - Adding new sounds, usually covered by rscadd unless you're only adding the sounds themselves.
* sounddel - Ditto as above with rscdel
* imageadd - Adding new icons; same situation as soundadd - usually you're adding something that uses these icons, so this isn't needed
* imagedel - Ditto as above.
* experiment - For experimental changes and tests that are intended to be temporary.
* wip - For works in progress. You probably won't get away with using this one.
Examples were changelog entries are optional/not typically required but encouraged:
* Cosmetic changes such as descriptions, sound effects, etc.
* Optimizations and other changes to underlying systems which do not affect gameplay.
* Minor bug fixes.
You'll find a README and example file in .\html\changelogs\ for further instructions.
You can also find a template for adding your changelog directly to the PR description here: https://github.com/Baystation12/Baystation12/wiki/Automatic-changelog-generation
As a courtesy, for ported PRs, please include if you have the blessing of the author. While not required, we encourage basic decency in porting others' work. It is also sufficient to note that the author has not expressed displeasure at the idea of their work getting ported.
Please refrain from porting works of authors that have expressed displeasure in having their work ported, thank you.
-->
36 changes: 36 additions & 0 deletions .github/workflows/changelog_generation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Compile changelogs

on:
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

jobs:
CompileCL:
runs-on: ubuntu-latest
if: github.repository == 'Foundation-19/Foundation-19' # to prevent this running on forks
steps:
- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
with:
fetch-depth: 0 # Otherwise, we will fail to push refs
ref: dev
token: ${{ secrets.BOT_TOKEN }}
- name: Python setup
uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
with:
python-version: '3.x'
- name: Install depends
run: |
python -m pip install --upgrade pip
pip install pyyaml bs4
- name: Compile CL
run: |
python tools/changelog/ss13_genchangelog.py html/changelog.html html/changelogs
- name: Commit And Push
run: |
git config --global user.email "${{ secrets.BOT_EMAIL }}"
git config --global user.name "${{ secrets.BOT_NAME }}"
git diff --quiet --exit-code && echo "No changes found, abort." && exit 0
git commit -m "Automatic changelog generation" -a
git push
52 changes: 0 additions & 52 deletions .github/workflows/compile_changelogs.yml

This file was deleted.

30 changes: 30 additions & 0 deletions .github/workflows/make_changelogs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Make changelogs

on:
push:
branches:
- dev

jobs:
MakeCL:
runs-on: ubuntu-latest
if: github.repository == 'Foundation-19/Foundation-19' # to prevent this running on forks
steps:
- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
with:
fetch-depth: 25
- name: Python setup
uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08
with:
python-version: '3.x'
- name: Install depends
run: |
python -m pip install --upgrade pip
pip install ruamel.yaml PyGithub
- name: Make CL
env:
BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
GIT_EMAIL: "${{ secrets.BOT_EMAIL }}"
GIT_NAME: "${{ secrets.BOT_NAME }}"
run: python tools/changelog/generate_cl.py
19 changes: 0 additions & 19 deletions .github/workflows/pr_emoji.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ config/*
sql/test_db

# VisualStudioCode
.vscode/*
.vscode/settings.json
*.code-workspace
.history

# swap
[._]*.s[a-v][a-z]
Expand Down
12 changes: 0 additions & 12 deletions .vscode/extensions.json

This file was deleted.

20 changes: 0 additions & 20 deletions .vscode/launch.json

This file was deleted.

77 changes: 36 additions & 41 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,38 @@
{
"eslint.nodePath": "./tgui/.yarn/sdks",
"eslint.workingDirectories": ["./tgui"],
"prettier.prettierPath": "./tgui/.yarn/sdks/prettier/index.js",
"typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"search.exclude": {
"**/.yarn": true,
"**/.pnp.*": true
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"files.eol": "\n",
"files.insertFinalNewline": true,
"gitlens.advanced.blame.customArguments": ["-w"],
"tgstationTestExplorer.project.resultsType": "json",
"[javascript]": {
"editor.rulers": [80],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[javascriptreact]": {
"editor.rulers": [80],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescript]": {
"editor.rulers": [80],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescriptreact]": {
"editor.rulers": [80],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[scss]": {
"editor.rulers": [80],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
}
"eslint.nodePath": "./tgui/.yarn/sdks",
"eslint.workingDirectories": [
"./tgui"
],
"typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"search.exclude": {
"**/.yarn": true,
"**/.pnp.*": true
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"workbench.editorAssociations": {
"*.dmi": "imagePreview.previewEditor"
},
"files.eol": "\n",
"files.insertFinalNewline": true,
"gitlens.advanced.blame.customArguments": [
"-w"
],
"[javascript]": {
"editor.rulers": [
80
]
},
"[typescript]": {
"editor.rulers": [
80
]
},
"[scss]": {
"editor.rulers": [
80
]
}
}
Loading

0 comments on commit 871992d

Please sign in to comment.