unticks or removes all devil related content

shiptest-ss13 · May 9, 2024 · ab42b49 · ab42b49
1 parent 6865b01
commit ab42b49
Show file tree

Hide file tree

Showing 27 changed files with 29 additions and 98 deletions.
diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm
@@ -74,8 +74,8 @@
 #define ANTAG_HUD_NINJA 17
 #define ANTAG_HUD_CHANGELING 18
 #define ANTAG_HUD_ABDUCTOR 19
-#define ANTAG_HUD_DEVIL 20
-#define ANTAG_HUD_SINTOUCHED 21
+//#define ANTAG_HUD_DEVIL 20
+//#define ANTAG_HUD_SINTOUCHED 21
 #define ANTAG_HUD_SOULLESS 22
 #define ANTAG_HUD_BROTHER 23
 #define ANTAG_HUD_OBSESSED 24

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -98,7 +98,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 
 #define isalienqueen(A) (istype(A, /mob/living/carbon/alien/humanoid/royal/queen))
 
-#define istruedevil(A) (istype(A, /mob/living/carbon/true_devil))
+//#define istruedevil(A) (istype(A, /mob/living/carbon/true_devil))
 
 //Silicon mobs
 #define issilicon(A) (istype(A, /mob/living/silicon))

diff --git a/code/__DEFINES/language.dm b/code/__DEFINES/language.dm
@@ -12,7 +12,6 @@
 #define LANGUAGE_APHASIA "aphasia"
 #define LANGUAGE_CULTIST "cultist"
 #define LANGUAGE_CURATOR "curator"
-#define LANGUAGE_DEVIL "devil"
 #define LANGUAGE_GLAND "gland"
 #define LANGUAGE_HAT "hat"
 #define LANGUAGE_HIGH "high"

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -69,7 +69,6 @@
 #define MONKEY_BODYPART "monkey"
 #define ALIEN_BODYPART "alien"
 #define LARVA_BODYPART "larva"
-#define DEVIL_BODYPART "devil"
 
 //Defines for Species IDs
 #define SPECIES_ABDUCTOR "abductor"

diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm
@@ -23,7 +23,6 @@
 #define ROLE_MONKEY "Monkey"
 #define ROLE_ABDUCTOR "Abductor"
 #define ROLE_REVENANT "Revenant"
-#define ROLE_DEVIL "Devil"
 #define ROLE_BROTHER "Blood Brother"
 #define ROLE_BRAINWASHED "Brainwashed Victim"
 #define ROLE_OVERTHROW "Syndicate Mutineer" //Role removed, left here for safety.
@@ -62,7 +61,7 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_SPACE_DRAGON,
 	ROLE_REVENANT,
 	ROLE_ABDUCTOR,
-	ROLE_DEVIL = /datum/game_mode/devil,
+	//ROLE_DEVIL = /datum/game_mode/devil,
 	ROLE_INTERNAL_AFFAIRS = /datum/game_mode/traitor/internal_affairs,
 	ROLE_SENTIENCE,
 	ROLE_BORER

diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
@@ -349,8 +349,10 @@ Turf and target are separate in case you want to teleport some distance from a t
 		moblist.Add(M)
 	for(var/mob/living/simple_animal/M in sortmob)
 		moblist.Add(M)
+	/*
 	for(var/mob/living/carbon/true_devil/M in sortmob)
 		moblist.Add(M)
+	*/
 	return moblist
 
 // Format a power value in W, kW, MW, or GW.

diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm
@@ -30,7 +30,7 @@ GLOBAL_LIST_EMPTY(tdome2)
 GLOBAL_LIST_EMPTY(tdomeobserve)
 GLOBAL_LIST_EMPTY(tdomeadmin)
 GLOBAL_LIST_EMPTY(prisonwarped)	//list of players already warped
-GLOBAL_LIST_EMPTY(blobstart) //blobs, santa, respawning devils
+GLOBAL_LIST_EMPTY(blobstart) //blobs, santa, respawning devils //REMIND ME TO GET THIS - FALLCON
 GLOBAL_LIST_EMPTY(secequipment) //sec equipment lockers that scale with the number of sec players
 GLOBAL_LIST_EMPTY(deathsquadspawn)
 GLOBAL_LIST_EMPTY(emergencyresponseteamspawn)

diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
@@ -37,7 +37,7 @@
 //Middle left indicators
 #define ui_lingchemdisplay "WEST,CENTER-1:15"
 #define ui_lingstingdisplay "WEST:6,CENTER-3:11"
