From 3635367e0346b247cc7dadf4b013a7fdab30fa26 Mon Sep 17 00:00:00 2001 From: DZD Date: Fri, 16 Jan 2015 17:10:34 -0500 Subject: [PATCH] Spelling Consistency Undoes changes made to spelling of the word "artifact/artefact" in order to maintain parity throughout the spellbook, or at least the bits that the user can see. --- code/game/gamemodes/wizard/spellbook.dm | 4 ++-- paradise.dme | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 88723b8214f..7cbb4f22a1c 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -129,7 +129,7 @@ dat += "
" dat += "Staff of Change
" - dat += "An artifact that spits bolts of coruscating energy which cause the target's very form to reshape itself.
" + dat += "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself.
" dat += "
" dat += "Six Soul Stone Shards and the spell Artificer
" @@ -153,7 +153,7 @@ dat += "
" dat += "Mastercrafted Armor Set
" - dat += "An artifact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space.
" + dat += "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space.
" dat += "
" dat += "Contract of Apprenticeship
" diff --git a/paradise.dme b/paradise.dme index 6731364f9b9..947a94145a4 100644 --- a/paradise.dme +++ b/paradise.dme @@ -164,7 +164,6 @@ #include "code\ATMOSPHERICS\components\unary\vent_pump.dm" #include "code\ATMOSPHERICS\components\unary\vent_scrubber.dm" #include "code\controllers\_DynamicAreaLighting_TG.dm" -#include "code\controllers\communications.dm" #include "code\controllers\configuration.dm" #include "code\controllers\emergency_shuttle_controller.dm" #include "code\controllers\failsafe.dm" @@ -245,6 +244,7 @@ #include "code\game\asteroid.dm" #include "code\game\atoms.dm" #include "code\game\atoms_movable.dm" +#include "code\game\communications.dm" #include "code\game\response_team.dm" #include "code\game\shuttle_engines.dm" #include "code\game\skincmd.dm" @@ -864,7 +864,6 @@ #include "code\modules\admin\verbs\randomverbs.dm" #include "code\modules\admin\verbs\striketeam.dm" #include "code\modules\admin\verbs\striketeam_syndicate.dm" -#include "code\modules\admin\verbs\ticklag.dm" #include "code\modules\admin\verbs\tripAI.dm" #include "code\modules\admin\verbs\vox_raiders.dm" #include "code\modules\assembly\assembly.dm"