[PROJECT] Removes Devils

_maps/map_files/generic/CentCom.dmm

@@ -9300,7 +9300,6 @@
 /area/centcom/testchamber)
 "aug" = (
 /obj/structure/table/wood,
-/obj/item/twohanded/pitchfork/demonic/ascended,
 /obj/item/melee/powerfist,
 /turf/open/floor/wood,
 /area/centcom/testchamber)

code/__DEFINES/hud.dm

@@ -40,8 +40,6 @@
 #define ui_lingchemdisplay "WEST,CENTER-1:15"
 #define ui_lingstingdisplay "WEST:6,CENTER-3:11"
 
-#define ui_devilsouldisplay "WEST:6,CENTER-1:15"
-
 //Lower center, persistent menu
 #define ui_sstore1 "CENTER-5:10,SOUTH:5"
 #define ui_id "CENTER-4:12,SOUTH:5"

code/__DEFINES/is_helpers.dm

@@ -107,8 +107,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 
 #define isalienqueen(A) (istype(A, /mob/living/carbon/alien/humanoid/royal/queen))
 
-#define isdevil(A) (istype(A, /mob/living/carbon/true_devil))
-
 //Silicon mobs
 #define issilicon(A) (istype(A, /mob/living/silicon))
 
@@ -162,7 +160,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 #define issupplypod(A) (istype(A, /obj/structure/closet/supplypod))
 
 GLOBAL_LIST_INIT(shoefootmob, typecacheof(list(
-	/mob/living/carbon/human/,
+	/mob/living/carbon/human,
 	/mob/living/simple_animal/cow,
 	/mob/living/simple_animal/hostile/cat_butcherer,
 	/mob/living/simple_animal/hostile/faithless,
@@ -176,7 +174,6 @@ GLOBAL_LIST_INIT(shoefootmob, typecacheof(list(
 	/mob/living/simple_animal/hostile/retaliate/spaceman,
 	/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace,
 	/mob/living/simple_animal/hostile/retaliate/goat,
-	/mob/living/carbon/true_devil,
 	)))
 
 GLOBAL_LIST_INIT(clawfootmob, typecacheof(list(

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"

code/__DEFINES/mobs.dm

@@ -98,7 +98,6 @@
 #define MONKEY_BODYPART "monkey"
 #define ALIEN_BODYPART "alien"
 #define LARVA_BODYPART "larva"
-#define DEVIL_BODYPART "devil"
 /*see __DEFINES/inventory.dm for bodypart bitflag defines*/
 
 //Reagent Metabolization flags, defines the type of reagents that affect this mob

code/__DEFINES/role_preferences.dm

@@ -26,7 +26,6 @@
 #define ROLE_MONKEY				"Monkey"
 #define ROLE_ABDUCTOR			"Abductor"
 #define ROLE_REVENANT			"Revenant"
-#define ROLE_DEVIL				"Devil"
 #define ROLE_SERVANT_OF_RATVAR	"Servant of Ratvar"
 #define ROLE_BROTHER			"Blood Brother"
 #define ROLE_BRAINWASHED		"Brainwashed Victim"
@@ -84,7 +83,6 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_MONKEY	= /datum/antagonist/monkey,
 	ROLE_ABDUCTOR = /datum/antagonist/abductor,
 	ROLE_REVENANT = /datum/antagonist/revenant,
-	ROLE_DEVIL = /datum/antagonist/devil,
 	ROLE_SERVANT_OF_RATVAR = /datum/antagonist/clockcult,
 	ROLE_BROTHER = /datum/antagonist/brother,
 	ROLE_BRAINWASHED = /datum/antagonist/brainwashed,

code/__DEFINES/traits.dm

@@ -270,6 +270,9 @@
 ///This mob can't use vehicles
 #define TRAIT_NOVEHICLE	"no_vehicle"
 
+///Trait given to a mob's mind to indicate they can't be revived due to otherworldly events.
+#define TRAIT_HELLBOUND "hellbound"
+
 /// This person is crying
 #define TRAIT_CRYING "crying"
 /// This human wants to see the color of their glasses, for some reason

code/__HELPERS/unsorted.dm

@@ -334,8 +334,6 @@ 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.

code/_globalvars/lists/mapping.dm

@@ -32,7 +32,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) //stationloving objects, blobs, santa, respawning devils
+GLOBAL_LIST_EMPTY(blobstart) //stationloving objects, blobs, santa
 GLOBAL_LIST_EMPTY(secequipment) //sec equipment lockers that scale with the number of sec players
 GLOBAL_LIST_EMPTY(deathsquadspawn)
 GLOBAL_LIST_EMPTY(emergencyresponseteamspawn)

code/_onclick/hud/hud.dm

@@ -31,8 +31,6 @@ 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/action_intent
 	var/atom/movable/screen/zone_select
 	var/atom/movable/screen/pull_icon
@@ -114,7 +112,6 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	healths = null
 	stamina = null
 	healthdoll = null
-	devilsouldisplay = null
 	blobpwrdisplay = null
 	alien_plasma_display = null
 	alien_queen_finder = null

code/_onclick/hud/human.dm

@@ -33,35 +33,6 @@
 	var/mob/living/carbon/human/H = usr
 	H.quick_equip()
 
-/atom/movable/screen/devil
-	invisibility = INVISIBILITY_ABSTRACT
-
-/atom/movable/screen/devil/soul_counter
-	icon = 'icons/mob/screen_gen.dmi'
-	name = "souls owned"
-	icon_state = "Devil-6"
-	screen_loc = ui_devilsouldisplay
-
-/atom/movable/screen/devil/soul_counter/proc/update_counter(souls)
-	invisibility = 0
-	maptext = ANTAG_MAPTEXT(souls, COLOR_RED)
-	switch(souls)
-		if(0, null)
-			icon_state = "Devil-1"
-		if(1,2)
-			icon_state = "Devil-2"
-		if(3 to 5)
-			icon_state = "Devil-3"
-		if(6 to 8)
-			icon_state = "Devil-4"
-		if(9 to INFINITY)
-			icon_state = "Devil-5"
-		else
-			icon_state = "Devil-6"
-
-/atom/movable/screen/devil/soul_counter/proc/clear()
-	invisibility = INVISIBILITY_ABSTRACT
-
 /atom/movable/screen/ling/sting
 	name = "current sting"
 	screen_loc = ui_lingstingdisplay
@@ -292,9 +263,6 @@
 	pull_icon.screen_loc = ui_above_intent
 	static_inventory += pull_icon
 
-	devilsouldisplay = new /atom/movable/screen/devil/soul_counter
-	infodisplay += devilsouldisplay
-
 	zone_select =  new /atom/movable/screen/zone_sel()
 	zone_select.icon = ui_style
 	zone_select.update_icon(mymob)

code/_onclick/other_mobs.dm

@@ -202,13 +202,6 @@
 /atom/proc/attack_drone(mob/living/simple_animal/drone/user)
 	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
 */

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/proc/lawid_to_type(lawid)
@@ -487,8 +485,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))
@@ -504,9 +500,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
@@ -643,21 +636,13 @@
 	zeroth = null
 	zeroth_borg = null
 
-/datum/ai_laws/proc/clear_law_sixsixsix(force)
-	if(force || !is_devil(owner))
-		devillaws = null
-
 /datum/ai_laws/proc/associate(mob/living/silicon/M)
 	if(!owner)
 		owner = M
 
 /datum/ai_laws/proc/get_law_list(include_zeroth = 0, show_numbers = 1)
 	var/list/data = list()
 
-	if (include_zeroth && devillaws && devillaws.len)
-		for(var/i in devillaws)
-			data += "[show_numbers ? "666:" : ""] <font color='#cc5500'>[i]</font>"
-
 	if (include_zeroth && zeroth)
 		data += "[show_numbers ? "0:" : ""] <font color='#ff0000'><b>[zeroth]</b></font>"
 

code/datums/mind.dm

@@ -706,9 +706,6 @@
 	add_antag_datum(head)
 	special_role = ROLE_REV_HEAD
 
-/datum/mind/proc/owns_soul()
-	return soulOwner == src
-
 /datum/mind/proc/transfer_martial_arts(mob/living/new_character)
 	if(!ishuman(new_character))
 		return