diff --git a/beestation.dme b/beestation.dme index 0c9f455f3d975..916ad27b82ed4 100644 --- a/beestation.dme +++ b/beestation.dme @@ -1627,7 +1627,6 @@ #include "code\game\objects\structures\artstuff.dm" #include "code\game\objects\structures\barsigns.dm" #include "code\game\objects\structures\bedsheet_bin.dm" -#include "code\game\objects\structures\vampire_crypt.dm" #include "code\game\objects\structures\bot_elevator.dm" #include "code\game\objects\structures\catwalk.dm" #include "code\game\objects\structures\crateshelf.dm" @@ -1739,6 +1738,7 @@ #include "code\game\objects\structures\transit_tubes\transit_tube.dm" #include "code\game\objects\structures\transit_tubes\transit_tube_construction.dm" #include "code\game\objects\structures\transit_tubes\transit_tube_pod.dm" +#include "code\game\objects\structures\vampire_crypt.dm" #include "code\game\turfs\baseturf_skipover.dm" #include "code\game\turfs\change_turf.dm" #include "code\game\turfs\turf.dm" @@ -1962,49 +1962,6 @@ #include "code\modules\antagonists\blob\structures\resource.dm" #include "code\modules\antagonists\blob\structures\shield.dm" #include "code\modules\antagonists\blood_contract\blood_contract.dm" -#include "code\modules\antagonists\vampire\conversion_vampire.dm" -#include "code\modules\antagonists\vampire\datum_vampire.dm" -#include "code\modules\antagonists\vampire\daylight_vampire.dm" -#include "code\modules\antagonists\vampire\frenzy_vampire.dm" -#include "code\modules\antagonists\vampire\life_vampire.dm" -#include "code\modules\antagonists\vampire\misc_procs_vampire.dm" -#include "code\modules\antagonists\vampire\moodlets_vampire.dm" -#include "code\modules\antagonists\vampire\names_vampire.dm" -#include "code\modules\antagonists\vampire\objectives_vampire.dm" -#include "code\modules\antagonists\vampire\clans\_clan.dm" -#include "code\modules\antagonists\vampire\clans\assignclan.dm" -#include "code\modules\antagonists\vampire\clans\clan_flavortext.dm" -#include "code\modules\antagonists\vampire\clans\malkavian.dm" -#include "code\modules\antagonists\vampire\clans\nosferatu.dm" -#include "code\modules\antagonists\vampire\clans\tremere.dm" -#include "code\modules\antagonists\vampire\clans\venture.dm" -#include "code\modules\antagonists\vampire\powers\_power.dm" -#include "code\modules\antagonists\vampire\powers\cloak.dm" -#include "code\modules\antagonists\vampire\powers\feed.dm" -#include "code\modules\antagonists\vampire\powers\fortitude.dm" -#include "code\modules\antagonists\vampire\powers\gohome.dm" -#include "code\modules\antagonists\vampire\powers\masquerade.dm" -#include "code\modules\antagonists\vampire\powers\veil.dm" -#include "code\modules\antagonists\vampire\powers\targeted\_targeted.dm" -#include "code\modules\antagonists\vampire\powers\targeted\brawn.dm" -#include "code\modules\antagonists\vampire\powers\targeted\haste.dm" -#include "code\modules\antagonists\vampire\powers\targeted\lunge.dm" -#include "code\modules\antagonists\vampire\powers\targeted\mesmerize.dm" -#include "code\modules\antagonists\vampire\powers\targeted\trespass.dm" -#include "code\modules\antagonists\vampire\powers\tremere\_tremere.dm" -#include "code\modules\antagonists\vampire\powers\tremere\auspex.dm" -#include "code\modules\antagonists\vampire\powers\tremere\dominate.dm" -#include "code\modules\antagonists\vampire\powers\tremere\thaumaturgey.dm" -#include "code\modules\antagonists\vampire\powers\vassal\distress.dm" -#include "code\modules\antagonists\vampire\powers\vassal\recuperate.dm" -#include "code\modules\antagonists\vampire\powers\vassal\revenge_bloodbag.dm" -#include "code\modules\antagonists\vampire\powers\vassal\revenge_checkstatus.dm" -#include "code\modules\antagonists\vampire\powers\vassal\revenge_fold.dm" -#include "code\modules\antagonists\vampire\vassals\datum_vassal.dm" -#include "code\modules\antagonists\vampire\vassals\ex_vassal.dm" -#include "code\modules\antagonists\vampire\vassals\favorite_vassal.dm" -#include "code\modules\antagonists\vampire\vassals\misc_procs_vassal.dm" -#include "code\modules\antagonists\vampire\vassals\revenge_vassal.dm" #include "code\modules\antagonists\brainwashing\brainwashing.dm" #include "code\modules\antagonists\brother\brother.dm" #include "code\modules\antagonists\changeling\cellular_emporium.dm" @@ -2228,6 +2185,49 @@ #include "code\modules\antagonists\traitor\IAA\internal_affairs.dm" #include "code\modules\antagonists\valentines\heartbreaker.dm" #include "code\modules\antagonists\valentines\valentine.dm" +#include "code\modules\antagonists\vampire\conversion_vampire.dm" +#include "code\modules\antagonists\vampire\datum_vampire.dm" +#include "code\modules\antagonists\vampire\daylight_vampire.dm" +#include "code\modules\antagonists\vampire\frenzy_vampire.dm" +#include "code\modules\antagonists\vampire\life_vampire.dm" +#include "code\modules\antagonists\vampire\misc_procs_vampire.dm" +#include "code\modules\antagonists\vampire\moodlets_vampire.dm" +#include "code\modules\antagonists\vampire\names_vampire.dm" +#include "code\modules\antagonists\vampire\objectives_vampire.dm" +#include "code\modules\antagonists\vampire\clans\_clan.dm" +#include "code\modules\antagonists\vampire\clans\assignclan.dm" +#include "code\modules\antagonists\vampire\clans\clan_flavortext.dm" +#include "code\modules\antagonists\vampire\clans\malkavian.dm" +#include "code\modules\antagonists\vampire\clans\nosferatu.dm" +#include "code\modules\antagonists\vampire\clans\tremere.dm" +#include "code\modules\antagonists\vampire\clans\ventrue.dm" +#include "code\modules\antagonists\vampire\powers\_power.dm" +#include "code\modules\antagonists\vampire\powers\cloak.dm" +#include "code\modules\antagonists\vampire\powers\feed.dm" +#include "code\modules\antagonists\vampire\powers\fortitude.dm" +#include "code\modules\antagonists\vampire\powers\gohome.dm" +#include "code\modules\antagonists\vampire\powers\masquerade.dm" +#include "code\modules\antagonists\vampire\powers\veil.dm" +#include "code\modules\antagonists\vampire\powers\targeted\_targeted.dm" +#include "code\modules\antagonists\vampire\powers\targeted\brawn.dm" +#include "code\modules\antagonists\vampire\powers\targeted\haste.dm" +#include "code\modules\antagonists\vampire\powers\targeted\lunge.dm" +#include "code\modules\antagonists\vampire\powers\targeted\mesmerize.dm" +#include "code\modules\antagonists\vampire\powers\targeted\trespass.dm" +#include "code\modules\antagonists\vampire\powers\tremere\_tremere.dm" +#include "code\modules\antagonists\vampire\powers\tremere\auspex.dm" +#include "code\modules\antagonists\vampire\powers\tremere\dominate.dm" +#include "code\modules\antagonists\vampire\powers\tremere\thaumaturgey.dm" +#include "code\modules\antagonists\vampire\powers\vassal\distress.dm" +#include "code\modules\antagonists\vampire\powers\vassal\recuperate.dm" +#include "code\modules\antagonists\vampire\powers\vassal\revenge_bloodbag.dm" +#include "code\modules\antagonists\vampire\powers\vassal\revenge_checkstatus.dm" +#include "code\modules\antagonists\vampire\powers\vassal\revenge_fold.dm" +#include "code\modules\antagonists\vampire\vassals\datum_vassal.dm" +#include "code\modules\antagonists\vampire\vassals\ex_vassal.dm" +#include "code\modules\antagonists\vampire\vassals\favorite_vassal.dm" +#include "code\modules\antagonists\vampire\vassals\misc_procs_vassal.dm" +#include "code\modules\antagonists\vampire\vassals\revenge_vassal.dm" #include "code\modules\antagonists\wishgranter\wishgranter.dm" #include "code\modules\antagonists\wizard\wizard.dm" #include "code\modules\antagonists\wizard\equipment\artefact.dm" diff --git a/code/modules/antagonists/vampire/clans/venture.dm b/code/modules/antagonists/vampire/clans/ventrue.dm similarity index 100% rename from code/modules/antagonists/vampire/clans/venture.dm rename to code/modules/antagonists/vampire/clans/ventrue.dm