Update, JUL2017

.gitattributes

@@ -1,6 +1,6 @@
 # dmm map merger hook
 # needs additional setup, see tools/mapmerge/install.txt
-*.dmm merge=merge-dmm
+*.dmm merge=merge-dmm eol=crlf
 
 # dmi icon merger hook
 # needs additional setup, see tools/dmitool/merging.txt

.gitignore

@@ -1,14 +1,18 @@
 #ignore misc BYOND files
 Thumbs.db
 *.log
-*.int
 *.rsc
+*.int
 *.dmb
 *.lk
 *.backup
+*.before
 data/
 cfg/
 build_log.txt
 
+__pycache__/
+*.py[cod]
+*$py.class
 /.atom-build.json
 .vscode/

.travis.yml

@@ -2,45 +2,51 @@ language: generic
 sudo: false
 
 env:
-  BYOND_MAJOR="510"
-  BYOND_MINOR="1346"
-  MACRO_COUNT=1156
-
+  BYOND_MAJOR="511"
+  BYOND_MINOR="1385"
+  MACRO_COUNT=120
+  FLYWAY_BUILD="4.2.0"
+
 cache:
   directories:
     - $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}
-
+    - $HOME/flyway-${FLYWAY_BUILD}
+
 addons:
+  mariadb: '10.1'
   apt:
     packages:
       - libc6-i386
       - libgcc1:i386
       - libstdc++6:i386
-  
+
 install:
   - pip install --user PyYaml -q
   - pip install --user beautifulsoup4 -q
 
 before_script:
+  - mysql -e 'CREATE DATABASE ss13_test;'
   - chmod +x ./install-byond.sh
   - ./install-byond.sh
+  - chmod +x ./install-flyway.sh
+  - ./install-flyway.sh
 
 script:
