Rebase attempt #1

Author: Kmc2000

.editorconfig

@@ -1,23 +1,17 @@
 [*]
 indent_style = tab
 indent_size = 4
-<<<<<<< HEAD
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-=======
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
 
 [*.yml]
 indent_style = space
 indent_size = 2
 
 [*.py]
 indent_style = space
-<<<<<<< HEAD
 
 [/tgui/**/*.{js,styl,ract,json,html}]
 indent_style = space
 indent_size = 2
-=======
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36

.github/CODEOWNERS

@@ -4,10 +4,8 @@
 # In the event that multiple org members are to be informed of changes
 # to the same file or dir, add them to the end under Multiple Owners
 
-#Francinum
-#SQL, Config, Manual Update Systems.
+# ChangelingRain
 
-<<<<<<< HEAD
 /code/__DEFINES/clockcult.dm @ChangelingRain
 /code/game/gamemodes/blob/ @ChangelingRain
 /code/game/gamemodes/clock_cult/ @ChangelingRain
@@ -79,10 +77,4 @@
 
 /code/__DEFINES/components.dm @Cyberboss @ninjanomnom
 /code/controllers/subsystem/air.dm @duncathan @MrStonedOne
-/code/datums/components/ @Cyberboss @ninjanomnom
-=======
-/code/controllers/subsystem/dbcore.dm @Francinum
-/SQL/ @Francinum
-/config/ @Francinum
-/code/controllers/configuration/ @Francinum
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
+/code/datums/components/ @Cyberboss @ninjanomnom

.github/CONTRIBUTING.md

@@ -394,10 +394,6 @@ There is no strict process when it comes to merging pull requests. Pull requests
 
 * Please explain why you are submitting the pull request, and how you think your change will be beneficial to the game. Failure to do so will be grounds for rejecting the PR.
 
-* If your pull request is not finished make sure it is at least testable in a live environment. Pull requests that do not at least meet this requirement will be closed. You may request a maintainer reopen the pull request when you're ready, or make a new one.
-
-* While we have no issue helping contributors (and especially new contributors) bring reasonably sized contributions up to standards via the pull request review process, larger contributions are expected to pass a higher bar of completeness and code quality *before* you open a pull request. Maintainers may close such pull requests that are deemed to be substantially flawed. You should take some time to discuss with maintainers or other contributors on how to improve the changes.
-
 ## Porting features/sprites/sounds/tools from other codebases
 
 If you are porting features/tools from other codebases, you must give them credit where it's due. Typically, crediting them in your pull request and the changelog is the recommended way of doing it. Take note of what license they use though, porting stuff from AGPLv3 and GPLv3 codebases are allowed.

.gitignore

@@ -210,18 +210,8 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/*
 /_maps/**/backup/
 /_maps/templates.dm
 
