Skip to content

Commit

Permalink
licencing fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
BurgerLUA committed Dec 11, 2020
1 parent dcf5e6b commit 2fe9c48
Show file tree
Hide file tree
Showing 7 changed files with 78 additions and 210 deletions.
5 changes: 1 addition & 4 deletions CREDITING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
Welcome to Burgerstation.
See licencing and readme for crediting

See LICENSE-AGPL3 and LICENCE-CC-BY-NC-SA for licensing.

If you wish use content under CC-BY-NC-SA, you're free to use it for non-commercial purposes as long as you appropriately credit the author.
Example of appropriate credit:

Bullet Projectile Code by BurgerBB, Ported from Burgerstation.
9 changes: 0 additions & 9 deletions LICENCE-CC-BY-NC-SA.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
As of March 22nd, 2020, this licence only applies to any and all files and folders located in the following directories of this project, unless stated otherwise.
/code/
/icons/
/sounds/

Attribution-ShareAlike 3.0 Unported

CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
License
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.

BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
Expand Down
21 changes: 21 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Welcome to Burgerstation.

As of December 11th, 2020 the licence Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) only applies to any and all files and folders located in the following directories of this project, unless stated otherwise.

/config/
/html/
/icons/
interface/
/maps/
/scripts/
/settings/
/sound/
/text/
/tools/

As of December 11th, 2020, the license Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0) only applies to any and all files and folders located in the following directories of this project, unless stated otherwise.

/code/



3 changes: 0 additions & 3 deletions code/_core/obj/structure/interactive/supermatter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
health = /health/construction/
health_base = 2000




/obj/structure/interactive/supermatter/on_damage_received(var/atom/atom_damaged,var/atom/attacker,var/atom/weapon,var/list/damage_table,var/damage_amount,var/critical_hit_multiplier,var/stealthy=FALSE)

. = ..()
Expand Down
191 changes: 0 additions & 191 deletions licence-agpl3.txt

This file was deleted.

56 changes: 56 additions & 0 deletions license-cc-by-sa.txt

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions please_readme.md

This file was deleted.

0 comments on commit 2fe9c48

Please sign in to comment.