From 793a2ce28f351421864572a9dae13f04293ecb3d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 1 Jul 2017 23:22:29 -0500 Subject: [PATCH] Grammar and message tweaks (#1722) --- code/game/machinery/hologram.dm | 6 +++--- code/modules/hydroponics/biogenerator.dm | 2 +- code/modules/library/lib_codex_gigas.dm | 9 ++++----- code/modules/research/circuitprinter.dm | 2 +- code/modules/research/destructive_analyzer.dm | 2 +- code/modules/research/experimentor.dm | 3 ++- code/modules/research/protolathe.dm | 2 +- code/modules/spells/spell_types/charge.dm | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 161e6161c8..db2e17863c 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -29,7 +29,7 @@ Possible to do for anyone motivated enough: #define HOLOPAD_MODE RANGE_BASED /obj/machinery/holopad - name = "Holopad" + name = "holopad" desc = "It's a floor-mounted device for projecting holographic images." icon_state = "holopad0" layer = LOW_OBJ_LAYER @@ -303,11 +303,11 @@ Possible to do for anyone motivated enough: Hologram.set_light(2) //hologram lighting set_holo(user, Hologram) - visible_message("A holographic image of [user] flicks to life right before your eyes!") + visible_message("A holographic image of [user] flickers to life before your eyes!") return Hologram else - to_chat(user, "ERROR: \black Unable to project hologram.") + to_chat(user, "ERROR: Unable to project hologram.") /*This is the proc for special two-way communication between AI and holopad/people talking near holopad. For the other part of the code, check silicon say.dm. Particularly robot talk.*/ diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 209372141f..0d008f0b53 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -1,5 +1,5 @@ /obj/machinery/biogenerator - name = "Biogenerator" + name = "biogenerator" desc = "Converts plants into biomass, which can be used to construct useful items." icon = 'icons/obj/biogenerator.dmi' icon_state = "biogen-empty" diff --git a/code/modules/library/lib_codex_gigas.dm b/code/modules/library/lib_codex_gigas.dm index ba14a6f210..9328be15e3 100644 --- a/code/modules/library/lib_codex_gigas.dm +++ b/code/modules/library/lib_codex_gigas.dm @@ -5,14 +5,15 @@ #define SUFFIX 5 /obj/item/weapon/book/codex_gigas - name = "Codex Gigas" + name = "\improper Codex Gigas" + desc = "A book documenting the nature of devils." icon_state ="demonomicon" throw_speed = 1 throw_range = 10 resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF author = "Forces beyond your comprehension" unique = 1 - title = "The codex gigas" + title = "the Codex Gigas" var/inUse = 0 var/currentName = "" var/currentSection = PRE_TITLE @@ -29,7 +30,7 @@ if(ishuman(user)) var/mob/living/carbon/human/U = user if(U.check_acedia()) - to_chat(user, "None of this matters, why are you reading this? You put the [title] down.") + to_chat(user, "None of this matters, why are you reading this? You put [title] down.") return user.visible_message("[user] opens [title] and begins reading intently.") ask_name(user) @@ -90,8 +91,6 @@ currentSection = SYLLABLE else if(GLOB.devil_suffix.Find(action)) currentSection = SUFFIX - else - to_chat(world, "Codex gigas failure [action]") return currentSection != oldSection /obj/item/weapon/book/codex_gigas/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \ diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 76c7a22f60..6a71e07110 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -5,7 +5,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). */ /obj/machinery/r_n_d/circuit_imprinter - name = "Circuit Imprinter" + name = "circuit imprinter" desc = "Manufactures circuit boards for the construction of machines." icon_state = "circuit_imprinter" container_type = OPENCONTAINER diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 5adfb14f88..12cfe93a3f 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -8,7 +8,7 @@ It is used to destroy hand-held objects and advance technological research. Cont Note: Must be placed within 3 tiles of the R&D Console */ /obj/machinery/r_n_d/destructive_analyzer - name = "Destructive Analyzer" + name = "destructive analyzer" desc = "Learn science by destroying things!" icon_state = "d_analyzer" var/decon_mod = 0 diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 872b7d270d..f31dbfa327 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -16,7 +16,8 @@ #define FAIL 8 /obj/machinery/r_n_d/experimentor - name = "E.X.P.E.R.I-MENTOR" + name = "\improper E.X.P.E.R.I-MENTOR" + desc = "A \"replacement\" for the deconstructive analyzer with a slight tendency to catastrophically fail." icon = 'icons/obj/machines/heavy_lathe.dmi' icon_state = "h_lathe" density = 1 diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index c6e742cbba..ed12ff6412 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -8,7 +8,7 @@ Note: Must be placed west/left of and R&D console to function. */ /obj/machinery/r_n_d/protolathe - name = "Protolathe" + name = "protolathe" desc = "Converts raw materials into useful objects." icon_state = "protolathe" container_type = OPENCONTAINER diff --git a/code/modules/spells/spell_types/charge.dm b/code/modules/spells/spell_types/charge.dm index c37166a244..7a038788e4 100644 --- a/code/modules/spells/spell_types/charge.dm +++ b/code/modules/spells/spell_types/charge.dm @@ -44,8 +44,8 @@ charged_item = I break else - to_chat(L, "Glowing red letters appear on the front cover...") - to_chat(L, "[pick("NICE TRY BUT NO!","CLEVER BUT NOT CLEVER ENOUGH!", "SUCH FLAGRANT CHEESING IS WHY WE ACCEPTED YOUR APPLICATION!", "CUTE!", "YOU DIDN'T THINK IT'D BE THAT EASY, DID YOU?")]") + to_chat(L, "Glowing red letters appear on the front cover...") + to_chat(L, "[pick("NICE TRY BUT NO!","CLEVER BUT NOT CLEVER ENOUGH!", "SUCH FLAGRANT CHEESING IS WHY WE ACCEPTED YOUR APPLICATION!", "CUTE! VERY CUTE!", "YOU DIDN'T THINK IT'D BE THAT EASY, DID YOU?")]") burnt_out = 1 else if(istype(item, /obj/item/weapon/gun/magic)) var/obj/item/weapon/gun/magic/I = item