Commit 6ea04890 authored by Wizardcrying's avatar Wizardcrying Committed by Probe1
Browse files

Spelling/grammar/wording/etc fixes (#12993)

* mainly standardized the vending machine descriptions with exceptions

* oops

* more

* this time i changed a proc name but there was only one use of it

* everything gets changed!

* this commit sponsored by low-quality forum posting

* buisness

* i broke it

* but is it really robust?

* why didn't this commit

* finally, spent a lot of my morning for this

* colour

* sure it's not atomic, celt
parent e8748029
......@@ -90,7 +90,7 @@
/obj/item/ashtray/bronze
name = "bronze ashtray"
desc = "Massive bronze ashtray."
desc = "A large ashtray made of bronze."
icon_state = "ashtray_br"
icon_empty = "ashtray_br"
icon_half = "ashtray_half_br"
......@@ -100,7 +100,7 @@
health = 72.0
starting_materials = list(MAT_IRON = 80)
w_type = RECYK_METAL
empty_desc = "Massive bronze ashtray."
empty_desc = "A large ashtray made of bronze."
throwforce = 10.0
die()
......@@ -112,7 +112,7 @@
/obj/item/ashtray/glass
name = "glass ashtray"
desc = "Glass ashtray. Looks fragile."
desc = "An ashtray made of glass."
icon_state = "ashtray_gl"
icon_empty = "ashtray_gl"
icon_half = "ashtray_half_gl"
......
This diff is collapsed.
......@@ -37,7 +37,7 @@
/////////////////////////// DNA MACHINES
/obj/machinery/dna_scannernew
name = "\improper DNA modifier"
desc = "It scans DNA structures."
desc = "A machine that scans the DNA structures of an organism for use with adjacent machinery. Can modify an organism's DNA as well as perform other functions with the use of a console."
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "scanner_0"
density = 1
......@@ -100,7 +100,7 @@
/obj/machinery/dna_scannernew/crowbarDestroy(mob/user)
if(occupant)
to_chat(user, "<span class='warning'>You cannot disassemble \the [src], it's occupado.</span>")
to_chat(user, "<span class='warning'>\the [src] is occupied.</span>")
return
return ..()
......@@ -134,7 +134,7 @@
if(usr.incapacitated() || usr.lying) //are you cuffed, dying, lying, stunned or other
return
if (!ishuman(usr) && !ismonkey(usr)) //Make sure they're a mob that has dna
to_chat(usr, "<span class='notice'> Try as you might, you can not climb up into the scanner.</span>")
to_chat(usr, "<span class='notice'>You cannot enter \the [src].</span>")
return
if (istype(usr, /mob/living/carbon/human/manifested))
to_chat(usr, "<span class='notice'> For some reason, the scanner is unable to read your genes.</span>")//to prevent a loophole that allows cultist to turn manifested ghosts into normal humans
......@@ -275,7 +275,7 @@
if(ghost)
if(ghost.client && ghost.can_reenter_corpse)
ghost << 'sound/effects/adminhelp.ogg'
to_chat(ghost, "<span class='interface big'><span class='bold'>Your corpse has been placed into a cloning scanner. Return to your body if you want to be resurrected/cloned!</span> \
to_chat(ghost, "<span class='interface big'><span class='bold'>Your corpse has been placed into a cloning scanner. Return to your body if you want to be cloned!</span> \
(Verbs -> Ghost -> Re-enter corpse, or <a href='?src=\ref[ghost];reentercorpse=1'>click here!</a>)</span>")
break
break
......@@ -314,7 +314,7 @@
var/mob/dead/observer/ghost = get_ghost_from_mind(M.mind)
if(ghost && ghost.client)
ghost << 'sound/effects/adminhelp.ogg'
to_chat(ghost, "<span class='interface big'><span class='bold'>Your corpse has been placed into a cloning scanner. Return to your body if you want to be resurrected/cloned!</span> \
to_chat(ghost, "<span class='interface big'><span class='bold'>Your corpse has been placed into a cloning scanner. Return to your body if you want to be cloned!</span> \
(Verbs -> Ghost -> Re-enter corpse, or <a href='?src=\ref[src];reentercorpse=1'>click here!</a>)</span>")
/obj/machinery/dna_scannernew/ex_act(severity)
......@@ -360,7 +360,7 @@
/obj/machinery/computer/scan_consolenew
name = "DNA Modifier Access Console"
desc = "Scans DNA."
desc = "Uses a DNA modifier to manipulate DNA via radiation as well as perform other functions."
icon = 'icons/obj/computer.dmi'
icon_state = "dna"
density = 1
......@@ -644,7 +644,7 @@
if (href_list["pulseRadiation"])
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
irradiating = src.radiation_duration
var/lock_state = src.connected.locked
......@@ -745,7 +745,7 @@
if (href_list["pulseUIRadiation"])
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
var/block = src.connected.occupant.dna.GetUISubBlock(src.selected_ui_block,src.selected_ui_subblock)
......@@ -804,7 +804,7 @@
if (href_list["pulseSERadiation"])
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
var/block = src.connected.occupant.dna.GetSESubBlock(src.selected_se_block,src.selected_se_subblock)
//var/original_block=block
......@@ -923,7 +923,7 @@
if (bufferOption == "saveUI")
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
if(src.connected.occupant && src.connected.occupant.dna)
var/datum/dna2/record/databuf=new
......@@ -937,7 +937,7 @@
if (bufferOption == "saveUIAndUE")
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
if(src.connected.occupant && src.connected.occupant.dna)
var/datum/dna2/record/databuf=new
......@@ -951,7 +951,7 @@
if (bufferOption == "saveSE")
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
if(src.connected.occupant && src.connected.occupant.dna)
var/datum/dna2/record/databuf=new
......@@ -976,7 +976,7 @@
if (bufferOption == "transfer")
if(connected.contains_husk())
to_chat(usr, "<span class='notice'>You cannot do this to a husked corpse.</span>")
to_chat(usr, "<span class='notice'>The organism inside does not have DNA.</span>")
return 1
if (!src.connected.occupant || (M_NOCLONE in src.connected.occupant.mutations) || !src.connected.occupant.dna)
return
......
/obj/effect/blob/core
name = "blob core"
icon_state = "core"
desc = "Some big pulsating blob creature thingy"
desc = "A part of a blob. It is large and pulsating."
health = 200
maxhealth = 200
fire_resist = 2
......
/obj/effect/blob/factory
name = "factory blob"
icon_state = "factory"
desc = "Some antibodies-producing blob creature thingy"
desc = "A part of a blob. It makes the sound of organic tissue being torn."
health = 100
maxhealth = 100
fire_resist = 2
......
/obj/effect/blob/node
name = "blob node"
icon_state = "node"
desc = "Some pulsating blob creature thingy"
desc = "A part of a blob."
health = 100
maxhealth = 100
fire_resist = 2
......
/obj/effect/blob/resource
name = "resource blob"
icon_state = "resource"
desc = "Some smoke-producing blob creature thingy"
desc = "A part of a blob. It makes a slow, deep breathing sound."
health = 30
maxhealth = 30
fire_resist = 2
......
/obj/effect/blob/shield
name = "strong blob"
icon_state = "strong"
desc = "Some very dense blob creature thingy"
desc = "A dense part of a blob."
health = 75
maxhealth = 75
fire_resist = 2
......
......@@ -41,7 +41,7 @@ var/list/blob_looks
icon = 'icons/mob/blob/blob_64x64.dmi'
icon_state = "center"
luminosity = 2
desc = "Some blob creature thingy"
desc = "A part of a blob."
density = 0 //Necessary for spore pathfinding
opacity = 0
anchored = 1
......
......@@ -614,7 +614,7 @@
D.canmove = 0
var/atom/movable/overlay/animation = null
usr.visible_message("<span class='warning'> A shape forms in the center of the rune. A shape of... a man.<BR>The world feels blury as your soul permeates this temporary body.</span>", \
usr.visible_message("<span class='warning'> A shape forms in the center of the rune. A shape of... a man.<BR>The world feels blurry as your soul permeates this temporary body.</span>", \
"<span class='warning'> A shape forms in the center of the rune. A shape of... a man.</span>", \
"<span class='warning'>You hear liquid flowing.</span>")
......@@ -1309,7 +1309,7 @@
usr.whisper("Sa tatha najin")
if(ishuman(user))
var/mob/living/carbon/human/P = user
usr.visible_message("<span class='warning'> In flash of red light, a set of armor appears on [usr]...</span>", \
usr.visible_message("<span class='warning'> In flash of red light, a set of armor appears on [usr].</span>", \
"<span class='warning'>You are blinded by the flash of red light! After you're able to see again, you see that you are now wearing a set of armor.</span>")
var/datum/game_mode/cult/mode_ticker = ticker.mode
if(isplasmaman(P))
......
/obj/machinery/optable
name = "Operating Table"
name = "operating table"
desc = "Used for advanced medical procedures."
icon = 'icons/obj/surgery.dmi'
icon_state = "table2-idle"
......
......@@ -2,7 +2,7 @@
/obj/machinery/bioprinter
name = "bioprinter"
desc = "It's a machine that grows replacement organs using meat and metal."
desc = "A machine that grows replacement organs using meat and metal."
icon = 'icons/obj/surgery.dmi'
icon_state = "bioprinter"
......@@ -53,7 +53,7 @@
/obj/machinery/bioprinter/prosthetics
name = "prosthetics fabricator"
desc = "It's a machine that prints prosthetic organs."
desc = "A machine that prints prosthetic organs."
prints_prosthetics = 1
/obj/machinery/bioprinter/attack_hand(mob/user)
......
......@@ -368,7 +368,7 @@
/obj/structure/table/holotable/wood
name = "table"
desc = "A square piece of wood standing on four wooden legs. It can not move."
desc = "A square piece of wood standing on four wooden legs. It cannot move."
icon = 'icons/obj/structures.dmi'
icon_state = "woodtable"
......
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
/obj/machinery/computer/operating
name = "Operating Computer"
name = "operating computer"
desc = "Used to monitor an organism's health on an adjacent operating table."
density = 1
anchored = 1.0
icon_state = "operating"
......
......@@ -36,7 +36,7 @@ var/shuttle_call/shuttle_calls[0]
// The communications computer
/obj/machinery/computer/communications
name = "Communications Console"
desc = "This can be used for various important functions. Still under developement."
desc = "A console that is used for various important Command functions."
icon_state = "comm"
req_access = list(access_heads)
circuit = "/obj/item/weapon/circuitboard/communications"
......
......@@ -515,7 +515,7 @@
/obj/machinery/computer/med_data/laptop
name = "Medical Laptop"
desc = "Cheap Nanotrasen Laptop."
desc = "A cheap laptop connected to the medical records."
icon_state = "medlaptop"
machine_flags = 0
......
......@@ -2,7 +2,7 @@
/obj/machinery/computer/secure_data//TODO:SANITY
name = "Security Records"
desc = "Used to view and edit personnel's security records"
desc = "Used to view and edit personnel's security records."
icon_state = "security"
req_one_access = list(access_security, access_forensics_lockers)
circuit = "/obj/item/weapon/circuitboard/secure_data"
......
obj/machinery/recharger/defibcharger/wallcharger // obj/machinery/recharger/defibcharger define doesn't exist, don't bother trying to look for it
name = "defibrillator recharger"
desc = "A special wall mounted recharger meant for emergency defibrillators"
desc = "A special wall-mounted recharger used to recharge defibrillators."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "wrecharger0"
anchored = 1
......@@ -102,4 +102,4 @@ obj/machinery/recharger/defibcharger/wallcharger/attackby(obj/item/weapon/G as o
else if (isscrewdriver(G) || iscrowbar(G))
..()
else
to_chat(user, "<span class='warning'>\The [G] isn't a defibrillator, it won't fit!</span>")
\ No newline at end of file
to_chat(user, "<span class='warning'>\The [G] isn't a defibrillator, it won't fit!</span>")
......@@ -78,7 +78,7 @@ var/global/list/igniters = list()
return
else
:
to_chat(user, "<span class='warning'>You need more welder fuel to do that.</span>")
to_chat(user, "<span class='warning'>You need more welding fuel to do that.</span>")
return 1
......
......@@ -7,7 +7,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
/obj/machinery/requests_console
name = "requests console"
desc = "A console intended to send requests to diferent departments on the station."
desc = "A console intended to send requests to various departments on the station."
anchored = 1
icon = 'icons/obj/terminals.dmi'
icon_state = "req_comp0"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment