diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 1f1c4ff1ae..b4b8187f45 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -20,7 +20,7 @@ Thus, the two variables affect pump operation are set in New(): level = 1 name = "gas pump" - desc = "A pump" + desc = "A pump that moves gas from one place to another." var/target_pressure = ONE_ATMOSPHERE diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index b4493a1566..fa0aaf4bd0 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -6,7 +6,7 @@ level = 1 name = "high power gas pump" - desc = "A pump. Has double the power rating of the standard gas pump." + desc = "A pump that moves gas from one place to another. Has double the power rating of the standard gas pump." power_rating = 15000 //15000 W ~ 20 HP diff --git a/code/ATMOSPHERICS/components/omni_devices/filter.dm b/code/ATMOSPHERICS/components/omni_devices/filter.dm index 6fbd91f861..d9009168c5 100644 --- a/code/ATMOSPHERICS/components/omni_devices/filter.dm +++ b/code/ATMOSPHERICS/components/omni_devices/filter.dm @@ -3,6 +3,7 @@ //-------------------------------------------- /obj/machinery/atmospherics/omni/atmos_filter name = "omni gas filter" + desc = "An advanced version of the gas filter, able to be configured for filtering of multiple gasses." icon_state = "map_filter" pipe_state = "omni_filter" diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index ea3bd60456..e900303e22 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -7,6 +7,7 @@ level = 1 name = "Gas filter" + desc = "Filters one type of gas from an input, and pushes it out the side." use_power = 1 idle_power_usage = 150 //internal circuitry, friction losses and stuff diff --git a/code/ATMOSPHERICS/pipes/he_pipes.dm b/code/ATMOSPHERICS/pipes/he_pipes.dm index 1b283e3ba4..843d349633 100644 --- a/code/ATMOSPHERICS/pipes/he_pipes.dm +++ b/code/ATMOSPHERICS/pipes/he_pipes.dm @@ -140,6 +140,7 @@ // Heat Exchange Junction - Interfaces HE pipes to normal pipes // /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction + desc = "An adaptor to transfer gasses between regular pipes and heat transferring ones. It doesn't conduct heat all that well." icon = 'icons/atmos/junction.dmi' icon_state = "intact" pipe_icon = "hejunction" diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index b73b8b8415..1087211842 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -1,6 +1,11 @@ /obj/machinery/sleep_console name = "sleeper console" +<<<<<<< HEAD icon = 'icons/obj/Cryogenic2_vr.dmi' //VOREStation Edit - Better icon. +======= + desc = "A control panel to operate a linked sleeper with." + icon = 'icons/obj/Cryogenic2.dmi' +>>>>>>> 5d5e361... Merge pull request #6621 from Shadow-Quill/Desc-Adds icon_state = "sleeperconsole" var/obj/machinery/sleeper/sleeper anchored = 1 //About time someone fixed this. diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index bc39c93840..339139d435 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -34,6 +34,7 @@ /obj/machinery/alarm name = "alarm" + desc = "Used to control various station atmospheric systems. The light indicates the current air status of the area." icon = 'icons/obj/monitors.dmi' icon_state = "alarm0" plane = TURF_PLANE diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index c18d2b9e93..ccab21e889 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -2,6 +2,7 @@ icon = 'icons/obj/stationobjs.dmi' icon_state = "gsensor1" name = "Gas Sensor" + desc = "Senses atmospheric conditions." anchored = 1 var/state = 0 @@ -77,6 +78,7 @@ obj/machinery/air_sensor/Destroy() icon_keyboard = "atmos_key" icon_screen = "tank" name = "Computer" + desc = "Control atmospheric systems, remotely." var/frequency = 1439 var/list/sensors = list() var/list/sensor_information = list() diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 55afd7f35f..0c1d68256c 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -1,5 +1,6 @@ /obj/machinery/portable_atmospherics/powered/scrubber name = "Portable Air Scrubber" + desc = "Similar to room scrubbers, this device contains an internal tank to scrub gasses from the atmosphere." icon = 'icons/obj/atmos.dmi' icon_state = "pscrubber:0" @@ -144,7 +145,11 @@ //Huge scrubber /obj/machinery/portable_atmospherics/powered/scrubber/huge name = "Huge Air Scrubber" +<<<<<<< HEAD icon = 'icons/obj/atmos_vr.dmi' //VOREStation Edit - New Sprite +======= + desc = "A larger variation of the portable scrubber, for industrial scrubbing of air. Must be turned on from a remote terminal." +>>>>>>> 5d5e361... Merge pull request #6621 from Shadow-Quill/Desc-Adds icon_state = "scrubber:0" anchored = 1 volume = 500000 @@ -239,6 +244,10 @@ /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary name = "Stationary Air Scrubber" +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/Initialize() + . = ..() + desc += "This one seems to be tightly secured with large bolts." + /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/attackby(var/obj/item/I as obj, var/mob/user as mob) if(I.is_wrench()) to_chat(user, "The bolts are too tight for you to unscrew!") diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index d81070e1f2..5caf9edd6e 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -2,6 +2,7 @@ /obj/machinery/computer/operating name = "patient monitoring console" + desc = "Used to monitor the vitals of a patient." density = 1 anchored = 1.0 icon_keyboard = "med_key" diff --git a/code/game/machinery/computer/RCON_Console.dm b/code/game/machinery/computer/RCON_Console.dm index 82ce0775d6..f403c0749f 100644 --- a/code/game/machinery/computer/RCON_Console.dm +++ b/code/game/machinery/computer/RCON_Console.dm @@ -6,7 +6,7 @@ /obj/machinery/computer/rcon name = "\improper RCON console" - desc = "Console used to remotely control machinery on the station." + desc = "Console used to remotely control electrical machinery on the station." icon_keyboard = "power_key" icon_screen = "ai_fixer" //VOREStation Edit light_color = "#a97faa" diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index d52300d13d..cb49dd8420 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 = "Restores AI units to working condition, assuming you have one inside!" icon_keyboard = "rd_key" icon_screen = "ai-fixer" light_color = "#a97faa" diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 14ba6dd005..c69cca31b5 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -4,6 +4,7 @@ /obj/machinery/computer/atmoscontrol name = "\improper Central Atmospherics Computer" + desc = "Control the station's atmospheric systems from afar! Certified atmospherics technicians only." icon_keyboard = "generic_key" icon_screen = "comm_logs" light_color = "#00b000" diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index c4930193b5..077e1b0d83 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -244,7 +244,7 @@ /obj/machinery/computer/security/wooden_tv name = "security camera monitor" - desc = "An old TV hooked into the stations camera network." + desc = "An old TV hooked into the station's camera network." icon_state = "television" icon_keyboard = null icon_screen = "detective_tv" @@ -254,7 +254,7 @@ /obj/machinery/computer/security/mining name = "outpost camera monitor" - desc = "Used to access the various cameras on the outpost." + desc = "Used to watch over mining operations." icon_keyboard = "mining_key" icon_screen = "mining" network = list("Mining Outpost") diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 5178d77d82..9da5397712 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -1,5 +1,6 @@ /obj/machinery/computer/cloning name = "cloning control console" + desc = "Used to start cloning cycles, as well as manage clone records." icon_keyboard = "med_key" icon_screen = "dna" light_color = "#315ab4" diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index a1fd7199b2..954ba223e3 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -77,6 +77,7 @@ /obj/machinery/computer/guestpass name = "guest pass terminal" + desc = "Used to print temporary passes for people. Handy!" icon_state = "guest" plane = TURF_PLANE layer = ABOVE_TURF_LAYER diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index da86e4ee3c..35d6f7e90b 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -549,7 +549,7 @@ /obj/machinery/computer/med_data/laptop name = "Medical Laptop" - desc = "A cheap laptop." + desc = "A cheap laptop. It seems to have only the medical records program." icon_state = "laptop" icon_keyboard = "laptop_key" icon_screen = "medlaptop" diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index cc1d5d0482..54006344f5 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -2,6 +2,7 @@ /obj/machinery/computer/prisoner name = "prisoner management console" + desc = "Used to keep those sneaky prisoners in line, if they have an implant." icon_keyboard = "security_key" icon_screen = "explosive" light_color = "#a91515" diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index 8fe6ffef8a..57a5f1b6ea 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -12,6 +12,7 @@ var/prison_shuttle_timeleft = 0 /obj/machinery/computer/prison_shuttle name = "prison shuttle control console" + desc = "Used to move the prison shuttle to and from its destination." icon_keyboard = "security_key" icon_screen = "syndishuttle" light_color = "#00ffff" diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm index 6170b302a2..9e6faf69f0 100644 --- a/code/game/machinery/computer/supply.dm +++ b/code/game/machinery/computer/supply.dm @@ -5,6 +5,7 @@ // Supply requests console /obj/machinery/computer/supplycomp name = "supply ordering console" + desc = "Request crates from here! Delivery not guaranteed." icon_screen = "request" circuit = /obj/item/weapon/circuitboard/supplycomp var/authorization = 0 @@ -18,6 +19,7 @@ // Supply control console /obj/machinery/computer/supplycomp/control name = "supply control console" + desc = "Control the cargo shuttle's functions remotely." icon_keyboard = "tech_key" icon_screen = "supply" light_color = "#b88b2e" diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index b4927f441c..fb4c9b7923 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 = "Used to cool people down for medical reasons. Totally." icon = 'icons/obj/cryogenics.dmi' // map only icon_state = "pod_preview" density = 1 diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index cbd0875cd3..65aa9a87d5 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -145,6 +145,7 @@ obj/machinery/airlock_sensor icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_sensor_off" name = "airlock sensor" + desc = "Sends atmospheric readings to a nearby controller." anchored = 1 power_channel = ENVIRON diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index 729d99f419..84aa62b155 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -1,5 +1,6 @@ /obj/machinery/floodlight name = "Emergency Floodlight" + desc = "Let there be light!" icon = 'icons/obj/machines/floodlight.dmi' icon_state = "flood00" density = 1 diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index cc20f2cb4e..cc5b330ba3 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -1,5 +1,6 @@ /obj/machinery/iv_drip name = "\improper IV drip" + desc = "Helpful for giving someone blood! Or taking it away. It giveth, it taketh." icon = 'icons/obj/iv_drip.dmi' anchored = 0 density = 0 diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 475f22a7d7..a9e5d7c154 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -10,6 +10,7 @@ /obj/machinery/media/jukebox/ name = "space jukebox" + desc = "Filled with songs both past and present!" icon = 'icons/obj/jukebox.dmi' icon_state = "jukebox2-nopower" var/state_base = "jukebox2" diff --git a/code/game/machinery/oxygen_pump.dm b/code/game/machinery/oxygen_pump.dm index 7665fd0e83..9378cc2f92 100644 --- a/code/game/machinery/oxygen_pump.dm +++ b/code/game/machinery/oxygen_pump.dm @@ -231,6 +231,7 @@ /obj/machinery/oxygen_pump/anesthetic name = "anesthetic pump" + desc = "A wall mounted anesthetic pump with a retractable mask that someone can pull over your face to knock you out." spawn_type = /obj/item/weapon/tank/anesthetic icon_state = "anesthetic_tank" icon_state_closed = "anesthetic_tank" @@ -266,6 +267,7 @@ /obj/machinery/oxygen_pump/mobile/anesthetic name = "portable anesthetic pump" + desc = "A portable anesthetic pump with a retractable mask that someone can pull over your face to knock you out." spawn_type = /obj/item/weapon/tank/anesthetic icon_state = "medpump_n2o" icon_state_closed = "medpump_n2o" diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index d863e57b90..89a2ed08c8 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -1,5 +1,6 @@ /obj/machinery/pipedispenser name = "Pipe Dispenser" + desc = "A large machine that can rapidly dispense pipes." icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" density = 1 @@ -105,6 +106,7 @@ /obj/machinery/pipedispenser/disposal name = "Disposal Pipe Dispenser" + desc = "A large machine that can rapidly dispense pipes. This one seems to dispsense disposal pipes." icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" density = 1 diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index b9cc3428f9..41e7b64ed7 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 = "View communication logs here. Translation not guaranteed." 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 6567012a80..16ac9ada8a 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -9,6 +9,7 @@ /obj/machinery/computer/telecomms/monitor name = "Telecommunications Monitor" + desc = "Used to traverse a telecommunication network. Helpful for debugging connection issues." icon_screen = "comm_monitor" var/screen = 0 // the screen number: diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 0d372b2aaa..a49376d7de 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -6,6 +6,7 @@ /obj/machinery/computer/telecomms/traffic name = "Telecommunications Traffic Control" + desc = "Used to upload code to telecommunication consoles for execution." icon_screen = "generic" var/screen = 0 // the screen number: diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 480e613c27..480c124235 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 = "Not a hiding place." icon = 'icons/obj/machines/washing_machine.dmi' icon_state = "wm_10" density = 1 diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index de1f20fe0a..f9d4384271 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" + desc = "Used to track exosuits, as well as view their logs and activate EMP beacons." icon_keyboard = "rd_key" icon_screen = "mecha" light_color = "#a97faa" diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 7dc64a8898..54c9a9539c 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -1,5 +1,6 @@ /obj/item/device/pipe_painter name = "pipe painter" + desc = "Used to apply a even coat of paint to pipes. Atmospheric usage reccomended." icon = 'icons/obj/bureaucracy.dmi' icon_state = "labeler1" var/list/modes diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 747f7f7d0e..bb8d4af636 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -25,8 +25,14 @@ var/global/list/default_medbay_channels = list( //VOREStation Edit End /obj/item/device/radio +<<<<<<< HEAD icon = 'icons/obj/radio_vr.dmi' //VOREStation Edit name = "shortwave radio" //VOREStation Edit +======= + icon = 'icons/obj/radio.dmi' + name = "station bounced radio" + desc = "Used to talk to people when headsets don't function. Range is limited." +>>>>>>> 5d5e361... Merge pull request #6621 from Shadow-Quill/Desc-Adds suffix = "\[3\]" icon_state = "walkietalkie" item_state = "radio" diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 4911846d65..7978115ca2 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -976,6 +976,7 @@ /obj/item/weapon/book/manual/barman_recipes name = "Barman Recipes" + desc = "For the enterprising drink server." icon_state = "barbook" author = "Sir John Rose" title = "Barman Recipes" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 4e031f4280..fbbb4448fa 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -103,6 +103,7 @@ /obj/item/weapon/storage/box/beakers name = "box of beakers" + desc = "A box full of beakers." icon_state = "beaker" starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker = 7) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 1d1934bf8a..e9a809e55c 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -357,6 +357,7 @@ icon_state = "vialbox6" icon_type = "vial" name = "vial storage box" + desc = "A helpful rack to hold test tubes." storage_slots = 6 can_hold = list(/obj/item/weapon/reagent_containers/glass/beaker/vial) starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/vial = 6) diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index b22ef4166f..3d3c3aad83 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -6,6 +6,7 @@ icon = 'icons/obj/food.dmi' icon_state = "donutbox" name = "donut box" + desc = "A box that holds tasty donuts, if you're lucky." max_storage_space = ITEMSIZE_COST_SMALL * 6 can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut) foldable = /obj/item/stack/material/cardboard diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 081dcdcb2d..7859ee97d5 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -173,6 +173,7 @@ /obj/item/weapon/storage/secure/safe name = "secure safe" + desc = "It doesn't seem all that secure. Oh well, it'll do." icon = 'icons/obj/storage.dmi' icon_state = "safe" icon_opened = "safe0" diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index 78095631de..23c662f7cc 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -1,5 +1,6 @@ /obj/structure/curtain name = "curtain" + desc = "The show must go on! At least, until you close these." icon = 'icons/obj/curtain.dmi' icon_state = "closed" plane = MOB_PLANE diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 5a237ca1e5..277b5de1ad 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -1,5 +1,6 @@ /obj/machinery/microwave name = "microwave" + desc = "Studies are inconclusive on whether pressing your face against the glass is harmful." icon = 'icons/obj/kitchen.dmi' icon_state = "mw" density = 1 diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 9b9be0d6c8..8823cbf733 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -13,6 +13,7 @@ /obj/structure/bookcase name = "bookcase" + desc = "A set of wooden shelves, perfect for placing books on." icon = 'icons/obj/library.dmi' icon_state = "book-0" anchored = 1 diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index e86ed026b7..d1125acd44 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -116,6 +116,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f // It is August 22nd, 2012... This TODO has already been here for months.. I wonder how long it'll last before someone does something about it. // Nov 2019. Nope. /obj/machinery/librarycomp name = "Check-In/Out Computer" + desc = "Print books from the archives! (You aren't quite sure how they're printed by it, though.)" icon = 'icons/obj/library.dmi' icon_state = "computer" anchored = 1 @@ -521,6 +522,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f */ /obj/machinery/bookbinder name = "Book Binder" + desc = "Bundles up a stack of inserted paper into a convenient book format." icon = 'icons/obj/library.dmi' icon_state = "binder" anchored = 1 diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index 9b75a1dba8..7335165092 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -3,6 +3,7 @@ /obj/item/weapon/coin icon = 'icons/obj/items.dmi' name = "Coin" + desc = "A simple coin you can flip." icon_state = "coin" force = 0.0 throwforce = 0.0 diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index b0da801703..94510629c5 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -1,5 +1,6 @@ /obj/item/weapon/clipboard name = "clipboard" + desc = "Used to clip paper to, for an on-the-go writing board." icon = 'icons/obj/bureaucracy.dmi' icon_state = "clipboard" item_state = "clipboard" diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 3feabab1e7..069e6c3405 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -6,6 +6,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins /obj/machinery/photocopier/faxmachine name = "fax machine" + desc = "Sent papers and pictures far away! Or to your co-worker's office a few doors down." icon = 'icons/obj/library.dmi' icon_state = "fax" insert_anim = "faxsend" diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 4f2c6d59ba..12f99f150f 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -1,5 +1,6 @@ /obj/item/weapon/hand_labeler name = "hand labeler" + desc = "Label everything like you've always wanted to! Stuck to the side is a label reading \'Labeler\'. Seems you're too late for that one." icon = 'icons/obj/bureaucracy.dmi' icon_state = "labeler0" var/label = null diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 4a24500fd3..850f8f6c8e 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -1,5 +1,6 @@ /obj/item/weapon/paper_bin name = "paper bin" + desc = "A plastic bin full of paper. It seems to have both regular and carbon-copy paper to choose from." icon = 'icons/obj/bureaucracy.dmi' icon_state = "paper_bin1" item_icons = list( diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 24ad752845..d5e04d97a4 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -1,5 +1,6 @@ /obj/machinery/photocopier name = "photocopier" + desc = "Copy all your important papers here!" icon = 'icons/obj/library.dmi' icon_state = "bigscanner" var/insert_anim = "bigscanner1" @@ -24,6 +25,10 @@ component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) RefreshParts() +/obj/machinery/photocopier/examine(mob/user as mob) + if(..(user, 1)) + to_chat(user, "The screen shows there's [toner ? "[toner]" : "no"] toner left in the printer.") + /obj/machinery/photocopier/attack_ai(mob/user as mob) return attack_hand(user) diff --git a/code/modules/power/fusion/fuel_assembly/fuel_control.dm b/code/modules/power/fusion/fuel_assembly/fuel_control.dm index 6825f9ba37..54e0bfb024 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_control.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_control.dm @@ -1,5 +1,6 @@ /obj/machinery/computer/fusion_fuel_control name = "fuel injection control computer" + desc = "Displays information about the fuel rods." icon = 'icons/obj/machines/power/fusion.dmi' icon_state = "fuel" circuit = /obj/item/weapon/circuitboard/fusion_fuel_control diff --git a/code/modules/power/fusion/gyrotron/gyrotron_control.dm b/code/modules/power/fusion/gyrotron/gyrotron_control.dm index 4f5abdbd3b..e638eee3e3 100644 --- a/code/modules/power/fusion/gyrotron/gyrotron_control.dm +++ b/code/modules/power/fusion/gyrotron/gyrotron_control.dm @@ -1,5 +1,6 @@ /obj/machinery/computer/gyrotron_control name = "gyrotron control console" + desc = "Used to control the R-UST stability beams." icon = 'icons/obj/machines/power/fusion.dmi' icon_state = "engine" light_color = COLOR_BLUE diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 4c07bd667c..9cbf00ddc6 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -10,6 +10,7 @@ /obj/machinery/chem_master name = "ChemMaster 3000" + desc = "Used to seperate and package chemicals in to patches, pills, or bottles. Warranty void if used to create Space Drugs." density = 1 anchored = 1 icon = 'icons/obj/chemical.dmi' @@ -327,6 +328,7 @@ /obj/machinery/reagentgrinder name = "All-In-One Grinder" + desc = "Grinds stuff into itty bitty bits." icon = 'icons/obj/kitchen.dmi' icon_state = "juicer1" density = 0 diff --git a/code/modules/reagents/dispenser/dispenser2.dm b/code/modules/reagents/dispenser/dispenser2.dm index 38c6cf39da..b09c55d95b 100644 --- a/code/modules/reagents/dispenser/dispenser2.dm +++ b/code/modules/reagents/dispenser/dispenser2.dm @@ -1,5 +1,6 @@ /obj/machinery/chemical_dispenser name = "chemical dispenser" + desc = "Automagically fabricates chemicals from electricity." icon = 'icons/obj/chemical.dmi' icon_state = "dispenser" diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 69b9937158..47adce6373 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -212,6 +212,7 @@ /obj/item/weapon/packageWrap name = "package wrapper" + desc = "Like wrapping paper, but less festive." icon = 'icons/obj/items.dmi' icon_state = "deliveryPaper" w_class = ITEMSIZE_NORMAL diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 75fb5fff2a..a23193581e 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -51,6 +51,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() icon = 'icons/obj/machines/research.dmi' icon_state = "server" name = "Messaging Server" + desc = "Facilitates both PDA messages and request console functions." density = 1 anchored = 1.0 use_power = 1 @@ -80,6 +81,11 @@ var/global/list/obj/machinery/message_server/message_servers = list() ..() return +/obj/machinery/message_server/examine(mob/user, distance, infix, suffix) + if(..()) + to_chat(user, "It appears to be [active ? "online" : "offline"].") + + /obj/machinery/message_server/proc/GenerateKey() //Feel free to move to Helpers. var/newKey @@ -231,6 +237,7 @@ var/obj/machinery/blackbox_recorder/blackbox icon = 'icons/obj/stationobjs.dmi' icon_state = "blackbox" name = "Blackbox Recorder" + desc = "Records all radio communications, as well as various other information in case of the worst." density = 1 anchored = 1.0 use_power = 1 diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 5346f50e6e..4d03051ca4 100755 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -29,6 +29,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, /obj/machinery/computer/rdconsole name = "R&D control console" + desc = "Science, in a computer! Experiment results not guaranteed." icon_keyboard = "rd_key" icon_screen = "rdcomp" light_color = "#a97faa" diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 7e736980db..8963928b36 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -150,6 +150,7 @@ /obj/machinery/computer/rdservercontrol name = "R&D Server Controller" + desc = "Manage the research designs and servers. Can also modify upload/download permissions to R&D consoles." icon_keyboard = "rd_key" icon_screen = "rdcomp" light_color = "#a97faa" diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 3d5422f4f1..5055eb7543 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -1,5 +1,6 @@ /obj/machinery/computer/shuttle_control name = "shuttle control console" + desc = "Used to control a linked shuttle." icon_keyboard = "atmos_key" icon_screen = "shuttle" circuit = null diff --git a/code/modules/turbolift/turbolift_console.dm b/code/modules/turbolift/turbolift_console.dm index a0cf1dbd52..71579d5471 100644 --- a/code/modules/turbolift/turbolift_console.dm +++ b/code/modules/turbolift/turbolift_console.dm @@ -116,6 +116,7 @@ // Panel. Lists floors (HTML), moves with the elevator, schedules a move to a given floor. /obj/structure/lift/panel name = "elevator control panel" + desc = "A control panel for moving the elevator. There's a slot for swiping IDs to enable additional controls." icon_state = "panel" req_access = list(access_eva) req_one_access = list(access_heads, access_atmospherics, access_medical) diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 46e838d37a..a6b007bf82 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -26,7 +26,12 @@ /obj/vehicle/train/trolley name = "cargo train trolley" +<<<<<<< HEAD icon = 'icons/obj/vehicles_vr.dmi' //VOREStation Edit +======= + desc = "A large, flat platform made for putting things on. Or people." + icon = 'icons/obj/vehicles.dmi' +>>>>>>> 5d5e361... Merge pull request #6621 from Shadow-Quill/Desc-Adds icon_state = "cargo_trailer" anchored = 0 passenger_allowed = 0 diff --git a/code/modules/virus2/analyser.dm b/code/modules/virus2/analyser.dm index af17836409..90c6135ecf 100644 --- a/code/modules/virus2/analyser.dm +++ b/code/modules/virus2/analyser.dm @@ -1,5 +1,6 @@ /obj/machinery/disease2/diseaseanalyser name = "disease analyser" + desc = "Analyzes diseases to find out information about them!" icon = 'icons/obj/virology.dmi' icon_state = "analyser" anchored = 1 diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm index 379d7ef533..c6be7bea09 100644 --- a/code/modules/virus2/dishincubator.dm +++ b/code/modules/virus2/dishincubator.dm @@ -1,5 +1,6 @@ /obj/machinery/disease2/incubator/ name = "pathogenic incubator" + desc = "Encourages the growth of diseases. This model comes with a dispenser system and a small radiation generator." density = 1 anchored = 1 icon = 'icons/obj/virology.dmi' diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm index da2c543fc8..0aa5f80a58 100644 --- a/code/modules/virus2/isolator.dm +++ b/code/modules/virus2/isolator.dm @@ -5,6 +5,7 @@ /obj/machinery/disease2/isolator/ name = "pathogenic isolator" + desc = "Used to isolate and identify diseases, allowing for comparison with a remote database." density = 1 anchored = 1 icon = 'icons/obj/virology.dmi'