Merge branch 'master' of https://github.com/ZomgPonies/Paradise

code/game/dna/genes/goon_powers.dm

@@ -515,7 +515,7 @@
 		if (61 to 80)
 			usr << "\blue <b>Condition</b>: [M.name] is suffering mild pain."
 		if (41 to 60)
-			usr << "\blue <b>Condition</b>: [M.name] is suffering significant pain."
+			usr << "\blue	 <b>Condition</b>: [M.name] is suffering significant pain."
 		if (21 to 40)
 			usr << "\blue <b>Condition</b>: [M.name] is suffering severe pain."
 		else
@@ -524,13 +524,13 @@
 
 	switch(M.a_intent)
 		if ("help")
-			usr << "\blue <b>Mood</b>: You sense benevolent thoughts from [M.name]."
+			usr << "\blue <b>Mood</b>: You sense benign thoughts from [M.name]."
 		if ("disarm")
 			usr << "\blue <b>Mood</b>: You sense cautious thoughts from [M.name]."
 		if ("grab")
-			usr << "\blue <b>Mood</b>: You sense hostile thoughts from [M.name]."
+			usr << "\blue <b>Mood</b>: You sense aggressive thoughts from [M.name]."
 		if ("harm")
-			usr << "\blue <b>Mood</b>: You sense cruel thoughts from [M.name]."
+			usr << "\blue <b>Mood</b>: You sense violent thoughts from [M.name]."
 			for(var/mob/living/L in view(7,M))
 				if (L == M)
 					continue

code/modules/reagents/Chemistry-Reagents-Antidepressants.dm

@@ -31,7 +31,7 @@
 /datum/reagent/antidepressant/citalopram
 	name = "Citalopram"
 	id = "citalopram"
-	description = "Stabilizes the mind a little."
+	description = "Stabilizes the mind a little, reducing hallucinations."
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 	custom_metabolism = 0.01
@@ -39,13 +39,7 @@
 
 	on_mob_life(var/mob/living/M as mob)
 		if(!M) M = holder.my_atom
-		if(src.volume <= 0.1) if(data != -1)
-			data = -1
-			M << "\red Your mind feels a little less stable.."
-		else
-			if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
-				data = world.time
-				M << "\blue Your mind feels stable.. a little stable."
+		M.hallucination = max(0, M.hallucination - 10)
 		..()
 		return