Merge pull request #5486 from TheDZD/genetics2

Genetic Instability Refactor & Minor Genetics Rebalance

code/__DEFINES/genetics.dm

@@ -107,3 +107,7 @@
 #define GENE_INSTABILITY_MINOR 5
 #define GENE_INSTABILITY_MODERATE 10
 #define GENE_INSTABILITY_MAJOR 15
+
+#define GENETIC_DAMAGE_STAGE_1 80
+#define GENETIC_DAMAGE_STAGE_2 65
+#define GENETIC_DAMAGE_STAGE_3 35

code/game/dna/genes/gene.dm

@@ -100,7 +100,7 @@
 	var/mutation=0
 
 	// Activation probability
-	var/activation_prob=45
+	var/activation_prob=100
 
 	// Possible activation messages
 	var/list/activation_messages=list()

code/game/dna/genes/goon_powers.dm

@@ -47,7 +47,7 @@
 	desc = "Enables the subject to bend low levels of light around themselves, creating a cloaking effect."
 	activation_messages = list("You begin to fade into the shadows.")
 	deactivation_messages = list("You become fully visible.")
-	activation_prob=10
+	activation_prob=25
 	mutation = CLOAK
 
 /datum/dna/gene/basic/stealth/darkcloak/New()
@@ -74,7 +74,7 @@
 	desc = "The subject becomes able to subtly alter light patterns to become invisible, as long as they remain still."
 	activation_messages = list("You feel one with your surroundings.")
 	deactivation_messages = list("You feel oddly visible.")
-	activation_prob=10
+	activation_prob=25
 	mutation = CHAMELEON
 
 /datum/dna/gene/basic/stealth/chameleon/New()

code/game/dna/genes/powers.dm

@@ -8,7 +8,7 @@
 	deactivation_messages=list("You feel the need to breathe, once more.")
 	instability = GENE_INSTABILITY_MODERATE
 	mutation=NO_BREATH
-	activation_prob=10
+	activation_prob=25
 
 /datum/dna/gene/basic/nobreath/New()
 	block=NOBREATHBLOCK
@@ -116,7 +116,7 @@
 	deactivation_messages=list("Your muscles shrink.")
 	instability = GENE_INSTABILITY_MAJOR
 	mutation=HULK
-	activation_prob=5
+	activation_prob=15
 
 /datum/dna/gene/basic/hulk/New()
 	block=HULKBLOCK
@@ -156,7 +156,7 @@
 	deactivation_messages=list("the walls around you re-appear.")
 	instability = GENE_INSTABILITY_MAJOR
 	mutation=XRAY
-	activation_prob=10
+	activation_prob=15
 
 /datum/dna/gene/basic/xray/New()
 	block=XRAYBLOCK
@@ -167,7 +167,7 @@
 	deactivation_messages = list("You feel dumber.")
 	instability = GENE_INSTABILITY_MAJOR
 	mutation=TK
-	activation_prob=10
+	activation_prob=15
 
 /datum/dna/gene/basic/tk/New()
 	block=TELEBLOCK

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

@@ -176,22 +176,22 @@
 		if(gene.is_active(src))
 			speech_problem_flag = 1
 			gene.OnMobLife(src)
-	if(gene_stability < 85)
+	if(gene_stability < GENETIC_DAMAGE_STAGE_1)
 		var/instability = DEFAULT_GENE_STABILITY - gene_stability
-		if(prob(instability / 10))
-			adjustFireLoss(min(6, instability / 12))
+		if(prob(instability * 0.1))
+			adjustFireLoss(min(5, instability * 0.67))
 			to_chat(src, "<span class='danger'>You feel like your skin is burning and bubbling off!</span>")
-		if(gene_stability < 70)
-			if(prob(instability / 12))
-				adjustCloneLoss(min(5, instability / 15))
+		if(gene_stability < GENETIC_DAMAGE_STAGE_2)
+			if(prob(instability * 0.83))
+				adjustCloneLoss(min(4, instability * 0.05))
 				to_chat(src, "<span class='danger'>You feel as if your body is warping.</span>")
-			if(prob(instability / 10))
-				adjustToxLoss(min(6, instability / 12))
+			if(prob(instability * 0.1))
+				adjustToxLoss(min(5, instability * 0.67))
 				to_chat(src, "<span class='danger'>You feel weak and nauseous.</span>")
-			if(gene_stability < 40 && prob(1))
+			if(gene_stability < GENETIC_DAMAGE_STAGE_3 && prob(1))
 				to_chat(src, "<span class='biggerdanger'>You feel incredibly sick... Something isn't right!</span>")
 				spawn(300)
-					if(gene_stability < 40)
+					if(gene_stability < GENETIC_DAMAGE_STAGE_3)
 						gib()
 
 	if(!(species.flags & RADIMMUNE))