-#define ui_devilsouldisplay "WEST:6,CENTER-1:15"
+//#define ui_devilsouldisplay "WEST:6,CENTER-1:15"
 
 //Lower center, persistent menu
 #define ui_sstore1 "CENTER-5:10,SOUTH:5"

diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
@@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	var/atom/movable/screen/alien_plasma_display
 	var/atom/movable/screen/alien_queen_finder
 
-	var/atom/movable/screen/devil/soul_counter/devilsouldisplay
+	//var/atom/movable/screen/devil/soul_counter/devilsouldisplay
 	var/atom/movable/screen/combo/combo_display
 
 	var/atom/movable/screen/action_intent

diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
@@ -33,6 +33,7 @@
 	var/mob/living/carbon/human/H = usr
 	H.quick_equip()
 
+/*
 /atom/movable/screen/devil
 	icon = 'icons/hud/screen_devil.dmi'
 	invisibility = INVISIBILITY_ABSTRACT
@@ -61,7 +62,7 @@
 
 /atom/movable/screen/devil/soul_counter/proc/clear()
 	invisibility = INVISIBILITY_ABSTRACT
-
+*/
 /atom/movable/screen/ling
 	icon = 'icons/hud/screen_changeling.dmi'
 	invisibility = INVISIBILITY_ABSTRACT

diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
@@ -178,12 +178,14 @@
 	attack_hand(user) //defaults to attack_hand. Override it when you don't want drones to do same stuff as humans.
 
 
+/*
 /*
 	True Devil
 */
 
 /mob/living/carbon/true_devil/UnarmedAttack(atom/A, proximity)
 	A.attack_hand(src)
+*/
 
 /*
 	Brain

diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm
@@ -1,4 +1,3 @@
-#define LAW_DEVIL "devil"
 #define LAW_ZEROTH "zeroth"
 #define LAW_INHERENT "inherent"
 #define LAW_SUPPLIED "supplied"
@@ -15,7 +14,6 @@
 	var/list/ion = list()
 	var/list/hacked = list()
 	var/mob/living/silicon/owner
-	var/list/devillaws = list()
 	var/id = DEFAULT_AI_LAWID
 
 /datum/ai_laws/Destroy(force, ...)
@@ -281,8 +279,6 @@
 
 /datum/ai_laws/proc/get_law_amount(groups)
 	var/law_amount = 0
-	if(devillaws && (LAW_DEVIL in groups))
-		law_amount++
 	if(zeroth && (LAW_ZEROTH in groups))
 		law_amount++
 	if(ion.len && (LAW_ION in groups))
@@ -298,9 +294,6 @@
 				law_amount++
 	return law_amount
 
-/datum/ai_laws/proc/set_law_sixsixsix(laws)
-	devillaws = laws
-
 /datum/ai_laws/proc/set_zeroth_law(law, law_borg = null)
 	zeroth = law
 	if(law_borg) //Making it possible for slaved borgs to see a different law 0 than their AI. --NEO

diff --git a/code/datums/hud.dm b/code/datums/hud.dm
@@ -23,8 +23,8 @@ GLOBAL_LIST_INIT(huds, list(
 	ANTAG_HUD_NINJA = new/datum/atom_hud/antag/hidden(),
 	ANTAG_HUD_CHANGELING = new/datum/atom_hud/antag/hidden(),
 	ANTAG_HUD_ABDUCTOR = new/datum/atom_hud/antag/hidden(),
-	ANTAG_HUD_DEVIL = new/datum/atom_hud/antag(),
-	ANTAG_HUD_SINTOUCHED = new/datum/atom_hud/antag/hidden(),
+	//ANTAG_HUD_DEVIL = new/datum/atom_hud/antag(),
+	//ANTAG_HUD_SINTOUCHED = new/datum/atom_hud/antag/hidden(),
 	ANTAG_HUD_SOULLESS = new/datum/atom_hud/antag/hidden(),
 	ANTAG_HUD_BROTHER = new/datum/atom_hud/antag/hidden(),
 	ANTAG_HUD_OBSESSED = new/datum/atom_hud/antag/hidden(),

diff --git a/code/datums/mind.dm b/code/datums/mind.dm
@@ -721,8 +721,10 @@
 	spell_list += S
 	S.action.Grant(current)
 
+/*
 /datum/mind/proc/owns_soul()
 	return soulOwner == src
+*/
 
 //To remove a specific spell from a mind
 /datum/mind/proc/RemoveSpell(obj/effect/proc_holder/spell/spell)

diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
@@ -383,6 +383,7 @@
 			V.assigned_role = "Clown Operative"
 			V.special_role = "Clown Operative"
 
+/*
 //////////////////////////////////////////////
 //                                          //
 //               DEVIL                      //
@@ -437,6 +438,7 @@
 			validtypes -= type
 		else
 			objective.find_target()
+*/
 
 //////////////////////////////////////////////
 //                                          //

diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm
@@ -49,7 +49,7 @@ AI MODULES
 	//Handle the lawcap
 	if(law_datum)
 		var/tot_laws = 0
-		for(var/lawlist in list(law_datum.devillaws, law_datum.inherent, law_datum.supplied, law_datum.ion, law_datum.hacked, laws))
+		for(var/lawlist in list(law_datum.inherent, law_datum.supplied, law_datum.ion, law_datum.hacked, laws))
 			for(var/mylaw in lawlist)
 				if(mylaw != "")
 					tot_laws++

diff --git a/code/game/objects/items/pitchfork.dm b/code/game/objects/items/pitchfork.dm
@@ -41,6 +41,7 @@
 	icon_state = "[base_icon_state]0"
 	return ..()
 
+/*
 /obj/item/pitchfork/demonic
 	name = "demonic pitchfork"
 	desc = "A red pitchfork, it looks like the work of the devil."
@@ -100,3 +101,4 @@
 		playsound(target, 'sound/magic/disintegrate.ogg', 100, TRUE)
 		W.dismantle_wall(devastated = FALSE)
 		return
+*/
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
@@ -542,6 +542,7 @@
 /obj/item/toy/talking/AI/generate_messages()
 	return list(generate_ion_law())
 
+/*
 /obj/item/toy/talking/codex_gigas
 	name = "Toy Codex Gigas"
 	desc = "A tool to help you write fictional devils!"
@@ -567,6 +568,7 @@
 	messages += "[GLOB.lawlorify[LORE][devil.ban]]"
 	messages += "[GLOB.lawlorify[LORE][devil.banish]]"
 	return messages
+*/
 
 /obj/item/toy/talking/owl
 	name = "owl action figure"

diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
@@ -259,7 +259,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	return
 
 /obj/item/katana/cursed/attack(mob/target, mob/living/carbon/human/user)
-	if(user.mind && user.owns_soul())
+	if(user.mind)
 		to_chat(user, "<span class='warning'>You feel a terrible chill as the emptiness within [src] devours on your life force!</span>")
 		user.apply_damage(rand(2,3), BURN, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_PRECISE_GROIN))
 		user.apply_damage(rand(2,3), BURN, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_PRECISE_GROIN))

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
@@ -851,6 +851,7 @@
 	if(!ai_number)
 		to_chat(usr, "<b>No AIs located</b>" , confidential = TRUE)
 
