From c004e0dd24aada25ccb3f7bb23e81ce46680c9df Mon Sep 17 00:00:00 2001 From: VTCobaltblood Date: Mon, 7 Jan 2019 02:02:38 +0300 Subject: [PATCH] Renames Nervousness to Stuttering (#5906) --- code/__defines/dna.dm | 4 +- code/game/dna/dna2_helpers.dm | 2 +- code/game/dna/genes/disabilities.dm | 10 ++--- .../objects/items/weapons/dna_injector.dm | 4 +- .../abstract/new_player/character_traits.dm | 10 ++--- code/modules/mob/living/carbon/human/life.dm | 2 +- ...lood - all-prs-are-only-for-my-benefit.yml | 41 +++++++++++++++++++ 7 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 html/changelogs/VTCobaltblood - all-prs-are-only-for-my-benefit.yml diff --git a/code/__defines/dna.dm b/code/__defines/dna.dm index 88082eb42da..1655659da68 100644 --- a/code/__defines/dna.dm +++ b/code/__defines/dna.dm @@ -35,7 +35,7 @@ #define EPILEPSY 2 #define COUGHING 4 #define TOURETTES 8 -#define NERVOUS 16 +#define STUTTER 16 #define DUMB 32 #define MONKEYLIKE 64 //sets IsAdvancedToolUser to FALSE #define PACIFIST 128 @@ -62,7 +62,7 @@ var/COUGHBLOCK = 0 var/GLASSESBLOCK = 0 var/EPILEPSYBLOCK = 0 var/TWITCHBLOCK = 0 -var/NERVOUSBLOCK = 0 +var/STUTTERBLOCK = 0 var/MONKEYBLOCK = STRUCDNASIZE var/BLOCKADD = 0 diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index 2c89dc11d42..cd239c7af8b 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -28,7 +28,7 @@ if(H.species && H.species.flags & NO_SCAN) return M.dna.check_integrity() - var/block = pick(GLASSESBLOCK,COUGHBLOCK,FAKEBLOCK,NERVOUSBLOCK,CLUMSYBLOCK,TWITCHBLOCK,HEADACHEBLOCK,BLINDBLOCK,DEAFBLOCK,HALLUCINATIONBLOCK) + var/block = pick(GLASSESBLOCK,COUGHBLOCK,FAKEBLOCK,STUTTERBLOCK,CLUMSYBLOCK,TWITCHBLOCK,HEADACHEBLOCK,BLINDBLOCK,DEAFBLOCK,HALLUCINATIONBLOCK) M.dna.SetSEState(block, 1) // Give Random Good Mutation to M diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm index 72a571abf83..7685478412e 100644 --- a/code/game/dna/genes/disabilities.dm +++ b/code/game/dna/genes/disabilities.dm @@ -92,13 +92,13 @@ New() block=TWITCHBLOCK -/datum/dna/gene/disability/nervousness - name="Nervousness" - activation_message="You feel nervous." - disability=NERVOUS +/datum/dna/gene/disability/stutter + name="Stuttering" + activation_message="You feel like forming words becomes increasingly difficult." + disability=STUTTER New() - block=NERVOUSBLOCK + block=STUTTERBLOCK /datum/dna/gene/disability/blindness name="Blindness" diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 27ac1c79836..d09093ed567 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -511,7 +511,7 @@ value = 0xFFF //block = 9 New() - block = NERVOUSBLOCK + block = STUTTERBLOCK ..() /obj/item/weapon/dnainjector/antistutt @@ -521,7 +521,7 @@ value = 0x001 //block = 9 New() - block = NERVOUSBLOCK + block = STUTTERBLOCK ..() /obj/item/weapon/dnainjector/blindmut diff --git a/code/modules/mob/abstract/new_player/character_traits.dm b/code/modules/mob/abstract/new_player/character_traits.dm index dcf8737b7cf..3a217799f20 100644 --- a/code/modules/mob/abstract/new_player/character_traits.dm +++ b/code/modules/mob/abstract/new_player/character_traits.dm @@ -14,12 +14,12 @@ /datum/character_disabilities/nearsighted/apply_self(var/mob/living/carbon/human/H) H.disabilities |= NEARSIGHTED -/datum/character_disabilities/nervous - name = "Nervousness" - desc = "You are prone to stuttering and bouts of anxiety." +/datum/character_disabilities/stutter + name = "Stuttering" + desc = "You have a chronic case of stuttering, repeating sounds involuntarily." -/datum/character_disabilities/nervous/apply_self(var/mob/living/carbon/human/H) - H.disabilities |= NERVOUS +/datum/character_disabilities/stutter/apply_self(var/mob/living/carbon/human/H) + H.disabilities |= STUTTER /datum/character_disabilities/deuteranomaly name = "Deuteranopia" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 82a9276b989..f639bd66193 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -227,7 +227,7 @@ pixel_x = old_x pixel_y = old_y return - if (disabilities & NERVOUS) + if (disabilities & STUTTER) speech_problem_flag = 1 if (prob(10)) stuttering = max(10, stuttering) diff --git a/html/changelogs/VTCobaltblood - all-prs-are-only-for-my-benefit.yml b/html/changelogs/VTCobaltblood - all-prs-are-only-for-my-benefit.yml new file mode 100644 index 00000000000..214746da0b8 --- /dev/null +++ b/html/changelogs/VTCobaltblood - all-prs-are-only-for-my-benefit.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: VTCobaltblood + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Renamed Nervousness to Stuttering." \ No newline at end of file