Devil affair agents

_maps/RandomRuins/LavaRuins/lavaland_surface_cursedtoyshop.dmm

@@ -166,7 +166,6 @@
 /area/ruin/powered)
 "ax" = (
 /obj/structure/table/wood,
-/obj/item/toy/talking/codex_gigas,
 /turf/open/floor/wood,
 /area/ruin/powered)
 "ay" = (

_maps/RandomRuins/StationRuins/maint/10x5/10x5_deltaarcade.dmm

@@ -251,7 +251,6 @@
 /area/template_noop)
 "x" = (
 /obj/structure/table/wood,
-/obj/item/toy/talking/codex_gigas,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},

_maps/map_files/AsteroidStation/AsteroidStation.dmm

@@ -48958,10 +48958,6 @@
 /area/maintenance/disposal/incinerator)
 "oIa" = (
 /obj/structure/table/wood,
-/obj/item/toy/talking/codex_gigas{
-	pixel_x = -3;
-	pixel_y = 2
-	},
 /obj/item/toy/talking/AI{
 	pixel_x = 3
 	},

_maps/map_files/generic/CentCom.dmm

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

code/__DEFINES/antagonists.dm

@@ -27,6 +27,8 @@
 #define APPRENTICE_ROBELESS "robeless"
 #define APPRENTICE_HEALING "healing"
 
+#define IS_INFERNAL_AGENT(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/infernal_affairs))
+#define IS_DEVIL(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/devil))
 
 //Blob
 /// blob gets a free reroll every X time
@@ -57,6 +59,9 @@
 /// because they have nothing else that supports an implant.
 #define UPLINK_IMPLANT_TELECRYSTAL_COST 4
 
+///Signal sent to a mob when they purchase an item from their uplink.
+#define COMSIG_ON_UPLINK_PURCHASE "comsig_on_uplink_purchase"
+
 //ERT Types
 #define ERT_BLUE "Blue"
 #define ERT_RED  "Red"
@@ -164,3 +169,5 @@
 #define ANTAG_SECOND_WARNING 2
 #define ANTAG_AWAKE 3
 
+///How many souls a Devil needs to 'Ascend'.
+#define DEVIL_SOULS_TO_ASCEND 8

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

@@ -109,8 +109,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))
 
@@ -166,7 +164,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,
@@ -180,7 +178,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

@@ -104,7 +104,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*/
 
 // Health/damage defines for carbon mobs

code/__DEFINES/role_preferences.dm

@@ -6,60 +6,60 @@
 
 //These are synced with the Database, if you change the values of the defines
 //then you MUST update the database!
