From ea2a6b120459a48f6bf160c77fdbb90c3de6f074 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Wed, 25 Jun 2025 23:10:02 +0200 Subject: [PATCH] Typos and Cigarette Fixes (#20878) this PR fixes some typos and increases the S'rendarr's Hand content in the adhomian cigarette from 5 to 10 to match the total amount found in other cigarettes. also removes "vanilla cigarettes" from the code because it isn't used anywhere. --- README.md | 2 +- code/game/atom/atom_examine.dm | 2 +- code/game/machinery/doors/airlock.dm | 4 ++-- code/game/objects/items/weapons/cigs_lighters.dm | 7 ++----- code/game/objects/items/weapons/tools.dm | 12 +++++------- .../overmap/exoplanets/decor/flora/potted_big.dm | 2 +- html/changelogs/SleepyGemmy-typo_fixes.yml | 10 ++++++++++ 7 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 html/changelogs/SleepyGemmy-typo_fixes.yml diff --git a/README.md b/README.md index 2b07362fca5..25dce822c69 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ If you wish to develop for or using this codebase, please read the "Development" ### DEVELOPMENT Note: If you wish to develop for our codebase, please take a look at the guides under .github/guides and the github wiki, as they outlines the guidelines for contributing to our codebase, which outline both the process for, and the guidelines you must follow to, have your PRs merged. -To develop for or using this codebase, the following tools are part of our toolchail: +To develop for or using this codebase, the following tools are part of our toolchain: - An updated and supported Windows Operating System version. (It might be possible to successfully follow the same general steps in other OSes, but they are untested) - [BYOND](https://www.byond.com/download/), with an active account ([Register](https://secure.byond.com/Join) if you do not have one already) diff --git a/code/game/atom/atom_examine.dm b/code/game/atom/atom_examine.dm index 648a4c5e07f..29e323a66f5 100644 --- a/code/game/atom/atom_examine.dm +++ b/code/game/atom/atom_examine.dm @@ -78,7 +78,7 @@ . += FONT_SMALL(SPAN_ALERT("- [desc_antag]")) else if(desc_extended || desc_info || (desc_antag && player_is_antag(user.mind))) // Checks if the object has a extended description, a mechanics description, and/or an antagonist description (and if the user is an antagonist). - . += FONT_SMALL(SPAN_NOTICE("\[?\] This object has additional examine information available. \[Show In Chat\]")) // If any of the above are true, show that the object has more information available. + . += FONT_SMALL(SPAN_NOTICE("\[?\] This object has additional examine information available. \[Show in Chat\]")) // If any of the above are true, show that the object has more information available. if(desc_extended) // If the item has a extended description, show that it is available. . += FONT_SMALL("- This object has an extended description.") if(desc_info) // If the item has a description regarding game mechanics, show that it is available. diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index a02cfce2691..aa3374109ac 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1251,7 +1251,7 @@ About the new airlock wires panel: /obj/machinery/door/airlock/proc/bolts_interact(var/mob/user, var/activate, var/isAdmin, var/antag) if(isrobot(user) && !Adjacent(user)) - to_chat(user, SPAN_WARNING("Your frame does not allow long distance wireless bolt control, you will need be adjacent the door.")) + to_chat(user, SPAN_WARNING("Your frame does not allow long distance wireless bolt control, you will need to be adjacent to the door.")) return if(isWireCut(WIRE_BOLTLIGHT)) // cut wire is noop to_chat(user, SPAN_WARNING("The door bolt control wire is cut - Door bolts permanently dropped.")) @@ -1557,7 +1557,7 @@ About the new airlock wires panel: src.loseBackupPower() if("bolts") if(isrobot(usr) && !Adjacent(usr)) - to_chat(usr, SPAN_WARNING("Your frame does not allow long distance wireless bolt control, you will need be adjacent the door.")) + to_chat(usr, SPAN_WARNING("Your frame does not allow long distance wireless bolt control, you will need to be adjacent to the door.")) return if(src.isWireCut(WIRE_BOLTLIGHT)) // cut wire is noop to_chat(usr, SPAN_WARNING("The door bolt control wire is cut - Door bolts permanently dropped.")) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index d8f67602d51..1d68c9dfcca 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -374,9 +374,6 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable) return ..() -/obj/item/clothing/mask/smokable/cigarette/vanilla - reagents_to_add = list(/singleton/reagent/toxin/tobacco = 15) - /obj/item/clothing/mask/smokable/cigarette/acmeco reagents_to_add = list( /singleton/reagent/toxin/tobacco = 5, @@ -411,7 +408,7 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable) name = "adhomian cigarette" desc = "An adhomian cigarette made from processed S'rendarr's Hand." reagents_to_add = list( - /singleton/reagent/toxin/tobacco/srendarrs_hand = 5, + /singleton/reagent/toxin/tobacco/srendarrs_hand = 10, /singleton/reagent/mental/nicotine = 5 ) @@ -431,7 +428,7 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable) ) /obj/item/clothing/mask/smokable/cigarette/dyn - name = "dyn cigarette" + name = "dyn cigarette" desc = "A mentholated cigarette from Nralakk made with processed dyn." reagents_to_add = list( /singleton/reagent/toxin/tobacco/sweet = 5, diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 3f9763d365d..0bec8f13387 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -715,7 +715,7 @@ icon_state = "crowbar_red" item_state = "crowbar_red" -/obj/item/crowbar/rescue_axe //Imagine something like a crash axe found on airplanes or forcing tools used by emergency services. This is a tool first and foremost. +/obj/item/crowbar/rescue_axe // Imagine something like a crash axe found on airplanes or forcing tools used by emergency services. This is a tool first and foremost. name = "rescue axe" desc = "A short lightweight emergency tool meant to chop, pry and pierce. Most of the handle is insulated excepting the wedge at the very bottom. The axe head atop the tool has a short pick opposite of the blade." icon_state = "rescue_axe" @@ -723,19 +723,19 @@ w_class = WEIGHT_CLASS_NORMAL force = 18 throwforce = 12 - obj_flags = null //Handle is insulated, so this means it won't conduct electricity and hurt you. + obj_flags = null // Handle is insulated, so this means it won't conduct electricity and hurt you. sharp = TRUE edge = TRUE origin_tech = list(TECH_ENGINEERING = 2) -/obj/item/crowbar/rescue_axe/resolve_attackby(atom/A)//In practice this means it just does full damage to reinforced windows, which halve the force of attacks done against it already. That's just fine. +/obj/item/crowbar/rescue_axe/resolve_attackby(atom/A) // In practice this means it just does full damage to reinforced windows, which halve the force of attacks done against it already. That's just fine. if(istype(A, /obj/structure/window)) force = initial(force) * 2 else force = initial(force) . = ..() -/obj/item/crowbar/rescue_axe/iscrowbar()//go ham +/obj/item/crowbar/rescue_axe/iscrowbar() if(ismob(loc)) var/mob/M = loc if(M.a_intent && M.a_intent == I_HURT) @@ -751,7 +751,7 @@ item_state = "rescue_axe_red" /obj/item/crowbar/hydraulic_rescue_tool - name = "Hydraulic rescue tool" + name = "hydraulic rescue tool" desc = "A hydraulic rescue tool that functions like a crowbar by applying strong amounts of hydraulic pressure to force open different things. Also known as jaws of life." icon = 'icons/obj/item/hydraulic_rescue_tool.dmi' icon_state = "jawspry" @@ -764,8 +764,6 @@ origin_tech = list(TECH_ENGINEERING = 1) matter = list(DEFAULT_WALL_MATERIAL = 50) attack_verb = list("attacked", "rammed", "battered", "bludgeoned") - sharp = FALSE - edge = FALSE // Pipe wrench /obj/item/pipewrench diff --git a/code/modules/overmap/exoplanets/decor/flora/potted_big.dm b/code/modules/overmap/exoplanets/decor/flora/potted_big.dm index 429e3cc4c28..72d28c9cbd0 100644 --- a/code/modules/overmap/exoplanets/decor/flora/potted_big.dm +++ b/code/modules/overmap/exoplanets/decor/flora/potted_big.dm @@ -151,7 +151,7 @@ /obj/structure/flora/pottedplant/cherrytree name = "potted cherry blossom tree" - desc = "A beautiful kwanzan cherry blossom tree. A notably ornamental tree, appreciated for its lack of fruit.." + desc = "A beautiful kwanzan cherry blossom tree. A notably ornamental tree, appreciated for its lack of fruit." icon_state = "plant-10" /obj/structure/flora/pottedplant/smallcactus diff --git a/html/changelogs/SleepyGemmy-typo_fixes.yml b/html/changelogs/SleepyGemmy-typo_fixes.yml new file mode 100644 index 00000000000..584518dd20d --- /dev/null +++ b/html/changelogs/SleepyGemmy-typo_fixes.yml @@ -0,0 +1,10 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - spellcheck: "Fixed the hydraulic rescue tool name being capitalized." + - spellcheck: "Fixed grammar on the long distance wireless bolt control message." + - spellcheck: "Fixed extra punctuation on the potted cherry blossom tree." + - bugfix: "Raised the S'rendarr's Hand (tobacco) content from 5 to 10 units in the adhomian cigarettes to match the total amount found in other cigarettes." + - spellcheck: "Changed the extended description prompt \"Show In Chat\" to \"Show in Chat\"."