From ecf2ed5639c67ffd4519b738c2e17e99d346ad32 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 9 Jan 2019 09:36:16 -0500 Subject: [PATCH 1/6] Grammar adjusts for negative traits. Improves grammar, spelling and legibility for Mute and Phobia traits. Also adds verbosity for their descriptions and acquisition/loss messages. --- code/datums/traits/negative.dm | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index da0b811d03..3a104502ef 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -267,14 +267,32 @@ /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 = "You feel your fears manifest themselfs." - lose_text = "You feel your fears fade away." - medical_record_text = "Patient has an extreme or irrational fear of or aversion to something." + gain_text = "You begin to tremble as an immeasurable fear grips your mind." + lose_text = "Your confidence wipes away the fear that had been plagueing you." + 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 H.gain_trauma(phobia, TRAUMA_RESILIENCE_SURGERY) + + /datum/quirk/mute + name = "Mute" + desc = "Due to some accident, medical condition, or simply by choice, you are completely unable to speak." + + value = -2 //HALP MAINTS + gain_text = "You find yourself unable to speak!" + lose_text = "You feel a growing strength in your vocal chords." + 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() + var/mob/living/carbon/human/H = quirk_holder + H.gain_trauma(mute, TRAUMA_RESILIENCE_SURGERY) + + /datum/quirk/mute/on_process() + if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums)) + to_chat(quirk_holder, "Your antagonistic nature has caused your voice to return.") From 39d75b93b1fcba0c9c4ca1a99ab5d30659f9c47a Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 9 Jan 2019 09:43:24 -0500 Subject: [PATCH 2/6] Git acting fucky --- code/datums/traits/negative.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index a214977bac..f1a4e07e41 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -278,7 +278,7 @@ var/mob/living/carbon/human/H = quirk_holder phobia = new H.gain_trauma(phobia, TRAUMA_RESILIENCE_SURGERY) - + /datum/quirk/mute name = "Mute" desc = "Due to some accident, medical condition, or simply by choice, you are completely unable to speak." From 7cca2e7fe9466f0c7fbc85586d02d5b565c9ecc4 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 9 Jan 2019 10:08:34 -0500 Subject: [PATCH 3/6] uhhh is this something that should be done because i have no idea --- code/datums/traits/negative.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index f1a4e07e41..095f75cb55 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -294,4 +294,4 @@ /datum/quirk/mute/on_process() if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums)) - to_chat(quirk_holder, "Your antagonistic nature has caused your voice to return.") \ No newline at end of file + to_chat(quirk_holder, "Your antagonistic nature has caused your voice to return.") qdel(src) From ff51bf470f1a1a5b34f0a37c8e900a0925a5eeca Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 9 Jan 2019 10:10:44 -0500 Subject: [PATCH 4/6] git still being weird --- code/datums/traits/negative.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 095f75cb55..aced161f48 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -294,4 +294,5 @@ /datum/quirk/mute/on_process() if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums)) - to_chat(quirk_holder, "Your antagonistic nature has caused your voice to return.") qdel(src) + to_chat(quirk_holder, "Your antagonistic nature has caused your voice to return.") + qdel(src) From f981618f7eb6a45ade54899c24c5f2b083a1fd16 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Wed, 9 Jan 2019 17:21:58 -0500 Subject: [PATCH 5/6] oops --- code/datums/traits/negative.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index aced161f48..fad1c8e615 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -270,7 +270,7 @@ 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 = "You begin to tremble as an immeasurable fear grips your mind." - lose_text = "Your confidence wipes away the fear that had been plagueing you." + lose_text = "Your confidence wipes away the fear that had been plaguing you." medical_record_text = "Patient has an extreme or irrational fear and aversion to an undefined stimuli." var/datum/brain_trauma/mild/phobia/phobia From 821c6f9db585624342485fa255072bfdf060ec67 Mon Sep 17 00:00:00 2001 From: Ragolution Date: Thu, 10 Jan 2019 08:51:06 -0500 Subject: [PATCH 6/6] Found another one. TRILBYYYYYYYY --- code/game/objects/items/kitchen.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index bf50e7546e..11d6f264b8 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -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()