Merge pull request #18441 from Xhuis/brash_gold

Makes Nar-Sian magic more effective against servants

code/game/gamemodes/cult/cult.dm

@@ -31,6 +31,8 @@
 		return 0
 	if(mind.enslaved_to)
 		return 0
+	if(is_servant_of_ratvar(mind.current))
+		return 0
 	return 1
 
 /datum/game_mode/cult

code/game/gamemodes/cult/cult_items.dm

@@ -29,9 +29,16 @@
 /obj/item/weapon/melee/cultblade/pickup(mob/living/user)
 	..()
 	if(!iscultist(user))
-		user << "<span class='cultlarge'>\"I wouldn't advise that.\"</span>"
-		user << "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>"
-		user.Dizzy(120)
+		if(!is_servant_of_ratvar(user))
+			user << "<span class='cultlarge'>\"I wouldn't advise that.\"</span>"
+			user << "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>"
+			user.Dizzy(120)
+		else
+			user << "<span class='cultlarge'>\"One of Ratvar's toys is trying to play with things [user.gender == FEMALE ? "s" : ""]he shouldn't. Cute.\"</span>"
+			user << "<span class='userdanger'>A horrible force yanks at your arm!</span>"
+			user.emote("scream")
+			user.apply_damage(30, BRUTE, pick("l_arm", "r_arm"))
+			user.unEquip(src)
 
 /obj/item/weapon/melee/cultblade/dagger
 	name = "sacrificial dagger"
@@ -48,6 +55,8 @@
 	if(iscarbon(target))
 		var/mob/living/carbon/C = target
 		C.bleed(50)
+		if(is_servant_of_ratvar(C) && C.reagents)
+			C.reagents.add_reagent("heparin", 1)
 
 
 /obj/item/weapon/restraints/legcuffs/bola/cult
@@ -166,14 +175,21 @@
 	flags = NODROP
 	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
 
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/equipped(mob/user, slot)
+/obj/item/clothing/suit/hooded/cultrobes/cult_shield/equipped(mob/living/user, slot)
 	..()
 	if(!iscultist(user))
-		user << "<span class='cultlarge'>\"I wouldn't advise that.\"</span>"
-		user << "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>"
-		user.unEquip(src, 1)
-		user.Dizzy(30)
-		user.Weaken(5)
+		if(!is_servant_of_ratvar(user))
+			user << "<span class='cultlarge'>\"I wouldn't advise that.\"</span>"
+			user << "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>"
+			user.unEquip(src, 1)
+			user.Dizzy(30)
+			user.Weaken(5)
+		else
+			user << "<span class='cultlarge'>\"Putting on things you don't own is bad, you know.\"</span>"
+			user << "<span class='userdanger'>The armor squeezes at your body!</span>"
+			user.emote("scream")
+			user.adjustBruteLoss(25)
+			user.unEquip(src, 1)
 
 /obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, attack_text, isinhands)
 	if(current_charges)
@@ -213,14 +229,21 @@
 	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
 	armor = list(melee = -100, bullet = -100, laser = -100,energy = -100, bomb = -100, bio = -100, rad = -100)
 
-/obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/user, slot)
+/obj/item/clothing/suit/hooded/cultrobes/berserker/equipped(mob/living/user, slot)
 	..()
 	if(!iscultist(user))
-		user << "<span class='cultlarge'>\"I wouldn't advise that.\"</span>"
-		user << "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>"
-		user.unEquip(src, 1)
-		user.Dizzy(30)
-		user.Weaken(5)
+		if(!is_servant_of_ratvar(user))
+			user << "<span class='cultlarge'>\"I wouldn't advise that.\"</span>"
+			user << "<span class='warning'>An overwhelming sense of nausea overpowers you!</span>"
+			user.unEquip(src, 1)
+			user.Dizzy(30)
+			user.Weaken(5)
+		else
+			user << "<span class='cultlarge'>\"Putting on things you don't own is bad, you know.\"</span>"
+			user << "<span class='userdanger'>The robes squeeze at your body!</span>"
+			user.emote("scream")
+			user.adjustBruteLoss(25)
+			user.unEquip(src, 1)
 
 /obj/item/clothing/glasses/night/cultblind
 	desc = "May nar-sie guide you through the darkness and shield you from the light."

code/game/gamemodes/cult/runes.dm

@@ -319,6 +319,10 @@ var/list/teleport_runes = list()
 		else if(is_sacrifice_target(M.mind))
 			for(var/C in invokers)
 				C << "<span class='cultlarge'>\"I desire this one for myself. <i>SACRIFICE THEM!</i>\"</span>"
+		else if(is_servant_of_ratvar(M))
+			M.visible_message("<span class='warning'>[M]'s eyes glow a defiant yellow!</span>", \
+			"<span class='cultlarge'>\"Stop resisting. You <i>will</i> be mi-\"</span> <span class='large_brass'>\"Give up and you will feel pain unlike anything you've ever felt!\"</span>")
+			M.Weaken(4)
 	if(!convertees.len)
 		fail_invoke()
 		log_game("Convert rune failed - no eligible convertees")
@@ -634,7 +638,7 @@ var/list/teleport_runes = list()
 			playsound(E, 'sound/magic/Disable_Tech.ogg', 100, 1)
 			for(var/M in invokers)
 				var/mob/living/L = M
-				L << "<span class=userdanger'>You chant in unison and a colossal burst of energy knocks you backward!</span>"
+				L << "<span class='userdanger'>You chant in unison and a colossal burst of energy knocks you backward!</span>"
 				L.Weaken(2)
 	qdel(src) //delete before pulsing because it's a delay reee
 	empulse(E, 9*invokers.len, 12*invokers.len) // Scales now, from a single room to most of the station depending on # of chanters
@@ -815,6 +819,9 @@ var/list/teleport_runes = list()
 			C << "<span class='cultlarge'>Your blood boils in your veins!</span>"
 			C.take_overall_damage(45,45)
 			C.Stun(7)
+			if(is_servant_of_ratvar(C))
+				C << "<span class='userdanger'>You feel unholy darkness dimming the Justiciar's light!</span>"
+				C.adjustStaminaLoss(30)
 	for(var/M in invokers)
 		var/mob/living/L = M
 		L.apply_damage(15, BRUTE, pick("l_arm", "r_arm"))

code/game/gamemodes/cult/talisman.dm

@@ -249,12 +249,14 @@
 			if(issilicon(target))
 				var/mob/living/silicon/S = target
 				S.emp_act(1)
-			if(iscarbon(target))
+			else if(iscarbon(target))
 				var/mob/living/carbon/C = target
 				C.silent += 5
 				C.stuttering += 15
 				C.cultslurring += 15
 				C.Jitter(15)
+			if(is_servant_of_ratvar(target))
+				target.adjustBruteLoss(15)
 		user.drop_item()
 		qdel(src)
 		return
@@ -302,6 +304,11 @@
 		if(iscarbon(target))
 			var/mob/living/carbon/H = target
 			H.reagents.add_reagent("mindbreaker", 25)
+			if(is_servant_of_ratvar(target))
+				target << "<span class='userdanger'>You see a brief but horrible vision of Ratvar, rusted and scrapped, being torn apart.</span>"
+				target.emote("scream")
+				target.confused = max(0, target.confused + 3)
+				target.flash_eyes()
 		qdel(src)