-#define ROLE_SYNDICATE			"Syndicate"
-#define ROLE_TRAITOR			"Traitor"
-#define ROLE_OPERATIVE			"Operative"
-#define ROLE_CLOWNOP			"Clown Operative"
-#define ROLE_CHANGELING			"Changeling"
-#define ROLE_WIZARD				"Wizard"
-#define ROLE_RAGINMAGES			"Ragin Mages"
-#define ROLE_BULLSHITMAGES		"Bullshit Mages"
-#define ROLE_MALF				"Malf AI"
-#define ROLE_REV				"Revolutionary"
-#define ROLE_REV_HEAD			"Head Revolutionary"
-#define ROLE_ALIEN				"Xenomorph"
-#define ROLE_PAI				"pAI"
-#define ROLE_CULTIST			"Cultist"
-#define ROLE_HERETIC			"Heretic"
-#define ROLE_BLOB				"Blob"
-#define ROLE_NINJA				"Space Ninja"
-#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"
-#define ROLE_HIVE				"Hivemind Host"
-#define ROLE_OBSESSED			"Obsessed"
-#define ROLE_SENTIENCE			"Sentient Creature"
-#define ROLE_MOUSE				"Mouse"
-#define ROLE_MIND_TRANSFER		"Mind Transfer Potion"
-#define ROLE_POSIBRAIN			"Posibrain"
-#define ROLE_DRONE				"Drone"
-#define ROLE_DEATHSQUAD			"Deathsquad"
-#define ROLE_LAVALAND			"Lavaland"
-#define ROLE_INTERNAL_AFFAIRS	"Internal Affairs Agent"
-#define ROLE_FUGITIVE           "Fugitive"
-#define ROLE_SHADOWLING 		"Shadowling" // Yogs
-#define ROLE_VAMPIRE			"Vampire" // Yogs
-#define ROLE_GANG				"gangster" // Yogs
-#define ROLE_DARKSPAWN			"darkspawn" // Yogs
-#define ROLE_HOLOPARASITE		"Holoparasite" // Yogs
-#define ROLE_HORROR				"Eldritch Horror" // Yogs
-#define ROLE_INFILTRATOR		"Infiltrator" // Yogs
-#define ROLE_ZOMBIE				"Zombie"
-#define ROLE_BLOODSUCKER		"Bloodsucker"
-#define ROLE_VAMPIRICACCIDENT	"Vampiric Accident"
-#define ROLE_BLOODSUCKERBREAKOUT	"Bloodsucker Breakout"
-#define ROLE_MONSTERHUNTER		"Monster Hunter"
-#define ROLE_SPACE_DRAGON		"Space Dragon"
-#define ROLE_GOLEM				"Golem"
-#define ROLE_SINFULDEMON		"Demon of Sin"
-#define ROLE_GHOSTBEACON		"Ghost Beacon"
-#define ROLE_NIGHTMARE			"Nightmare"
-#define ROLE_DISEASE			"Disease"
-#define ROLE_PIRATE				"Pirate"
+#define ROLE_SYNDICATE "Syndicate"
+#define ROLE_TRAITOR "Traitor"
+#define ROLE_OPERATIVE "Operative"
+#define ROLE_CLOWNOP "Clown Operative"
+#define ROLE_CHANGELING "Changeling"
+#define ROLE_WIZARD "Wizard"
+#define ROLE_INFERNAL_AFFAIRS "Infernal Affairs Agent"
+#define ROLE_INFERNAL_AFFAIRS_DEVIL "Infernal Devil"
+#define ROLE_RAGINMAGES "Ragin Mages"
+#define ROLE_BULLSHITMAGES "Bullshit Mages"
+#define ROLE_MALF "Malf AI"
+#define ROLE_REV "Revolutionary"
+#define ROLE_REV_HEAD "Head Revolutionary"
+#define ROLE_ALIEN "Xenomorph"
+#define ROLE_PAI "pAI"
+#define ROLE_CULTIST "Cultist"
+#define ROLE_HERETIC "Heretic"
+#define ROLE_BLOB "Blob"
+#define ROLE_NINJA "Space Ninja"
+#define ROLE_MONKEY "Monkey"
+#define ROLE_ABDUCTOR "Abductor"
+#define ROLE_REVENANT "Revenant"
+#define ROLE_SERVANT_OF_RATVAR "Servant of Ratvar"
+#define ROLE_BROTHER "Blood Brother"
+#define ROLE_BRAINWASHED "Brainwashed Victim"
+#define ROLE_HIVE "Hivemind Host"
+#define ROLE_OBSESSED "Obsessed"
+#define ROLE_SENTIENCE "Sentient Creature"
+#define ROLE_MOUSE "Mouse"
+#define ROLE_MIND_TRANSFER "Mind Transfer Potion"
+#define ROLE_POSIBRAIN "Posibrain"
+#define ROLE_DRONE "Drone"
+#define ROLE_DEATHSQUAD "Deathsquad"
+#define ROLE_LAVALAND "Lavaland"
+#define ROLE_FUGITIVE "Fugitive"
+#define ROLE_SHADOWLING "Shadowling" // Yogs
+#define ROLE_VAMPIRE "Vampire" // Yogs
+#define ROLE_GANG "gangster" // Yogs
+#define ROLE_DARKSPAWN "darkspawn" // Yogs
+#define ROLE_HOLOPARASITE "Holoparasite" // Yogs
+#define ROLE_HORROR "Eldritch Horror" // Yogs
+#define ROLE_INFILTRATOR "Infiltrator" // Yogs
+#define ROLE_ZOMBIE "Zombie"
+#define ROLE_BLOODSUCKER "Bloodsucker"
+#define ROLE_VAMPIRICACCIDENT "Vampiric Accident"
+#define ROLE_BLOODSUCKERBREAKOUT "Bloodsucker Breakout"
+#define ROLE_MONSTERHUNTER "Monster Hunter"
+#define ROLE_SPACE_DRAGON "Space Dragon"
+#define ROLE_GOLEM "Golem"
+#define ROLE_SINFULDEMON "Demon of Sin"
+#define ROLE_GHOSTBEACON "Ghost Beacon"
+#define ROLE_NIGHTMARE "Nightmare"
+#define ROLE_DISEASE "Disease"
+#define ROLE_PIRATE "Pirate"
 
 
 //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
