Merge branch 'master' into development

code/game/gamemodes/mixed/paranoia.dm

@@ -9,3 +9,4 @@
 	require_all_templates = 1
 	votable = 1
 	antag_tags = list(MODE_MALFUNCTION, MODE_TRAITOR, MODE_CHANGELING)
+	disabled_jobs = list("AI")

html/changelog.html

@@ -56,6 +56,22 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">13 October 2017</h2>
+			<h3 class="author">Alberyk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed two AIs spawning during paranoia.</li>
+			</ul>
+			<h3 class="author">Belsima updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Microwaves can now be cleaned with soap.</li>
+			</ul>
+			<h3 class="author">MoondancerPony updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Telescience now starts with 3 crystals again.</li>
+				<li class="balance">Telescience can now go up to 5 crystals instead of just 4.</li>
+				<li class="bugfix">The default Z-level for the telescience console is now the level it's actually on.</li>
+			</ul>
+
 			<h2 class="date">17 September 2017</h2>
 			<h3 class="author">Skull132 updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -4563,3 +4563,13 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2017-09-17:
   Skull132:
   - tweak: CCIAA now have full access to AOOC, as per the decree of the Head Admins.
+2017-10-13:
+  Alberyk:
+  - bugfix: Fixed two AIs spawning during paranoia.
+  Belsima:
+  - bugfix: Microwaves can now be cleaned with soap.
+  MoondancerPony:
+  - tweak: Telescience now starts with 3 crystals again.
+  - balance: Telescience can now go up to 5 crystals instead of just 4.
+  - bugfix: The default Z-level for the telescience console is now the level it's
+      actually on.

html/changelogs/belsima-microwave.yml

@@ -1,37 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#   balance
-#################################
-
-# Your name.  
-author: Belsima
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - bugfix: "Microwaves can now be cleaned with soap."

html/changelogs/tsci-fixes-mdp.yml

@@ -1,6 +0,0 @@
-author: MoondancerPony
-delete-after: True
-changes: 
-  - tweak: "Telescience now starts with 3 crystals again."
-  - balance: "Telescience can now go up to 5 crystals instead of just 4."
-  - bugfix: "The default Z-level for the telescience console is now the level it's actually on."