Merge branch 'master' into master

AresMUSH · Nov 23, 2020 · 4905277 · 4905277
2 parents 133f252 + 256be63
commit 4905277
Show file tree

Hide file tree

Showing 104 changed files with 1,216 additions and 1,430 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,10 +1,14 @@
 License
 ----
 
-<span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">AresMUSH and the FS3 System</span>  are copyright 2007 by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.aresmush.com" property="cc:attributionName" rel="cc:attributionURL">Linda Naughton (aka Faraday)</a> and are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.
+<span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">AresMUSH and the FS3 System</span>  are copyright 2007 by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.aresmush.com" property="cc:attributionName" rel="cc:attributionURL">Faraday ("the author")</a> and are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.
 
 <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a>
 
-In a nutshell, that means you can use, share and modify it as long as you give credit and don't make money off it.
+In a nutshell, that means you can use, share and modify it as long as you give credit to the author and don't make money off it.
 
-There is NO WARRANTY for this software, express or implied.  You accept it as-is, and agree that the author is not responsible for any defects in operation or harm to the game, server, or anything else.
+**THERE IS NO WARRANTY FOR THIS SOFTWARE, EXPRESS OR IMPLIED.  YOU ACCEPT IT AS-IS, AND AGREE THAT THE AUTHOR IS NOT RESPONSIBLE FOR ANY DEFECTS IN OPERATION, HARM TO THE GAME OR SERVER, OR ANY OTHER CLAIM, DAMAGES OR LIABILITY RESULTING FROM THE USE OF THE SOFTWARE.**
+
+As mentioned in the Creative Commons license, this license only grants you the right to use the software, and "may not give you all of the permissions necessary for your intended use." You are solely responsible for ensuring that how you use this software complies with all applicable laws and regulations, such as (but not limited to) copyright laws and privacy regulations such as GDPR and COPPA.
+
+This license agreement consists of the only permissions to use this software, and use of this software is acceptance of its terms.  Failing to adhere to the terms of the license agreement constitutes a violation of the author's copyright and will result in revocation of the license to use this software as well as any other penalties the author may pursue under law to protect their copyright.
diff --git a/README.md b/README.md
@@ -6,11 +6,11 @@ The README file in each folder contains details about each item.
 
 ## Contribution Guidlines
 
-See the [AresMUSH submission guidelines](https://aresmush.com/tutorials/code/extra-contribs/) if you want to contribute your own plugins or extras.
+See the [AresMUSH submission guidelines](https://aresmush.com/tutorials/code/extra-contribs.html) if you want to contribute your own plugins or extras.
 
 ## Plugins
 
-Within the [plugins](https://github.com/AresMUSH/ares-extras/tree/master/plugins) folder are additional plugins that you can add to your game.  They can be installed easily using the add-plugin script, as described in [Ares Extras](https://aresmush.com/tutorials/code/extras/).  
+Within the [plugins](https://github.com/AresMUSH/ares-extras/tree/master/plugins) folder are additional plugins that you can add to your game.  They can be installed easily using the add-plugin script, as described in [Ares Extras](https://aresmush.com/tutorials/code/extras.html).  
 
 You can install plugins directly from the game using `plugin/install <name>`.
 
@@ -26,8 +26,8 @@ You can install a theme from the game using `theme/install <name>`.
 
 ## Snippets
 
-The [snippets](https://github.com/AresMUSH/ares-extras/tree/master/snippets) folder contains code snippets that are not full plugins.
+The [snippets](https://github.com/AresMUSH/ares-extras/tree/master/snippets) folder contains code, style or configuration tidbits.
 
-## Archived Items
+## License
 
-Archived items are **not supported**, and may even be based off of an old version of AresMUSH.  They will require some code effort to get working, or you can just use them for ideas.
+See [License](https://github.com/AresMUSH/ares-extras/blob/master/LICENSE.md)
diff --git a/archived/teamup-events/README.md b/archived/teamup-events/README.md
diff --git a/archived/teamup-events/events.rb b/archived/teamup-events/events.rb
diff --git a/archived/teamup-events/events.yml b/archived/teamup-events/events.yml
diff --git a/archived/teamup-events/events/cron_event_handler.rb b/archived/teamup-events/events/cron_event_handler.rb
diff --git a/archived/teamup-events/events/game_started_event_handler.rb b/archived/teamup-events/events/game_started_event_handler.rb
diff --git a/archived/teamup-events/help/en/index.md b/archived/teamup-events/help/en/index.md
diff --git a/archived/teamup-events/helpers.rb b/archived/teamup-events/helpers.rb
diff --git a/archived/teamup-events/lib/event_detail_cmd.rb b/archived/teamup-events/lib/event_detail_cmd.rb
diff --git a/archived/teamup-events/lib/events_cmd.rb b/archived/teamup-events/lib/events_cmd.rb
diff --git a/archived/teamup-events/locales/locale_en.yml b/archived/teamup-events/locales/locale_en.yml
diff --git a/archived/teamup-events/public/events_api.rb b/archived/teamup-events/public/events_api.rb