shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7913 from Ragolution/TrilbyTraitTypos

Browse Source 
Grammar adjusts for negative traits.
This commit is contained in:
deathride58
2019-01-12 01:09:07 -05:00
committed by GitHub
parent 2b68547f8d 821c6f9db5
commit 201026a6e5
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/traits/negative.dm
+10 -10
View File
@@ -267,13 +267,13 @@
/datum/quirk/phobia
name = "Phobia"
desc = "You've had a traumatic past, that has scared you for life while dealing with your greatest fear."
desc = "You've had a traumatic past, one that has scarred you for life, and cripples you when dealing with your greatest fears."
value = -2 // It can hardstun you. You can be a job that your phobia targets...
gain_text = "<span class='danger'>You feel your fears manifest themselfs.</span>"
lose_text = "<span class='notice'>You feel your fears fade away.</span>"
medical_record_text = "Patient has an extreme or irrational fear of or aversion to something."
gain_text = "<span class='danger'>You begin to tremble as an immeasurable fear grips your mind.</span>"
lose_text = "<span class='notice'>Your confidence wipes away the fear that had been plaguing you.</span>"
medical_record_text = "Patient has an extreme or irrational fear and aversion to an undefined stimuli."
var/datum/brain_trauma/mild/phobia/phobia
/datum/quirk/phobia/add()
var/mob/living/carbon/human/H = quirk_holder
phobia = new
@@ -281,11 +281,11 @@
/datum/quirk/mute
name = "Mute"
desc = "Do to some accident caused you or by choice you have no voice to be heard!"
desc = "Due to some accident, medical condition, or simply by choice, you are completely unable to speak."
value = -2 //HALP MAINTS
gain_text = "<span class='danger'>I rather not say...</span>"
lose_text = "<span class='notice'>I can speak once more.</span>"
medical_record_text = "Patient has an been unable to talk or use there voice."
gain_text = "<span class='danger'>You find yourself unable to speak!</span>"
lose_text = "<span class='notice'>You feel a growing strength in your vocal chords.</span>"
medical_record_text = "Functionally mute, patient is unable to use their voice in any capacity."
var/datum/brain_trauma/severe/mute
/datum/quirk/mute/add()
@@ -294,5 +294,5 @@
/datum/quirk/mute/on_process()
if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))
to_chat(quirk_holder, "<span class='boldannounce'>Your antagonistic nature has caused your voice to be heard.</span>")
to_chat(quirk_holder, "<span class='boldannounce'>Your antagonistic nature has caused your voice to return.</span>")
qdel(src)
code/game/objects/items/kitchen.dm
+1 -1
View File
@@ -179,7 +179,7 @@
/obj/item/kitchen/knife/scimitar
name = "Scimitar knife"
desc = "A knife used to cleanly butcher, its been modifed to be able to cut more meat then a normale knife. Do to the years of use its blade isnt as strong as it once was!"
desc = "A knife used to cleanly butcher. Its razor-sharp edge has been honed for butchering, but has been poorly maintained over the years."
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
/obj/item/kitchen/knife/scimiar/Initialize()