From 010fa439399581391fcd509d2058191ff4fa74b3 Mon Sep 17 00:00:00 2001
From: historia <workhorse@localhost.localdomain>
Date: Sat, 20 Jun 2026 21:36:32 -0400
Subject: feat: stop command added

---
 data/help/actions.yaml    |  2 +-
 data/help/id.yaml         |  6 +++---
 data/help/scavenging.yaml | 10 +++++-----
 data/help/science.yaml    |  2 +-
 data/help/stop.yaml       | 12 ++++++++++++
 data/help/trigger.yaml    |  2 +-
 6 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 data/help/stop.yaml

(limited to 'data/help')

diff --git a/data/help/actions.yaml b/data/help/actions.yaml
index 7a2cbd3..7f6c7d8 100644
--- a/data/help/actions.yaml
+++ b/data/help/actions.yaml
@@ -6,7 +6,7 @@ description: |
 
   Instant actions — execute immediately, bypassing the tick queue entirely:
     say, score, inventory, equipment, look, exits, help, map, option,
-    alias, unalias, description, queued
+    alias, unalias, description, queued, stop
 
   Free actions — stackable, all execute before active actions:
     wear, wield, remove, unwear, unwield, style
diff --git a/data/help/id.yaml b/data/help/id.yaml
index 6605711..9703485 100644
--- a/data/help/id.yaml
+++ b/data/help/id.yaml
@@ -1,14 +1,14 @@
 name: "id"
 category: "Commands"
 description: |
-  Identify scrap metal at an altar to produce junk.
+  Identify scrap at an altar to produce junk.
 
   Usage: id
          identify
 
   Stand at an altar with the matching identifier tool in
-  your inventory and scrap metal. Type 'id' to convert all
-  your scrap metal into junk on the next game tick.
+  your inventory and scrap. Type 'id' to convert all
+  your scrap into junk on the next game tick.
 
   Each altar type requires a specific identifier:
     Solar Altar  → solar identifier → solarjunk  (level 1)
diff --git a/data/help/scavenging.yaml b/data/help/scavenging.yaml
index d91c6ed..03f155f 100644
--- a/data/help/scavenging.yaml
+++ b/data/help/scavenging.yaml
@@ -2,13 +2,13 @@ name: "scavenging"
 category: "Skills"
 description: |
   Scavenging is the art of reclaiming useful circuitry from
-  salvaged scrap metal.
+  salvaged scrap.
 
-  Step 1: Mine scrap metal from scrap piles (requires a pickaxe,
+  Step 1: Mine scrap from scrap piles (requires a pickaxe,
           uses the Mining skill).
-  Step 2: Take scrap metal to an altar with the matching
+  Step 2: Take scrap to an altar with the matching
           identifier tool.
-  Step 3: Type 'id' to convert all scrap metal into junk.
+  Step 3: Type 'id' to convert all scrap into junk.
 
   Junk types and requirements:
     Solarjunk  — level 1,  solar identifier (5 XP/scrap)
@@ -34,6 +34,6 @@ description: |
     Deathjunk:  2x at 99
     Bloodjunk:  2x at 99
 
-  Scrap metal is not stackable — you can carry 28 per trip
+  Scrap is not stackable — you can carry 28 per trip
   (one per inventory slot). Each trip converts all scrap in
   one tick.
diff --git a/data/help/science.yaml b/data/help/science.yaml
index 57588b3..901b2f3 100644
--- a/data/help/science.yaml
+++ b/data/help/science.yaml
@@ -8,7 +8,7 @@ description: |
   Key concepts:
   - Modules are triggered with 'trigger <module>'
   - Every module costs a combination of junk items
-  - All modules also cost 1 scrap metal, UNLESS you have a deck
+  - All modules also cost 1 scrap, UNLESS you have a deck
     equipped
   - Wielding a deck (science weapon) removes the scrap
     requirement and enables autotrigger combat
diff --git a/data/help/stop.yaml b/data/help/stop.yaml
new file mode 100644
index 0000000..72d163f
--- /dev/null
+++ b/data/help/stop.yaml
@@ -0,0 +1,12 @@
+name: "stop"
+category: "General"
+description: |
+  Cancels your current action immediately.
+
+  Usage: stop
+
+  Stops whatever you are currently doing — gathering, crafting, talking,
+  fletching, combat, or any other active action. Also clears any queued
+  active action and background actions (cleaning, fletching).
+
+  If you're not doing anything, it tells you so.
diff --git a/data/help/trigger.yaml b/data/help/trigger.yaml
index 9211c08..558342f 100644
--- a/data/help/trigger.yaml
+++ b/data/help/trigger.yaml
@@ -27,7 +27,7 @@ description: |
     trigger transport town      - Teleport to Town Square
     trigger enchant 1 sapphire  - Enchant a sapphire ring
 
-  All mods cost junk (and 1 scrap metal unless you have a deck
+  All mods cost junk (and 1 scrap unless you have a deck
   equipped). Type 'mods' to see your available mods and costs.
 
   See also: autotrigger, mods, science
-- 
cgit v1.2.3