diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index 6521255f639..268e8cd2164 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -27413,7 +27413,7 @@ "eci" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance/glass{ - name = "Auxiliry Dock Maintainence" + name = "Auxiliary Dock Maintenance" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60908,7 +60908,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance/glass{ - name = "Auxiliry Dock Storage Room" + name = "Auxiliary Dock Storage Room" }, /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /obj/effect/mapping_helpers/airlock/unres/delayed{ @@ -75764,7 +75764,7 @@ "lib" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance/glass{ - name = "Auxiliry Dock Maintainence" + name = "Auxiliary Dock Maintenance" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -105332,7 +105332,7 @@ "pzT" = ( /obj/structure/cable, /obj/machinery/door/airlock/maintenance/glass{ - name = "Auxiliry Dock Maintainence" + name = "Auxiliary Dock Maintenance" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -115378,7 +115378,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance/glass{ - name = "Auxiliry Dock Maintainence" + name = "Auxiliary Dock Maintenance" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, diff --git a/code/__HELPERS/pronouns.dm b/code/__HELPERS/pronouns.dm index cc1f357fcf6..dd00dddd9b7 100644 --- a/code/__HELPERS/pronouns.dm +++ b/code/__HELPERS/pronouns.dm @@ -60,7 +60,7 @@ /datum/proc/p_themselves(temp_gender) return "itself" -/datum/proc/plural_s(pluralize) +/proc/plural_s(pluralize) switch(copytext_char(pluralize, -2)) if ("ss") return "es" diff --git a/code/datums/components/atom_mounted.dm b/code/datums/components/atom_mounted.dm index 5306e15873f..87a9d1b7e84 100644 --- a/code/datums/components/atom_mounted.dm +++ b/code/datums/components/atom_mounted.dm @@ -38,7 +38,7 @@ SIGNAL_HANDLER if (parent in view(user.client?.view || world.view, user)) - examine_list += span_notice("\The [hanging_support_atom] is currently supporting [span_bold("[parent]")]. Deconstruction or excessive damage would cause it to [span_bold("fall to the ground")].") + examine_list += span_notice("\The [hanging_support_atom] is currently supporting [span_bold("\the [parent]")]. Deconstruction or excessive damage would cause it to [span_bold("fall to the ground")].") /// When the type of turf changes, if it is changing into a floor we should drop our contents /datum/component/atom_mounted/proc/on_turf_changing(datum/source, path, new_baseturfs, flags, post_change_callbacks) diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm index c296c9bd4b4..a72a6bbb25f 100644 --- a/code/datums/components/udder.dm +++ b/code/datums/components/udder.dm @@ -37,11 +37,11 @@ var/udder_filled_percentage = PERCENT(udder.reagents.total_volume / udder.reagents.maximum_volume) switch(udder_filled_percentage) if(0 to 10) - examine_list += span_notice("[parent]'s [udder] is dry.") + examine_list += span_notice("[parent]'s [udder.name] is dry.") if(11 to 99) - examine_list += span_notice("[parent]'s [udder] can be milked if you have something to contain it.") + examine_list += span_notice("[parent]'s [udder.name] can be milked if you have something to contain it.") if(100) - examine_list += span_notice("[parent]'s [udder] is round and full, and can be milked if you have something to contain it.") + examine_list += span_notice("[parent]'s [udder.name] is round and full, and can be milked if you have something to contain it.") ///signal called on parent being attacked with an item diff --git a/code/datums/elements/reagent_scoopable_atom.dm b/code/datums/elements/reagent_scoopable_atom.dm index dddd7f79e4e..2ad0ca906ea 100644 --- a/code/datums/elements/reagent_scoopable_atom.dm +++ b/code/datums/elements/reagent_scoopable_atom.dm @@ -33,5 +33,5 @@ return ITEM_INTERACT_BLOCKING if(!container.reagents.add_reagent(reagent_to_extract, rand(5, 10))) to_chat(user, span_warning("[container] is full.")) - user.visible_message(span_notice("[user] scoops [reagent_to_extract::name] from the [source] with [container]."), span_notice("You scoop out [reagent_to_extract::name] from the [src] using [container].")) + user.visible_message(span_notice("[user] scoops [reagent_to_extract::name] from [source] with [container]."), span_notice("You scoop out [reagent_to_extract::name] from [source] using [container].")) return ITEM_INTERACT_SUCCESS diff --git a/code/datums/material/material_container.dm b/code/datums/material/material_container.dm index 4990e5bf764..8a074d5c36e 100644 --- a/code/datums/material/material_container.dm +++ b/code/datums/material/material_container.dm @@ -304,6 +304,7 @@ if(!(mat_container_flags & MATCONTAINER_SILENT)) var/list/status_data = chat_msgs["[MATERIAL_INSERT_ITEM_FAILURE]"] || list() var/list/item_data = status_data[target_item.name] || list() + item_data["item"] = target_item item_data["count"] += 1 status_data[target_item.name] = item_data chat_msgs["[MATERIAL_INSERT_ITEM_FAILURE]"] = status_data @@ -366,9 +367,8 @@ var/item_name = target_item.name var/item_count = 1 var/is_stack = FALSE - var/obj/item/stack/the_stack if(isstack(target_item)) - the_stack = target_item + var/obj/item/stack/the_stack = target_item item_name = the_stack.singular_name item_count = the_stack.amount is_stack = TRUE @@ -382,9 +382,9 @@ //collect all messages to print later var/list/status_data = chat_msgs["[MATERIAL_INSERT_ITEM_SUCCESS]"] || list() var/list/item_data = status_data[item_name] || list() + item_data["item"] = target_item item_data["count"] += item_count item_data["amount"] += inserted - item_data["stack"] = is_stack status_data[item_name] = item_data chat_msgs["[MATERIAL_INSERT_ITEM_SUCCESS]"] = status_data @@ -409,6 +409,7 @@ //collect all messages to print later var/list/status_data = chat_msgs["[inserted]"] || list() var/list/item_data = status_data[item_name] || list() + item_data["item"] = target_item item_data["count"] += item_count status_data[item_name] = item_data chat_msgs["[inserted]"] = status_data @@ -450,23 +451,39 @@ for(var/item_name in status_data) //read the params var/list/chat_data = status_data[item_name] + var/obj/item/item = chat_data["item"] var/count = chat_data["count"] var/amount = chat_data["amount"] //decode the message switch(text2num(status)) if(MATERIAL_INSERT_ITEM_SUCCESS) //no problems full item was consumed - if(chat_data["stack"]) + if(isstack(item)) + var/obj/item/stack/stack = item var/sheets = min(count, amount) //minimum between sheets inserted vs sheets consumed(values differ for alloys) - to_chat(user, span_notice("[sheets > 1 ? "[sheets] " : ""][item_name][sheets > 1 ? "s were" : " was"] added to [parent].")) + if (sheets > 1) + to_chat(user, span_notice("[sheets] [stack.singular_name][plural_s(stack.singular_name)] were added to [parent].")) + else + to_chat(user, span_notice("The [stack.singular_name] was added to [parent].")) else - to_chat(user, span_notice("[count > 1 ? "[count] " : ""][item_name][count > 1 ? "s" : ""], worth [amount] sheets, [count > 1 ? "were" : "was"] added to [parent].")) + if (count > 1) + to_chat(user, span_notice("[count] [item.name][plural_s(item.name)], worth [amount] sheet\s, were added to [parent].")) + else + to_chat(user, span_notice("\The [item], worth [amount] sheet\s, [item.p_were()] added to [parent].")) if(MATERIAL_INSERT_ITEM_NO_SPACE) //no space - to_chat(user, span_warning("[parent] has no space to accept [item_name]!")) + to_chat(user, span_warning("[parent] has no space to accept \the [item]!")) if(MATERIAL_INSERT_ITEM_NO_MATS) //no materials inside these items - to_chat(user, span_warning("[item_name][count > 1 ? "s have" : " has"] no materials that can be accepted by [parent]!")) + if(isstack(item)) + var/obj/item/stack/stack = item + to_chat(user, span_warning("The [stack.singular_name] has no materials that can be accepted by [parent]!")) + else + to_chat(user, span_warning("\The [item][count > 1 ? "[plural_s(item.name)] have" : " [item.p_have()]"] no materials that can be accepted by [parent]!")) if(MATERIAL_INSERT_ITEM_FAILURE) //could be because the material type was not accepted or other stuff - to_chat(user, span_warning("[item_name][count > 1 ? "s were" : " was"] rejected by [parent]!")) + if (isstack(item)) + var/obj/item/stack/stack = item + to_chat(user, span_warning("The [stack.singular_name] was rejected by [parent]!")) + else + to_chat(user, span_warning("\The [item][count > 1 ? "[plural_s(item.name)] were" : " [item.p_were()]"] rejected by [parent]!")) //finally delete the items for(var/obj/item/deleting as anything in to_delete) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index efcc1777aab..a279bc34a50 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -649,7 +649,7 @@ GLOBAL_LIST_EMPTY(possible_items) if(item) targetinfo = item steal_target = targetinfo.targetitem - explanation_text = "Steal [targetinfo.name]" + explanation_text = "Steal [targetinfo.name]." give_special_equipment(targetinfo.special_equipment) return steal_target else diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index c3fc2b6fbfa..bf179dff162 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -119,7 +119,7 @@ var/is_operational = TRUE ///list of all the parts used to build it, if made from certain kinds of frames. var/list/component_parts = null - ///Is the machines maintainence panel open. + ///Is the machines maintenance panel open. var/panel_open = FALSE ///Is the machine open or closed var/state_open = FALSE diff --git a/code/game/machinery/atmos_field_gen.dm b/code/game/machinery/atmos_field_gen.dm index 004728d3914..91749477395 100644 --- a/code/game/machinery/atmos_field_gen.dm +++ b/code/game/machinery/atmos_field_gen.dm @@ -6,7 +6,7 @@ #define GENERATOR_ACTIVE 2 /obj/machinery/atmos_shield_gen - name = "Atmospheric Shield Generator" + name = "atmospheric shield generator" desc = "Produces an atmos shield in a line between itself and another generator with both facing the other, while active. Powered by APC. Field must not be obstructed by wall, or an atmos shield field. Will turn on after gaining power if turned off due to power loss." icon = 'icons/obj/machines/atmosshieldgen.dmi' base_icon_state = "atmosshield" @@ -85,10 +85,10 @@ if(locked) . += span_boldwarning("LOCKED") return - . += span_notice("Maximum field length: [max_range] tiles") - . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "close" : "open"]") + . += span_notice("Maximum field length: [max_range] tiles.") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "close" : "open"].") if(panel_open) - . += span_notice("It can be [EXAMINE_HINT("pried")] apart") + . += span_notice("It can be [EXAMINE_HINT("pried")] apart.") /obj/machinery/atmos_shield_gen/RefreshParts() . = ..() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 1636380afe3..92e6c994305 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -60,14 +60,14 @@ if(!in_range(user, src) && !isobserver(user)) return - . += span_notice("Material usage cost at [creation_efficiency * 100]%") + . += span_notice("Material usage cost at [creation_efficiency * 100]%.") if(drop_direction) . += span_notice("Currently configured to drop printed objects [dir2text(drop_direction)].") . += span_notice("[EXAMINE_HINT("Alt-click")] to reset.") else . += span_notice("[EXAMINE_HINT("Drag")] towards a direction (while next to it) to change drop direction.") - . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") if(panel_open) . += span_notice("The machine can be [EXAMINE_HINT("pried")] apart.") diff --git a/code/game/machinery/big_manipulator.dm b/code/game/machinery/big_manipulator.dm index f7d7beeb46c..632d8378c99 100644 --- a/code/game/machinery/big_manipulator.dm +++ b/code/game/machinery/big_manipulator.dm @@ -25,7 +25,7 @@ /// The Big Manipulator's core. Main part of the mechanism that carries out the entire process. /obj/machinery/big_manipulator - name = "Big Manipulator" + name = "big manipulator" desc = "Operates different objects. Truly, a groundbreaking innovation..." icon = 'icons/map_icons/objects.dmi' icon_state = "/obj/machinery/big_manipulator" diff --git a/code/game/machinery/computer/telescreen.dm b/code/game/machinery/computer/telescreen.dm index 6f5f335a54d..4b0c44329b4 100644 --- a/code/game/machinery/computer/telescreen.dm +++ b/code/game/machinery/computer/telescreen.dm @@ -87,7 +87,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai /obj/machinery/computer/security/telescreen/entertainment/examine(mob/user) . = ..() . += length(network) ? span_notice("The TV is broadcasting something!") : span_notice("There's nothing on TV.") - . += span_notice("The volume is currently [speakers.should_be_listening ? "on" : "off"]") + . += span_notice("The volume is currently [speakers.should_be_listening ? "on" : "off"].") /obj/machinery/computer/security/telescreen/entertainment/ui_state(mob/user) return GLOB.always_state diff --git a/code/game/machinery/flatpacker.dm b/code/game/machinery/flatpacker.dm index 011ddf7f1b1..563d74c23f5 100644 --- a/code/game/machinery/flatpacker.dm +++ b/code/game/machinery/flatpacker.dm @@ -79,13 +79,13 @@ . += span_notice("The status display reads:") . += span_notice("Capable of packing up to Tier [max_part_tier].") . += span_notice("Storing up to [materials.max_amount] material units.") - . += span_notice("Material consumption at [creation_efficiency * 100]%") + . += span_notice("Material consumption at [creation_efficiency * 100]%.") - . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "close" : "open"]") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "close" : "open"].") if(panel_open) - . += span_notice("It can be [EXAMINE_HINT("pried")] apart") + . += span_notice("It can be [EXAMINE_HINT("pried")] apart.") if(!QDELETED(inserted_board)) - . += span_notice("The board can be ejected via [EXAMINE_HINT("Ctrl Click")]") + . += span_notice("The board can be ejected via [EXAMINE_HINT("Ctrl Click")].") if(length(inserted_board.flatpack_components)) var/list/obj/item/to_insert for(var/obj/item/component as anything in inserted_board.flatpack_components) @@ -95,9 +95,9 @@ continue LAZYADDASSOC(to_insert, get_flatpack_component_name(component), "[inserted]/[required]") if(length(to_insert)) - . += span_warning("The following components must be inserted by hand before packaging") + . += span_warning("The following components must be inserted by hand before packaging:") for(var/component_name in to_insert) - . += span_warning("[component_name]:[to_insert[component_name]]") + . += span_warning("[component_name]: [to_insert[component_name]].") /obj/machinery/flatpacker/update_overlays() . = ..() diff --git a/code/game/machinery/machine_frame.dm b/code/game/machinery/machine_frame.dm index e74daa5c3ad..e7be3814a18 100644 --- a/code/game/machinery/machine_frame.dm +++ b/code/game/machinery/machine_frame.dm @@ -357,14 +357,14 @@ // We might end up qdel'ing the part if it's a stock part datum. // In practice, this doesn't have side effects to the name, // but academically we should not be using an object after it's deleted. - var/part_name = "[tool]" + var/part_name = "\the [tool]" if (ispath(stock_part_base, /datum/stock_part)) // We can't just reuse stock_part_path here or its singleton, // or else putting in a tier 2 part will deconstruct to a tier 1 part. var/stock_part_datum = GLOB.stock_part_datums_per_object[tool.type] if (isnull(stock_part_datum)) - stack_trace("tool.type] does not have an associated stock part datum!") + stack_trace("[tool.type] does not have an associated stock part datum!") continue components += stock_part_datum diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 3eacf7b7f9f..466f37726bc 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -1,6 +1,6 @@ /obj/machinery/recharge_station name = "recharging station" - desc = "This device recharges energy dependent lifeforms, like cyborgs, ethereals and MODsuit users." + desc = "This device recharges energy-dependent lifeforms, like cyborgs, ethereals, and MODsuit users." icon = 'icons/obj/machines/borg_charger.dmi' icon_state = "borgcharger0" active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.1 diff --git a/code/game/machinery/wall_healer.dm b/code/game/machinery/wall_healer.dm index 3bcef5c124a..513faebd37b 100644 --- a/code/game/machinery/wall_healer.dm +++ b/code/game/machinery/wall_healer.dm @@ -1,6 +1,6 @@ /// A wall mounted machine that heals chip damage for a price /obj/machinery/wall_healer - name = "\improper Deforest First Aid Station" + name = "\improper DeForest first aid station" desc = "A wall-mounted first aid station, designed to treat minor injuries - just stick your hand in and try to relax." icon = 'icons/obj/machines/wall_healer.dmi' icon_state = "wall_healer" @@ -559,7 +559,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/wall_healer, 32) /obj/machinery/wall_healer/free - name = "\improper Deforest Emergency First Aid Station" + name = "\improper DeForest emergency first aid station" /obj/machinery/wall_healer/free/init_payment() return diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index 06604a872fd..92b62d7caa1 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -102,8 +102,8 @@ /obj/item/door_remote/captain name = "command door remote" - desc = "A remote for controlling a set of airlocks. Despite its gaudy insignia denoting the Captain as its owner, some fine print\ - indicates that its access is exclusively relegated to the Bridge and high-security command areas -- an additional byline\ + desc = "A remote for controlling a set of airlocks. Despite its gaudy insignia denoting the Captain as its owner, some fine print \ + indicates that its access is exclusively relegated to the Bridge and high-security command areas -- an additional byline \ specifically excludes Security from the high-security areas. Ironic." department = "command" region_access = REGION_COMMAND @@ -132,7 +132,7 @@ /obj/item/door_remote/head_of_security name = "security door remote" - desc = "A remote for controlling a set of airlocks. This one smells like sweat, blood, resentment, and coffee.\ + desc = "A remote for controlling a set of airlocks. This one smells like sweat, blood, resentment, and coffee. \ Someone appears to have tampered with the identifier." department = "security" region_access = REGION_SECURITY @@ -149,7 +149,7 @@ /obj/item/door_remote/chief_medical_officer name = "medical door remote" - desc = "A remote for controlling a set of airlocks. It has the overpowering odor of blood and, despite its medical insignia,\ + desc = "A remote for controlling a set of airlocks. It has the overpowering odor of blood and, despite its medical insignia, \ has absolutely no accompanying odor of disinfectant." department = "med" region_access = REGION_MEDBAY @@ -157,7 +157,7 @@ /obj/item/door_remote/head_of_personnel name = "service door remote" - desc = "A remote for controlling a set of airlocks. This one smells like printer ink, and fills its holder with the urge\ + desc = "A remote for controlling a set of airlocks. This one smells like printer ink, and fills its holder with the urge \ to mysteriously vanish." department = "civilian" region_access = REGION_GENERAL diff --git a/code/game/objects/items/food/bait.dm b/code/game/objects/items/food/bait.dm index 53a7cbe47ce..274273bf3fe 100644 --- a/code/game/objects/items/food/bait.dm +++ b/code/game/objects/items/food/bait.dm @@ -16,7 +16,7 @@ /obj/item/food/bait/worm name = "worm" - desc = "It's a wriggling worm from a can of fishing bait. You're not going to eat it are you ?" + desc = "It's a wriggling worm from a can of fishing bait. You're not going to eat it, are you?" icon = 'icons/obj/fishing.dmi' icon_state = "worm" food_reagents = list(/datum/reagent/consumable/nutriment/protein = 1) diff --git a/code/game/objects/items/surgery_tray.dm b/code/game/objects/items/surgery_tray.dm index 8c0ccdad40f..7d0653f7bdf 100644 --- a/code/game/objects/items/surgery_tray.dm +++ b/code/game/objects/items/surgery_tray.dm @@ -6,7 +6,7 @@ */ /obj/item/surgery_tray name = "surgery tray" - desc = "A Deforest brand medical cart. It is a folding model, meaning the wheels on the bottom can be retracted and the body used as a tray." + desc = "A DeForest-brand medical cart. It is a folding model, meaning the wheels on the bottom can be retracted and the body used as a tray." icon = 'icons/obj/medical/medicart.dmi' icon_state = "tray" w_class = WEIGHT_CLASS_BULKY @@ -188,7 +188,7 @@ /obj/item/surgery_tray/full/morgue name = "autopsy tray" - desc = "A Deforest brand surgery tray, made for use in morgues. It is a folding model, \ + desc = "A DeForest-brand surgery tray, made for use in morgues. It is a folding model, \ meaning the wheels on the bottom can be extended outwards, making it a cart." starting_items = list( /obj/item/blood_filter/cruel, diff --git a/code/game/objects/structures/fake_stairs.dm b/code/game/objects/structures/fake_stairs.dm index 1152a8c02dc..9a33da5818c 100644 --- a/code/game/objects/structures/fake_stairs.dm +++ b/code/game/objects/structures/fake_stairs.dm @@ -1,5 +1,6 @@ /// Stairs but they are FAKE and dont have any of the Z-changing behavior. DO NOT MAP THESE NEXT TO REAL STAIRS /obj/structure/fake_stairs + gender = PLURAL name = "stairs" icon = 'icons/obj/stairs.dmi' icon_state = "stairs" diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index a836886da62..974425c94ca 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -457,7 +457,7 @@ update_appearance() /obj/structure/flora/tree/pine/xmas - name = "xmas tree" + name = "\improper Christmas tree" desc = "A wondrous decorated Christmas tree." icon_state = "pine_c" diff --git a/code/game/objects/structures/plaques/static_plaques.dm b/code/game/objects/structures/plaques/static_plaques.dm index 6aed496b6f4..8d8dcade606 100644 --- a/code/game/objects/structures/plaques/static_plaques.dm +++ b/code/game/objects/structures/plaques/static_plaques.dm @@ -21,7 +21,7 @@ desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands." /obj/structure/plaque/static_plaque/thunderdome - name = "Thunderdome Plaque" + name = "\improper Thunderdome plaque" desc = "This plaque commemorates those who have fallen in glorious combat. For all the charred, dizzy, and beaten men who have died in its hands." /obj/structure/plaque/static_plaque/golden @@ -38,7 +38,7 @@ // Runtimestation: added Nov 11, 2016 (946ec1fec869eb59d6a84e32c90613af734fcd0e) /obj/structure/plaque/static_plaque/golden/commission - name = "Commission Plaque" + name = "commission plaque" desc = "Spinward Sector Station SS-13\n'Runtime' Class Outpost\nCommissioned 03/11/2556\n'Dedicated to the Pioneers'" icon_state = "commission_nt" layer = BELOW_OPEN_DOOR_LAYER diff --git a/code/game/objects/structures/signs/signs_misc.dm b/code/game/objects/structures/signs/signs_misc.dm index b167f62ec9d..33e0fa12086 100644 --- a/code/game/objects/structures/signs/signs_misc.dm +++ b/code/game/objects/structures/signs/signs_misc.dm @@ -21,7 +21,7 @@ is_editable = TRUE /obj/structure/sign/chalkboard_menu - name = "\improper Chalkboard coffee menu" + name = "chalkboard coffee menu" icon_state = "chalkboard_menu" icon = 'icons/obj/machines/barsigns.dmi' desc = "85cr for a iced lactose-free caramel frappe?! Who buys that?!" diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 8adfd07671e..bcb08189bae 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -231,7 +231,7 @@ ADMIN_VERB(debug_z_levels, R_DEBUG, "Debug Z-Levels", "Displays a list of all z- var/list/messages = list() var/list/z_list = SSmapping.z_list - messages += "\nWorld: [world.maxx] x [world.maxy] x [world.maxz]\n" + messages += "World: [world.maxx] x [world.maxy] x [world.maxz]\n" var/list/linked_levels = list() var/min_x = INFINITY diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 7f580e1020c..88f50b3cb3e 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -637,7 +637,7 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w if(teamsize <= 0) return FALSE - candidates = SSpolling.poll_ghost_candidates("Do you wish to be considered for a [span_notice("Nanotrasen emergency response drone")]?", check_jobban = ROLE_DRONE, alert_pic = /mob/living/basic/drone/classic, role_name_text = "nanotrasen emergency response drone") + candidates = SSpolling.poll_ghost_candidates("Do you wish to be considered for a [span_notice("Nanotrasen emergency response drone")]?", check_jobban = ROLE_DRONE, alert_pic = /mob/living/basic/drone/classic, role_name_text = "Nanotrasen emergency response drone") if(length(candidates) == 0) return FALSE diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 3404163bbbc..1ba92e66292 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -147,13 +147,13 @@ GLOBAL_LIST_EMPTY(antagonists) //button for antags to review their descriptions/info /datum/action/antag_info - name = "Open Special Role Information:" + name = "Open Special Role Information" button_icon_state = "round_end" show_to_observers = FALSE /datum/action/antag_info/New(Target) . = ..() - name = "Open [target] Information:" + name = "Open [target] Information" /datum/action/antag_info/Trigger(mob/clicker, trigger_flags) . = ..() diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index fb61b7c74ab..08d9ab5808b 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -194,7 +194,7 @@ if(H.move_intent == MOVE_INTENT_RUN) INVOKE_ASYNC(src, PROC_REF(triggered), H) H.visible_message(span_warning("[H] accidentally steps on [src]."), \ - span_warning("You accidentally step on [src]")) + span_warning("You accidentally step on [src].")) else if(ismouse(MM) || isregalrat(MM)) INVOKE_ASYNC(src, PROC_REF(triggered), MM) else if(AM.density) // For mousetrap grenades, set off by anything heavy diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 303f905a086..8c57f8a9da0 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -204,7 +204,7 @@ . += span_notice("Use [EXAMINE_HINT("Alt-Click")] to [state_open ? "Close" : "Open"] the machine.") . += span_notice("Use [EXAMINE_HINT("Ctrl-Click")] to turn [on ? "Off" : "On"] the machine.") - . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] open.") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] open.") if(panel_open) . += span_notice("[src] can be [EXAMINE_HINT("pried")] apart.") . += span_notice("[src] can be rotated with a [EXAMINE_HINT("wrench")].") diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 077fb430ea2..d2bc055ec58 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -246,8 +246,11 @@ return FALSE /obj/machinery/atmospherics/components/unary/thermomachine/wrench_act_secondary(mob/living/user, obj/item/tool) - if(!panel_open || check_pipe_on_turf()) - visible_message(span_warning("A pipe is hogging the port, remove the obstruction or change the machine piping layer.")) + if(!panel_open) + balloon_alert(user, "open panel!") + return ITEM_INTERACT_SUCCESS + if(!anchored && check_pipe_on_turf()) + visible_message(span_warning("A pipe is hogging the port. Remove the obstruction or change the machine piping layer.")) return ITEM_INTERACT_SUCCESS if(default_unfasten_wrench(user, tool)) change_pipe_connection(!anchored) diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 7ed1d9ca32a..509370a0307 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -709,9 +709,9 @@ // Go over the gases in canister, pull all their info and mark the spooky ones var/list/output = list() - output += "[key_name(user)] opened a canister [wire_pulsed ? "via wire pulse" : ""] that contains the following:" + output += "[key_name(user)] opened a canister[wire_pulsed ? " via wire pulse" : ""] that contains the following:" var/list/admin_output = list() - admin_output += "[ADMIN_LOOKUPFLW(user)] opened a canister [wire_pulsed ? "via wire pulse" : ""] that contains the following at [ADMIN_VERBOSEJMP(src)]:" + admin_output += "[ADMIN_LOOKUPFLW(user)] opened a canister[wire_pulsed ? " via wire pulse" : ""] that contains the following at [ADMIN_VERBOSEJMP(src)]:" var/list/gases = air_contents.gases var/danger = FALSE for(var/gas_index in 1 to length(gases)) diff --git a/code/modules/bitrunning/job.dm b/code/modules/bitrunning/job.dm index 5baf875ccf7..8939478018e 100644 --- a/code/modules/bitrunning/job.dm +++ b/code/modules/bitrunning/job.dm @@ -1,6 +1,6 @@ /datum/job/bitrunner title = JOB_BITRUNNER - description = "Surf the virtual domain for gear and loot. Decrypt your rewards on station." + description = "Surf the virtual domain for gear and loot, decrypt your rewards on station." faction = FACTION_STATION total_positions = 3 spawn_positions = 3 diff --git a/code/modules/bitrunning/netpod/_netpod.dm b/code/modules/bitrunning/netpod/_netpod.dm index 80c3bfc5b21..6fac2feb144 100644 --- a/code/modules/bitrunning/netpod/_netpod.dm +++ b/code/modules/bitrunning/netpod/_netpod.dm @@ -76,12 +76,12 @@ /obj/machinery/netpod/examine(mob/user) . = ..() - . += span_notice("Its maintainance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "close" : "open"].") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "close" : "open"].") if(isnull(occupant)) if(panel_open) . += span_notice("It can be [EXAMINE_HINT("pried")] apart.") else - . += span_notice("Its hatch can be [EXAMINE_HINT("pried")] [state_open ? "closed" : "open"]") + . += span_notice("Its hatch can be [EXAMINE_HINT("pried")] [state_open ? "closed" : "open"].") if(isnull(server_ref?.resolve())) . += span_infoplain("It's not connected to anything.") diff --git a/code/modules/bitrunning/objects/byteforge.dm b/code/modules/bitrunning/objects/byteforge.dm index 29ca48d0af1..a4ceb6fb534 100644 --- a/code/modules/bitrunning/objects/byteforge.dm +++ b/code/modules/bitrunning/objects/byteforge.dm @@ -35,9 +35,9 @@ /obj/machinery/byteforge/examine(mob/user) . = ..() - . += span_notice("Make sure this is 4 tiles from the quantum server") + . += span_notice("Must be within 4 tiles of the quantum server.") - . += span_notice("Its maintainance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "close" : "open"].") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "close" : "open"].") if(panel_open) . += span_notice("It can be [EXAMINE_HINT("pried")] apart.") diff --git a/code/modules/bitrunning/server/_parent.dm b/code/modules/bitrunning/server/_parent.dm index 9e0e8251d01..b91b6a15d40 100644 --- a/code/modules/bitrunning/server/_parent.dm +++ b/code/modules/bitrunning/server/_parent.dm @@ -88,7 +88,7 @@ . += span_infoplain("Can be resource intensive to run. Ensure adequate power supply.") - . += span_notice("Its maintainance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "close" : "open"].") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "close" : "open"].") if(panel_open) . += span_notice("It can be [EXAMINE_HINT("pried")] apart.") diff --git a/code/modules/cargo/exports.dm b/code/modules/cargo/exports.dm index 78241aa6d74..2c1a8e5274b 100644 --- a/code/modules/cargo/exports.dm +++ b/code/modules/cargo/exports.dm @@ -244,7 +244,7 @@ Then the player gets the profit from selling his own wasted time. if(unit_name) msg += unit_name if(total_amount > 1) - msg += "s" + msg += plural_s(unit_name) if(message) msg += " " diff --git a/code/modules/cargo/exports/parts.dm b/code/modules/cargo/exports/parts.dm index 3d4aaef65af..43d8a60518f 100644 --- a/code/modules/cargo/exports/parts.dm +++ b/code/modules/cargo/exports/parts.dm @@ -37,5 +37,9 @@ /datum/export/refill_canister cost = CARGO_CRATE_VALUE * 0.5 //If someone want to make this worth more as it empties, go ahead unit_name = "vending refill canister" - message = "Thank you for restocking the station!" export_types = list(/obj/item/vending_refill) + +/datum/export/refill_canister/total_printout(datum/export_report/ex, notes = TRUE) + . = ..() + if(. && notes) + . += " Thank you for restocking the station!" diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm index 61254001258..fb3c1a83787 100644 --- a/code/modules/cargo/order.dm +++ b/code/modules/cargo/order.dm @@ -158,7 +158,7 @@ container_contents -= missing_item for(var/item in container_contents) - manifest_text += "
  • [container_contents[item]] [item][container_contents[item] == 1 ? "" : "s"]
    • " + manifest_text += "
  • [container_contents[item]] [item][container_contents[item] == 1 ? "" : plural_s(item)]
    • " manifest_text += "" manifest_text += "

    Stamp below to confirm receipt of goods:

    " diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 003cbf4850a..28f5fc69937 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -1,4 +1,5 @@ /obj/item/clothing/glasses/hud + gender = NEUTER name = "HUD" desc = "A heads-up display that provides important info in (almost) real time." flags_1 = null //doesn't protect eyes because it's a monocle, duh @@ -93,6 +94,7 @@ clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_MEDICAL_HUD) /obj/item/clothing/glasses/hud/health/sunglasses + gender = PLURAL name = "medical HUDSunglasses" desc = "Sunglasses with a medical HUD." icon_state = "sunhudmed" @@ -135,6 +137,7 @@ icon_state = length(color_cutoffs) ? initial(icon_state) : "night_off" /obj/item/clothing/glasses/hud/diagnostic/sunglasses + gender = PLURAL name = "diagnostic sunglasses" desc = "Sunglasses with a diagnostic HUD." icon_state = "sunhuddiag" @@ -179,6 +182,7 @@ user.update_worn_glasses() /obj/item/clothing/glasses/hud/security/sunglasses + gender = PLURAL name = "security HUDSunglasses" desc = "Sunglasses with a security HUD." icon_state = "sunhudsec" @@ -213,6 +217,7 @@ icon_state = length(color_cutoffs) ? initial(icon_state) : "night_off" /obj/item/clothing/glasses/hud/security/sunglasses/gars + gender = PLURAL name = "\improper HUD gar glasses" desc = "GAR glasses with a HUD." icon_state = "gar_sec" @@ -295,6 +300,7 @@ thermal_overload() /obj/item/clothing/glasses/hud/spacecop + gender = PLURAL name = "police aviators" desc = "For thinking you look cool while brutalizing protestors and minorities." icon_state = "bigsunglasses" @@ -305,6 +311,7 @@ /obj/item/clothing/glasses/hud/spacecop/hidden // for the undercover cop + gender = PLURAL name = "sunglasses" desc = "These sunglasses are special, and let you view potential criminals." icon_state = "sun" diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 48fae41c724..7afc876c9fd 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -122,8 +122,8 @@ name = "welding hard hat" desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight AND welding shield! The bulb seems a little smaller though." light_range = 3 //Needs a little bit of tradeoff - toggle_message = "You pull the visor down" - alt_toggle_message = "You push the visor up" + toggle_message = "You pull the visor down." + alt_toggle_message = "You push the visor up." dog_fashion = null actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen) flash_protect = FLASH_PROTECTION_WELDER diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 66b5703c492..6d74a9f9cca 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -240,8 +240,8 @@ icon_state = "riot" base_icon_state = "riot" inhand_icon_state = "riot_helmet" - toggle_message = "You pull the visor down" - alt_toggle_message = "You push the visor up" + toggle_message = "You pull the visor down." + alt_toggle_message = "You push the visor up." armor_type = /datum/armor/toggleable_riot flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDESNOUT strip_delay = 8 SECONDS @@ -295,8 +295,8 @@ icon_state = "justice" base_icon_state = "justice" inhand_icon_state = "justice_helmet" - toggle_message = "You turn off the lights" - alt_toggle_message = "You turn on the lights" + toggle_message = "You turn off the lights." + alt_toggle_message = "You turn on the lights." actions_types = list(/datum/action/item_action/toggle_helmet_light) ///Cooldown for toggling the visor. COOLDOWN_DECLARE(visor_toggle_cooldown) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 9c1ba74d210..01d617611d6 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -219,8 +219,8 @@ GLOBAL_LIST_INIT(clown_mask_options, list( flash_protect = FLASH_PROTECTION_WELDER custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2, /datum/material/glass=SHEET_MATERIAL_AMOUNT) tint = 2 - toggle_message = "You pull the visor down" - alt_toggle_message = "You push the visor up" + toggle_message = "You pull the visor down." + alt_toggle_message = "You push the visor up." armor_type = /datum/armor/gas_welding actions_types = list(/datum/action/item_action/toggle) flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDESNOUT diff --git a/code/modules/experisci/destructive_scanner.dm b/code/modules/experisci/destructive_scanner.dm index 4d6ae192db1..46b5ab01d86 100644 --- a/code/modules/experisci/destructive_scanner.dm +++ b/code/modules/experisci/destructive_scanner.dm @@ -4,8 +4,8 @@ * Placed machine that handles destructive experiments (but can also do the normal ones) */ /obj/machinery/destructive_scanner - name = "Experimental Destructive Scanner" - desc = "A much larger version of the hand-held scanner, a charred label warns about its destructive capabilities." + name = "experimental destructive scanner" + desc = "A much larger version of the hand-held scanner. A charred label warns about its destructive capabilities." icon = 'icons/obj/machines/destructive_scanner.dmi' icon_state = "tube_open" circuit = /obj/item/circuitboard/machine/destructive_scanner diff --git a/code/modules/explorer_drone/scanner_array.dm b/code/modules/explorer_drone/scanner_array.dm index 237c3aee606..cabd51f5e6e 100644 --- a/code/modules/explorer_drone/scanner_array.dm +++ b/code/modules/explorer_drone/scanner_array.dm @@ -190,7 +190,7 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) config_flags = EXPERIMENT_CONFIG_ALWAYS_ACTIVE) /obj/machinery/exoscanner - name = "Scanner array" + name = "scanner array" icon = 'icons/obj/exploration.dmi' icon_state = "scanner_off" desc = "A sophisticated scanning array. Easily influenced by its environment." diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index d002378ed12..8c8f1135d89 100644 --- a/code/modules/food_and_drinks/pizzabox.dm +++ b/code/modules/food_and_drinks/pizzabox.dm @@ -82,7 +82,7 @@ if(length(boxes)) desc = "A pile of boxes suited for pizzas. There appear to be [length(boxes) + 1] boxes in the pile." if(box.boxtag != "") - desc = "[desc] The [length(boxes) ? "top box" : "box"]'s tag reads: [box.boxtag]" + desc = "[desc] The [length(boxes) ? "top box" : "box"]'s tag reads: [box.boxtag]." /obj/item/pizzabox/update_icon_state() if(!open) diff --git a/code/modules/food_and_drinks/restaurant/_venue.dm b/code/modules/food_and_drinks/restaurant/_venue.dm index 0a968e3351f..9742111972d 100644 --- a/code/modules/food_and_drinks/restaurant/_venue.dm +++ b/code/modules/food_and_drinks/restaurant/_venue.dm @@ -217,7 +217,7 @@ return ..() if(!(linked_venue.req_access in used_id.GetAccess())) - to_chat(user, span_warning("This card lacks the access to change this venues status.")) + to_chat(user, span_warning("This card lacks the access to change this venue's status.")) return linked_venue.toggle_open() diff --git a/code/modules/food_and_drinks/restaurant/generic_venues.dm b/code/modules/food_and_drinks/restaurant/generic_venues.dm index 49905b76341..06bb1b42cd5 100644 --- a/code/modules/food_and_drinks/restaurant/generic_venues.dm +++ b/code/modules/food_and_drinks/restaurant/generic_venues.dm @@ -62,6 +62,7 @@ holosign_type = /obj/structure/holosign/robot_seat/restaurant /obj/structure/holosign/robot_seat/restaurant + gender = PLURAL name = "restaurant seating" linked_venue = /datum/venue/restaurant @@ -94,5 +95,6 @@ holosign_type = /obj/structure/holosign/robot_seat/bar /obj/structure/holosign/robot_seat/bar + gender = PLURAL name = "bar seating" linked_venue = /datum/venue/bar diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index 44346103466..f8d65aabb8f 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -1,7 +1,7 @@ /datum/job/chemist title = JOB_CHEMIST - description = "Supply the doctors with chemicals, make medicine, as well as \ - less likable substances in the comfort of a fully reinforced room." + description = "Supply the doctors with chemicals, make medicine, cook up \ + sketchy substances in the comfort of a fully reinforced room." faction = FACTION_STATION total_positions = 2 spawn_positions = 2 diff --git a/code/modules/jobs/job_types/coroner.dm b/code/modules/jobs/job_types/coroner.dm index 4fe6ad3cdb2..ddb1ad7e83f 100644 --- a/code/modules/jobs/job_types/coroner.dm +++ b/code/modules/jobs/job_types/coroner.dm @@ -1,7 +1,7 @@ /datum/job/coroner title = JOB_CORONER - description = "Perform Autopsies whenever needed, \ - Update medical records accordingly, apply formaldehyde." + description = "Perform autopsies whenever needed, \ + update medical records accordingly, apply formaldehyde." faction = FACTION_STATION total_positions = 1 spawn_positions = 1 diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 1136063a73c..618cba05e40 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -1,7 +1,7 @@ /datum/job/head_of_personnel title = JOB_HEAD_OF_PERSONNEL description = "Alter access on ID cards, manage the service department, \ - protect Ian, run the station when the captain dies." + protect Ian, run the station when the Captain dies." auto_deadmin_role_flags = DEADMIN_POSITION_HEAD head_announce = RADIO_CHANNEL_SERVICE faction = FACTION_STATION diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index 7c7656d8b46..d7c52c8255b 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -1,6 +1,6 @@ /datum/job/janitor title = JOB_JANITOR - description = "Clean up trash and blood. Replace broken lights. Slip people over." + description = "Clean up trash and blood, replace broken lights, slip people over." faction = FACTION_STATION total_positions = 2 spawn_positions = 1 diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 7bc267b124b..d7963faeedf 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -1,7 +1,7 @@ /datum/job/doctor title = JOB_MEDICAL_DOCTOR description = "Save lives, run around the station looking for victims, \ - scan everyone in sight" + scan everyone in sight." faction = FACTION_STATION total_positions = 6 spawn_positions = 4 diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm index 095dd9f158b..2e2d7d38bf0 100644 --- a/code/modules/jobs/job_types/research_director.dm +++ b/code/modules/jobs/job_types/research_director.dm @@ -1,7 +1,7 @@ /datum/job/research_director title = JOB_RESEARCH_DIRECTOR description = "Supervise research efforts, ensure Robotics is in working \ - order, make sure the AI and its Cyborgs aren't rogue, replacing them if \ + order, make sure the AI and its Cyborgs aren't rogue, replace them if \ they are." auto_deadmin_role_flags = DEADMIN_POSITION_HEAD head_announce = RADIO_CHANNEL_SCIENCE diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index c5aa9f5affb..6f166c35d16 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -1,7 +1,7 @@ /datum/job/shaft_miner title = JOB_SHAFT_MINER - description = "Travel to strange lands. Mine ores. \ - Meet strange creatures. Kill them for their gold." + description = "Travel to strange lands, mine ores, \ + meet strange creatures, kill them for their gold." faction = FACTION_STATION total_positions = 3 spawn_positions = 3 diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/puzzle.dm b/code/modules/mapfluff/ruins/lavalandruin_code/puzzle.dm index b5d151dd04f..48bba6e78c6 100644 --- a/code/modules/mapfluff/ruins/lavalandruin_code/puzzle.dm +++ b/code/modules/mapfluff/ruins/lavalandruin_code/puzzle.dm @@ -196,7 +196,7 @@ /obj/structure/puzzle_element name = "mysterious pillar" - desc = "puzzling..." + desc = "Puzzling..." icon = 'icons/obj/mining_zones/artefacts.dmi' icon_state = "puzzle_pillar" anchored = FALSE @@ -315,7 +315,7 @@ return /obj/item/prisoncube - name = "Prison Cube" + name = "prison cube" desc = "Dusty cube with humanoid imprint on it." icon = 'icons/obj/mining_zones/artefacts.dmi' icon_state = "prison_cube" diff --git a/code/modules/mapfluff/ruins/spaceruin_code/derelict_sulaco.dm b/code/modules/mapfluff/ruins/spaceruin_code/derelict_sulaco.dm index 202b1e64ea3..d020536e129 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/derelict_sulaco.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/derelict_sulaco.dm @@ -40,7 +40,7 @@ desc = "State of the art machinery for general overwatch purposes." upperinfo = "Bravo Overwatch Console" icon_screen = "explosive" - content = list("Operator: Cas Ashpole

    Squad Overwatch: Cas Ashpole

    Squad Leader Deployed
    Squad Smartgunners: 1 Deployed
    Squad Corpsmen: 1 Deployed
    Squad Engineers: 2 Deployed
    Squad Marines: 4 Deployed
    Total: 9 Deployed
    Marines Alive: 0

    Name Role State Location SL Distance
    Chip Mello Squad Leader Dead Self-Destruct Core Room N/A
    Sophie Knight Squad Smartgunner Dead Self-Destruct Core Room 4
    Marie Newman Squad Corpsman Dead Unknown N/A
    Angelo Patton Squad Engineer Dead Sulaco Maintenence 19
    Marlon Foster Squad Engineer Dead Sulaco Dropship Hangar 28
    Doug Davidson Squad Marine Dead Sulaco Hangar Workshop 33
    Courtney Miller Squad Marine Dead Sulaco Hangar Workshop 42
    Cesar Jefferson Squad Marine Dead Self-Destruct Core Room 14

    Primary Objective: Defend the self-destruct core.
    Secondary Objective: Give them hell!
    ") + content = list("Operator: Cas Ashpole

    Squad Overwatch: Cas Ashpole

    Squad Leader Deployed
    Squad Smartgunners: 1 Deployed
    Squad Corpsmen: 1 Deployed
    Squad Engineers: 2 Deployed
    Squad Marines: 4 Deployed
    Total: 9 Deployed
    Marines Alive: 0

    Name Role State Location SL Distance
    Chip Mello Squad Leader Dead Self-Destruct Core Room N/A
    Sophie Knight Squad Smartgunner Dead Self-Destruct Core Room 4
    Marie Newman Squad Corpsman Dead Unknown N/A
    Angelo Patton Squad Engineer Dead Sulaco Maintenance 19
    Marlon Foster Squad Engineer Dead Sulaco Dropship Hangar 28
    Doug Davidson Squad Marine Dead Sulaco Hangar Workshop 33
    Courtney Miller Squad Marine Dead Sulaco Hangar Workshop 42
    Cesar Jefferson Squad Marine Dead Self-Destruct Core Room 14

    Primary Objective: Defend the self-destruct core.
    Secondary Objective: Give them hell!
    ") /obj/machinery/computer/terminal/sulaco/overwatch/main name = "main overwatch console" diff --git a/code/modules/mapfluff/ruins/spaceruin_code/originalcontent.dm b/code/modules/mapfluff/ruins/spaceruin_code/originalcontent.dm index d2380479a56..811330d1661 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/originalcontent.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/originalcontent.dm @@ -18,7 +18,7 @@ /obj/item/paper/pamphlet/ruin/originalcontent/pennywise name = "Painting - 'Pennywise'" - default_raw_text = "This picture depicts a smiling clown. Something doesn't feel right about this.." + default_raw_text = "This picture depicts a smiling clown. Something doesn't feel right about this..." icon_state = "painting3" /obj/item/paper/pamphlet/ruin/originalcontent/yelling diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm index 27eae573c87..871d4e7ab7e 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -125,7 +125,7 @@ /obj/machinery/ore_silo/examine(mob/user) . = ..() . += span_notice("It can be linked to techfabs, circuit printers and protolathes with a multitool.") - . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") if(panel_open) . += span_notice("The whole machine can be [EXAMINE_HINT("pried")] apart.") diff --git a/code/modules/mob/living/basic/lavaland/raptor/raptor_dex.dm b/code/modules/mob/living/basic/lavaland/raptor/raptor_dex.dm index 90595dd942a..4243b7b5455 100644 --- a/code/modules/mob/living/basic/lavaland/raptor/raptor_dex.dm +++ b/code/modules/mob/living/basic/lavaland/raptor/raptor_dex.dm @@ -1,5 +1,5 @@ /obj/item/raptor_dex - name = "RaptorDex" + name = "\improper RaptorDex" desc = "A device used to analyze lavaland raptors!" icon = 'icons/obj/devices/scanner.dmi' icon_state = "raptor_dex" diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 368241aa844..82aa79711d8 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -586,7 +586,7 @@ SEND_SIGNAL(src, COMSIG_MOB_EXAMINING, examinify, result) if(removes_double_click) result += span_notice("You can examine [examinify] closer...") - result_combined = (atom_title ? fieldset_block("[atom_title]", jointext(result, "
    "), "boxed_message") : boxed_message(jointext(result, "
    "))) + result_combined = (atom_title ? fieldset_block("[atom_title].", jointext(result, "
    "), "boxed_message") : boxed_message(jointext(result, "
    "))) to_chat(src, span_infoplain(result_combined)) SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, examinify) diff --git a/code/modules/power/floodlight.dm b/code/modules/power/floodlight.dm index 1b5a8692743..9f7fa72dd7a 100644 --- a/code/modules/power/floodlight.dm +++ b/code/modules/power/floodlight.dm @@ -209,12 +209,12 @@ if(!anchored) . += span_notice("It needs to be wrenched on top of a wire.") else - . += span_notice("Its at power level [setting].") + . += span_notice("It's at power level [setting].") if(panel_open) - . += span_notice("Its maintainence hatch is open but can be [EXAMINE_HINT("screwed")] close.") + . += span_notice("Its maintenance hatch is open but can be [EXAMINE_HINT("screwed")] closed.") . += span_notice("You can remove the light tube by [EXAMINE_HINT("hand")].") else - . += span_notice("Its maintainence hatch can be [EXAMINE_HINT("screwed")] open.") + . += span_notice("Its maintenance hatch can be [EXAMINE_HINT("screwed")] open.") /obj/machinery/power/floodlight/process() var/turf/T = get_turf(src) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index e93e65261cb..a6fb54edc70 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -124,7 +124,7 @@ /obj/machinery/power/smes/examine(user) . = ..() - . += span_notice("it's maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "opened"]") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "opened"].") if(panel_open) if(!terminal) . += span_notice("It can be [EXAMINE_HINT("pried")] apart.") diff --git a/code/modules/power/turbine/turbine.dm b/code/modules/power/turbine/turbine.dm index e2d47010850..dc9708a1d1a 100644 --- a/code/modules/power/turbine/turbine.dm +++ b/code/modules/power/turbine/turbine.dm @@ -95,7 +95,7 @@ . += span_notice("\The [installed_part] can be [EXAMINE_HINT("pried")] out.") else . += span_warning("Is missing a [initial(part_path.name)].") - . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") if(panel_open) . += span_notice("It can rotated with a [EXAMINE_HINT("wrench")]") . += span_notice("The full machine can be [EXAMINE_HINT("pried")] apart") diff --git a/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm b/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm index b33016b452a..c7c4523cff4 100644 --- a/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm +++ b/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm @@ -1,5 +1,5 @@ /obj/machinery/chem_mass_spec - name = "High-performance liquid chromatography machine" + name = "high-performance liquid chromatography machine" desc = "Allows you to purify reagents & separate out inverse reagents" icon = 'icons/obj/medical/chemical.dmi' icon_state = "HPLC" @@ -102,7 +102,7 @@ . += span_notice("Its [EXAMINE_HINT("anchored")] in place.") else . += span_warning("Needs to be [EXAMINE_HINT("wrenched")] to use.") - . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") if(panel_open) . += span_notice("It can be [EXAMINE_HINT("pried")] apart.") diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index f02704c0573..fe120a8d2d3 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -1,7 +1,7 @@ #define MAX_CONTAINER_PRINT_AMOUNT 50 /obj/machinery/chem_master - name = "ChemMaster 3000" + name = "\improper ChemMaster 3000" desc = "Used to separate chemicals and distribute them in a variety of forms." icon = 'icons/obj/medical/chemical.dmi' icon_state = "chemmaster" @@ -83,13 +83,13 @@ if(in_range(user, src) || isobserver(user)) . += span_notice("The status display reads:
    Reagent buffer capacity: [reagents.maximum_volume] units.
    Printing speed: [0.75 SECONDS / printing_speed * 100]%.") if(!QDELETED(beaker)) - . += span_notice("[beaker] of [beaker.reagents.maximum_volume]u capacity inserted") - . += span_notice("Right click with empty hand to remove beaker") + . += span_notice("[beaker] of [beaker.reagents.maximum_volume]u capacity inserted.") + . += span_notice("Right click with empty hand to remove beaker.") else - . += span_warning("Missing input beaker") + . += span_warning("Missing input beaker.") - . += span_notice("It can be [EXAMINE_HINT("wrenched")] [anchored ? "loose" : "in place"]") - . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "close" : "open"]") + . += span_notice("It can be [EXAMINE_HINT("wrenched")] [anchored ? "loose" : "in place"].") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "close" : "open"].") if(panel_open) . += span_notice("The machine can be [EXAMINE_HINT("pried")] apart.") diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 8dd7f26c7b8..b998523bc25 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -1,6 +1,6 @@ /obj/machinery/reagentgrinder - name = "\improper All-In-One Grinder" + name = "all-in-one grinder" desc = "From BlenderTech. Will It Blend? Let's test it out!" icon = 'icons/obj/machines/kitchen.dmi' icon_state = "juicer" @@ -117,7 +117,7 @@ . += span_notice("It can be [EXAMINE_HINT("wrenched")] loose.") else . += span_warning("Needs to be [EXAMINE_HINT("wrenched")] in place to work.") - . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") if(panel_open) . += span_notice("It can be [EXAMINE_HINT("pried")] apart.") diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm index 02c96e8418d..e41296a589a 100644 --- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm +++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm @@ -77,7 +77,7 @@ . += span_notice("Reagent capacity [reagents.total_volume]/[reagents.maximum_volume].") . += span_notice("Operating at [round((efficiency / 26) * 100)]% efficiency.") - . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") if(panel_open) . += span_notice("It can be [EXAMINE_HINT("pried")] apart.") diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 4dc1fd1bdb9..dfbed0e37f5 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -629,7 +629,7 @@ GLOBAL_VAR_INIT(disposals_animals_spawned, 0) var/turf/final_turf = length(open_turfs) ? pick(open_turfs) : drop_location() var/mob/living/startled_animal = new contained_animal(drop_location()) startled_animal.Move(final_turf) - visible_message(span_notice("A startled [startled_animal] jumps out of [src]")) + visible_message(span_notice("A startled [startled_animal] jumps out of [src].")) contained_animal = null /// Initiates flushing diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 03fba49ac07..1134674d93c 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -79,8 +79,8 @@ if(!in_range(user, src) && !isobserver(user)) return - . += span_notice("Material usage cost at [efficiency_coeff * 100]%") - . += span_notice("Build time at [efficiency_coeff * 100]%") + . += span_notice("Material usage cost at [efficiency_coeff * 100]%.") + . += span_notice("Build time at [efficiency_coeff * 100]%.") if(drop_direction) . += span_notice("Currently configured to drop printed objects [dir2text(drop_direction)].") . += span_notice("[EXAMINE_HINT("Alt-click")] to reset.") diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 665dae0e243..100c7979c24 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -43,7 +43,7 @@ return . += span_notice("A [EXAMINE_HINT("multitool")] with techweb designs can be uploaded here.") - . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") if(panel_open) . += span_notice("Use a [EXAMINE_HINT("multitool")] or [EXAMINE_HINT("wirecutters")] to interact with wires.") . += span_notice("The machine can be [EXAMINE_HINT("pried")] apart.") diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index a115c28538a..fab16ff1565 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -7,8 +7,8 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) #define ACCESS_GRANTING_COOLDOWN (30 SECONDS) /obj/machinery/keycard_auth - name = "Keycard Authentication Device" - desc = "This device is used to trigger station functions, which require more than one ID card to authenticate, or to give the Janitor access to a department." + name = "keycard authentication device" + desc = "This device is used to trigger station functions which require more than one ID card to authenticate, or to give the Janitor access to a department." icon = 'icons/obj/machines/keycard_auth_table.dmi' icon_state = "auth_off" power_channel = AREA_USAGE_ENVIRON diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index 036aae8e099..90e30ea03f8 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -405,8 +405,8 @@ if(INVOCATION_EMOTE) invoker.visible_message( - capitalize(REPLACE_PRONOUNS(replacetext(used_invocation_message, "%CASTER", invoker.name), invoker)), - capitalize(REPLACE_PRONOUNS(replacetext(invocation_self_message, "%CASTER", invoker.name), invoker)), + capitalize(REPLACE_PRONOUNS(replacetext(used_invocation_message, "%CASTER", "[invoker]"), invoker)), + capitalize(REPLACE_PRONOUNS(replacetext(invocation_self_message, "%CASTER", "[invoker]"), invoker)), visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, ) diff --git a/code/modules/vending/vendor/_vending.dm b/code/modules/vending/vendor/_vending.dm index 139a50f62e9..f983615b034 100644 --- a/code/modules/vending/vendor/_vending.dm +++ b/code/modules/vending/vendor/_vending.dm @@ -359,7 +359,7 @@ if(isnull(refill_canister)) return // you can add the comment here instead - . += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"]") + . += span_notice("Its maintenance panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].") if(panel_open) . += span_notice("The machine may be [EXAMINE_HINT("pried")] apart.") diff --git a/strings/tcg/set_one.json b/strings/tcg/set_one.json index 73851198cd2..6b73ff7a7eb 100644 --- a/strings/tcg/set_one.json +++ b/strings/tcg/set_one.json @@ -936,7 +936,7 @@ { "id": "drone_pai", "name": "Personal AI Device (Drone Shell)", - "desc": "The most basic Personal AI shell, the Drone Shell resembles the old maintainance drones used on Nanotrasen Stations prior to 'the incident', and is perfect for the tech-savvy AI-owner.", + "desc": "The most basic Personal AI shell, the Drone Shell resembles the old maintenance drones used on Nanotrasen Stations prior to 'the incident', and is perfect for the tech-savvy AI-owner.", "rules": "Tap this card: Add a silicon card from your discard pile to your hand.", "icon_state": "pai_drone", "power": "2", diff --git a/tgui/packages/tgui/interfaces/AtmosAlertConsole.tsx b/tgui/packages/tgui/interfaces/AtmosAlertConsole.tsx index e27ddaa1396..6ea0c6b5907 100644 --- a/tgui/packages/tgui/interfaces/AtmosAlertConsole.tsx +++ b/tgui/packages/tgui/interfaces/AtmosAlertConsole.tsx @@ -18,7 +18,7 @@ export const AtmosAlertConsole = (props) => {