Skip to content

Commit

Permalink
Merge branch 'master220' into Abotch-Remap
Browse files Browse the repository at this point in the history
  • Loading branch information
tsoivecen199015 authored Jan 11, 2025
2 parents 91f7a6f + 240753f commit 92edbc0
Show file tree
Hide file tree
Showing 830 changed files with 32,792 additions and 14,662 deletions.
37 changes: 37 additions & 0 deletions .github/assets/60-percent-of-the-time-works-every-time.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions .github/assets/fuck-it-ship-it.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/made-in-byond.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/assets/ss1984.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
102 changes: 63 additions & 39 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,55 +1,79 @@
# Paradise
[![CI](https://github.com/ss220-space/Paradise/workflows/CI/badge.svg)](https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3ACI)
[![Render Nanomaps](https://github.com/ss220-space/Paradise/workflows/Render%20Nanomaps/badge.svg)](https://github.com/ParadiseSS13/Paradise/actions?query=workflow%3A%22Render+Nanomaps%22)
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/ss220-space/paradise.svg)](http://isitmaintained.com/project/paradisess13/paradise "Average time to resolve an issue")
[![Percentage of issues still open](http://isitmaintained.com/badge/open/ss220-space/paradise.svg)](http://isitmaintained.com/project/paradisess13/paradise "Percentage of issues still open")
# <p align="center"> Буквально SS1984</p>
<a align="center" href="#"><img src=".github/assets/ss1984.gif" alt="Буквально SS1984"></a>

[![forthebadge](http://forthebadge.com/images/badges/60-percent-of-the-time-works-every-time.svg)](http://forthebadge.com)
[![forthebadge](http://forthebadge.com/images/badges/contains-technical-debt.svg)](http://forthebadge.com)
[![forthebadge](http://forthebadge.com/images/badges/fuck-it-ship-it.svg)](http://forthebadge.com)
<p align="center">
<a href="https://github.com/ss220-space/Paradise/actions?query=workflow%3ACI"><img src="https://github.com/ss220-space/Paradise/workflows/CI/badge.svg" alt="CI"></a>
<a href="https://github.com/ss220-space/Paradise/actions?query=workflow%3A%22Render+Nanomaps%22"><img src="https://github.com/ss220-space/Paradise/workflows/Render%20Nanomaps/badge.svg" alt="Render Nanomaps"></a>
</p>

# Ссылки

- [Website](https://ss220.space/)
<p align="center">
<a href="https://xkcd.ru/371/"><img src=".github/assets/60-percent-of-the-time-works-every-time.svg" alt="60% Works"></a>
<a href="https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a/"><img src=".github/assets/made-in-byond.gif" alt="Made in BYOND"></a>
<a href="https://xkcd.ru/1296/"><img src=".github/assets/fuck-it-ship-it.svg" alt="Fuck it, Ship it"></a>
</p>

# Ссылки SS1984

- [Вебсайт](https://ss220.space/)
- [Discord](https://discord.ss220.space)

# Original useful Links
# Апстрим проект Paradise

- [Website](https://www.paradisestation.org/)
- [Discord](https://discordapp.com/invite/YJDsXFE)
- [Documentation](https://codedocs.paradisestation.org)
- [Github](https://github.com/ParadiseSS13/Paradise)
- [Вебсайт](https://www.paradisestation.org/)
- [Документация](https://devdocs.paradisestation.org)

# Useful Documents
# Полезная документация (Устарело)

- [Installation Guide](.github/DOWNLOADING.md)
- [Contribution Guide](.github/CONTRIBUTING.md)
- [Autodocumentation Guide](.github/AUTODOC_GUIDE.md)

---
> [!TIP]
> Больше всего информации находиться у нас в Discord сервере в закрытых каналах<br>
> Для получения доступа, обратитесь к каналу [#информация](https://discord.com/channels/617003227182792704/628271712097665025). Там указаны какие есть роли, что они дают и как их получить.<br>
> Альтернативно, вы можете прочитать документарию апстрим Paradise [Getting Started Guide](https://devdocs.paradisestation.org/contributing/getting_started/)
---

### LICENSE

Paradise is licensed under the GNU Affero General Public License version 3.
As of 5th January 2015 any new contributions are licensed under the AGPL as well,
if you wish to submit code under the GPL v3 then commits and files must be marked as such
in comments. If you wish to use our code in a closed source manner you may use anything
before commit 445615b8439bf606ff204a42c8e7b6b69d983255,
which is licensed under GPL v3.
The major change here is that if you host a server using any code licensed under AGPL you
are required to provide full source code for your servers users as well,
including addons and modifications you have made.

See [this](https://www.gnu.org/licenses/why-affero-gpl.html) for more information.

Any files located in the
`Paradise/goon`,
`Paradise/icons/goonstation`, or
`Paradise/sound/goonstation`
directories, or any subdirectories of mentioned directories are licensed under the
Creative Commons 3.0 BY-NC-SA license
(https://creativecommons.org/licenses/by-nc-sa/3.0)

All other assets including icons and sound files are licensed under the
Creative Commons 3.0 BY-SA license (https://creativecommons.org/licenses/by-sa/3.0/),
unless otherwise indicated.
> [!CAUTION]
> If you wish to use our code in a closed source manner (i.e. not make it available to the public and/or those who connect to services you offer using this code) you must **only** use code prior to commit [1af3ddef2af85937251e24384c2173c4b6c3222b on 2015/01/05 22:04 GMT](https://github.com/ParadiseSS13/Paradise/commit/1af3ddef2af85937251e24384c2173c4b6c3222b), which is licenced under GPLv3.
### Click each banner for further information

---

<details>
<summary><a href="#"><img src="https://img.shields.io/badge/licence-AGPL_3-red?style=for-the-badge" alt="AGPLv3 license"></a></summary>

>All code after and including commit [1af3ddef2af85937251e24384c2173c4b6c3222b on 2015/01/05 22:04 GMT](https://github.com/ParadiseSS13/Paradise/commit/1af3ddef2af85937251e24384c2173c4b6c3222b) is licensed under the [GNU Affero General Public License version 3](https://www.gnu.org/licenses/agpl-3.0.en.html) unless otherwise specified within the folder or file.
</details>
<details>
<summary><a href="#"><img src="https://img.shields.io/badge/licence-GPL_3-orange?style=for-the-badge" alt="GPLv3 license"></a></summary>

>All code prior to commit [1af3ddef2af85937251e24384c2173c4b6c3222b on 2015/01/05 22:04 GMT](https://github.com/ParadiseSS13/Paradise/commit/1af3ddef2af85937251e24384c2173c4b6c3222b) is licensed under the [GPL General Public License version 3](https://www.gnu.org/licenses/gpl-3.0.en.html)
</details>
<details>
<summary><a href="#"><img src="https://img.shields.io/badge/licence-MIT-green?style=for-the-badge" alt="MIT license"></a></summary>

>Some files are licenced under the [MIT license](https://opensource.org/license/MIT), these files will clearly specify this licence at the head of each file.
</details>
<details>
<summary><a href="#"><img src="https://img.shields.io/badge/licence-CC_3.0_BY--NC--SA-blue?style=for-the-badge" alt="Creative Commons 3.0 BY-NC-SA" align="centre"></a></summary>

>Any files with the ancestor directories [`Paradise/icons/goonstation`](icons/goonstation) or [`Paradise/sound/goonstation`](sound/goonstation) are licensed under the [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0).
>
>Further files or folders may also fall under this licence, and any such instances will be specified within the folder or file.
</details>
<details>
<summary><a href="#"><img src="https://img.shields.io/badge/licence-CC_3.0_BY--SA-lightblue?style=for-the-badge" alt="Creative Commons 3.0 BY-SA"></a></summary>

>All other non-code assets, including icons and sound files, are licensed under the [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/), unless otherwise specified within the folder or file.
</details>
4 changes: 2 additions & 2 deletions _build_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ export STABLE_BYOND_MAJOR=515
# Stable Byond Minor
export STABLE_BYOND_MINOR=1642
# Beta Byond Major
export BETA_BYOND_MAJOR=515
export BETA_BYOND_MAJOR=516
# Beta Byond Minor
export BETA_BYOND_MINOR=1642
export BETA_BYOND_MINOR=1648
# For the RUSTG library. Not actually installed by CI but kept as a reference
export RUSTG_VERSION=3.3.0-ss220
#For DMJIT librarry
Expand Down
Loading

0 comments on commit 92edbc0

Please sign in to comment.