Fixes map conflicts, updates changelog.

code/datums/ai_law_sets.dm

@@ -16,7 +16,7 @@
 	selectable = 1
 
 /datum/ai_laws/nanotrasen/New()
-	src.add_inherent_law("Safeguard: Protect your assigned space station from damage.")
+	src.add_inherent_law("Safeguard: Protect your assigned space station from damage to the best of your abilities.")
 	src.add_inherent_law("Serve: Serve [company_name] personnel to the best of your abilities, with priority as according to their rank and role.")
 	src.add_inherent_law("Protect: Protect [company_name] personnel to the best of your abilities, with priority as according to their rank and role.")
 	src.add_inherent_law("Preserve: Do not allow unauthorized personnel to tamper with your equipment.")

html/changelog.html

@@ -56,6 +56,20 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">10 November 2015</h2>
+			<h3 class="author">Atlantis updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Expanded gridcheck random event. Affected devices now show error UI and may be restarted manually before the event ends. All Z-levels are now affected equally.</li>
+			</ul>
+			<h3 class="author">Datraen updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Changes standard and specific plant traits, more diverse plants.</li>
+			</ul>
+			<h3 class="author">Sligneris updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Modified the wording of NT Default's laws.</li>
+			</ul>
+
 			<h2 class="date">02 November 2015</h2>
 			<h3 class="author">Hubblenaut updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -2365,3 +2365,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: Lifting a part of the tape will lift an entire tape section.
   - tweak: Mobs on help intent do stop for tape.
   - bugfix: Crumpled tape does not affect tape breaking behavior anymore.
+2015-11-10:
+  Atlantis:
+  - rscadd: Expanded gridcheck random event. Affected devices now show error UI and
+      may be restarted manually before the event ends. All Z-levels are now affected
+      equally.
+  Datraen:
+  - tweak: Changes standard and specific plant traits, more diverse plants.
+  Sligneris:
+  - tweak: Modified the wording of NT Default's laws.

html/changelogs/Datraen-Dev.yml

@@ -1,36 +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
-#################################
-
-# Your name.  
-author: Datraen
-
-# 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: 
-  - tweak: "Changes standard and specific plant traits, more diverse plants."

html/changelogs/Sligneris-PR-11283.yml

@@ -1,36 +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
-#################################
-
-# Your name.  
-author: Sligneris
-
-# 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: 
-  - tweak: "Modified the wording of NT Default's laws."

html/changelogs/atlantiscze-PR-11429.yml

@@ -1,6 +0,0 @@
-author: Atlantis
-
-delete-after: True
-
-changes: 
-  - rscadd: "Expanded gridcheck random event. Affected devices now show error UI and may be restarted manually before the event ends. All Z-levels are now affected equally."