diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index e9ffae73946..1bb4666e237 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -240,14 +240,14 @@ return /obj/machinery/body_scanconsole + name = "body scanner console" + desc = "An advanced control panel that can be used to interface with a connected body scanner." + icon = 'icons/obj/sleeper.dmi' + icon_state = "body_scannerconsole" var/obj/machinery/bodyscanner/connected var/known_implants = list(/obj/item/implant/chem, /obj/item/implant/death_alarm, /obj/item/implant/mindshield, /obj/item/implant/tracking) var/collapse_desc = "" var/broken_desc = "" - name = "Body Scanner Console" - desc = "A control panel for some kind of medical device." - icon = 'icons/obj/sleeper.dmi' - icon_state = "body_scannerconsole" density = 0 anchored = 1 component_types = list( diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 507e79de4e8..37637fbe429 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -75,11 +75,11 @@ obj/machinery/air_sensor/Destroy() return ..() /obj/machinery/computer/general_air_control + name = "atmosphere monitoring console" + desc = "A console that gives an atmospheric condition readout of various sensors connected to it." icon_screen = "tank" light_color = LIGHT_COLOR_CYAN - name = "Computer" - var/frequency = 1439 var/list/sensors = list() diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index da1665a5b64..0372ea5e6ac 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -1,6 +1,6 @@ /obj/machinery/biogenerator - name = "Biogenerator" - desc = "" + name = "biogenerator" + desc = "An advanced machine that can be used to convert grown plantlike biological material into various other bio-goods." icon = 'icons/obj/biogenerator.dmi' icon_state = "biogen-stand" density = 1 diff --git a/code/game/machinery/chem_heater.dm b/code/game/machinery/chem_heater.dm index 1054771c898..23ec388b5a6 100644 --- a/code/game/machinery/chem_heater.dm +++ b/code/game/machinery/chem_heater.dm @@ -1,5 +1,6 @@ /obj/machinery/chem_heater name = "chemical heater" + desc = "A simple device that can be used to heat the contents of a beaker to a precise temperature." icon = 'icons/obj/chemical.dmi' icon_state = "mixer0b" use_power = 0 diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index d002866ce85..760d16b43b2 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -2,7 +2,7 @@ /obj/machinery/computer/operating name = "patient monitoring console" - desc_info = "This console gives information on the status of the patient on the adjacent operating table, notably their consciousness." + desc = "A console that displays information on the status of the patient on an adjacent operating table." density = TRUE anchored = TRUE diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 6bf176e0a92..849574b5a2c 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -1,9 +1,10 @@ /obj/structure/AIcore - density = 1 - anchored = 0 name = "\improper AI core" + desc = "A large machine that can store an AI, give it power, and protection. Additionally, it provides site-wide camera access." icon = 'icons/mob/AI.dmi' icon_state = "0" + density = 1 + anchored = 0 var/state = 0 var/datum/ai_laws/laws = new /datum/ai_laws/nanotrasen var/obj/item/circuitboard/circuit = null diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 9fee00bf567..bdfa1141862 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -1,8 +1,6 @@ -//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 - /obj/machinery/computer/prisoner name = "prisoner management console" - + desc = "A console that can be used to track tracking implants, and deliver an activation signal to chemical implants." icon_screen = "explosive" light_color = LIGHT_COLOR_ORANGE req_access = list(access_armory) diff --git a/code/game/machinery/computer/sentencing.dm b/code/game/machinery/computer/sentencing.dm index 3be87ad6423..3d50a60e8f3 100644 --- a/code/game/machinery/computer/sentencing.dm +++ b/code/game/machinery/computer/sentencing.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/sentencing name = "criminal sentencing console" - desc = "Used to generate a criminal sentence." + desc = "A console that allows registered security personnel to create incident reports for various on-station crimes. It produces an encrypted report that can be used to automatically set a brig timer." icon_state = "computerw" icon_screen = "securityw" light_color = LIGHT_COLOR_ORANGE diff --git a/code/game/machinery/computer/slotmachine.dm b/code/game/machinery/computer/slotmachine.dm index d967f0e1c0c..53f1d508766 100644 --- a/code/game/machinery/computer/slotmachine.dm +++ b/code/game/machinery/computer/slotmachine.dm @@ -8,7 +8,7 @@ /obj/machinery/computer/slot_machine name = "slot machine" - desc = "Gambling for the antisocial." + desc = "A large slot machine with various colourful slots on its face and a lever on its side. It takes various material coins." icon = 'icons/obj/machines/slotmachine.dmi' icon_state = "slots1" density = TRUE diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 0addf014886..16d8e90177e 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -2,6 +2,7 @@ /obj/machinery/atmospherics/unary/cryo_cell name = "cryo cell" + desc = "A cryogenic chamber that can freeze occupants while keeping them alive, preventing them from taking any further damage. It can be loaded with a chemical cocktail for various medical benefits." desc_info = "The cryogenic chamber, or 'cryo', treats most damage types, most notably genetic damage. It also stabilizes patients \ in critical condition by placing them in stasis, so they can be treated at a later time.
\
\ diff --git a/code/game/machinery/gumball.dm b/code/game/machinery/gumball.dm index 56cc01622c5..e60a3171fe8 100644 --- a/code/game/machinery/gumball.dm +++ b/code/game/machinery/gumball.dm @@ -1,6 +1,6 @@ /obj/machinery/gumballmachine name = "gumball machine" - desc = "A colorful candy machine." + desc = "A lithe device with a glass globe on top, which can be operated to dispense various candies." icon = 'icons/obj/vending.dmi' icon_state = "gumball_100" layer = 2.9 diff --git a/code/game/machinery/kitchen/cooking_machines/candy.dm b/code/game/machinery/kitchen/cooking_machines/candy.dm index 8b4e3694e7d..5843bd07e8b 100644 --- a/code/game/machinery/kitchen/cooking_machines/candy.dm +++ b/code/game/machinery/kitchen/cooking_machines/candy.dm @@ -1,6 +1,6 @@ /obj/machinery/appliance/mixer/candy name = "candy machine" - desc = "Get yer candied cheese wheels here!" + desc = "A small kitchen appliance which can be used to create an array tasty candies." icon_state = "mixer_off" off_icon = "mixer_off" on_icon = "mixer_on" diff --git a/code/game/machinery/kitchen/cooking_machines/cereal.dm b/code/game/machinery/kitchen/cooking_machines/cereal.dm index 9ea5986ce49..44e707ba528 100644 --- a/code/game/machinery/kitchen/cooking_machines/cereal.dm +++ b/code/game/machinery/kitchen/cooking_machines/cereal.dm @@ -1,6 +1,6 @@ /obj/machinery/appliance/mixer/cereal name = "cereal maker" - desc = "Now with Dann O's available!" + desc = "A small kitchen appliance that can be used to combine various foodstuffs into filling cereal." icon = 'icons/obj/cooking_machines.dmi' icon_state = "cereal_off" cook_type = "cerealized" diff --git a/code/game/machinery/kitchen/cooking_machines/fryer.dm b/code/game/machinery/kitchen/cooking_machines/fryer.dm index 6b0d745580b..2bd5ee02ab4 100644 --- a/code/game/machinery/kitchen/cooking_machines/fryer.dm +++ b/code/game/machinery/kitchen/cooking_machines/fryer.dm @@ -1,6 +1,6 @@ /obj/machinery/appliance/cooker/fryer name = "deep fryer" - desc = "Deep fried everything." + desc = "A large kitchen appliance that can be used to deep fry food, which gives it a crunchy texture." icon_state = "fryer_off" can_cook_mobs = 1 cook_type = "deep fried" diff --git a/code/game/machinery/kitchen/cooking_machines/oven.dm b/code/game/machinery/kitchen/cooking_machines/oven.dm index f5b44d4267b..57850cae92f 100644 --- a/code/game/machinery/kitchen/cooking_machines/oven.dm +++ b/code/game/machinery/kitchen/cooking_machines/oven.dm @@ -1,6 +1,6 @@ /obj/machinery/appliance/cooker/oven name = "oven" - desc = "Cookies are ready, dear." + desc = "A large kitchen appliance that can be used to prepare food via electric convection cooking." icon = 'icons/obj/cooking_machines.dmi' icon_state = "ovenopen" cook_type = "baked" diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index bab695093fa..cdcca074c56 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -2,6 +2,7 @@ */ /obj/machinery/smartfridge name = "\improper SmartFridge" + desc = "An advanced food storage vendor that keeps food at the exact temperature it needs to be for optimal taste." icon = 'icons/obj/vending.dmi' icon_state = "smartfridge" layer = 2.9 diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index a73df84ba59..e3c9ef204cf 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -5,6 +5,7 @@ /obj/machinery/computer/telecomms/server name = "Telecommunications Server Monitor" + desc = "A monitor that contains and displays the logs of a selected telecommunications server to authorized personnel." icon_screen = "comm_logs" var/screen = 0 // the screen number: diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 886e9d372cf..063fa9aa04d 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -1,6 +1,3 @@ -//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 - - /* Telecomms monitor tracks the overall trafficing of a telecommunications network and displays a heirarchy of linked machines. @@ -9,6 +6,7 @@ /obj/machinery/computer/telecomms/monitor name = "Telecommunications Monitor" + desc = "A monitor that tracks the overall traffic of a telecommunicaations network, and displays a hierarchy of linked machines." icon_screen = "comm_monitor" var/screen = 0 // the screen number: diff --git a/code/game/objects/structures/therapy.dm b/code/game/objects/structures/therapy.dm index 79e7188a8bf..341cc501c7c 100644 --- a/code/game/objects/structures/therapy.dm +++ b/code/game/objects/structures/therapy.dm @@ -476,7 +476,7 @@ /obj/machinery/chakraconsole name = "Therapy Pod Console" - desc = "A control panel for some kind of medical device." + desc = "An advanced control panel that can be used to interface with a connected therapy pod." icon = 'icons/obj/sleeper.dmi' icon_state = "sleeper_s_scannerconsole" density = 0 diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index c94096768c9..805e06b5425 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 sulphuric acid). /obj/machinery/r_n_d/circuit_imprinter name = "circuit imprinter" + desc = "An advanced device that can only be operated via a nearby RnD console, it can print any circuitboard the user requests, provided it has the correct materials to do so." icon_state = "circuit_imprinter" flags = OPENCONTAINER diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index b14c76e330a..a6f18cb3b5b 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -8,6 +8,7 @@ Note: Must be placed within 3 tiles of the R&D Console /obj/machinery/r_n_d/destructive_analyzer name = "destructive analyzer" + desc = "A cutting-edge research device that allows scientists to discover and further knowledge in fields that were used in the manufacture of certain objects." icon_state = "d_analyzer" var/obj/item/loaded_item = null var/decon_mod = 0 diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 195c9572c7a..6f525da3bea 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -1,5 +1,6 @@ /obj/machinery/r_n_d/protolathe name = "protolathe" + desc = "An upgraded variant of a common Autolathe, this can only be operated via a nearby RnD console, but can manufacture cutting edge technology, provided it has the design and the correct materials." icon_state = "protolathe" flags = OPENCONTAINER diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 3e220a8aa03..c7169c0b9d9 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -866,4 +866,5 @@ won't update every console in existence) but it's more of a hassle to do. Also, /obj/machinery/computer/rdconsole/core name = "core R&D console" + desc = "A console which is used to operate various research devices. It is the backbone of any megacorporate research division." id = 1 \ No newline at end of file diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 7b7838d234f..c7fd1fe9ee4 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -1,5 +1,6 @@ /obj/machinery/r_n_d/server name = "R&D server" + desc = "A server which houses a back-up of all station research. It can be used to restore lost data, or to act as another point of retrieval." icon = 'icons/obj/machines/research.dmi' icon_state = "server" var/datum/research/files @@ -169,6 +170,7 @@ /obj/machinery/computer/rdservercontrol name = "R&D server controller" + desc = "A console use to operate a RnD server, such as locking it, wiping it, or downloading its stored research." icon_screen = "rdcomp" light_color = "#a97faa" diff --git a/code/modules/research/weaponsanalyzer.dm b/code/modules/research/weaponsanalyzer.dm index d296fcebd5d..16dc1d7cd7f 100644 --- a/code/modules/research/weaponsanalyzer.dm +++ b/code/modules/research/weaponsanalyzer.dm @@ -1,5 +1,6 @@ /obj/machinery/weapons_analyzer name = "weapons analyzer" + desc = "A research device which can be used to put together modular energy weapons, or to gain knowledge about the effectiveness of various objects as weaponry." icon = 'icons/obj/machines/research.dmi' icon_state = "weapon_analyzer" density = TRUE diff --git a/html/changelogs/geeves-machine_descriptions.yml b/html/changelogs/geeves-machine_descriptions.yml new file mode 100644 index 00000000000..e4c369edde4 --- /dev/null +++ b/html/changelogs/geeves-machine_descriptions.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Gave various machines descriptions." \ No newline at end of file