-
Notifications
You must be signed in to change notification settings - Fork 222
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Getting wizard working PR to pass CI.
- Loading branch information
1 parent
0766cec
commit 9d42ece
Showing
2 changed files
with
88 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,49 @@ | ||
| #ifndef GAMEMODE_PACK_CULT | ||
| #define GAMEMODE_PACK_CULT | ||
|
|
||
| #ifdef GAMEMODE_PACK_DEITY | ||
| #warn Deity modpack loaded before Cult modpack, Nar'sie godform will be unavailable! | ||
| #endif | ||
|
|
||
| // BEGIN_INCLUDE | ||
| #include "_cult.dm" | ||
| #include "archaeology.dm" | ||
| #include "codex.dm" | ||
| #include "flooring.dm" | ||
| #include "gamemode.dm" | ||
| #include "ghosts.dm" | ||
| #include "ghosttrap.dm" | ||
| #include "hell_universe.dm" | ||
| #include "holy.dm" | ||
| #include "items.dm" | ||
| #include "materials.dm" | ||
| #include "narsie.dm" | ||
| #include "objectives.dm" | ||
| #include "overrides.dm" | ||
| #include "ritual.dm" | ||
| #include "runes.dm" | ||
| #include "special_role.dm" | ||
| #include "structures.dm" | ||
| #include "talisman.dm" | ||
| #include "wizard.dm" | ||
| #include "cultify\de-cultify.dm" | ||
| #include "abilities\_handler.dm" | ||
| #include "abilities\construct.dm" | ||
| #include "abilities\harvest.dm" | ||
| #include "abilities\shade.dm" | ||
| #include "cultify\defile.dm" | ||
| #include "cultify\mob.dm" | ||
| #include "cultify\turf.dm" | ||
| #include "mobs\mob_subtypes.dm" | ||
| #include "mobs\shade.dm" | ||
| #include "mobs\constructs\constructs.dm" | ||
| #include "mobs\constructs\soulstone.dm" | ||
| // END_INCLUDE | ||
| #endif | ||
| #ifndef GAMEMODE_PACK_CULT | ||
| #define GAMEMODE_PACK_CULT | ||
|
|
||
| #ifdef GAMEMODE_PACK_DEITY | ||
| #warn Deity modpack loaded before Cult modpack, Nar'sie godform will be unavailable! | ||
| #endif | ||
|
|
||
| // BEGIN_INCLUDE | ||
| #include "_cult.dm" | ||
| #include "archaeology.dm" | ||
| #include "codex.dm" | ||
| #include "flooring.dm" | ||
| #include "gamemode.dm" | ||
| #include "ghosts.dm" | ||
| #include "ghosttrap.dm" | ||
| #include "hell_universe.dm" | ||
| #include "holy.dm" | ||
| #include "items.dm" | ||
| #include "materials.dm" | ||
| #include "narsie.dm" | ||
| #include "objectives.dm" | ||
| #include "overrides.dm" | ||
| #include "ritual.dm" | ||
| #include "runes.dm" | ||
| #include "special_role.dm" | ||
| #include "structures.dm" | ||
| #include "talisman.dm" | ||
| #include "wizard.dm" | ||
| #include "abilities\_handler.dm" | ||
| #include "abilities\construct.dm" | ||
| #include "abilities\harvest.dm" | ||
| #include "abilities\shade.dm" | ||
| #include "cultify\de-cultify.dm" | ||
| #include "cultify\defile.dm" | ||
| #include "cultify\mob.dm" | ||
| #include "cultify\turf.dm" | ||
| #include "mobs\mob_subtypes.dm" | ||
| #include "mobs\shade.dm" | ||
| #include "mobs\constructs\constructs.dm" | ||
| #include "mobs\constructs\soulstone.dm" | ||
| // END_INCLUDE | ||
| #endif | ||
| // BEGIN_INTERNALS | ||
| // END_INTERNALS | ||
| // BEGIN_FILE_DIR | ||
| #define FILE_DIR . | ||
| // END_FILE_DIR | ||
| // BEGIN_PREFERENCES | ||
| // END_PREFERENCES |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,39 @@ | ||
| #ifndef GAMEMODE_PACK_WIZARD | ||
| #define GAMEMODE_PACK_WIZARD | ||
| // BEGIN_INCLUDE | ||
| #include "_wizard.dm" | ||
| #include "artifacts.dm" | ||
| #include "contracts.dm" | ||
| #include "familiar.dm" | ||
| #include "machines.dm" | ||
| #include "mode.dm" | ||
| #include "outfits.dm" | ||
| #include "overrides.dm" | ||
| #include "role.dm" | ||
| #include "scrolls.dm" | ||
| #include "staves.dm" | ||
| #include "storage.dm" | ||
| #include "wizard_base.dm" | ||
| #include "wizard_clothes.dm" | ||
| #include "wizard_props.dm" | ||
| #include "spellbook\spellbook_subtypes.dm" | ||
| #include "spellbook\spellbook.dm" | ||
| #include "spellbook\spellbook_types\_spellbook_type.dm" | ||
| #include "spellbook\spellbook_types\spellbook_battlemage.dm" | ||
| #include "spellbook\spellbook_types\spellbook_cleric.dm" | ||
| #include "spellbook\spellbook_types\spellbook_druid.dm" | ||
| #include "spellbook\spellbook_types\spellbook_spatial.dm" | ||
| #include "spellbook\spellbook_types\spellbook_standard.dm" | ||
| #include "spellbook\spellbook_types\spellbook_student.dm" | ||
| #include "spells\_spell_handler.dm" | ||
| #include "spells\_spell.dm" | ||
| #include "spells\knock.dm" | ||
| // END_INCLUDE | ||
| #endif | ||
| #ifndef GAMEMODE_PACK_WIZARD | ||
| #define GAMEMODE_PACK_WIZARD | ||
| // BEGIN_INCLUDE | ||
| #include "_wizard.dm" | ||
| #include "artifacts.dm" | ||
| #include "contracts.dm" | ||
| #include "familiar.dm" | ||
| #include "machines.dm" | ||
| #include "mode.dm" | ||
| #include "outfits.dm" | ||
| #include "overrides.dm" | ||
| #include "role.dm" | ||
| #include "scrolls.dm" | ||
| #include "staves.dm" | ||
| #include "storage.dm" | ||
| #include "wizard_base.dm" | ||
| #include "wizard_clothes.dm" | ||
| #include "wizard_props.dm" | ||
| #include "spellbook\spellbook.dm" | ||
| #include "spellbook\spellbook_subtypes.dm" | ||
| #include "spellbook\spellbook_types\_spellbook_type.dm" | ||
| #include "spellbook\spellbook_types\spellbook_battlemage.dm" | ||
| #include "spellbook\spellbook_types\spellbook_cleric.dm" | ||
| #include "spellbook\spellbook_types\spellbook_druid.dm" | ||
| #include "spellbook\spellbook_types\spellbook_spatial.dm" | ||
| #include "spellbook\spellbook_types\spellbook_standard.dm" | ||
| #include "spellbook\spellbook_types\spellbook_student.dm" | ||
| #include "spells\_spell.dm" | ||
| #include "spells\_spell_handler.dm" | ||
| #include "spells\knock.dm" | ||
| // END_INCLUDE | ||
| #endif | ||
| // BEGIN_INTERNALS | ||
| // END_INTERNALS | ||
| // BEGIN_FILE_DIR | ||
| #define FILE_DIR . | ||
| // END_FILE_DIR | ||
| // BEGIN_PREFERENCES | ||
| // END_PREFERENCES |