Merge pull request #2503 from CIB/feature

Improved brainloss effects.

code/game/gamemodes/revolution/rp_revolution.dm

@@ -78,6 +78,17 @@
 		rev_mind.special_role = "Head Revolutionary"
 		obj_count++
 
+	// Show each head revolutionary up to 3 candidates
+	var/list/already_considered = list()
+	for(var/i = 0, i < 2, i++)
+		var/mob/rev_mob = rev_mind.current
+		already_considered += rev_mob
+		// Tell them about people they might want to contact.
+		var/mob/living/carbon/human/M = get_nt_opposed()
+		if(M && !(M.mind in head_revolutionaries) && !(M in already_considered))
+			rev_mob << "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them."
+			rev_mob.mind.store_memory("<b>Potential Collaborator</b>: [M.real_name]")
+
 ///////////////////////////////////////////////////
 //Deals with converting players to the revolution//
 ///////////////////////////////////////////////////

code/game/machinery/cloning.dm

@@ -133,7 +133,7 @@
 					return 0
 
 
-	src.heal_level = rand(60,100) //Randomizes what health the clone is when ejected
+	src.heal_level = rand(10,40) //Randomizes what health the clone is when ejected
 	src.attempting = 1 //One at a time!!
 	src.locked = 1
 
@@ -150,8 +150,8 @@
 
 	src.icon_state = "pod_1"
 	//Get the clone body ready
-	H.adjustCloneLoss(src.heal_level + 100) //new damage var so you can't eject a clone early then stab them to abuse the current damage system --NeoFite
-	H.adjustBrainLoss(heal_level)
+	H.adjustCloneLoss(150) //new damage var so you can't eject a clone early then stab them to abuse the current damage system --NeoFite
+	H.adjustBrainLoss(src.heal_level + 50 + rand(10, 30)) // The rand(10, 30) will come out as extra brain damage
 	H.Paralyse(4)
 
 	//Here let's calculate their health so the pod doesn't immediately eject them!!!

code/game/machinery/doors/airlock.dm

@@ -847,6 +847,8 @@ About the new airlock wires panel:
 			if(src.shock(user, 100))
 				return
 
+	// No. -- cib
+	/**
 	if(ishuman(user) && prob(40) && src.density)
 		var/mob/living/carbon/human/H = user
 		if(H.getBrainLoss() >= 60)
@@ -861,6 +863,7 @@ About the new airlock wires panel:
 			else
 				visible_message("\red [user] headbutts the airlock. Good thing they're wearing a helmet.")
 			return
+	**/
 
 	if(src.p_open)
 		user.set_machine(src)

code/modules/mob/living/carbon/human/life.dm

@@ -261,7 +261,8 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 		if (disabilities & NERVOUS)
 			if (prob(10))
 				stuttering = max(10, stuttering)
-		if (getBrainLoss() >= 60 && stat != 2)
+		// No. -- cib
+		/*if (getBrainLoss() >= 60 && stat != 2)
 			if (prob(3))
 				switch(pick(1,2,3))
 					if(1)
@@ -270,6 +271,25 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 						say(pick("FUS RO DAH","fucking 4rries!", "stat me", ">my face", "roll it easy!", "waaaaaagh!!!", "red wonz go fasta", "FOR TEH EMPRAH", "lol2cat", "dem dwarfs man, dem dwarfs", "SPESS MAHREENS", "hwee did eet fhor khayosss", "lifelike texture ;_;", "luv can bloooom", "PACKETS!!!"))
 					if(3)
 						emote("drool")
+		*/
+
+		if(stat != 2)
+			var/rn = rand(0, 200)
+			if(getBrainLoss() >= 5)
+				if(0 <= rn && rn <= 3)
+					custom_pain("Your head feels numb and painful.")
+			if(getBrainLoss() >= 15)
+				if(4 <= rn && rn <= 6) if(eye_blurry <= 0)
+					src << "\red It becomes hard to see for some reason."
+					eye_blurry = 10
+			if(getBrainLoss() >= 35)
+				if(7 <= rn && rn <= 9) if(hand && equipped())
+					src << "\red Your hand won't respond properly, you drop what you're holding."
+					drop_item()
+			if(getBrainLoss() >= 50)
+				if(10 <= rn && rn <= 12) if(!lying)
+					src << "\red Your legs won't respond properly, you fall down."
+					lying = 1
 
 	proc/handle_organs()
 		// take care of organ related updates, such as broken and missing limbs