diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index ded8358aecd..1cded54f77f 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -1,6 +1,6 @@ /obj/machinery/camera name = "security camera" - desc = "It's used to monitor rooms." + desc = "Used by security teams and annoying AIs to watch over you." icon = 'icons/obj/monitors.dmi' icon_state = "camera" power_state = ACTIVE_POWER_USE diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 2b8a90d63df..a51f7aadade 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -48,6 +48,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays) /obj/machinery/door/airlock name = "airlock" + desc = "An airlock door keeping you safe from the vacuum of space. Only works if closed." icon = 'icons/obj/doors/airlocks/station/public.dmi' icon_state = "closed" anchored = TRUE diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 6edf5605baa..c4d7cb0c9cb 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -540,7 +540,7 @@ glass = stealth_glass airlock_material = stealth_airlock_material name = "airlock" - desc = "It opens and closes." + desc = "An airlock door keeping you safe from the vacuum of space. Only works if closed." stealthy = TRUE update_icon() diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index b79f6c96820..3fc3fbebe41 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -1,6 +1,6 @@ /obj/machinery/door/window name = "interior door" - desc = "A strong door." + desc = "A door that's also a window, isn't that amazing?" icon = 'icons/obj/doors/windoor.dmi' icon_state = "left" layer = ABOVE_WINDOW_LAYER @@ -401,6 +401,7 @@ /obj/machinery/door/window/reinforced name = "Branch, do not add stuff here" + desc = "A stronger version of the common windoor, often used by authority figures denying assistants their rightful access." icon_state = "leftsecure" base_state = "leftsecure" max_integrity = 300 //Stronger doors for prison (regular window door health is 200) @@ -435,8 +436,8 @@ base_state = "right" /obj/machinery/door/window/antitheft - desc = "Better do not try to steal, pal, lube off." name = "Branch, do not add stuff here" + desc = "Better do not try to steal, pal, lube off." /obj/machinery/door/window/antitheft/normal name = ".custom placement" @@ -448,6 +449,7 @@ /obj/machinery/door/window/brigdoor name = "Do not make stuff here, its needed for code to not collapse" + desc = "A stronger version of the common windoor, often used by authority figures denying assistants their rightful access." icon_state = "leftsecure" base_state = "leftsecure" max_integrity = 300 //Stronger doors for prison (regular window door health is 200) diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index 87442a6672d..ac9571a6dd0 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -1,5 +1,6 @@ /obj/machinery/floodlight name = "emergency floodlight" + desc = "An artificial sun, except a lot smaller and a lot less powerful." icon = 'icons/obj/machines/floodlight.dmi' icon_state = "flood00" anchored = FALSE diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index 278e53b8099..e289a5212b2 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -33,6 +33,7 @@ /obj/machinery/computer/guestpass name = "guest pass terminal" + desc = "This console allows staff to give out temporary access to their coworkers." icon_state = "guest" icon_screen = "pass" icon_keyboard = null @@ -231,6 +232,7 @@ /obj/machinery/computer/guestpass/hop name = "\improper HoP guest pass terminal" + desc = "The Head of Personnel's guest pass terminal allows the HoP to temporarily allow anyone into places they probably shouldn't be." /obj/machinery/computer/guestpass/hop/get_changeable_accesses() . = ..() diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index a2fb89910f8..e4a3ce3450d 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -3,6 +3,7 @@ /obj/machinery/iv_drip name = "\improper IV drip" + desc = "Simply attach a bloodbag and puncture the patient with a needle, they'll have more blood in no time." icon = 'icons/goonstation/objects/iv.dmi' icon_state = "stand" anchored = FALSE diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 4b485350dcb..734f85d0f5f 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -2,7 +2,7 @@ // can have multiple per area /obj/machinery/light_switch name = "light switch" - desc = "It turns lights on and off. What are you, simple?" + desc = "A switch for turning the lights on and off for an entire room." icon = 'icons/obj/power.dmi' icon_state = "light1" anchored = TRUE @@ -45,7 +45,7 @@ /obj/machinery/light_switch/examine(mob/user) . = ..() - . += "A light switch. It is [get_area(src).lightswitch ? "on" : "off"]." + . += "It is [get_area(src).lightswitch ? "on" : "off"]." /obj/machinery/light_switch/attack_ghost(mob/user) if(user.can_advanced_admin_interact()) diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 1b9c93628a9..a25e252705f 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -97,7 +97,7 @@ /obj/machinery/economy/vending/coffee name = "\improper Solar's Best Hot Drinks" - desc = "A vending machine which dispenses hot drinks." + desc = "A vending machine which dispenses coffee, coffee, hot chocolate, and more coffee!" ads_list = list("Have a drink!", "Drink up!", "It's good for you!", diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 42f987fdb8b..1370f1f2b42 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -1,6 +1,6 @@ /obj/item/radio/intercom name = "station intercom (General)" - desc = "Talk through this." + desc = "A reliable form of communication even during local communication blackouts." icon_state = "intercom" layer = ABOVE_WINDOW_LAYER anchored = TRUE @@ -85,7 +85,7 @@ /obj/item/radio/intercom/syndicate name = "illicit intercom" - desc = "Talk through this. Evilly" + desc = "Communicate with your minions. Evilly" frequency = SYND_FREQ syndiekey = new /obj/item/encryptionkey/syndicate/nukeops @@ -296,7 +296,7 @@ /obj/item/radio/intercom/locked/prison name = "prison intercom" - desc = "Talk through this. It looks like it has been modified to not broadcast." + desc = "A reliable form of communication even during local communication blackouts. It looks like it has been modified to not broadcast. Not so reliable, I guess..." /obj/item/radio/intercom/locked/prison/New() ..() diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index cd83d8b79b5..24fcd542715 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -38,6 +38,7 @@ /obj/item/storage/fancy/donut_box name = "donut box" + desc = "\"To do, or do nut, the choice is obvious.\"" icon_type = "donut" icon_state = "donutbox" storage_slots = 6 diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index afef1b023e0..2153082219c 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -257,7 +257,7 @@ LINEN BINS /obj/structure/bedsheetbin name = "linen bin" - desc = "A linen bin. It looks rather cosy." + desc = "A linen bin. It looks rather cozy." icon = 'icons/obj/structures.dmi' icon_state = "linenbin-full" anchored = TRUE diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index e678e495210..0374a552687 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -11,6 +11,7 @@ /obj/structure/closet/secure_closet/freezer/kitchen name = "kitchen cabinet" + desc = "It's a card-locked cabinet for storing dry ingredients. It looks robust enough to withstand most explosions." req_access = list(ACCESS_KITCHEN) /obj/structure/closet/secure_closet/freezer/kitchen/populate_contents() diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 361d4d9fbd6..9ed65153be9 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -375,8 +375,8 @@ new /obj/item/rcd(src) /obj/structure/closet/crate/freezer - desc = "A freezer." name = "Freezer" + desc = "A freezer for keeping food and organs fresh." icon_state = "freezer" icon_opened = "freezer_open" icon_closed = "freezer" diff --git a/code/game/objects/structures/extinguisher_cabinet.dm b/code/game/objects/structures/extinguisher_cabinet.dm index 0b69123d880..77b53eb0e21 100644 --- a/code/game/objects/structures/extinguisher_cabinet.dm +++ b/code/game/objects/structures/extinguisher_cabinet.dm @@ -5,7 +5,7 @@ /obj/structure/extinguisher_cabinet name = "extinguisher cabinet" - desc = "A small wall mounted cabinet designed to hold a fire extinguisher." + desc = "A small wall mounted cabinet designed to hold a fire extinguisher. \"Don't break the glass\" is written next to the handle." icon = 'icons/obj/closet.dmi' icon_state = "extinguisher" anchored = TRUE diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 7109ea8444b..fd6d679e4e2 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -256,6 +256,7 @@ // Kirby plants /obj/item/kirbyplants name = "potted plant" + desc = "Some greenery, how nice." icon = 'icons/obj/flora/plants.dmi' icon_state = "random_plant" anchored = FALSE diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 3bff273939c..6585976999e 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -1,5 +1,6 @@ /obj/structure/girder name = "girder" + desc = "The basis of any wall, and therefore any space station or ship." icon_state = "girder" anchored = TRUE density = TRUE diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index 209e30cb02a..a2cef4fc3f5 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -2,7 +2,7 @@ GLOBAL_LIST_EMPTY(gas_meters) /obj/machinery/atmospherics/meter name = "gas flow meter" - desc = "A gas flow meter" + desc = "A meter used by experienced atmospheric technicians to determine pressure and temperature in a pipe." icon = 'icons/obj/meter.dmi' icon_state = "meterX" layer = GAS_PIPE_VISIBLE_LAYER + GAS_PUMP_OFFSET diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 2fb402bf66b..f1875a85c80 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -1,6 +1,6 @@ /obj/item/clothing/mask/gas name = "gas mask" - desc = "A face-covering mask that can be connected to an air supply." + desc = "A face-covering mask that can be connected to an air supply. Used by mischievous assistants and syndicate agents alike." icon_state = "gas_alt" flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT flags_inv = HIDEEARS|HIDEEYES|HIDEFACE diff --git a/code/modules/economy/economy_machinery/eftpos.dm b/code/modules/economy/economy_machinery/eftpos.dm index b6abb56afc4..acab3350a93 100644 --- a/code/modules/economy/economy_machinery/eftpos.dm +++ b/code/modules/economy/economy_machinery/eftpos.dm @@ -218,7 +218,7 @@ /obj/item/eftpos/register name = "point of sale" - desc = "Also known as a cash register, or, more commonly, \"robbery magnet\". It's old and rusty, and had an EFTPOS module fitted in it." + desc = "Also known as a cash register, or, more commonly, \"robbery magnet\". It's old and rusty, and had an EFTPOS module fitted in it. Swipe your ID card to make purchases electronically." icon = 'icons/obj/machines/pos.dmi' icon_state = "pos" force = 10 diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 88d923bb445..98416362cac 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -286,6 +286,7 @@ item_state = "carton" throwforce = 0 is_glass = FALSE + gender = PLURAL list_reagents = list("orangejuice" = 100) /obj/item/reagent_containers/drinks/bottle/cream @@ -295,6 +296,7 @@ item_state = "carton" throwforce = 0 is_glass = FALSE + gender = PLURAL list_reagents = list("cream" = 100) /obj/item/reagent_containers/drinks/bottle/tomatojuice @@ -304,6 +306,7 @@ item_state = "carton" throwforce = 0 is_glass = FALSE + gender = PLURAL list_reagents = list("tomatojuice" = 100) /obj/item/reagent_containers/drinks/bottle/limejuice @@ -313,6 +316,7 @@ item_state = "carton" throwforce = 0 is_glass = FALSE + gender = PLURAL list_reagents = list("limejuice" = 100) /obj/item/reagent_containers/drinks/bottle/milk @@ -322,6 +326,7 @@ item_state = "carton" throwforce = 0 is_glass = FALSE + gender = PLURAL list_reagents = list("milk" = 100) ////////////////////////// MOLOTOV /////////////////////// diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index aa1d746e5e7..d4e386b18da 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -1,6 +1,6 @@ #define GIBBER_ANIMATION_DELAY 16 /obj/machinery/gibber - name = "Gibber" + name = "\improper Gibber" desc = "The name isn't descriptive enough?" icon = 'icons/obj/kitchen.dmi' icon_state = "grinder" diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 6d7ef45eb2c..41b5cf9bcc2 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -1,5 +1,6 @@ /obj/machinery/processor - name = "Food Processor" + name = "\improper Food Processor" + desc = "Used for turning ingredients into other ingredients." icon = 'icons/obj/kitchen.dmi' icon_state = "processor" layer = 2.9 diff --git a/code/modules/library/library_computer.dm b/code/modules/library/library_computer.dm index 6debf40b576..9e9741d1c78 100644 --- a/code/modules/library/library_computer.dm +++ b/code/modules/library/library_computer.dm @@ -18,6 +18,7 @@ */ /obj/machinery/computer/library name = "Library Computer" + desc = "Used by dusty librarians for their dusty books." icon = 'icons/obj/computer.dmi' icon_state = "oldcomp" icon_screen = "library" diff --git a/code/modules/library/library_equipment.dm b/code/modules/library/library_equipment.dm index 9c536cab025..00790622c60 100644 --- a/code/modules/library/library_equipment.dm +++ b/code/modules/library/library_equipment.dm @@ -159,6 +159,7 @@ */ /obj/machinery/bookbinder name = "Book Binder" + desc = "Used by authors, poets, and librarians to scan papers and print copies of their fanfics." icon = 'icons/obj/library.dmi' icon_state = "binder" anchored = TRUE diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 44bc6c90725..7fafc804e93 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -1,6 +1,7 @@ /*****************Pickaxes & Drills & Shovels****************/ /obj/item/pickaxe name = "pickaxe" + desc = "A tool for digging rock and stone. Better get to work." icon = 'icons/obj/mining_tool.dmi' icon_state = "pickaxe" flags = CONDUCT diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 2de58c9f39a..5c7d18eb303 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -7,6 +7,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist) /obj/machinery/photocopier/faxmachine name = "fax machine" + desc = "Because just talking to your coworkers is too efficient." icon = 'icons/obj/library.dmi' icon_state = "fax" insert_anim = "faxsend" @@ -59,6 +60,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist) /obj/machinery/photocopier/faxmachine/longrange name = "long range fax machine" + desc = "A fax machine of the ancient days, now using modern entanglement networks, all the better to snitch on your coworkers." fax_network = "Central Command Quantum Entanglement Network" long_range_enabled = TRUE @@ -68,6 +70,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist) /obj/machinery/photocopier/faxmachine/longrange/syndie name = "syndicate long range fax machine" + desc = "For requesting supplies from your benefactors, not that they'll send you any." emagged = TRUE syndie_restricted = TRUE req_one_access = list(ACCESS_SYNDICATE) diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index f0ed2903029..ad8101088b0 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -11,7 +11,7 @@ */ /obj/structure/filingcabinet name = "filing cabinet" - desc = "A large cabinet with drawers." + desc = "A large cabinet with drawers for holding only the finest papers, photos, and folders." icon = 'icons/obj/bureaucracy.dmi' icon_state = "filingcabinet" density = TRUE diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index f09a8253bcb..0113e77452f 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -1,6 +1,6 @@ /obj/item/folder name = "folder" - desc = "A folder." + desc = "A folder for keeping all your important papers and photos." icon = 'icons/obj/bureaucracy.dmi' icon_state = "folder" w_class = WEIGHT_CLASS_SMALL @@ -14,19 +14,19 @@ A.emp_act(severity) /obj/item/folder/blue - desc = "A blue folder." + desc = "A blue folder for keeping all the blueprints of your great ideas." icon_state = "folder_blue" /obj/item/folder/red - desc = "A red folder." + desc = "A red folder for storing all the documents you've \"acquired\"." icon_state = "folder_red" /obj/item/folder/yellow - desc = "A yellow folder." + desc = "A yellow folder for keeping all your very important court forms." icon_state = "folder_yellow" /obj/item/folder/white - desc = "A white folder." + desc = "A white folder for holding medical records, if anyone ever prints any." icon_state = "folder_white" /obj/item/folder/update_overlays() diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 649d994f32c..132a0888755 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -1,5 +1,6 @@ /obj/item/paper_bin name = "paper bin" + desc = "The second-most important part of bureaucracy, after the pen of course." icon = 'icons/obj/bureaucracy.dmi' icon_state = "paper_bin1" item_state = "sheet-metal" diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 62dbba38be8..855fdf38103 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -4,6 +4,7 @@ /obj/machinery/photocopier name = "photocopier" + desc = "For making copies of important documents, or more likely, your ass." icon = 'icons/obj/library.dmi' icon_state = "bigscanner" @@ -579,6 +580,7 @@ /obj/item/toner name = "toner cartridge" + desc = "Has 140 papers worth of ink in it! Shame you can only use 30 before it runs out of cyan..." icon = 'icons/obj/device.dmi' icon_state = "tonercartridge" var/toner_amount = 30 diff --git a/code/modules/power/lights.dm b/code/modules/power/lights.dm index 1b391b25088..238d7b7fc33 100644 --- a/code/modules/power/lights.dm +++ b/code/modules/power/lights.dm @@ -164,10 +164,9 @@ */ /obj/machinery/light name = "light fixture" + desc = "Industrial-grade light fixture for brightening up dark corners of the station." icon = 'icons/obj/lighting.dmi' - var/base_state = "tube" // Base description and icon_state icon_state = "tube1" - desc = "A lighting fixture." anchored = TRUE layer = 5 max_integrity = 100 @@ -175,6 +174,7 @@ idle_power_consumption = 2 //when in low power mode active_power_consumption = 20 //when in full power mode power_channel = PW_CHANNEL_LIGHTING //Lights are calc'd via area so they dont need to be in the machine list + var/base_state = "tube" // Base description and icon_state /// Is the light on or off? var/on = FALSE /// Is the light currently turning on? @@ -231,12 +231,12 @@ */ /obj/machinery/light/small icon_state = "bulb1" - base_state = "bulb" + desc = "A compact and cheap light fixture, perfect for keeping maintenance tunnels appropriately spooky." fitting = "bulb" + base_state = "bulb" brightness_range = 4 brightness_color = "#a0a080" nightshift_light_range = 4 - desc = "A small lighting fixture." light_type = /obj/item/light/bulb /obj/machinery/light/spot diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 6fccd36e9e9..5f23162b1e2 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -1,5 +1,6 @@ /obj/machinery/chem_dispenser name = "chem dispenser" + desc = "For making chemicals, medicine, and explosions." density = TRUE anchored = TRUE icon = 'icons/obj/chemical.dmi' diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 56752286676..78b8fe058d0 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -18,6 +18,7 @@ /obj/machinery/chem_master name = "\improper ChemMaster 3000" + desc = "Used to turn reagents into pills, patches, and store them in bottles." density = TRUE anchored = TRUE icon = 'icons/obj/chemical.dmi' @@ -608,6 +609,7 @@ /obj/machinery/chem_master/condimaster name = "\improper CondiMaster 3000" + desc = "Used to remove reagents from that single beaker you're using, or create condiment packs and bottles; your choice." condi = TRUE /obj/machinery/chem_master/condimaster/Initialize(mapload) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 32cf4cde057..09ed6ed24ef 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -1,5 +1,6 @@ /obj/machinery/reagentgrinder name = "\improper All-In-One Grinder" + desc = "A chef's 9th most powerful weapon, right after the grill. Used for grinding items into reagents." icon = 'icons/obj/kitchen.dmi' icon_state = "juicer1" layer = 2.9 diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index 44cc8cae37d..b3e9897462e 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -290,8 +290,8 @@ list_reagents = list("methamphetamine" = 10) /obj/item/reagent_containers/glass/bucket - desc = "It's a bucket." name = "bucket" + desc = "Useful for moving liquids, or having a helmet in the zombie apocalypse." icon = 'icons/obj/janitor.dmi' icon_state = "bucket" item_state = "bucket" diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index bebbaf729cf..2cad9ad15e3 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -9,7 +9,7 @@ /obj/machinery/disposal name = "disposal unit" - desc = "A pneumatic waste disposal unit. Alt-click to manually eject its contents." + desc = "A pneumatic waste disposal unit, or a basketball hoop if you're bored. Alt-click to manually eject its contents." icon = 'icons/obj/pipes/disposal.dmi' icon_state = "disposal" anchored = TRUE