Conflicts IV

code/__DEFINES/role_preferences.dm

@@ -25,7 +25,7 @@
 #define ROLE_HOG_GOD			"hand of god: god"
 #define ROLE_HOG_CULTIST		"hand of god: cultist"
 #define ROLE_DEVIL				"devil"
-
+#define ROLE_SERVANT_OF_RATVAR	"servant of Ratvar"
 
 //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
 //The gamemode specific ones are just so the gamemodes can query whether a player is old enough
@@ -49,5 +49,6 @@ var/global/list/special_roles = list(
 	ROLE_ABDUCTOR = /datum/game_mode/abduction,
 	ROLE_HOG_GOD = /datum/game_mode/hand_of_god,
 	ROLE_HOG_CULTIST = /datum/game_mode/hand_of_god,
-	ROLE_DEVIL = /datum/game_mode/devil
+	ROLE_DEVIL = /datum/game_mode/devil,
+	ROLE_SERVANT_OF_RATVAR = /datum/game_mode/clockwork_cult,
 )

code/modules/mob/living/carbon/brain/MMI.dm

@@ -9,11 +9,12 @@
 	origin_tech = "biotech=3"
 	var/braintype = "Cyborg"
 	var/obj/item/device/radio/radio = null //Let's give it a radio.
-	var/syndiemmi = 0 //Whether or not this is a Syndicate MMI
+	var/hacked = 0 //Whether or not this is a Syndicate MMI
 	var/mob/living/carbon/brain/brainmob = null //The current occupant.
 	var/mob/living/silicon/robot = null //Appears unused.
 	var/obj/mecha = null //This does not appear to be used outside of reference in mecha.dm.
 	var/obj/item/organ/brain/brain = null //The actual brain
+	var/clockwork = FALSE //If this is a soul vessel
 
 /obj/item/device/mmi/update_icon()
 	if(brain)
@@ -187,7 +188,7 @@
 /obj/item/device/mmi/syndie
 	name = "Syndicate Man-Machine Interface"
 	desc = "Syndicate's own brand of MMI. It enforces laws designed to help Syndicate agents achieve their goals upon cyborgs created with it, but doesn't fit in Nanotrasen AI cores."
-	syndiemmi = 1
+	hacked = 1
 
 /obj/item/device/mmi/syndie/New()
 	..()

code/modules/mob/living/living_defense.dm

@@ -300,3 +300,17 @@
 		return 1
 
 //Looking for irradiate()? It's been moved to radiation.dm under the rad_act() for mobs.
+
+/mob/living/Stun(amount)
+	if(stun_absorption && !stat)
+		visible_message("<span class='warning'>[src]'s yellow aura momentarily intensifies!</span>", "<span class='userdanger'>Your ward absorbs the stun!</span>")
+		stun_absorption_count += amount
+		return 0
+	..()
+
+/mob/living/Weaken(amount)
+	if(stun_absorption && !stat)
+		visible_message("<span class='warning'>[src]'s yellow aura momentarily intensifies!</span>", "<span class='userdanger'>Your ward absorbs the stun!</span>")
+		stun_absorption_count += amount
+		return 0
+	..()

code/modules/mob/living/living_defines.dm

@@ -60,4 +60,9 @@
 
 	var/list/butcher_results = null
 	var/hellbound = 0 //People who've signed infernal contracts are unrevivable.
-
+
+	var/stun_absorption = FALSE //If all incoming stuns are being absorbed
+	var/stun_absorption_count = 0 //How many seconds of stun that have been absorbed
+
+	var/mob/living/mental_dominator //The person controlling the mind of this person, if applicable
+	var/mob/living/mind_control_holder/mind_control_holder //If the mob is being mind controlled, where their old mind is stored (check clock_mobs.dm)