diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 7baf0906d03..b05861acfe1 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -786,7 +786,7 @@
// Cooldown
injector_ready = FALSE
- addtimer(CALLBACK(src, PROC_REF(injector_cooldown_finish)), 30 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(injector_cooldown_finish)), 10 SECONDS)
// Create it
var/datum/dna2/record/buf = buffers[buffer_id]
diff --git a/code/game/dna/mutations/_mutations.dm b/code/game/dna/mutations/_mutations.dm
index 8ed4022c5be..6ac82a6e74a 100644
--- a/code/game/dna/mutations/_mutations.dm
+++ b/code/game/dna/mutations/_mutations.dm
@@ -9,8 +9,6 @@
var/instability = 0
/// Trait to give, if any
var/traits_to_add = list()
- /// Activation probability
- var/activation_prob = 100
/// Possible activation messages
var/list/activation_messages = list()
/// Possible deactivation messages
@@ -24,10 +22,7 @@
// Return TRUE if we can activate.
// HANDLE MUTCHK_FORCED HERE!
/datum/mutation/proc/can_activate(mob/M, flags)
- if(flags & MUTCHK_FORCED)
- return TRUE
- // Probability check
- return prob(activation_prob)
+ return TRUE
// Called when the gene activates. Do your magic here.
/datum/mutation/proc/activate(mob/living/M)
diff --git a/code/game/dna/mutations/disabilities.dm b/code/game/dna/mutations/disabilities.dm
index e7d1448728f..60c4e85bff4 100644
--- a/code/game/dna/mutations/disabilities.dm
+++ b/code/game/dna/mutations/disabilities.dm
@@ -16,7 +16,7 @@
name = "Hallucinate"
activation_messages = list("Your mind says 'Hello'.")
deactivation_messages = list("Sanity returns. Or does it?")
- instability = -GENE_INSTABILITY_MODERATE
+ instability = -GENE_INSTABILITY_MAJOR
/datum/mutation/disability/hallucinate/New()
..()
@@ -61,7 +61,7 @@
name = "Clumsiness"
activation_messages = list("You feel lightheaded.")
deactivation_messages = list("You regain some control of your movements")
- instability = -GENE_INSTABILITY_MINOR
+ instability = -GENE_INSTABILITY_MODERATE
traits_to_add = list(TRAIT_CLUMSY)
/datum/mutation/disability/clumsy/New()
@@ -128,7 +128,7 @@
name = "Colourblindness"
activation_messages = list("You feel a peculiar prickling in your eyes while your perception of colour changes.")
deactivation_messages = list("Your eyes tingle unsettlingly, though everything seems to become a lot more colourful.")
- instability = -GENE_INSTABILITY_MODERATE
+ instability = -GENE_INSTABILITY_MINOR
traits_to_add = list(TRAIT_COLORBLIND)
/datum/mutation/disability/colourblindness/New()
@@ -208,7 +208,7 @@
desc = "Garbles the subject's voice into an incomprehensible speech."
activation_messages = list("Your vocal cords feel alien.")
deactivation_messages = list("Your vocal cords no longer feel alien.")
- instability = -GENE_INSTABILITY_MINOR
+ instability = -GENE_INSTABILITY_MODERATE
traits_to_add = list(TRAIT_WINGDINGS)
/datum/mutation/disability/wingdings/New()
@@ -241,7 +241,7 @@
desc = "Completely shuts down the speech center of the subject's brain."
activation_messages = list("You feel unable to express yourself at all.")
deactivation_messages = list("You feel able to speak freely again.")
- instability = -GENE_INSTABILITY_MODERATE
+ instability = -GENE_INSTABILITY_MAJOR
traits_to_add = list(TRAIT_MUTE)
/datum/mutation/disability/mute/New()
@@ -292,7 +292,6 @@
desc = "Greatly slows the subject's metabolism, enabling greater buildup of lipid tissue."
activation_messages = list("You feel blubbery and lethargic!")
deactivation_messages = list("You feel fit!")
- instability = -GENE_INSTABILITY_MINOR
traits_to_add = list(TRAIT_SLOWDIGESTION)
/datum/mutation/disability/fat/New()
@@ -535,7 +534,7 @@
desc = "Causes the cerebellum to shut down in some places."
activation_messages = list("You feel very dizzy...")
deactivation_messages = list("You regain your balance.")
- instability = -GENE_INSTABILITY_MINOR
+ instability = -GENE_INSTABILITY_MODERATE
/datum/mutation/disability/dizzy/New()
..()
diff --git a/code/game/dna/mutations/mutation_powers.dm b/code/game/dna/mutations/mutation_powers.dm
index b8a1e0370d9..7ec6487c299 100644
--- a/code/game/dna/mutations/mutation_powers.dm
+++ b/code/game/dna/mutations/mutation_powers.dm
@@ -6,9 +6,8 @@
name = "No Breathing"
activation_messages = list("You feel no need to breathe.")
deactivation_messages = list("You feel the need to breathe, once more.")
- instability = GENE_INSTABILITY_MODERATE
+ instability = GENE_INSTABILITY_MAJOR
traits_to_add = list(TRAIT_NOBREATH)
- activation_prob = 25
/datum/mutation/nobreath/New()
..()
@@ -65,7 +64,7 @@
name = "No Prints"
activation_messages = list("Your fingers feel numb.")
deactivation_messages = list("Your fingers no longer feel numb.")
- instability = GENE_INSTABILITY_MINOR
+ instability = GENE_INSTABILITY_MODERATE
traits_to_add = list(TRAIT_NOFINGERPRINTS)
/datum/mutation/noprints/New()
@@ -83,24 +82,24 @@
..()
block = GLOB.shockimmunityblock
-/datum/mutation/midget
- name = "Midget"
+/datum/mutation/dwarf
+ name = "Dwarf"
activation_messages = list("Everything around you seems bigger now...")
deactivation_messages = list("Everything around you seems to shrink...")
- instability = GENE_INSTABILITY_MINOR
+ instability = GENE_INSTABILITY_MODERATE
traits_to_add = list(TRAIT_DWARF)
-/datum/mutation/midget/New()
+/datum/mutation/dwarf/New()
..()
block = GLOB.smallsizeblock
-/datum/mutation/midget/activate(mob/M)
+/datum/mutation/dwarf/activate(mob/M)
..()
M.pass_flags |= PASSTABLE
M.resize = 0.8
M.update_transform()
-/datum/mutation/midget/deactivate(mob/M)
+/datum/mutation/dwarf/deactivate(mob/M)
..()
M.pass_flags &= ~PASSTABLE
M.resize = 1.25
@@ -113,7 +112,6 @@
deactivation_messages = list("Your muscles shrink.")
instability = GENE_INSTABILITY_MAJOR
traits_to_add = list(TRAIT_HULK, TRAIT_CHUNKYFINGERS)
- activation_prob = 15
/datum/mutation/hulk/New()
..()
@@ -147,7 +145,6 @@
deactivation_messages = list("You feel dumber.")
instability = GENE_INSTABILITY_MAJOR
traits_to_add = list(TRAIT_TELEKINESIS)
- activation_prob = 15
/datum/mutation/tk/New()
..()
@@ -163,6 +160,7 @@
name = "Sober"
activation_messages = list("You feel unusually sober.")
deactivation_messages = list("You feel like you could use a stiff drink.")
+ instability = GENE_INSTABILITY_MINOR
traits_to_add = list(TRAIT_ALCOHOL_TOLERANCE)
@@ -176,6 +174,7 @@
desc = "Boosts efficiency in sectors of the brain commonly associated with meta-mental energies."
activation_messages = list("Your mind feels closed.")
deactivation_messages = list("You feel oddly exposed.")
+ instability = GENE_INSTABILITY_MINOR
/datum/mutation/psychic_resist/New()
..()
@@ -186,7 +185,7 @@
/////////////////////////
/datum/mutation/stealth
- instability = GENE_INSTABILITY_MODERATE
+ instability = GENE_INSTABILITY_MAJOR
/datum/mutation/stealth/can_activate(mob/M, flags)
// Can only activate one of these at a time.
@@ -205,7 +204,6 @@
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 = 25
/datum/mutation/stealth/darkcloak/New()
..()
@@ -231,7 +229,6 @@
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 = 25
/datum/mutation/stealth/chameleon/New()
..()
@@ -340,7 +337,7 @@
desc = "Allows the subject to eat just about anything without harm."
activation_messages = list("You feel hungry.")
deactivation_messages = list("You don't feel quite so hungry anymore.")
- instability = GENE_INSTABILITY_MINOR
+ instability = GENE_INSTABILITY_MODERATE
spelltype=/obj/effect/proc_holder/spell/eat
@@ -445,7 +442,7 @@
//cooldown = 30
activation_messages = list("Your leg muscles feel taut and strong.")
deactivation_messages = list("Your leg muscles shrink back to normal.")
- instability = GENE_INSTABILITY_MINOR
+ instability = GENE_INSTABILITY_MODERATE
spelltype =/obj/effect/proc_holder/spell/leap
@@ -702,7 +699,7 @@
spelltype =/obj/effect/proc_holder/spell/morph
activation_messages = list("Your body feels like it can alter its appearance.")
deactivation_messages = list("Your body doesn't feel capable of altering its appearance.")
- instability = GENE_INSTABILITY_MINOR
+ instability = GENE_INSTABILITY_MODERATE
/datum/mutation/grant_spell/morph/New()
..()
@@ -1105,7 +1102,7 @@
name = "Flash Protection"
activation_messages = list("You stop noticing the glare from lights...")
deactivation_messages = list("Lights begin glaring again...")
- instability = GENE_INSTABILITY_MINOR
+ instability = GENE_INSTABILITY_MODERATE
traits_to_add = list(TRAIT_FLASH_PROTECTION)
/datum/mutation/flash_protection/New()
diff --git a/code/modules/mob/living/carbon/human/human_life.dm b/code/modules/mob/living/carbon/human/human_life.dm
index b796502eaa3..83fba460563 100644
--- a/code/modules/mob/living/carbon/human/human_life.dm
+++ b/code/modules/mob/living/carbon/human/human_life.dm
@@ -107,14 +107,14 @@
if(!ignore_gene_stability && gene_stability < GENETIC_DAMAGE_STAGE_1)
var/instability = DEFAULT_GENE_STABILITY - gene_stability
if(prob(instability * 0.1))
- adjustFireLoss(min(5, instability * 0.67))
+ adjustFireLoss(min(10, instability * 0.67))
to_chat(src, "You feel like your skin is burning and bubbling off!")
if(gene_stability < GENETIC_DAMAGE_STAGE_2)
if(prob(instability * 0.83))
- adjustCloneLoss(min(4, instability * 0.05))
+ adjustCloneLoss(min(8, instability * 0.05))
to_chat(src, "You feel as if your body is warping.")
if(prob(instability * 0.1))
- adjustToxLoss(min(5, instability * 0.67))
+ adjustToxLoss(min(10, instability * 0.67))
to_chat(src, "You feel weak and nauseous.")
if(gene_stability < GENETIC_DAMAGE_STAGE_3 && prob(1))
to_chat(src, "You feel incredibly sick... Something isn't right!")
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
index 0c674ca4528..b0cfab0b1f5 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
@@ -183,7 +183,7 @@
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf
name = "dwarf legion"
- desc = "You can still see what was once a midget under the shifting mass of corruption."
+ desc = "You can still see what was once a dwarf under the shifting mass of corruption."
icon_state = "dwarf_legion"
icon_living = "dwarf_legion"
icon_aggro = "dwarf_legion"