From 8d3ceab28783ef3304ea069ff9a6e2a7e94e7af2 Mon Sep 17 00:00:00 2001
From: Belsima <31827220+Belsima@users.noreply.github.com>
Date: Fri, 8 Dec 2017 16:30:34 -0500
Subject: [PATCH] grammar never ends (#4421)
* Update Sleeper.dm
* Update robot_fabricator.dm
* Update requests_console.dm
* Update vr_console.dm
* Update teleporter.dm
* Update records_scanner.dm
* Update mercrenegade.dm
* Update clown_items.dm
* Update firstaid.dm
* Update teleporter.dm
* capitalization fixes
* Update clown_items.dm
---
code/game/gamemodes/mixed/mercrenegade.dm | 6 ++---
code/game/machinery/Sleeper.dm | 24 +++++++++----------
code/game/machinery/records_scanner.dm | 6 ++---
code/game/machinery/requests_console.dm | 10 ++++----
code/game/machinery/robot_fabricator.dm | 6 ++---
code/game/machinery/teleporter.dm | 6 ++---
code/game/machinery/vr_console.dm | 4 ++--
.../game/objects/items/weapons/clown_items.dm | 12 +++++-----
.../objects/items/weapons/storage/firstaid.dm | 16 ++++++-------
9 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/code/game/gamemodes/mixed/mercrenegade.dm b/code/game/gamemodes/mixed/mercrenegade.dm
index 37ef6b76d9..b1e873535e 100644
--- a/code/game/gamemodes/mixed/mercrenegade.dm
+++ b/code/game/gamemodes/mixed/mercrenegade.dm
@@ -1,11 +1,11 @@
/datum/game_mode/mercren
name = "Mercenaries & Renegades"
- round_description = "A mercenary team has invaded the station, as well as other having brought their own form protection."
- extended_round_description = "Mercenaries and traitors spawn during this round."
+ round_description = "A mercenary team has invaded the station, and others have brought their own form of protection."
+ extended_round_description = "Mercenaries and renegades spawn during this round."
config_tag = "mercren"
required_players = 16 //What could possibly go wrong?
required_players_secret = 15
required_enemies = 8
end_on_antag_death = 0
antag_tags = list(MODE_MERCENARY, MODE_RENEGADE)
- require_all_templates = 1
\ No newline at end of file
+ require_all_templates = 1
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index f510688733..2020686aff 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -1,5 +1,5 @@
/obj/machinery/sleep_console
- name = "Sleeper Console"
+ name = "sleeper console"
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeperconsole"
var/obj/machinery/sleeper/sleeper
@@ -34,7 +34,7 @@
return 1
if(sleeper.panel_open)
- user << "Close the maintenance panel first."
+ to_chat(user, "Close the maintenance panel first.")
return
if(!sleeper)
@@ -44,7 +44,7 @@
else if(sleeper)
return sleeper.ui_interact(user)
else
- user << "Sleeper not found!"
+ to_chat(user, "Sleeper not found!")
/obj/machinery/sleep_console/attackby(var/obj/item/I, var/mob/user)
if(computer_deconstruction_screwdriver(user, I))
@@ -61,7 +61,7 @@
/obj/machinery/sleeper
name = "sleeper"
- desc = "A fancy bed with built-in injectors, a dialysis machine, and a limited health scanner."
+ desc = "A stasis pod with built-in injectors, a dialysis machine, and a limited health scanner."
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper_0"
density = 1
@@ -181,7 +181,7 @@
return 1
if(usr == occupant)
- usr << "You can't reach the controls from the inside."
+ to_chat(usr, "You can't reach the controls from the inside.")
return
add_fingerprint(usr)
@@ -221,7 +221,7 @@
I.loc = src
user.visible_message("\The [user] adds \a [I] to \the [src].", "You add \a [I] to \the [src].")
else
- user << "\The [src] has a beaker already."
+ to_chat(user, "\The [src] has a beaker already.")
return
/obj/machinery/sleeper/verb/move_eject()
@@ -233,7 +233,7 @@
if(DEAD)
return
if(UNCONSCIOUS)
- usr << "You struggle through the haze to hit the eject button. This will take a couple of minutes..."
+ to_chat(usr, "You struggle through the haze to hit the eject button. This will take a couple of minutes...")
sleep(2 MINUTES)
if(!src || !usr || !occupant || (occupant != usr)) //Check if someone's released/replaced/bombed him already
return
@@ -279,7 +279,7 @@
if(stat & (BROKEN|NOPOWER))
return
if(occupant)
- user << "\The [src] is already occupied."
+ to_chat(user, "\The [src] is already occupied.")
return
if(M == user)
@@ -289,7 +289,7 @@
if(do_after(user, 20))
if(occupant)
- user << "\The [src] is already occupied."
+ to_chat(user, "\The [src] is already occupied.")
return
M.stop_pulling()
if(M.client)
@@ -333,8 +333,8 @@
if(occupant.reagents.get_reagent_amount(chemical) + amount <= 20)
use_power(amount * CHEM_SYNTH_ENERGY)
occupant.reagents.add_reagent(chemical, amount)
- user << "Occupant now has [occupant.reagents.get_reagent_amount(chemical)] units of [available_chemicals[chemical]] in their bloodstream."
+ to_chat(user, "Occupant now has [occupant.reagents.get_reagent_amount(chemical)] units of [available_chemicals[chemical]] in their bloodstream.")
else
- user << "The subject has too many chemicals."
+ to_chat(user, "The subject has too many chemicals in their bloodstream.")
else
- user << "There's no suitable occupant in \the [src]."
+ to_chat(user, "There's no suitable occupant in \the [src].")
diff --git a/code/game/machinery/records_scanner.dm b/code/game/machinery/records_scanner.dm
index f9ed05c7e9..e8fdc17f0e 100644
--- a/code/game/machinery/records_scanner.dm
+++ b/code/game/machinery/records_scanner.dm
@@ -1,6 +1,6 @@
//not a computer
obj/machinery/scanner
- name = "Identity Analyser"
+ name = "identity analyzer"
var/outputdir = 0
icon = 'icons/obj/stationobjs.dmi'
icon_state = "scanner_idle"
@@ -70,7 +70,7 @@ obj/machinery/scanner/attack_hand(mob/living/carbon/human/user)
Black Marks:
"}
for(var/A in marks)
text += "[A]
"
- user << "You feel a sting as the scanner extracts some of your blood."
+ to_chat(user, "You feel a sting as the scanner extracts some of your blood.")
var/turf/T = get_step(src,outputdir)
var/obj/item/weapon/paper/print = new(T)
print.name = "[mname] Report"
@@ -136,4 +136,4 @@ obj/machinery/scanner/attack_hand(mob/living/carbon/human/user)
data_core.general += G
data_core.medical += M
data_core.security += S
- data_core.locked += L
\ No newline at end of file
+ data_core.locked += L
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 64aecd9c0f..6bf06e5e2f 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -23,7 +23,7 @@ var/req_console_information = list()
var/list/obj/machinery/requests_console/allConsoles = list()
/obj/machinery/requests_console
- name = "Requests Console"
+ name = "requests console"
desc = "A console intended to send requests to different departments on the station."
anchored = 1
icon = 'icons/obj/terminals.dmi'
@@ -72,7 +72,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
announcement.title = "[department] announcement"
announcement.newscast = 1
- name = "[department] Requests Console"
+ name = "[department] requests console"
allConsoles += src
if(departmentType & RC_ASSIST)
req_console_assistance |= department
@@ -198,15 +198,15 @@ var/list/obj/machinery/requests_console/allConsoles = list()
updateUsrDialog()
return
- //err... hacking code, which has no reason for existing... but anyway... it was once supposed to unlock priority 3 messanging on that console (EXTREME priority...), but the code for that was removed.
+ //err... hacking code, which has no reason for existing... but anyway... it was once supposed to unlock priority 3 messaging on that console (EXTREME priority...), but the code for that was removed.
/obj/machinery/requests_console/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob)
if(computer_deconstruction_screwdriver(user, O))
return
if(istype(O, /obj/item/device/multitool))
if(panel_open)
- var/input = sanitize(input(usr, "What Department id would you like to give this Request Console?", "Multitool-Request Console interface", department))
+ var/input = sanitize(input(usr, "What Department ID would you like to give this request console?", "Multitool-Request Console Interface", department))
if(!input)
- usr << "No input found please hang up and try your call again."
+ to_chat(usr, "No input found. Please hang up and try your call again.")
return
department = input
announcement.title = "[department] announcement"
diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm
index 59f364d948..f77982843b 100644
--- a/code/game/machinery/robot_fabricator.dm
+++ b/code/game/machinery/robot_fabricator.dm
@@ -1,5 +1,5 @@
/obj/machinery/robotic_fabricator
- name = "Robotic Fabricator"
+ name = "robotic fabricator"
icon = 'icons/obj/robotics.dmi'
icon_state = "fab-idle"
density = 1
@@ -30,7 +30,7 @@
overlays -= "fab-load-metal"
updateDialog()
else
- user << "The robot part maker is full. Please remove metal from the robot part maker in order to insert more."
+ to_chat(user, "The robot part maker is full. Please remove metal from the robot part maker in order to insert more.")
/obj/machinery/robotic_fabricator/attack_hand(user as mob)
var/dat
@@ -135,4 +135,4 @@ Please wait until completion...
for (var/mob/M in viewers(1, src))
if(M.client && M.machine == src)
- attack_hand(M)
\ No newline at end of file
+ attack_hand(M)
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index b3c2c23f64..9353bb888c 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -1,5 +1,5 @@
/obj/machinery/computer/teleporter
- name = "Teleporter Control Console"
+ name = "teleporter control console"
desc = "Used to control a linked teleportation Hub and Station."
icon_keyboard = "teleport_key"
icon_screen = "teleport"
@@ -56,8 +56,8 @@
L = locate("landmark*[C.data]") // use old stype
if(istype(L, /obj/effect/landmark/) && istype(L.loc, /turf))
- usr << "You insert the coordinates into the machine."
- usr << "A message flashes across the screen reminding the traveller that the nuclear authentication disk is to remain on the station at all times."
+ to_chat(usr, "You insert the coordinates into the machine.")
+ to_chat(usr, "A message flashes across the screen, reminding the user that the nuclear authentication disk is not transportable via insecure means.")
user.drop_item()
qdel(I)
diff --git a/code/game/machinery/vr_console.dm b/code/game/machinery/vr_console.dm
index 79fdf882fa..b013fb1dca 100644
--- a/code/game/machinery/vr_console.dm
+++ b/code/game/machinery/vr_console.dm
@@ -1,5 +1,5 @@
/obj/machinery/vr_sleeper
- name = "VR sleeper"
+ name = "virtual reality sleeper"
desc = "A fancy bed with built-in sensory I/O ports and connectors to interface users' minds with their bodies in virtual reality."
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "syndipod_0"
@@ -217,7 +217,7 @@
occupant.enter_vr(avatar)
// Prompt for username after they've enterred the body.
- var/newname = sanitize(input(avatar, "You are enterring virtual reality. Your username is currently [src.name]. Would you like to change it to something else?", "Name change") as null|text, MAX_NAME_LEN)
+ var/newname = sanitize(input(avatar, "You are entering virtual reality. Your username is currently [src.name]. Would you like to change it to something else?", "Name change") as null|text, MAX_NAME_LEN)
if (newname)
avatar.real_name = newname
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index d15b78963d..7124cb489f 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -33,23 +33,23 @@
//I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing.
//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
if(user.client && (target in user.client.screen))
- user << "You need to take that [target.name] off before cleaning it."
+ to_chat(user, "You need to take that [target.name] off before cleaning it.")
else if(istype(target,/obj/effect/decal/cleanable/blood))
- user << "You scrub \the [target.name] out."
+ to_chat(user, "You scrub \the [target.name] out.")
target.clean_blood()
return //Blood is a cleanable decal, therefore needs to be accounted for before all cleanable decals.
else if(istype(target,/obj/effect/decal/cleanable))
- user << "You scrub \the [target.name] out."
+ to_chat(user, "You scrub \the [target.name] out.")
qdel(target)
else if(istype(target,/turf))
- user << "You scrub \the [target.name] clean."
+ to_chat(user, "You scrub \the [target.name] clean.")
var/turf/T = target
T.clean(src, user)
else if(istype(target,/obj/structure/sink))
- user << "You wet \the [src] in the sink."
+ to_chat(user, "You wet \the [src] in the sink.")
wet()
else
- user << "You clean \the [target.name]."
+ to_chat(user, "You clean \the [target.name].")
target.clean_blood()
return
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index ab9b1ba173..ad2d474eb6 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -8,7 +8,7 @@
* First Aid Kits
*/
/obj/item/weapon/storage/firstaid
- name = "first-aid kit"
+ name = "first aid kit"
desc = "It's an emergency medical kit for those serious boo-boos."
icon_state = "firstaid"
throw_speed = 2
@@ -18,8 +18,8 @@
/obj/item/weapon/storage/firstaid/fire
- name = "fire first-aid kit"
- desc = "It's an emergency medical kit for when the toxins lab -spontaneously- burns down."
+ name = "fire first aid kit"
+ desc = "It's an emergency medical kit for when the toxins lab spontaneously burns down."
icon_state = "ointment"
item_state_slots = list(slot_r_hand_str = "firstaid-ointment", slot_l_hand_str = "firstaid-ointment")
@@ -55,8 +55,8 @@
return
/obj/item/weapon/storage/firstaid/toxin
- name = "toxin first aid"
- desc = "Used to treat when you have a high amoutn of toxins in your body."
+ name = "poison first aid kit" //IRL the term used would be poison first aid kit.
+ desc = "Used to treat when one has a high amount of toxins in their body."
icon_state = "antitoxin"
item_state_slots = list(slot_r_hand_str = "firstaid-toxin", slot_l_hand_str = "firstaid-toxin")
@@ -76,7 +76,7 @@
return
/obj/item/weapon/storage/firstaid/o2
- name = "oxygen deprivation first aid"
+ name = "oxygen deprivation first aid kit"
desc = "A box full of oxygen goodies."
icon_state = "o2"
item_state_slots = list(slot_r_hand_str = "firstaid-o2", slot_l_hand_str = "firstaid-o2")
@@ -94,8 +94,8 @@
return
/obj/item/weapon/storage/firstaid/adv
- name = "advanced first-aid kit"
- desc = "Contains advanced medical treatments."
+ name = "advanced first aid kit"
+ desc = "Contains advanced medical treatments, for serious boo-boos."
icon_state = "advfirstaid"
item_state_slots = list(slot_r_hand_str = "firstaid-advanced", slot_l_hand_str = "firstaid-advanced")