Skip to content

Commit

Permalink
New changes
Browse files Browse the repository at this point in the history
  • Loading branch information
DebugOk committed Feb 18, 2024
1 parent c513bce commit fce831a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
10 changes: 1 addition & 9 deletions LEGAL.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,8 @@ All images, models, and rigging files in this repository are licensed under the
## Code license

### IMPORTANT
This repository contains code that remains licensed under MIT regardless of the date, this only applies to changes we have made separate from our upstream, https://github.com/space-wizards/space-station-14.
Any code we have licensed under AGPLv3 will have this clearly marked in the first line of the file, and in the case of changes in files that arent ours, before and after the change.
If a file does not explicitly relicense itself as AGPLv3, it is to be assumed that it is still under MIT.

Note: We may make changes in within files that are licensed under MIT. These modifications will contain a notice if they are licensed under AGPLv3.

---

Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 may be licensed under the GNU Affero General Public License version 3.0, unless otherwise stated. See `LICENSE-AGPLv3.txt`.
Note: If a file does not explicitly relicense itself as AGPLv3, it is to be assumed that it is still under MIT.
Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0, unless otherwise stated. See `LICENSE-AGPLv3.txt`.

Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license, unless otherwise stated. See `LICENSE-MIT.txt`.

Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ Any changes made to files belonging to our upstream should be properly marked in

## License

All code for the repository is licensed under [MIT](https://github.com/DeltaV-Station/Delta-v/blob/master/LICENSE-MIT.txt), or [AGPLv3](https://github.com/DeltaV-Station/Delta-v/blob/master/LICENSE-AGPLv3.txt).

If code does not explicitly mention the license it is under, it should be assumed to be MIT. To avoid any confusion, it is best to take all code outside of the DeltaV namespaces from our upstream, [space-wizards/space-station-14](https://github.com/space-wizards/space-station-14)
Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the GNU Affero General Public License version 3.0, unless otherwise stated. See `LICENSE-AGPLv3.txt`.
Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 is licensed under the MIT license, unless otherwise stated. See `LICENSE-MIT.txt`.

Most assets are licensed under [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) unless stated otherwise. Assets have their license and the copyright in the metadata file. [Example](https://github.com/DeltaV-Station/Delta-v/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).

Expand Down

0 comments on commit fce831a

Please sign in to comment.