-<<<<<<< HEAD
 # Ignore custom music (amend as appropriate)
 /config/jukebox_music/sounds/*
 !/config/jukebox_music/sounds/exclude
 /config/title_music/sounds/*
-!/config/title_music/sounds/exclude
-=======
-# Ignore custom music and title screens (amend as appropriate)
-/config/jukebox_music/sounds/*
-!/config/jukebox_music/sounds/exclude
-/config/title_music/sounds/*
-!/config/title_music/sounds/exclude
-/config/title_screens/images/*
-!/config/title_screens/images/exclude
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
+!/config/title_music/sounds/exclude

.travis.yml

@@ -1,20 +1,10 @@
-<<<<<<< HEAD
 anguage: generic
-=======
-language: generic
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
 dist: xenial
 sudo: false
 
 branches:
-<<<<<<< HEAD
   only:
     - master
-=======
-  except:
-  - ___TGS3TempBranch
-  - ___TGSTempBranch
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
 
 matrix:
   include:
@@ -29,11 +19,7 @@ matrix:
         - tools/travis/install_build_tools.sh
         - tools/travis/install_spaceman_dmm.sh dreamchecker
       script:
-<<<<<<< HEAD
         - tools/travis/check_filedirs.sh beestation.dme
-=======
-        - tools/travis/check_filedirs.sh nsv13.dme
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
         - tools/travis/check_changelogs.sh
         - find . -name "*.php" -print0 | xargs -0 -n1 php -l
         - find . -name "*.json" -not -path "./tgui/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py
@@ -55,11 +41,7 @@ matrix:
       before_script:
         - tools/travis/template_dm_generator.py
       script:
-<<<<<<< HEAD
         - tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -DALL_MAPS beestation.dme
-=======
-        - tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -DALL_MAPS nsv13.dme
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
 
     - name: "Compile and Run Tests"
       addons:
@@ -84,21 +66,11 @@ matrix:
         - tools/travis/install_libmariadb.sh
         - tools/travis/install_rust_g.sh
       before_script:
-<<<<<<< HEAD
         - mysql -u root -e 'CREATE DATABASE bee_travis;'
         - mysql -u root bee_travis < SQL/beestation_schema.sql
         - tools/travis/build_bsql.sh
       script:
         - tools/travis/dm.sh -DTRAVISBUILDING beestation.dme || travis_terminate 1
-=======
-        - mysql -u root -e 'CREATE DATABASE tg_travis;'
-        - mysql -u root tg_travis < SQL/tgstation_schema.sql
-        - mysql -u root -e 'CREATE DATABASE tg_travis_prefixed;'
-        - mysql -u root tg_travis_prefixed < SQL/tgstation_schema_prefixed.sql
-        - tools/travis/build_bsql.sh
-      script:
-        - tools/travis/dm.sh -DTRAVISBUILDING nsv13.dme || travis_terminate 1
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
         - tools/travis/run_server.sh
 
 #    - name: "Generate Documentation"
@@ -108,11 +80,7 @@ matrix:
 #        - tools/travis/install_spaceman_dmm.sh dmdoc
 #      before_script:
 #        # Travis checks out a hash, try to get back on a branch.
-<<<<<<< HEAD
 #        - git checkout -qf $(git name-rev --name-only HEAD) || true
-=======
-#        - git checkout $TRAVIS_BRANCH || true
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
 #      script:
 #        - ~/dmdoc
 #        - touch dmdoc/.nojekyll
@@ -121,7 +89,3 @@ matrix:
 #        skip_cleanup: true
 #        local_dir: dmdoc
 #        github_token: $DMDOC_GITHUB_TOKEN
-<<<<<<< HEAD
-=======
-#        fqdn: codedocs.tgstation13.org
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36

Dockerfile

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 FROM tgstation/byond:512.1488 as base
-=======
-FROM tgstation/byond:512.1478 as base
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
 
 FROM base as build_base
 

README.md

@@ -1,32 +1,13 @@
-<<<<<<< HEAD
 <h1 align="center">BeeStation 13 Codebase</h1>
 
 
-=======
-## NVS 13 codebase
-
-[![Build Status](https://travis-ci.com/DDMers/NSV13.svg?branch=master)](https://travis-ci.com/DDMers/NSV13) [![Krihelimeter](https://www.krihelinator.xyz/badge/DDMers/nsv13)](https://www.krihelinator.xyz)  
-[![Percentage of issues still open](https://isitmaintained.com/badge/open/DDMers/nsv13.svg)](https://isitmaintained.com/project/DDMers/nsv13 "Percentage of issues still open") [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/DDMers/nsv13.svg)](https://isitmaintained.com/project/DDMers/nsv13 "Average time to resolve an issue") ![Coverage](https://img.shields.io/badge/coverage---2%25-red.svg)  
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
 [![forthebadge](https://forthebadge.com/images/badges/built-with-resentment.svg)](https://forthebadge.com) [![forthebadge](https://forthebadge.com/images/badges/contains-technical-debt.svg)](https://user-images.githubusercontent.com/8171642/50290880-ffef5500-043a-11e9-8270-a2e5b697c86c.png) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
 [![Build Status](https://travis-ci.com/BeeStation/BeeStation-Hornet.svg?branch=master)](https://travis-ci.com/BeeStation/BeeStation-Hornet) ![Open Issues](https://isitmaintained.com/badge/open/BeeStation/BeeStation-Hornet.svg)
 
 **Website:** http://beestation13.com
 **Code:** https://github.com/beestation/beestation-hornet
 **Wiki:** https://wiki.beestation13.com/view/Main_Page
 
-<<<<<<< HEAD
-=======
-### NSV Information
-
-**Discord:** https://discord.gg/u7uwyQ3
-
-### Upstream Information
-**Website:** https://www.tgstation13.org
-**Code:** https://github.com/tgstation/tgstation
-**Wiki** https://tgstation13.org/wiki/Main_Page
-**IRC:** irc://irc.rizon.net/coderbus or if you dont have an IRC client, you can click  [here](https://kiwiirc.com/client/irc.rizon.net:6667/?&theme=cli#coderbus)
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
 
 ## DOWNLOADING
 
@@ -117,23 +98,13 @@ https://github.com/tgstation/tgstation-server
 
 ## MAPS
 
-<<<<<<< HEAD
 BeeStation currently comes equipped with these maps.
 
 * [DeltaStation (default)](https://wiki.beestation13.com/view/DeltaStation)
 * [BoxStation](https://wiki.beestation13.com/view/Boxstation)
 * [MetaStation](https://wiki.beestation13.com/view/MetaStation)
 * [PubbyStation](https://wiki.beestation13.com/view/PubbyStation)
 * [DonutStation](https://wiki.beestation13.com/view/Donutstation)
-=======
-/tg/station currently comes equipped with five maps.
-
-* [BoxStation (default)](https://tgstation13.org/wiki/Boxstation)
-* [MetaStation](https://tgstation13.org/wiki/MetaStation)
-* [DeltaStation](https://tgstation13.org/wiki/DeltaStation)
-* [PubbyStation](https://tgstation13.org/wiki/PubbyStation)
-* [DonutStation](https://tgstation13.org/wiki/Donutstation)
->>>>>>> 6019aa33c0e954c94587c43287536eaf970cdb36
 
 
 All maps have their own code file that is in the base of the _maps directory. Maps are loaded dynamically when the game starts. Follow this guideline when adding your own map, to your fork, for easy compatibility.

SQL/database_changelog.txt

@@ -40,20 +40,6 @@ CHANGE `server` `server_name` varchar(32);
 ----------------------------------------------------
 
 
-Version 5.3, 6 July 2019, by Atlanta-Ned
-Added a `feedback` column to the admin table, used for linking to individual admin feedback threads. Currently this is only used for statistics tracking tools such as Statbus and isn't used by the game.
-
-ALTER TABLE `admin` ADD `feedback` VARCHAR(255) NULL DEFAULT NULL AFTER `rank`;
-
-----------------------------------------------------
-
-Version 5.2, 30 May 2019, by AffectedArc07
-Added a field to the `player` table to track ckey and discord ID relationships
-
-ALTER TABLE `player`
-	ADD COLUMN `discord_id` BIGINT NULL DEFAULT NULL AFTER `flags`;
-----------------------------------------------------
-
 Version 5.1, 25 Feb 2018, by MrStonedOne
 Added four tables to enable storing of stickybans in the database since byond can lose them, and to enable disabling stickybans for a round without depending on a crash free round. Existing stickybans are automagically imported to the tables.