Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into supernova

code/modules/antagonists/changeling/changeling.dm

@@ -433,31 +433,21 @@
 		destroy_objective.find_target()
 		objectives += destroy_objective
 	else
-		if(prob(70))
-			var/datum/objective/assassinate/once/kill_objective = new
-			kill_objective.owner = owner
-			if(team_mode) //No backstabbing while in a team
-				kill_objective.find_target_by_role(role = ROLE_CHANGELING, role_type = 1, invert = 1)
-			else
-				kill_objective.find_target()
-			objectives += kill_objective
-			
-		/*else
-			var/datum/objective/maroon/maroon_objective = new
-			maroon_objective.owner = owner
-			if(team_mode)
-				maroon_objective.find_target_by_role(role = ROLE_CHANGELING, role_type = 1, invert = 1)
-			else
-				maroon_objective.find_target()
-			objectives += maroon_objective*/
+		var/datum/objective/assassinate/once/kill_objective = new
+		kill_objective.owner = owner
+		if(team_mode) //No backstabbing while in a team
+			kill_objective.find_target_by_role(role = ROLE_CHANGELING, role_type = 1, invert = 1)
+		else
+			kill_objective.find_target()
+		objectives += kill_objective
 
-			if (!(locate(/datum/objective/escape) in objectives) && escape_objective_possible)
-				var/datum/objective/escape/escape_with_identity/identity_theft = new
-				identity_theft.owner = owner
-				identity_theft.target = kill_objective.target
-				identity_theft.update_explanation_text()
-				objectives += identity_theft
-				escape_objective_possible = FALSE
+		if(!(locate(/datum/objective/escape) in objectives) && escape_objective_possible && prob(50))
+			var/datum/objective/escape/escape_with_identity/identity_theft = new
+			identity_theft.owner = owner
+			identity_theft.target = kill_objective.target
+			identity_theft.update_explanation_text()
+			objectives += identity_theft
+			escape_objective_possible = FALSE
 
 	if (!(locate(/datum/objective/escape) in objectives) && escape_objective_possible)
 		if(prob(50))

code/modules/antagonists/disease/disease_abilities.dm

@@ -191,8 +191,6 @@ new /datum/disease_ability/symptom/powerful/youth
 /datum/disease_ability/action/sneeze
 	name = "Voluntary Sneezing"
 	actions = list(/datum/action/cooldown/disease_sneeze)
-	cost = 2
-	required_total_points = 3
 	short_desc = "Force the host you are following to sneeze, spreading your infection to those in front of them."
 	long_desc = "Force the host you are following to sneeze with extra force, spreading your infection to any victims in a 4 meter cone in front of your host.<br>Cooldown: 20 seconds"
 
@@ -229,8 +227,6 @@ new /datum/disease_ability/symptom/powerful/youth
 /datum/disease_ability/action/infect
 	name = "Secrete Infection"
 	actions = list(/datum/action/cooldown/disease_infect)
-	cost = 2
-	required_total_points = 3
 	short_desc = "Cause all objects your host is touching to become infectious for a limited time, spreading your infection to anyone who touches them."
 	long_desc = "Cause the host you are following to excrete an infective substance from their pores, causing all objects touching their skin to transmit your infection to anyone who touches them for the next 30 seconds. This includes the floor, if they are not wearing shoes, and any items they are holding, if they are not wearing gloves.<br>Cooldown: 40 seconds"
 
@@ -271,23 +267,20 @@ new /datum/disease_ability/symptom/powerful/youth
 //healing costs more so you have to techswitch from naughty disease otherwise we'd have friendly disease for easy greentext (no fun!)
 
 /datum/disease_ability/symptom/mild
-	cost = 2
-	required_total_points = 4
 	category = "Symptom (Weak)"
 
 /datum/disease_ability/symptom/medium
-	cost = 4
-	required_total_points = 8
 	category = "Symptom"
 
 /datum/disease_ability/symptom/medium/heal
 	cost = 5
+	required_total_points = 5
 	malefit = -1
 	category = "Symptom (+)"
 
 /datum/disease_ability/symptom/powerful
 	cost = 4
-	required_total_points = 16
+	required_total_points = 10
 	category = "Symptom (Strong)"
 
 /datum/disease_ability/symptom/powerful/heal

code/modules/antagonists/eldritch_cult/eldritch_magic.dm

@@ -566,7 +566,7 @@
 		human_user.adjustBruteLoss(-10, FALSE)
 		human_user.adjustFireLoss(-10, FALSE)
 		human_user.adjustStaminaLoss(-10, FALSE)
-		human_user.adjustToxLoss(-10, FALSE)
+		human_user.adjustToxLoss(-10, FALSE, TRUE)
 		human_user.adjustOxyLoss(-10)
 
 /obj/effect/proc_holder/spell/pointed/manse_link

code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm

@@ -183,7 +183,7 @@
 	var/mob/living/carbon/human/human_user = user
 	human_user.adjustBruteLoss(-6, FALSE)
 	human_user.adjustFireLoss(-6, FALSE)
-	human_user.adjustToxLoss(-6, FALSE)
+	human_user.adjustToxLoss(-6, FALSE, TRUE)
 	human_user.adjustOxyLoss(-6, FALSE)
 	human_user.adjustStaminaLoss(-20)
 

code/modules/antagonists/traitor/classes/subterfuge.dm

@@ -12,11 +12,10 @@
 		mode = SSticker.mode
 		assassin_prob = max(0,mode.threat_level-40)
 	if(prob(assassin_prob))
-		if(prob(assassin_prob))
-			var/datum/objective/assassinate/once/kill_objective = new
-			kill_objective.owner = T.owner
-			kill_objective.find_target()
-			T.add_objective(kill_objective)
+		var/datum/objective/assassinate/once/kill_objective = new
+		kill_objective.owner = T.owner
+		kill_objective.find_target()
+		T.add_objective(kill_objective)
 	else
 		var/list/weights = list()
 		weights["sabo"] = length(subtypesof(/datum/sabotage_objective))