Merge pull request #4605 from MistakeNot4892/removal/deity

Removed deity mode.
NebulaSS13 · Dec 7, 2024 · 8a7982e · 8a7982e
2 parents c23b2c8 + 8ca7971
commit 8a7982e
Show file tree

Hide file tree

Showing 86 changed files with 2 additions and 5,128 deletions.
diff --git a/code/modules/species/outsider/shadow.dm b/code/modules/species/outsider/shadow.dm
diff --git a/code/modules/species/outsider/starlight.dm b/code/modules/species/outsider/starlight.dm
diff --git a/maps/exodus/exodus.dm b/maps/exodus/exodus.dm
@@ -1,7 +1,6 @@
 #if !defined(USING_MAP_DATUM)
 
 	#include "../../mods/gamemodes/cult/_cult.dme"
-	#include "../../mods/gamemodes/deity/_deity.dme"
 	#include "../../mods/gamemodes/heist/_heist.dme"
 	#include "../../mods/gamemodes/meteor/_meteor.dme"
 	#include "../../mods/gamemodes/ninja/_ninja.dme"

diff --git a/maps/exodus/exodus_antagonism.dm b/maps/exodus/exodus_antagonism.dm
@@ -3,15 +3,6 @@
 	LAZYINITLIST(protected_jobs)
 	protected_jobs   |= list(/datum/job/officer, /datum/job/warden, /datum/job/detective, /datum/job/captain, /datum/job/lawyer, /datum/job/hos)
 
-/decl/special_role/godcultist/Initialize()
-	. = ..()
-	LAZYINITLIST(restricted_jobs)
-	restricted_jobs  |= list(/datum/job/lawyer, /datum/job/captain, /datum/job/hos)
-	LAZYINITLIST(protected_jobs)
-	protected_jobs   |= list(/datum/job/officer, /datum/job/warden, /datum/job/detective)
-	LAZYINITLIST(blacklisted_jobs)
-	blacklisted_jobs |= /datum/job/chaplain
-
 /decl/special_role/cultist/Initialize()
 	. = ..()
 	LAZYINITLIST(restricted_jobs)

diff --git a/maps/modpack_testing/modpack_testing.dm b/maps/modpack_testing/modpack_testing.dm
@@ -4,7 +4,6 @@
 	#include "blank.dmm"
 
 	#include "../../mods/gamemodes/cult/_cult.dme"
-	#include "../../mods/gamemodes/deity/_deity.dme"
 	#include "../../mods/gamemodes/heist/_heist.dme"
 	#include "../../mods/gamemodes/meteor/_meteor.dme"
 	#include "../../mods/gamemodes/ninja/_ninja.dme"

diff --git a/maps/tradeship/tradeship.dm b/maps/tradeship/tradeship.dm
@@ -5,7 +5,6 @@
 	#endif
 
 	#include "../../mods/gamemodes/cult/_cult.dme"
-	#include "../../mods/gamemodes/deity/_deity.dme"
 	#include "../../mods/gamemodes/heist/_heist.dme"
 	#include "../../mods/gamemodes/ninja/_ninja.dme"
 	#include "../../mods/gamemodes/revolution/_revolution.dme"

diff --git a/mods/gamemodes/cult/_cult.dme b/mods/gamemodes/cult/_cult.dme
@@ -1,10 +1,6 @@
 #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"

diff --git a/mods/gamemodes/cult/ghosttrap.dm b/mods/gamemodes/cult/ghosttrap.dm
@@ -20,9 +20,3 @@
 	var/obj/item/soulstone/stone = new(get_turf(user))
 	stone.shade = new(stone)
 	request_player(stone.shade, "The soul stone shade summon ritual has been performed. ")
-
-#ifdef GAMEMODE_PACK_DEITY
-/decl/ghosttrap/cult_shade/Initialize()
-	ban_checks |= /decl/special_role/godcultist
-	. = ..()
-#endif
diff --git a/mods/gamemodes/cult/items.dm b/mods/gamemodes/cult/items.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/items/weapon/swords/cult.dmi'
 	material_alteration = MAT_FLAG_ALTERATION_COLOR | MAT_FLAG_ALTERATION_NAME
 
-// separated into a proc so that deity can modify it
+// separated into a proc so that subtypes can modify it
 /obj/item/sword/cultblade/proc/can_use_safely(mob/living/user)
 	return iscultist(user)
 

diff --git a/mods/gamemodes/deity/_defines.dm b/mods/gamemodes/deity/_defines.dm
diff --git a/mods/gamemodes/deity/_deity.dm b/mods/gamemodes/deity/_deity.dm
diff --git a/mods/gamemodes/deity/_deity.dme b/mods/gamemodes/deity/_deity.dme