From ffbac82f91bc7948f769f372e05ddf1041f519db Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Tue, 10 Nov 2015 10:46:22 +0100 Subject: [PATCH] Fixes map conflicts, updates changelog. --- code/datums/ai_law_sets.dm | 2 +- html/changelog.html | 14 + html/changelogs/.all_changelog.yml | 9 + html/changelogs/Datraen-Dev.yml | 36 - html/changelogs/Sligneris-PR-11283.yml | 36 - html/changelogs/atlantiscze-PR-11429.yml | 6 - maps/backup/exodus-1.dmm | 7584 +++++++++++++++ maps/exodus-1.dmm | 10734 ++++++++++----------- 8 files changed, 12975 insertions(+), 5446 deletions(-) delete mode 100644 html/changelogs/Datraen-Dev.yml delete mode 100644 html/changelogs/Sligneris-PR-11283.yml delete mode 100644 html/changelogs/atlantiscze-PR-11429.yml create mode 100644 maps/backup/exodus-1.dmm diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index f582422548d..a65d20c6437 100644 --- a/code/datums/ai_law_sets.dm +++ b/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.") diff --git a/html/changelog.html b/html/changelog.html index 623355b4b59..d0d2dcf652f 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,20 @@ -->
+

10 November 2015

+

Atlantis updated:

+ +

Datraen updated:

+ +

Sligneris updated:

+ +

02 November 2015

Hubblenaut updated: