diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm index 94b180be3c8..716ecf9d615 100644 --- a/code/_globalvars/genetics.dm +++ b/code/_globalvars/genetics.dm @@ -10,7 +10,6 @@ GLOBAL_VAR_INIT(fakeblock, 0) GLOBAL_VAR_INIT(coughblock, 0) GLOBAL_VAR_INIT(glassesblock, 0) GLOBAL_VAR_INIT(epilepsyblock, 0) -GLOBAL_VAR_INIT(twitchblock, 0) GLOBAL_VAR_INIT(nervousblock, 0) GLOBAL_VAR_INIT(wingdingsblock, 0) GLOBAL_VAR_INIT(monkeyblock, DNA_SE_LENGTH) // Monkey block will always be the DNA_SE_LENGTH diff --git a/code/datums/components/zombie_regen.dm b/code/datums/components/zombie_regen.dm index 546b98838fc..da04e6fc21c 100644 --- a/code/datums/components/zombie_regen.dm +++ b/code/datums/components/zombie_regen.dm @@ -67,7 +67,6 @@ zomboid.cure_nearsighted() zomboid.CureMute() zomboid.CureDeaf() - zomboid.CureTourettes() zomboid.CureEpilepsy() zomboid.CureCoughing() zomboid.CureNervous() diff --git a/code/game/dna/mutations/disabilities.dm b/code/game/dna/mutations/disabilities.dm index 9039ac04521..b27f573ef01 100644 --- a/code/game/dna/mutations/disabilities.dm +++ b/code/game/dna/mutations/disabilities.dm @@ -68,29 +68,6 @@ ..() block = GLOB.clumsyblock -/datum/mutation/disability/tourettes - name = "Tourettes" - activation_messages = list("You twitch.") - deactivation_messages = list("Your mouth tastes like soap.") - -/datum/mutation/disability/tourettes/New() - ..() - block = GLOB.twitchblock - -/datum/mutation/disability/tourettes/on_life(mob/living/carbon/human/H) - if(prob(10)) - switch(rand(1, 3)) - if(1) - H.emote("twitch") - if(2 to 3) - H.say("[prob(50) ? ";" : ""][pick("SHIT", "PISS", "FUCK", "CUNT", "COCKSUCKER", "MOTHERFUCKER", "TITS")]") - var/x_offset_old = H.pixel_x - var/y_offset_old = H.pixel_y - var/x_offset = H.pixel_x + rand(-2, 2) - var/y_offset = H.pixel_y + rand(-1, 1) - animate(H, pixel_x = x_offset, pixel_y = y_offset, time = 1) - animate(H, pixel_x = x_offset_old, pixel_y = y_offset_old, time = 1) - /datum/mutation/disability/nervousness name = "Nervousness" activation_messages = list("You feel nervous.") diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm index f65680cad61..e4944cadef8 100644 --- a/code/game/gamemodes/setupgame.dm +++ b/code/game/gamemodes/setupgame.dm @@ -39,7 +39,6 @@ GLOB.coughblock = getAssignedBlock("COUGH", numsToAssign) GLOB.glassesblock = getAssignedBlock("GLASSES", numsToAssign) GLOB.epilepsyblock = getAssignedBlock("EPILEPSY", numsToAssign) - GLOB.twitchblock = getAssignedBlock("TWITCH", numsToAssign) GLOB.nervousblock = getAssignedBlock("NERVOUS", numsToAssign) GLOB.wingdingsblock = getAssignedBlock("WINGDINGS", numsToAssign) GLOB.mesonblock = getAssignedBlock("MESONS", numsToAssign, good=1) diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index e4c09eff7eb..6d222636c8e 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -464,26 +464,6 @@ /obj/item/dnainjector/anticlumsy/GetInitBlock() return GLOB.clumsyblock -/obj/item/dnainjector/antitour - name = "DNA-Injector (Anti-Tour.)" - desc = "Will cure tourettes." - datatype = DNA2_BUF_SE - value = 0x001 - forcedmutation = TRUE - -/obj/item/dnainjector/antitour/GetInitBlock() - return GLOB.twitchblock - -/obj/item/dnainjector/tourmut - name = "DNA-Injector (Tour.)" - desc = "Gives you a nasty case off tourettes." - datatype = DNA2_BUF_SE - value = 0xFFF - forcedmutation = TRUE - -/obj/item/dnainjector/tourmut/GetInitBlock() - return GLOB.twitchblock - /obj/item/dnainjector/stuttmut name = "DNA-Injector (Stutt.)" desc = "Makes you s-s-stuttterrr." diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 61aa7959a24..e9acf13ed25 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -530,7 +530,6 @@ cure_nearsighted() CureMute() CureDeaf() - CureTourettes() CureEpilepsy() CureCoughing() CureNervous() diff --git a/code/modules/mob/living/living_status_procs.dm b/code/modules/mob/living/living_status_procs.dm index 97433d8b3fd..7aecf4226aa 100644 --- a/code/modules/mob/living/living_status_procs.dm +++ b/code/modules/mob/living/living_status_procs.dm @@ -837,10 +837,6 @@ STATUS EFFECTS /mob/living/proc/CureNervous() CureIfHasDisability(GLOB.nervousblock) -// Tourettes -/mob/living/proc/CureTourettes() - CureIfHasDisability(GLOB.twitchblock) - /mob/living/proc/CureIfHasDisability(block) if(dna && dna.GetSEState(block)) dna.SetSEState(block, 0, 1) //Fix the gene diff --git a/code/modules/reagents/chemistry/reagents/admin_reagents.dm b/code/modules/reagents/chemistry/reagents/admin_reagents.dm index 6f6fe190d06..29eee26a2e6 100644 --- a/code/modules/reagents/chemistry/reagents/admin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/admin_reagents.dm @@ -31,7 +31,6 @@ M.CureMute() M.CureDeaf() M.CureEpilepsy() - M.CureTourettes() M.CureCoughing() M.CureNervous() M.SetEyeBlurry(0)