Conflicts I

code/__DEFINES/role_preferences.dm

@@ -24,7 +24,8 @@
 #define ROLE_REVENANT			"revenant"
 #define ROLE_HOG_GOD			"hand of god: god"
 #define ROLE_HOG_CULTIST		"hand of god: cultist"
-#define ROLE_SERVANT_OF_RATVAR	"servant of Ratvar"
+#define ROLE_DEVIL				"devil"
+
 
 //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
@@ -48,5 +49,5 @@ 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_SERVANT_OF_RATVAR = /datum/game_mode/clockwork_cult,
+	ROLE_DEVIL = /datum/game_mode/devil
 )

code/modules/mob/living/living_defense.dm

@@ -78,6 +78,7 @@
 
 /mob/living/mech_melee_attack(obj/mecha/M)
 	if(M.occupant.a_intent == "harm")
+		M.do_attack_animation(src)
 		if(M.damtype == "brute")
 			step_away(src,M,15)
 		switch(M.damtype)
@@ -101,8 +102,6 @@
 		add_logs(M.occupant, src, "pushed", M)
 		visible_message("<span class='warning'>[M] pushes [src] out of the way.</span>")
 
-		return
-
 
 //Mobs on Fire
 /mob/living/proc/IgniteMob()
@@ -171,39 +170,6 @@
 
 //Mobs on Fire end
 
-/mob/living/proc/dominate_mind(mob/living/target, duration = 100, silent) //Allows one mob to assume control of another while imprisoning the old consciousness for a time
-	if(!target)
-		return 0
-	if(target.mental_dominator)
-		src << "<span class='warning'>[target] is already being controlled by someone else!</span>"
-		return 0
-	if(!target.mind)
-		src << "<span class='warning'>[target] is mindless and would make you permanently catatonic!</span>"
-		return 0
-	if(!silent)
-		src << "<span class='userdanger'>You pounce upon [target]'s mind and seize control of their body!</span>"
-		target << "<span class='userdanger'>Your control over your body is wrenched away from you!</span>"
-	target.mind_control_holder = new/mob/living/mind_control_holder(target)
-	target.mind_control_holder.real_name = "imprisoned mind of [target.real_name]"
-	target.mind.transfer_to(target.mind_control_holder)
-	mind.transfer_to(target)
-	target.mental_dominator = src
-	spawn(duration)
-		if(!src)
-			if(!silent)
-				target << "<span class='userdanger'>You try to return to your own body, but sense nothing! You're being forced out!</span>"
-			target.ghostize(1)
-			target.mind_control_holder.mind.transfer_to(target)
-			if(!silent)
-				target << "<span class='userdanger'>You take control of your own body again!</span>"
-			return 0
-		if(!silent)
-			target << "<span class='userdanger'>You're forced out! You return to your own body.</span>"
-		target.mind.transfer_to(src)
-		target.mind_control_holder.mind.transfer_to(target)
-		if(!silent)
-			target << "<span class='userdanger'>You take control of your own body again!</span>"
-		return 1
 
 /mob/living/acid_act(acidpwr, toxpwr, acid_volume)
 	take_organ_damage(min(10*toxpwr, acid_volume * toxpwr))
@@ -334,17 +300,3 @@
 		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
-	..()