From 002edceacc572c01f6de685fd509c050a2e134dc Mon Sep 17 00:00:00 2001 From: DZD Date: Fri, 16 Jan 2015 17:20:21 -0500 Subject: [PATCH 1/2] Revert "Spelling Consistency" This reverts commit 3635367e0346b247cc7dadf4b013a7fdab30fa26. --- code/game/gamemodes/wizard/spellbook.dm | 4 ++-- paradise.dme | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 7cbb4f22a1c..88723b8214f 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 artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself.
" + dat += "An artifact 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 artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space.
" + dat += "An artifact 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 947a94145a4..6731364f9b9 100644 --- a/paradise.dme +++ b/paradise.dme @@ -164,6 +164,7 @@ #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" @@ -244,7 +245,6 @@ #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,6 +864,7 @@ #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" From 5a04ea1a79d0cf5421e290f5a592fa32e5ad3c64 Mon Sep 17 00:00:00 2001 From: DZD Date: Fri, 16 Jan 2015 17:26:40 -0500 Subject: [PATCH 2/2] Spelling Consistency Fixes AGAIN This time without compiler-breaking #include statement changes. --- code/game/gamemodes/wizard/spellbook.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 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
"