+  - $HOME/flyway-${FLYWAY_BUILD}/flyway migrate -user=root -password= -url=jdbc:mysql://localhost:3306/ss13_test
   - shopt -s globstar
   - (! grep 'step_[xy]' maps/**/*.dmm)
   - (! find nano/templates/ -type f -exec md5sum {} + | sort | uniq -D -w 32 | grep nano)
   - (! grep -E "<\s*span\s+class\s*=\s*('[^'>]+|[^'>]+')\s*>" **/*.dm)
   - (num=`grep -E '\\\\(red|blue|green|black|b|i[^mc])' **/*.dm | wc -l`; echo "$num escapes (expecting ${MACRO_COUNT} or less)"; [ $num -le ${MACRO_COUNT} ])
   - awk -f tools/indentation.awk **/*.dm
-  - md5sum -c - <<< "0af969f671fba6cf9696c78cd175a14a *baystation12.int"
-  - md5sum -c - <<< "88490b460c26947f5ec1ab1bb9fa9f17 *html/changelogs/example.yml"
+  - md5sum -c - <<< "0af969f671fba6cf9696c78cd175a14a *aurorastation.int"
+  - md5sum -c - <<< "94c0d540b3b0f008fbc4353e667de690 *html/changelogs/example.yml"
   - python tools/TagMatcher/tag-matcher.py ../..
   - python tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs --dry-run
   - source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
   - cp config/example/* config/
-  - scripts/dm.sh -DUNIT_TEST baystation12.dme
+  - scripts/dm.sh -DUNIT_TEST aurorastation.dme
   - grep "0 warnings" build_log.txt
-  - DreamDaemon baystation12.dmb -invisible -trusted -core 2>&1 | tee log.txt
+  - DreamDaemon aurorastation.dmb -invisible -trusted -core 2>&1 | tee log.txt
   - grep "All Unit Tests Passed" log.txt
   - (! grep "runtime error:" log.txt)
-  - (! grep 'Process scheduler caught exception processing' log.txt)

README.md

@@ -1,6 +1,10 @@
 # Aurorastation
 
-[Website](https://aurorastation.org/) - [Code](https://github.com/Aurorastation/Aurora.3)
+**[Website](https://aurorastation.org/)**
+
+**[Code](https://github.com/Aurorastation/Aurora.3)**
+
+[![Krihelimeter](http://www.krihelinator.xyz/badge/Aurorastation/Aurora.3)](http://www.krihelinator.xyz/repositories/Aurorastation/Aurora.3)
 
 ---
 
@@ -39,11 +43,11 @@ Now git will ignore changes to the file baystation12.int.
 
 First-time installation should be fairly straightforward.  First, you'll need BYOND installed.  You can get it from [here](http://www.byond.com/).
 
-This is a sourcecode-only release, so the next step is to compile the server files.  Open baystation12.dme by double-clicking it, open the Build menu, and click compile.  This'll take a little while, and if everything's done right you'll get a message like this:
+This is a sourcecode-only release, so the next step is to compile the server files.  Open aurorastation.dme by double-clicking it, open the Build menu, and click compile.  This'll take a little while, and if everything's done right you'll get a message like this:
 
-    saving baystation12.dmb (DEBUG mode)
-    
-    baystation12.dmb - 0 errors, 0 warnings
+    saving aurorastation.dmb (DEBUG mode)
+
+    aurorastation.dmb - 0 errors, 0 warnings
 
 If you see any errors or warnings, something has gone wrong - possibly a corrupt download or the files extracted wrong, or a code issue on the main repo. Ask on the server Discord if you're completely lost.
 
@@ -55,7 +59,7 @@ You'll also want to edit admins.txt to remove the default admins and add your ow
 
 where the BYOND key must be in lowercase and the admin rank must be properly capitalised.  There are a bunch more admin ranks, but these two should be enough for most servers, assuming you have trustworthy admins.
 
-Finally, to start the server, run Dream Daemon and enter the path to your compiled baystation12.dmb file.  Make sure to set the port to the one you  specified in the config.txt, and set the Security box to 'Trusted'.  Then press GO and the server should start up and be ready to join.
+Finally, to start the server, run Dream Daemon and enter the path to your compiled aurorastation.dmb file.  Make sure to set the port to the one you  specified in the config.txt, and set the Security box to 'Trusted'.  Then press GO and the server should start up and be ready to join.
 
 ---
 
@@ -78,7 +82,7 @@ When you have done this, you'll need to recompile the code, but then it should w
 
 ### Configuration
 
-For a basic setup, simply copy every file from config/example to config. 
+For a basic setup, simply copy every file from config/example to config.
 
 For more advanced setups, setting the server `tick_lag` in the config as well as configuring SQL are good first steps.
 
@@ -87,3 +91,11 @@ For more advanced setups, setting the server `tick_lag` in the config as well as
 ### SQL Setup
 
 The SQL backend for the library and stats tracking requires a MySQL server, as does the optional SQL saves system. Your server details go in config/dbconfig.txt, and initial database setup is done with [flyway](https://flywaydb.org/). Detailed instructions can be found [here](https://github.com/Aurorastation/Aurora.3/tree/master/SQL).
+
+---
+
+### Discord Bot
+
+The Aurorastation codebase uses a built-in Discord bot to interface with Discord. Some of its features rely on the MySQL database, specifically, channel storage and configuration. So a database is required for its operation. If that is present, then setup is relatively easy: simply set up the `config/discord.txt` file according to the example located in the `config/example/` folder, and populate the database with appropriate channel and server information.
+
+At present, there is no built in GUI for doing the latter. So direct database modification is required unless you set up the python companion bot. The python companion bot is BOREALIS II, and can be located [here](https://github.com/Aurorastation/BOREALISbot2). Though not required, it makes database modification easier. See commands that start with `channel_`.

SQL/migrate/V003__Ipintel.sql

@@ -0,0 +1,14 @@
+--
+-- Adds the IP intel database table.
+--
+
+CREATE TABLE `ss13_ipintel` (
+  `ip` varbinary(16) NOT NULL,
+  `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `intel` double NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ip`),
+  KEY `idx_ipintel` (`ip`,`intel`,`date`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+ALTER TABLE `ss13_player`
+  ADD `account_join_date` DATE NULL DEFAULT NULL AFTER `whitelist_status`;

SQL/migrate/V004__Character_signatures.sql

@@ -0,0 +1,8 @@
+--
+-- Implemented in PR #2098.
+-- Adds character signature fields to the database.
+--
+
+ALTER TABLE `ss13_characters_flavour`
+	ADD `signature` TINYTEXT NULL DEFAULT NULL AFTER `char_id`,
+	ADD `signature_font` TINYTEXT NULL DEFAULT NULL AFTER `signature`;

SQL/migrate/V005__Body_markings.sql

@@ -0,0 +1,7 @@
+--
+-- Implemented in PR #2607.
+-- Character body marking migration file
+--
+
+ALTER TABLE `ss13_characters`
+  ADD `body_markings` TEXT NULL DEFAULT NULL AFTER `organs_robotic`;

SQL/migrate/V006__No_Privacy.sql

@@ -0,0 +1,6 @@
+--
+-- Implemented in PR #2863.
+-- Removes unused privacy table.
+--
+
+DROP TABLE `ss13_privacy`;