@@ -70,9 +70,11 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_TRAITOR = /datum/antagonist/traitor,
 	ROLE_OPERATIVE = /datum/antagonist/nukeop,
 	ROLE_CLOWNOP = /datum/antagonist/nukeop/clownop,
-	ROLE_CHANGELING	= /datum/antagonist/changeling,
+	ROLE_CHANGELING = /datum/antagonist/changeling,
 	ROLE_WIZARD = /datum/antagonist/wizard,
-	ROLE_RAGINMAGES	= /datum/antagonist/wizard,
+	ROLE_INFERNAL_AFFAIRS = /datum/antagonist/infernal_affairs,
+	ROLE_INFERNAL_AFFAIRS_DEVIL = /datum/antagonist/devil,
+	ROLE_RAGINMAGES = /datum/antagonist/wizard,
 	ROLE_BULLSHITMAGES = /datum/antagonist/wizard,
 	ROLE_MALF = /datum/antagonist/traitor/malf,
 	ROLE_REV_HEAD = /datum/antagonist/rev/head,
@@ -81,15 +83,13 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_HERETIC = /datum/antagonist/heretic,
 	ROLE_BLOB = /datum/antagonist/blob,
 	ROLE_NINJA = /datum/antagonist/ninja,
-	ROLE_MONKEY	= /datum/antagonist/monkey,
+	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,
 	ROLE_OBSESSED = /datum/antagonist/obsessed,
-	ROLE_INTERNAL_AFFAIRS = /datum/antagonist/traitor/internal_affairs,
 	ROLE_FUGITIVE = /datum/antagonist/fugitive,
 	ROLE_SHADOWLING = /datum/antagonist/shadowling, // Yogs
 	ROLE_VAMPIRE = /datum/antagonist/vampire, // Yogs
@@ -98,7 +98,7 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_HOLOPARASITE = /datum/antagonist/guardian, // Yogs
 	ROLE_HORROR = /datum/antagonist/horror, // Yogs
 	ROLE_INFILTRATOR = /datum/antagonist/infiltrator, // Yogs
-	ROLE_ZOMBIE	= /datum/antagonist/zombie,
+	ROLE_ZOMBIE = /datum/antagonist/zombie,
 	ROLE_BLOODSUCKER = /datum/antagonist/bloodsucker,
 	ROLE_MONSTERHUNTER = /datum/antagonist/monsterhunter,
 	ROLE_SPACE_DRAGON = /datum/antagonist/space_dragon,
@@ -112,6 +112,6 @@ GLOBAL_LIST_INIT(special_roles, list(
 ))
 
 //Job defines for what happens when you fail to qualify for any job during job selection
-#define BEOVERFLOW 	1
-#define BERANDOMJOB 	2
-#define RETURNTOLOBBY 	3
+#define BEOVERFLOW 1
+#define BERANDOMJOB 2
+#define RETURNTOLOBBY 3

code/__DEFINES/traits.dm

@@ -143,6 +143,7 @@
 #define TRAIT_MUTE				"mute"
 #define TRAIT_EMOTEMUTE			"emotemute"
 #define TRAIT_DEAF				"deaf"
+#define TRAIT_DEVIL_CONTRACT_IMMUNE "devil_contract_immune"
 #define TRAIT_NEARSIGHT			"nearsighted"
 #define TRAIT_FAT				"fat"
 #define TRAIT_HUSK				"husk"
@@ -289,6 +290,9 @@
 /// You can't see color!
 #define TRAIT_COLORBLIND "color_blind"
 
+///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
@@ -346,6 +350,7 @@
 #define GENETIC_MUTATION "genetic"
 #define OBESITY "obesity"
 #define MAGIC_TRAIT "magic"
+#define DEVIL_TRAIT "devil"
 #define TRAUMA_TRAIT "trauma"
 #define DISEASE_TRAIT "disease"
 #define SPECIES_TRAIT "species"

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/maintenance_loot.dm

@@ -432,7 +432,7 @@ GLOBAL_LIST_INIT(maintenance_loot_traditional,list(
 	/obj/item/melee/vxtvulhammer/toy = W_RARE,
 	/obj/item/toy/syndicateballoon = W_RARE,
 	/obj/item/toy/talking/AI = W_RARE,
-	/obj/item/toy/talking/codex_gigas = W_RARE,
+	/obj/item/toy/codex_gigas = W_RARE,
 	/obj/item/toy/talking/griffin = W_RARE,
 	/obj/item/toy/talking/owl = W_RARE,
 	/obj/item/toy/toy_dagger = W_RARE,

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)