From 3bf74de3b171b2510917c5ef1488f41c2126218b Mon Sep 17 00:00:00 2001
From: Belsima <31827220+Belsima@users.noreply.github.com>
Date: Tue, 5 Dec 2017 15:34:45 -0500
Subject: [PATCH] Grammar time, again. (#4402)
* Shriek grammar.
* Updates jumpsuit grammar.
* Update civilian.dm
* Update NewBan.dm
* Update gravitygenerator.dm
* Update Dreaming.dm
* Update shriek.dm
* Update NewBan.dm
---
code/game/gamemodes/changeling/powers/shriek.dm | 12 ++++++------
code/modules/admin/NewBan.dm | 4 ++--
code/modules/clothing/under/color.dm | 4 ++--
code/modules/clothing/under/jobs/civilian.dm | 4 ++--
code/modules/flufftext/Dreaming.dm | 2 +-
code/modules/power/gravitygenerator.dm | 6 +++---
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/code/game/gamemodes/changeling/powers/shriek.dm b/code/game/gamemodes/changeling/powers/shriek.dm
index 37e7f67fe0..40e796490f 100644
--- a/code/game/gamemodes/changeling/powers/shriek.dm
+++ b/code/game/gamemodes/changeling/powers/shriek.dm
@@ -1,6 +1,6 @@
/datum/power/changeling/resonant_shriek
name = "Resonant Shriek"
- desc = "Our lungs and vocal chords shift, allowing us to briefly emit a noise that deafens and confuses the weak-minded biologicals and synthetics."
+ desc = "Our lungs and vocal cords shift, allowing us to briefly emit a noise that deafens and confuses the weak-minded."
helptext = "Lights are blown, organics are disoriented, and synthetics act as if they were flashed."
enhancedtext = "Range is doubled."
ability_icon_state = "ling_resonant_shriek"
@@ -20,19 +20,19 @@
/mob/proc/changeling_resonant_shriek()
set category = "Changeling"
set name = "Resonant Shriek (20)"
- set desc = "Emits a high-frequency sound that confuses and deafens humans, blows out nearby lights and overloads cyborg sensors."
+ set desc = "Emits a high-frequency sound that confuses and deafens organics, blows out nearby lights, and overloads synthetics' sensors."
var/datum/changeling/changeling = changeling_power(20,0,100,CONSCIOUS)
if(!changeling) return 0
if(is_muzzled())
- src << "Mmmf mrrfff!"
+ to_chat(src, "Mmmf mrrfff!")
return 0
if(ishuman(src))
var/mob/living/carbon/human/H = src
if(H.silent)
- src << "You can't speak!"
+ to_chat(src, "You can't speak!")
return 0
if(world.time < (changeling.last_shriek + 10 SECONDS) )
@@ -49,7 +49,7 @@
var/range = 4
if(src.mind.changeling.recursive_enhancement)
range = range * 2
- src << "We are extra loud."
+ to_chat(src, "We are extra loud.")
src.attack_log += text("\[[time_stamp()]\] Used Resonant Shriek.")
message_admins("[key_name(src)] used Resonant Shriek ([src.x],[src.y],[src.z]) (JMP).")
@@ -144,4 +144,4 @@
changeling.last_shriek = world.time
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index a376fc040a..0b3899ad99 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -23,7 +23,7 @@ var/savefile/Banlist
.["desc"] = "\nReason: [Banlist["reason"]]\nExpires: [GetExp(Banlist["minutes"])]\nBy: [Banlist["bannedby"]][appeal]"
else
Banlist.cd = "/base/[ckey][id]"
- .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: PERMENANT\nBy: [Banlist["bannedby"]][appeal]"
+ .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: PERMANENT\nBy: [Banlist["bannedby"]][appeal]"
.["reason"] = "ckey/id"
return .
else
@@ -49,7 +49,7 @@ var/savefile/Banlist
else
.["desc"] = "\nReason: [Banlist["reason"]]\nExpires: [GetExp(Banlist["minutes"])]\nBy: [Banlist["bannedby"]][appeal]"
else
- .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: PERMENANT\nBy: [Banlist["bannedby"]][appeal]"
+ .["desc"] = "\nReason: [Banlist["reason"]]\nExpires: PERMANENT\nBy: [Banlist["bannedby"]][appeal]"
.["reason"] = matches
return .
return 0
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 7452b35aab..cc5d7ed917 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -5,7 +5,7 @@
/obj/item/clothing/under/color/blackf
name = "feminine black jumpsuit"
- desc = "It's very smart and in a ladies-size!"
+ desc = "It's very smart and in a ladies size!"
icon_state = "black"
worn_state = "blackf"
@@ -32,7 +32,7 @@
/obj/item/clothing/under/color/orange
name = "orange jumpsuit"
- desc = "It's standardised prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+ desc = "It's standardized prisoner-wear. Its suit sensors are permanently set to the \"Tracking\" position."
icon_state = "orange"
has_sensor = 2
sensor_mode = 3
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index a9757e3026..0a8f3d3c65 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -70,7 +70,7 @@
/obj/item/clothing/under/rank/clown
name = "clown suit"
- desc = "'HONK!'"
+ desc = "Honk!"
icon_state = "clown"
rolled_sleeves = -1
@@ -173,7 +173,7 @@
/obj/item/clothing/under/lawyer/oldman
name = "Old Man's Suit"
- desc = "A classic suit for the older gentleman with built in back support."
+ desc = "A classic suit for the older gentleman, with built in back support."
icon_state = "oldman"
item_state_slots = list(slot_r_hand_str = "johnny", slot_l_hand_str = "johnny")
diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm
index c93bb863eb..cbbfb4d11c 100644
--- a/code/modules/flufftext/Dreaming.dm
+++ b/code/modules/flufftext/Dreaming.dm
@@ -14,7 +14,7 @@ var/list/dreams = list(
"an Unathi","a Tajaran","the Station Intelligence core","the mining station","the research station","a beaker of strange liquid",
"a Teshari", "a Diona nymph","the supermatter","Major Bill","a Morpheus ship with a ridiculous name","the Exodus","a star",
"a Dionaea gestalt","the chapel","a distant scream","endless chittering noises","glowing eyes in the shadows","an empty glass",
- "a disoriented Promethean","towers of plastic","a Gygax","a synthetic","a Man-Machine Interface","maintanence drones",
+ "a disoriented Promethean","towers of plastic","a Gygax","a synthetic","a Man-Machine Interface","maintenance drones",
"unintelligible writings","a Fleet ship",
)
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index d6ae824fd1..2c73ebd641 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -1,7 +1,7 @@
// It.. uses a lot of power. Everything under power is engineering stuff, at least.
/obj/machinery/computer/gravity_control_computer
- name = "Gravity Generator Control"
+ name = "gravity generator control"
desc = "A computer to control a local gravity generator. Qualified personnel only."
icon_state = "airtunnel0e"
anchored = 1
@@ -10,7 +10,7 @@
/obj/machinery/gravity_generator/
- name = "Gravitational Generator"
+ name = "gravitational generator"
desc = "A device which produces a gravaton field when set up."
icon = 'icons/obj/singularity.dmi'
icon_state = "TheSingGen"
@@ -94,7 +94,7 @@
else
dat += "[A]
"
- dat += "
Maintainence Functions:
"
+ dat += "
Maintenance Functions:
"
if(gravity_generator:on)
dat += " TURN GRAVITY GENERATOR OFF. "
else