+/*
 /datum/admins/proc/output_all_devil_info()
 	var/devil_number = 0
 	for(var/datum/mind/D in SSticker.mode.devils)
@@ -866,6 +867,7 @@
 		to_chat(usr, devil.printdevilinfo(), confidential = TRUE)
 	else
 		to_chat(usr, "<b>[M] is not a devil.", confidential = TRUE)
+*/
 
 /datum/admins/proc/dynamic_mode_options(mob/user)
 	var/dat = {"

diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm
@@ -286,7 +286,7 @@
 									"Ghost and Other Roles" = list(ROLE_BRAINWASHED, ROLE_DEATHSQUAD, ROLE_DRONE, ROLE_LAVALAND, ROLE_MIND_TRANSFER, ROLE_POSIBRAIN, ROLE_SENTIENCE),
 									"Antagonist Positions" = list(ROLE_ABDUCTOR, ROLE_ALIEN, ROLE_BLOB,
 									ROLE_BROTHER, ROLE_CHANGELING, ROLE_CULTIST,
-									ROLE_DEVIL, ROLE_INTERNAL_AFFAIRS, ROLE_MALF,
+									ROLE_INTERNAL_AFFAIRS, ROLE_MALF,
 									ROLE_MONKEY, ROLE_NINJA, ROLE_OPERATIVE,
 									ROLE_OVERTHROW, ROLE_REV, ROLE_REVENANT,
 									ROLE_REV_HEAD, ROLE_SYNDICATE,

diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
@@ -1159,12 +1159,6 @@
 			return
 		output_ai_laws()
 
-	else if(href_list["admincheckdevilinfo"])
-		if(!check_rights(R_ADMIN))
-			return
-		var/mob/M = locate(href_list["admincheckdevilinfo"])
-		output_devil_info(M)
-
 	else if(href_list["adminmoreinfo"])
 		var/mob/M = locate(href_list["adminmoreinfo"]) in GLOB.mob_list
 		if(!ismob(M))

diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
@@ -79,9 +79,6 @@
 		return
 	if(!ishuman(M))//If target is not a human.
 		return ..()
-	if((M.mind && !M.mind.hasSoul) || is_devil(M))
-		to_chat(user, "<span class='warning'>This... thing has no soul! It's filled with evil!</span>")
-		return
 	if(iscultist(M))
 		if(iscultist(user))
 			to_chat(user, "<span class='cultlarge'>\"Come now, do not capture your bretheren's soul.\"</span>")

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
@@ -1131,33 +1131,6 @@
 /mob/living/carbon/alien/update_stamina()
 	return
 
-/mob/living/proc/owns_soul()
-	if(mind)
-		return mind.soulOwner == mind
-	return TRUE
-
-/mob/living/proc/return_soul()
-	hellbound = 0
-	if(mind)
-		var/datum/antagonist/devil/devilInfo = mind.soulOwner.has_antag_datum(/datum/antagonist/devil)
-		if(devilInfo)//Not sure how this could be null, but let's just try anyway.
-			devilInfo.remove_soul(mind)
-		mind.soulOwner = mind
-
-/mob/living/proc/has_bane(banetype)
-	var/datum/antagonist/devil/devilInfo = is_devil(src)
-	return devilInfo && banetype == devilInfo.bane
-
-/mob/living/proc/check_weakness(obj/item/weapon, mob/living/attacker)
-	if(mind && mind.has_antag_datum(/datum/antagonist/devil))
-		return check_devil_bane_multiplier(weapon, attacker)
-	return 1 //This is not a boolean, it's the multiplier for the damage the weapon does.
-
-/mob/living/proc/check_acedia()
-	if(mind && mind.has_objective(/datum/objective/sintouched/acedia))
-		return TRUE
-	return FALSE
-
 /mob/living/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE, quickstart = TRUE)
 	stop_pulling()
 	. = ..()

diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
@@ -148,14 +148,6 @@
 
 	for(var/V in listeners)
 		var/mob/living/L = V
-		var/datum/antagonist/devil/devilinfo = is_devil(L)
-		if(devilinfo && findtext(message, devilinfo.truename))
-			var/start = findtext(message, devilinfo.truename)
-			listeners = list(L) //Devil names are unique.
-			power_multiplier *= 5 //if you're a devil and god himself addressed you, you fucked up
-			//Cut out the name so it doesn't trigger commands
-			message = copytext(message, 1, start) + copytext(message, start + length(devilinfo.truename))
-			break
 		else if(findtext(message, L.real_name, 1, length(L.real_name) + 1))
 			specific_listeners += L //focus on those with the specified name
 			//Cut out the name so it doesn't trigger commands
@@ -330,12 +322,7 @@
 		cooldown = COOLDOWN_MEME
 		for(var/V in listeners)
 			var/mob/living/L = V
-			var/text = ""
-			if(is_devil(L))
-				var/datum/antagonist/devil/devilinfo = is_devil(L)
-				text = devilinfo.truename
-			else
-				text = L.real_name
+			var/text = L.real_name
 			addtimer(CALLBACK(L, TYPE_PROC_REF(/atom/movable, say), text), 5 * i)
 			i++
 

diff --git a/config/game_options.txt b/config/game_options.txt
@@ -101,8 +101,6 @@ PROBABILITY MONKEY 1
 PROBABILITY METEOR 0
 PROBABILITY EXTENDED 1
 PROBABILITY SECRET_EXTENDED 1
-PROBABILITY DEVIL 0
-PROBABILITY DEVIL_AGENTS 0
 PROBABILITY CLOWNOPS 2
 
 ## You probably want to keep sandbox off by default for secret and random.
@@ -186,12 +184,6 @@ MIDROUND_ANTAG WIZARD
 #MIN_POP METEOR 0
 #MAX_POP METEOR -1
 
-#MIN_POP DEVIL 0
-#MAX_POP DEVIL -1
-
-#MIN_POP DEVIL_AGENTS 25
-#MAX_POP DEVIL_AGENTS -1
-
 ## Setting at least one mode to be playable at 0/1 players is required.
 #MIN_POP EXTENDED 0
 #MAX_POP EXTENDED -1