From 69981620697b76f601855c7d36b9012146808e16 Mon Sep 17 00:00:00 2001 From: nobalm Date: Tue, 30 Sep 2014 23:43:07 -0400 Subject: [PATCH 1/6] Added descriptions to objects Descriptions were added to the following objects: supply shuttle console, supply ordering console, air alarm, AI system integrity restorer, cloning console, operating computer, prisoner management console, AI display, exosuit control console, mech bay power control console, inteliCard, labor shuttle console, mining shuttle console, photocopier, PanD.E.M.I.C 2200, Circuit Imprinter, Destructive Analyzer, Protolathe, Robotics R&D Console, R&D Server Controller --- code/controllers/supply_shuttle.dm | 2 ++ code/game/machinery/alarm.dm | 1 + code/game/machinery/computer/Operating.dm | 1 + code/game/machinery/computer/aifixer.dm | 1 + code/game/machinery/computer/cloning.dm | 1 + code/game/machinery/computer/prisoner.dm | 1 + code/game/machinery/status_display.dm | 1 + code/game/mecha/mech_bay.dm | 1 + code/game/mecha/mecha_control_console.dm | 1 + code/game/objects/items/devices/aicard.dm | 3 ++- code/modules/mining/laborcamp/laborshuttle.dm | 1 + code/modules/mining/mine_items.dm | 1 + code/modules/paperwork/photocopier.dm | 1 + code/modules/reagents/Chemistry-Machinery.dm | 1 + code/modules/research/circuitprinter.dm | 1 + code/modules/research/destructive_analyzer.dm | 1 + code/modules/research/protolathe.dm | 1 + code/modules/research/rdconsole.dm | 2 ++ code/modules/research/server.dm | 1 + 19 files changed, 22 insertions(+), 1 deletion(-) diff --git a/code/controllers/supply_shuttle.dm b/code/controllers/supply_shuttle.dm index 56cd7f8d0b3..b9265cecc5e 100644 --- a/code/controllers/supply_shuttle.dm +++ b/code/controllers/supply_shuttle.dm @@ -76,6 +76,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle /obj/machinery/computer/supplycomp name = "supply shuttle console" + desc = "Used to order supplies." icon = 'icons/obj/computer.dmi' icon_state = "supply" req_access = list(access_cargo) @@ -89,6 +90,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle /obj/machinery/computer/ordercomp name = "supply ordering console" + desc = "Used to order supplies from cargo staff." icon = 'icons/obj/computer.dmi' icon_state = "request" circuit = /obj/item/weapon/circuitboard/ordercomp diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 3cb05fe99f1..a152bbd6139 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -46,6 +46,7 @@ /obj/machinery/alarm name = "alarm" + desc = "A machine that monitors atmosphere levels. Goes off if the area is dangerous." icon = 'icons/obj/monitors.dmi' icon_state = "alarm0" anchored = 1 diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index a6b29ab6203..5e000ff76d6 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -1,5 +1,6 @@ /obj/machinery/computer/operating name = "operating computer" + desc = "Used to monitor the vitals of a patient during surgery." icon_state = "operating" density = 1 anchored = 1.0 diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index efb6bc939dd..c5b83a61b9f 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -1,5 +1,6 @@ /obj/machinery/computer/aifixer name = "\improper AI system integrity restorer" + desc = "Used to restore nonfunctioning AIs." icon = 'icons/obj/computer.dmi' icon_state = "ai-fixer" req_access = list(access_captain, access_robotics, access_heads) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index f4e41af1fd2..6fbba86fd4d 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -1,6 +1,7 @@ /obj/machinery/computer/cloning name = "cloning console" + desc = "Used to clone people and manage DNA." icon = 'icons/obj/computer.dmi' icon_state = "dna" circuit = /obj/item/weapon/circuitboard/cloning diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index c0ce0bcfc8b..fda6e858eb3 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -1,5 +1,6 @@ /obj/machinery/computer/prisoner name = "prisoner management console" + desc = "Used to manage tracking implants placed inside criminals." icon = 'icons/obj/computer.dmi' icon_state = "explosive" req_access = list(access_brig) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 92086d93316..1e68c29d017 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -201,6 +201,7 @@ /obj/machinery/ai_status_display icon = 'icons/obj/status_display.dmi' + desc = "A small screen which the AI can use to present itself." icon_state = "frame" name = "\improper AI display" anchored = 1 diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 659544a14f2..23417f8f67b 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -78,6 +78,7 @@ /obj/machinery/computer/mech_bay_power_console name = "mech bay power control console" + desc = "Used to control mechbay power ports." density = 1 anchored = 1 icon = 'icons/obj/computer.dmi' diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index bc011e640c2..81562c7cbf0 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -1,5 +1,6 @@ /obj/machinery/computer/mecha name = "exosuit control console" + desc = "Used to remotely locate or lockdown exosuits." icon = 'icons/obj/computer.dmi' icon_state = "mecha" req_access = list(access_robotics) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 27b7ead9398..ac0371d34f1 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -1,5 +1,6 @@ /obj/item/device/aicard name = "inteliCard" + desc = "A storage device for AIs. Patent pending." icon = 'icons/obj/aicards.dmi' icon_state = "aicard" // aicard-full item_state = "electronic" @@ -56,7 +57,7 @@ dat += "AI nonfunctional" else if (!src.flush) - dat += {"Wipe AI"} + dat += {"Wipe AI"} else dat += "Wipe in progress" dat += "
" diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm index 49d287e75c0..b8030133c76 100644 --- a/code/modules/mining/laborcamp/laborshuttle.dm +++ b/code/modules/mining/laborcamp/laborshuttle.dm @@ -1,5 +1,6 @@ /obj/machinery/computer/shuttle/labor name = "labor shuttle console" + desc = "Used to call and send the labor camp shuttle." icon = 'icons/obj/computer.dmi' icon_state = "shuttle" circuit = /obj/item/weapon/circuitboard/labor_shuttle diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index d4545caaebd..31358b8a373 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -43,6 +43,7 @@ /obj/machinery/computer/shuttle/mining name = "Mining Shuttle Console" + desc = "Used to call and send the mining shuttle." req_access = list(access_mining) circuit = /obj/item/weapon/circuitboard/mining_shuttle id = "mining" diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 1df8ee0aa83..0c1045050c8 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -9,6 +9,7 @@ */ /obj/machinery/photocopier name = "photocopier" + desc = "Used to copy important documents and anatomy studies." icon = 'icons/obj/library.dmi' icon_state = "bigscanner" anchored = 1 diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index daeab3aac5f..504e1616cdf 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -516,6 +516,7 @@ /obj/machinery/computer/pandemic name = "PanD.E.M.I.C 2200" + desc = "Used to work with viruses." density = 1 anchored = 1 icon = 'icons/obj/chemical.dmi' diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 427fffa7d8f..a19eaff4eb4 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -6,6 +6,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). */ /obj/machinery/r_n_d/circuit_imprinter name = "Circuit Imprinter" + desc = "Manufactures circuit boards for the construction of machines." icon_state = "circuit_imprinter" flags = OPENCONTAINER diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 3d2f4ffc7ec..82912068a18 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -9,6 +9,7 @@ Note: Must be placed within 3 tiles of the R&D Console */ /obj/machinery/r_n_d/destructive_analyzer name = "Destructive Analyzer" + desc = "Learn science by destroying things!" icon_state = "d_analyzer" var/obj/item/weapon/loaded_item = null var/decon_mod = 0 diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 8a0d9a45373..7c7c13791c0 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -9,6 +9,7 @@ Note: Must be placed west/left of and R&D console to function. */ /obj/machinery/r_n_d/protolathe name = "Protolathe" + desc = "Converts raw materials into useful objects." icon_state = "protolathe" flags = OPENCONTAINER diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 44d17074cbe..f927f96c9c7 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -935,10 +935,12 @@ won't update every console in existence) but it's more of a hassle to do. Also, /obj/machinery/computer/rdconsole/robotics name = "Robotics R&D Console" + desc = "A console used to interface with R&D tools." id = 2 req_access = null req_access_txt = "29" /obj/machinery/computer/rdconsole/core name = "Core R&D Console" + desc = "A console used to interface with R&D tools." id = 1 \ No newline at end of file diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 2daa19ffe69..b5d05a946f3 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -176,6 +176,7 @@ /obj/machinery/computer/rdservercontrol name = "R&D Server Controller" + desc = "Used to manage access to research and manufacturing databases." icon_state = "rdcomp" var/screen = 0 var/obj/machinery/r_n_d/server/temp_server From 5bafd342ce17039d7ce9b91b6a74cd7abf93136c Mon Sep 17 00:00:00 2001 From: nobalm Date: Wed, 1 Oct 2014 14:29:18 -0400 Subject: [PATCH 2/6] Added descriptions to chem, chef and botany objects Added examine descriptions to the following items: mircowave, smartfridge, Biogenerator, chem dispenser, ChemMaster 3000, CondiMaster 3000, All-In-One Grinder --- code/modules/food&drinks/kitchen machinery/microwave.dm | 1 + code/modules/food&drinks/kitchen machinery/smartfridge.dm | 1 + code/modules/hydroponics/biogenerator.dm | 4 ++-- code/modules/reagents/Chemistry-Machinery.dm | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/modules/food&drinks/kitchen machinery/microwave.dm b/code/modules/food&drinks/kitchen machinery/microwave.dm index 8eca9a923cc..247b6721383 100644 --- a/code/modules/food&drinks/kitchen machinery/microwave.dm +++ b/code/modules/food&drinks/kitchen machinery/microwave.dm @@ -1,5 +1,6 @@ /obj/machinery/microwave name = "microwave" + desc = "Keeps hot things hot and cold things hot." icon = 'icons/obj/kitchen.dmi' icon_state = "mw" layer = 2.9 diff --git a/code/modules/food&drinks/kitchen machinery/smartfridge.dm b/code/modules/food&drinks/kitchen machinery/smartfridge.dm index ea28ba2f3c1..014669ec4ad 100644 --- a/code/modules/food&drinks/kitchen machinery/smartfridge.dm +++ b/code/modules/food&drinks/kitchen machinery/smartfridge.dm @@ -3,6 +3,7 @@ // ------------------------- /obj/machinery/smartfridge name = "smartfridge" + desc = "Keeps cold things cold and hot things cold." icon = 'icons/obj/vending.dmi' icon_state = "smartfridge" layer = 2.9 diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 22ac1096d87..4dfb52d0699 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -1,6 +1,6 @@ /obj/machinery/biogenerator name = "Biogenerator" - desc = "" + desc = "Makes things out of biomass." icon = 'icons/obj/biogenerator.dmi' icon_state = "biogen-empty" density = 1 @@ -286,4 +286,4 @@ else if(href_list["menu"]) menustat = "menu" updateUsrDialog() - + diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 504e1616cdf..2973bfcc363 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -4,6 +4,7 @@ /obj/machinery/chem_dispenser name = "chem dispenser" + desc = "Creates and dispenses chemicals." density = 1 anchored = 1 icon = 'icons/obj/chemical.dmi' @@ -242,6 +243,7 @@ /obj/machinery/chem_master name = "ChemMaster 3000" + desc = "Used to bottle chemicals to create pills." density = 1 anchored = 1 icon = 'icons/obj/chemical.dmi' @@ -509,6 +511,7 @@ /obj/machinery/chem_master/condimaster name = "CondiMaster 3000" + desc = "Used to create condiments and other cooking supplies." condi = 1 //////////////////////////////////////////////////////////////////////// @@ -806,6 +809,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) /obj/machinery/reagentgrinder name = "All-In-One Grinder" + desc = "Used to grind things up into raw materials." icon = 'icons/obj/kitchen.dmi' icon_state = "juicer1" layer = 2.9 From cb0bb28e18bd5092443328b6b6193cf62de26278 Mon Sep 17 00:00:00 2001 From: nobalm Date: Wed, 1 Oct 2014 15:21:22 -0400 Subject: [PATCH 3/6] Added description to washing machine --- code/game/machinery/washing_machine.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index a639b5f63ad..9894f60dd3f 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -1,5 +1,6 @@ /obj/machinery/washing_machine name = "washing machine" + desc = "Gets rid of those pesky bloodstains, or your money back!" icon = 'icons/obj/machines/washing_machine.dmi' icon_state = "wm_10" density = 1 From 16f06b479bf646756915be0dc86e04e6cdbfa342 Mon Sep 17 00:00:00 2001 From: nobalm Date: Wed, 1 Oct 2014 15:41:22 -0400 Subject: [PATCH 4/6] Added changelog --- html/changelogs/Nobalm-PR-5049.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/Nobalm-PR-5049.yml diff --git a/html/changelogs/Nobalm-PR-5049.yml b/html/changelogs/Nobalm-PR-5049.yml new file mode 100644 index 00000000000..b02f7ea314f --- /dev/null +++ b/html/changelogs/Nobalm-PR-5049.yml @@ -0,0 +1,4 @@ +author: Nobalm +delete-after: True +changes: + - rscadd: Added examine descriptions to twenty eight objects. \ No newline at end of file From 60909e36292cadbc7151b8333e85628f82a95016 Mon Sep 17 00:00:00 2001 From: nobalm Date: Wed, 1 Oct 2014 18:05:21 -0400 Subject: [PATCH 5/6] Changed descriptions of objects to be more helpful Changes the descriptions of the following objects to be more useful and instructive: AI system integrity restorer, Biogenerator --- code/game/machinery/computer/aifixer.dm | 2 +- code/modules/hydroponics/biogenerator.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index c5b83a61b9f..03fbde6121a 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/aifixer name = "\improper AI system integrity restorer" - desc = "Used to restore nonfunctioning AIs." + desc = "Used on inteliCards containing nonfunctioning AIs to restore them to working order." icon = 'icons/obj/computer.dmi' icon_state = "ai-fixer" req_access = list(access_captain, access_robotics, access_heads) diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 4dfb52d0699..3b76c06082c 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -1,6 +1,6 @@ /obj/machinery/biogenerator name = "Biogenerator" - desc = "Makes things out of biomass." + desc = "Converts plants into biomass, which can be used to construct useful items." icon = 'icons/obj/biogenerator.dmi' icon_state = "biogen-empty" density = 1 From 97943029cd85e52558aafb84b4400cb8698b7072 Mon Sep 17 00:00:00 2001 From: nobalm Date: Wed, 1 Oct 2014 18:09:51 -0400 Subject: [PATCH 6/6] Changed tiny pointless phrasing nitpick Replaced 'on' with 'with' in the AI system integrity restorer description --- code/game/machinery/computer/aifixer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 03fbde6121a..2b3f208b9fe 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/aifixer name = "\improper AI system integrity restorer" - desc = "Used on inteliCards containing nonfunctioning AIs to restore them to working order." + desc = "Used with inteliCards containing nonfunctioning AIs to restore them to working order." icon = 'icons/obj/computer.dmi' icon_state = "ai-fixer" req_access = list(access_captain, access_robotics, access_heads)