@maka/maka-cli 5.200.0 → 5.202.0

package/bundle/typescript/src/commands/game/sideQuest/factories/scene-factory.js

@@ -14,6 +14,7 @@ import { migrateLegacySeed } from './seed-migration.js';
 import { Device } from '../models/device.js';
 import { fuzzyPickName } from '../utilities/fuzzy-match.js';
 import { adoptSeededIce } from '../utilities/ic-actors.js';
+import { NPC_EQUIP_CATEGORIES, outfitNpcBySlug } from '../npc-kits.js';
 /**
  * How many AI enrichment calls may be in flight at once.
  *
@@ -512,27 +513,58 @@ Key Locations: ${json.rooms.map(r => r.name).join(', ')}
                 logger.error(`Scene "${json.name}": the door ${String(direction)} of ${room.name} was locked by "${wanted ?? '(nothing)'}", which no device holds and no item matches -- it ships unlocked rather than as a wall.`);
             }
         }
+        // Step 4.04: NPCs get their kit (npc-kits.ts, SR5 p.379-385, catalog
+        // v21). AFTER "heldBy" has landed (Step 4.5 above -- the numbering is
+        // historical, the source order is what runs) and BEFORE the equip
+        // step below, on purpose: an author who put a weapon in this NPC's
+        // hands with heldBy is the author speaking, and the kit yields its
+        // own weapon to it (respectCarried) while its armor still layers.
+        // The seed's `kit` is applied here rather than in npc-factory for
+        // the same reason startSpot/guarding/hostile are applied at Step 3
+        // instead of the constructor: the factory drops every field but four,
+        // and the ordering guarantee above only holds in THIS loop.
+        for (const npcJson of json.npcs ?? []) {
+            if (!npcJson.player.kit)
+                continue;
+            const npc = scene.getActor(npcJson.player.name);
+            if (!npc)
+                continue;
+            outfitNpcBySlug(npc, npcJson.player.kit, {
+                lieutenant: npcJson.player.lieutenant === true,
+                respectCarried: true,
+            });
+        }
         // Step 4.05: NPCs wear their gear. "heldBy" only puts items in an NPC's
         // inventory, but combat pools (see Player.getWeaponProfile /
         // getArmorValue) read from EQUIPPED slots -- without this, an enforcer
         // "holding" an assault rifle and an armored jacket would fight
         // bare-fisted in street clothes. Only weapon/armor categories are
-        // auto-equipped: plot items (datachips, books, keys) stay in inventory
-        // where "give"/death-drops expect them. Failures are non-fatal -- a
-        // second weapon just stays holstered in inventory.
-        const combatCategories = new Set([
-            Category.Weapon, Category.MeleeWeapon, Category.RangedWeapon,
-            Category.Armor, Category.BodyArmor, Category.ArmorClothing, Category.Shield,
-            Category.Helmet, Category.ArmArmor, Category.LegArmor, Category.Boots, Category.Gloves,
-        ]);
+        // auto-equipped (NPC_EQUIP_CATEGORIES -- the one list, shared with the
+        // ephemeral governor): plot items (datachips, books, keys) stay in
+        // inventory where "give"/death-drops expect them. Failures are
+        // non-fatal -- a second weapon just stays holstered in inventory.
+        //
+        // FIRST WEAPON WINS (2026-09-15, the day kits gave every guard two).
+        // `equip` SWAPS, so the unguarded loop this used to be would have
+        // ended every PR 1 ganger holding the knife with the Browning
+        // holstered -- the exact bug archetypes.ts:outfitArchetype documents
+        // for runners. It never fired here only because no seeded NPC ever
+        // carried two weapons. Armor still layers, so only weapons are
+        // guarded.
+        const weaponCategories = new Set([Category.Weapon, Category.MeleeWeapon, Category.RangedWeapon]);
         for (const npcJson of json.npcs ?? []) {
             const npc = scene.getActor(npcJson.player.name);
             if (!npc)
                 continue;
             for (const item of [...npc.inventory.getAllItems()]) {
-                if (combatCategories.has(item.category)) {
+                if (!NPC_EQUIP_CATEGORIES.has(item.category))
+                    continue;
+                if (weaponCategories.has(item.category) && npc.getCarriedWeapon())
+                    continue;
+                try {
                     npc.equip(item);
                 }
+                catch { /* nothing to slot it into -- stays holstered */ }
             }
         }
         // Step 4.1: Add Starting Items for the Player (skipped when continuing

package/bundle/typescript/src/commands/game/sideQuest/factories/scene-seed-generator.js

@@ -9,7 +9,7 @@ import { GenerationCapture } from '../utilities/generation-capture.js';
 import { fetchCanonContext } from '../utilities/canon-lore.js';
 import { providerUnavailable } from '../utilities/draft-failure-note.js';
 import { SceneSynthesizer } from './scene-factory.js';
-import { buildSkeletonPrompt, buildRoomsPrompt, buildNpcsPrompt, buildDevicesPrompt, buildItemsPrompt, pickRunType, parseJsonReply, validateSkeleton, normalizeSkeleton, assembleScene, classifyRepair, CHUNK_SCHEMAS, unwrapChunk, VAULT_HOST_RATING, } from './scene-chunks.js';
+import { buildSkeletonPrompt, buildRoomsPrompt, buildNpcsPrompt, buildDevicesPrompt, buildItemsPrompt, pickRunType, parseJsonReply, validateSkeleton, normalizeSkeleton, settleSecurity, assembleScene, classifyRepair, CHUNK_SCHEMAS, unwrapChunk, VAULT_HOST_RATING, } from './scene-chunks.js';
 // The fixer name convention and the player dossier live with the prompt
 // builders now (see scene-chunks.ts); re-exported so the existing
 // import sites (call.ts, game.ts) keep working unchanged.
@@ -241,6 +241,15 @@ export class SceneSeedGenerator {
                 // for a scaled opposition, and this is what makes the aim
                 // stick when the model quietly ignores it.
                 validateSkeleton(skeleton, player, crew);
+                // WHO GUARDS THIS PLACE (npc-kits.ts): clamp the declared tier
+                // against the job number and post the lieutenant if this table
+                // outguns it. After validation, so a rejected skeleton never
+                // has its security settled; before the detail passes, so the
+                // NPC prompt can be told which entries the kit will dress.
+                for (const note of settleSecurity(skeleton, tier, player, crew)) {
+                    notes.push(note);
+                    logger.write(`SceneSeedGenerator: ${note}`);
+                }
                 GenerationCapture.record({
                     stage: 'skeleton', outcome: 'accepted', pipeline, attempt,
                     prompt, reply, notes,

package/bundle/typescript/src/commands/game/sideQuest/game.js

@@ -12,6 +12,9 @@ import { hostInteriorPanel } from './utilities/grid-view.js';
 import { DEFAULT_GRID_PROVIDER, PUBLIC_GRID, globalGrid, looseEndGrid } from './utilities/grids.js';
 import { buildCleanupSeed } from './factories/cleanup-seed.js';
 import { EditFileCommand, EraseCommand } from './commands/edit-file.js';
+import { EraseMarkCommand } from './commands/erase-mark.js';
+import { SPRITE_POWER_COMMANDS } from './commands/sprite-power.js';
+import { cleanupOutcome } from './utilities/cleanup-errand.js';
 import { hostsInReach, hostDockLine, gridVicinity } from './utilities/grid-reach.js';
 import { nameThem, scrubHandles } from './utilities/identity.js';
 import { dirname } from 'path';
@@ -590,6 +593,19 @@ export default class Game {
         // `?? []`: hosted-homecoming.test.ts drives a Game off its prototype,
         // where field initialisers never ran.
         for (const le of this._looseEnds ?? []) {
+            // A HIRED SCRUB RESOLVES BEFORE THE DESK DOES (cleanup-errand.ts).
+            // You paid at the hub and did not get to watch; this is where the
+            // decker reports back, and it happens whatever grace is left --
+            // that is what the nuyen bought.
+            if (le.hired) {
+                const done = this.settleHiredCleanup(le);
+                lines.push(...done.lines);
+                // A botched scrub leaves the footage exactly where it was, and
+                // the grace clock keeps running -- you bought an attempt.
+                if (done.keep)
+                    kept.push(done.record);
+                continue;
+            }
             const left = le.homecomingsLeft - 1;
             if (left > 0) {
                 kept.push({ ...le, homecomingsLeft: left });
@@ -607,6 +623,60 @@ export default class Game {
         }
         return lines;
     }
+    /**
+     * A HIRED SCRUB REPORTS BACK (utilities/cleanup-errand.ts). The
+     * decker's test is rolled HERE, not at hire time: you paid for a
+     * result you do not get to watch, and the delay is the point.
+     *
+     * The pool was banked on the record at hire (the fixer's Connection +
+     * Loyalty) so a loyalty shift in between cannot retroactively change a
+     * job already bought. It rolls against the host's rating -- the same
+     * ice the runner would have had to get through.
+     */
+    settleHiredCleanup(le) {
+        const hired = le.hired;
+        const mine = rollPool(Math.max(1, hired.pool));
+        const host = rollPool(Math.max(1, le.host.rating));
+        const outcome = cleanupOutcome(mine.hits - host.hits, mine.criticalGlitch);
+        Logger.getInstance().write(`Cleanup errand "${le.id}": ${hired.decker} via ${hired.fixer}, ${mine.hits} v ${host.hits} -> ${outcome}.`);
+        Logger.getInstance().meta(`Cleanup errand -- ${hired.decker} (${hired.fixer}'s reach): ${formatRoll(mine)} v. ${le.site}'s host: ${formatRoll(host)}`);
+        if (outcome === 'botched') {
+            // The clock keeps running, and the hire is spent: the record goes
+            // back to being yours to deal with.
+            const left = le.homecomingsLeft - 1;
+            const stillOpen = left > 0;
+            if (!stillOpen) {
+                const stained = this.player.addPublicAwareness(`caught on the cameras at "${le.site}" during "${le.jobName}"`);
+                return {
+                    lines: [`\n{red-fg}${hired.fixer} calls, short: "${hired.decker} got burned off ${le.site}'s host. Didn't get it." And then the desk reviews the feeds anyway.{/red-fg}${stained ? ` (+1 Public Awareness, now ${this.player.publicAwareness})` : ''}`],
+                    keep: false,
+                    record: le,
+                };
+            }
+            return {
+                lines: [`\n{yellow-fg}${hired.fixer} calls, short: "${hired.decker} got burned off ${le.site}'s host. Didn't get it -- and no, you don't get the nuyen back."{/yellow-fg}${hint(` (The footage is still up. Hire again, or "jack in" and "hop ${le.site}" yourself.)`)}`],
+                keep: true,
+                record: { ...le, homecomingsLeft: left, hired: undefined },
+            };
+        }
+        const leverage = outcome === 'leverage';
+        return {
+            lines: [`\n{light-blue-fg}${hired.fixer} pings you two days on: "${le.site}'s feeds from '${le.jobName}' are a loop of an empty hallway. You were never there."{/light-blue-fg}${leverage ? `\n{yellow-fg}A beat later, a second message from a number you don't know: a single still of your face, and nothing else. ${hired.decker} kept a copy.{/yellow-fg}` : ''}`],
+            keep: false,
+            record: le,
+        };
+    }
+    /**
+     * HIRE A SHADOW DECKER for an open loose end (commands/crew.ts,
+     * "hire cleanup"). Debits the nuyen and stamps the record; the job
+     * itself resolves at the next homecoming (settleHiredCleanup).
+     */
+    hireCleanup(le, hired) {
+        const idx = this._looseEnds.findIndex(x => x.id === le.id);
+        if (idx >= 0)
+            this._looseEnds[idx] = { ...this._looseEnds[idx], hired };
+        Logger.getInstance().write(`Cleanup hired: ${hired.decker} via ${hired.fixer} for "${le.id}" at ${hired.price} nuyen.`);
+    }
     /** The grids "hop" lists for the open loose ends -- from the hub only. */
     looseEndGrids() {
         if (!this.hasHub || this.scene !== this._hubScene)
@@ -1689,7 +1759,11 @@ export default class Game {
             name: `${item.name} (autopilot)`,
             description: `${this.player.name}'s drone running its dog-brain autopilot: it follows them, watches, and ${armed ? 'shoots what threatens them' : 'has cameras where guns would go -- it never attacks'}.`,
             kind: 'drone',
-            combat: { body: item.droneBody, agility: pilot, reaction: pilot, logic: pilot, intuition: pilot, willpower: pilot, strength: 1, charisma: 1, skills: { perception: pilot, ...(armed ? { firearms: pilot } : {}) } },
+            // `firearms` is not a skill (skills.ts, stage 3) and this shell
+            // carried it as a dead key until 2026-09-15: an armed drone rolls
+            // Gunnery (p.131, and what getAttackPool reads for a jumped-in
+            // frame) and, for a mounted gun's own skill, the split three.
+            combat: { body: item.droneBody, agility: pilot, reaction: pilot, logic: pilot, intuition: pilot, willpower: pilot, strength: 1, charisma: 1, skills: { perception: pilot, ...(armed ? { gunnery: pilot, automatics: pilot, pistols: pilot, longarms: pilot } : {}) } },
             room, plane: 'meat', force: pilot, boundDevice: item,
         });
         // Take-command weight checks (Player.addInventory) enforce this cap
@@ -3001,6 +3075,12 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         CommandFactory.registerCommand('wipe', EraseCommand);
         // MAtrix Recognition Keys (canon p.235-236).
         CommandFactory.registerCommand('mark', MarkCommand);
+        CommandFactory.registerCommand('unmark', EraseMarkCommand);
+        // SPRITE POWERS (p.256-257): one verb per power, reached as
+        // "order <sprite> <power> <target>" -- see commands/sprite-power.ts.
+        for (const [key, cls] of Object.entries(SPRITE_POWER_COMMANDS)) {
+            CommandFactory.registerCommand(key, cls);
+        }
         // Camera feeds you own (surveillance).
         CommandFactory.registerCommand('snoop', SnoopCommand);
         // The cable into a slaved camera (canon p.232/233) -- "splice" is
@@ -3383,8 +3463,20 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
             const where = this._resumedAt && this._resumedAt !== this._homeRoom
                 ? `You're back at the ${this._resumedAt.name}${this.player.atSpot ? `, by the ${this.player.atSpot}` : ''} -- right where you left off.`
                 : 'The cot remembers your shape.';
+            // THE NAG HAS TO NAME A ROUTE THIS RUNNER CAN TAKE (user
+            // 2026-09-15). "jack in, then hop" is closed to anyone without a
+            // deck and a direct neural interface -- which is most runners --
+            // so a street samurai was told about a consequence and handed no
+            // lever. The errand (utilities/cleanup-errand.ts) is that lever,
+            // and it is the advice a non-decker gets.
+            const hiredNote = this._looseEnds.some(le => le.hired)
+                ? ` Somebody is already on one of them.`
+                : '';
+            const route = this.player.canReachMatrix()
+                ? `"jack in", then "hop" -- the site's grid is listed while the footage is still up there. Or "ask <contact> about cleanup" to buy the scrub instead.`
+                : `"ask <contact> about cleanup" -- you can't ride the grid, but somebody you know knows somebody who can.`;
             const looseNote = this._looseEnds.length > 0
-                ? `\n\n{yellow-fg}${this._looseEnds.map(le => `${le.site} still has your face from "${le.jobName}".`).join(' ')}{/yellow-fg}${hint(` ("jack in", then "hop" -- the site's grid is listed while the footage is still up there.)`)}`
+                ? `\n\n{yellow-fg}${this._looseEnds.map(le => `${le.site} still has your face from "${le.jobName}".`).join(' ')}${hiredNote}{/yellow-fg}${hint(` (${route})`)}`
                 : '';
             return `Welcome back, ${this.player.name}. ${where}\n ${this.scene.story}${pendingNote}${looseNote}`;
         }
@@ -6647,7 +6739,7 @@ ${client.name} won't be remembering anything. Dead Johnsons pay nothing -- and t
         // players" / "crew street"); the bare verb still answers quietly.
         { title: 'party', entries: [['crew', 'party'], ['hire'], ['dismiss'], ['train'], ['order'], ['lead'], ['command'], ['deploy'], ['recall'], ['stow']] },
         { title: 'magic', entries: [['spells'], ['cast'], ['summon', 'conjure'], ['project', 'astral'], ['return'], ['assense'], ['counterspell']] },
-        { title: 'matrix', entries: [['jack'], ['jackpoint'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['disable'], ['brick'], ['download'], ['enter'], ['exit-host'], ['hop'], ['tap', 'splice'], ['snoop'], ['overwatch', 'os'], ['hide'], ['edit'], ['erase', 'wipe'], ['pan'], ['ar'], ['aros'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
+        { title: 'matrix', entries: [['jack'], ['jackpoint'], ['deck'], ['load'], ['unload'], ['hack'], ['mark'], ['unmark'], ['disable'], ['brick'], ['download'], ['enter'], ['exit-host'], ['hop'], ['tap', 'splice'], ['snoop'], ['overwatch', 'os'], ['hide'], ['edit'], ['erase', 'wipe'], ['pan'], ['ar'], ['aros'], ['silent'], ['reboot'], ['agent'], ['drone'], ['jump', 'rig']] },
         // The Emerged get their own shelf (player request: "there MUST be
         // resonance" -- matrix is the place, Resonance is the talent).
         // `sustain` shelves here and not under magic: the command is

package/bundle/typescript/src/commands/game/sideQuest/models/host.js

@@ -77,6 +77,14 @@ export class Host {
     /** Kinds crashed this turn; the host relaunches them next turn (p.355-356). */
     relaunchQueue = [];
     patrolCountdown;
+    /**
+     * SUPPRESSION (SR5 p.257, utilities/sprite-power-actions.ts): a sprite
+     * inside the host is arguing with its launch paths, so IC it brings up
+     * arrives (Level / 2) Combat Turns late -- and "delayed IC can't act or
+     * be targeted" while it waits. Counted down by hostTurnStart. Session
+     * state, like the rest of the fight.
+     */
+    icLaunchDelay = 0;
     /** A haven (jackpoint.ts): never hunts, shows no rating, forgets cracks. */
     sanctioned = false;
     /**

package/bundle/typescript/src/commands/game/sideQuest/models/item.js

@@ -49,6 +49,40 @@ export class Item extends AbstractItem {
     // work (rest.ts). A reboot does NOT clear it; that is the whole
     // difference from `jammed`.
     bricked = false;
+    /**
+     * RUINED (Room.layOutBody, catalog v21 NPC kits): armor that soaked
+     * the rounds that killed its wearer. Rated 0 (armorValue, armorBonus)
+     * and worth nothing (commerce.ts priceOf); it drops, so the runner
+     * sees what the guard was wearing, and it is not a free set of full
+     * body armor -- the plates are what stopped the rounds. Saved.
+     */
+    ruined = false;
+    /** Mark this piece ruined, and say so on it. Idempotent. */
+    ruin(how) {
+        if (this.ruined)
+            return;
+        this.ruined = true;
+        this.description = `${this.description} RUINED -- ${how}.`;
+    }
+    /**
+     * SPRITE POWERS ON A FILE (SR5 p.256-257,
+     * utilities/sprite-power-actions.ts). Matrix-plane items only; all
+     * three are session state, like the marks and sightings they sit
+     * beside -- a sprite's work lasts as long as the sprite does.
+     *
+     * CAMOUFLAGE: folded inside another file, so a Matrix Search walks
+     * past it (commands/search.ts) and only a Matrix Perception hunting
+     * this file turns it up -- the sprite included.
+     */
+    concealedBy;
+    /** HASH: sealed by a Resonance algorithm only this sprite can undo, for
+     *  `hashTurns` Combat Turns. Nothing else edits or deletes it while it
+     *  holds (commands/edit-file.ts). */
+    hashedBy;
+    hashTurns = 0;
+    /** WATERMARK: an invisible tag only Resonance-driven things read -- a
+     *  technomancer or another sprite. A new one overwrites the old. */
+    watermark;
     _transferable;
     // New currency-related fields
     _currencyAmount = 0;
@@ -562,6 +596,8 @@ export class Item extends AbstractItem {
      * clothing 0. Only the highest worn piece counts (Player.armorBreakdown).
      */
     get armorValue() {
+        if (this.ruined)
+            return 0;
         const w = this.row?.wearable;
         if (w?.armor !== undefined)
             return w.armor;
@@ -579,6 +615,8 @@ export class Item extends AbstractItem {
     }
     /** A "+" accessory's bonus (helmet +2, shield +6, p.437-438): the row's, else the class value. */
     get armorBonus() {
+        if (this.ruined)
+            return 0;
         const w = this.row?.wearable;
         if (w?.armorBonus !== undefined)
             return w.armorBonus;

package/bundle/typescript/src/commands/game/sideQuest/models/npc.js

@@ -705,6 +705,18 @@ export class NPC extends Player {
      * "nobody in particular", which every rule reads as no opinion.
      */
     faction;
+    /**
+     * WHAT THIS GRUNT CARRIES AND HOW TRAINED THEY ARE (npc-kits.ts, SR5
+     * p.379-385): the kit row's slug, its Professional Rating, and
+     * whether this one is the team's lieutenant (p.380-381). Set by
+     * outfitNpcKit and read by the Combat Turn for Group Edge and morale.
+     * Absent on every NPC built from an attribute block alone, which is
+     * every NPC there was before catalog v21. Session state, never saved:
+     * a seeded NPC is re-outfitted from its seed on every synthesis.
+     */
+    kit;
+    professionalRating;
+    lieutenant;
     /**
      * SET ONLY BY THE EPHEMERAL GOVERNOR (utilities/ephemeral.ts): this
      * body is a passing face, not a character. Its presence trims the
@@ -735,6 +747,14 @@ export class NPC extends Player {
     }
     boundDevice;
     companionKind;
+    /**
+     * ELECTRON STORM (SR5 p.257, utilities/sprite-power-actions.ts): the
+     * persona this sprite is holding a storm open on. It burns again every
+     * action the sprite spends sustaining it, and "if the sprite takes any
+     * Matrix damage, all of its electron storms end immediately" -- which
+     * is why this is cleared on damage rather than on a timer.
+     */
+    sustainedStorm;
     /**
      * Runs one command AS this NPC through its own scene-bound registry --
      * the deterministic control surface for "order <companion> <command>"

package/bundle/typescript/src/commands/game/sideQuest/models/player.js

@@ -621,6 +621,21 @@ export class Player extends AbstractPlayer {
     // against me (hack.ts). My "reboot" wipes them all; a placer's own
     // reboot/jack-out/convergence wipes just theirs (utilities/marks.ts).
     panMarksBy = new Map();
+    /**
+     * COOKIE (SR5 p.256-257, utilities/sprite-power-actions.ts): sprite
+     * name -> net hits, which is the DEPTH the report carries when it ships
+     * home (one hit a bare outline, four or more a detailed report). The
+     * carrier does not know it is there; a Matrix Perception on them finds
+     * it. Session state, like the marks above -- a sprite's work lasts as
+     * long as the sprite.
+     */
+    cookiedBy = new Map();
+    /**
+     * DIAGNOSTICS (p.257): the Teamwork bonus a machine sprite is holding
+     * on ONE device -- "it takes the sprite's entire attention", so there
+     * is at most one, and giving that sprite any other order drops it.
+     */
+    spriteAssist;
     // OVERWATCH SCORE (GOD, canon p.231-232, see utilities/overwatch.ts):
     // evidence tally of this actor's illegal Matrix actions. Starts at 0
     // on a fresh boot, grows with every Attack/Sleaze action (and a
@@ -704,6 +719,27 @@ export class Player extends AbstractPlayer {
             return true;
         return this.dniSource() !== null;
     }
+    /**
+     * COULD THIS RUNNER RIDE THE GRID AT ALL -- the question commands/jack.ts
+     * answers in three separate refusals, asked once so ADVICE can be
+     * written for the right audience.
+     *
+     * Added for the loose-end nag (user 2026-09-15): the hub told every
+     * runner to "jack in, then hop" and erase the footage, including a
+     * street samurai with no deck and no datajack, who therefore got a
+     * consequence with no lever. A line that recommends a route has to
+     * know whether the reader can take it.
+     *
+     * Deliberately NOT the same as "may jack in right now" -- a bricked
+     * deck is a repair, not a disqualification, and this is about what the
+     * character can ever do rather than what they can do this minute.
+     */
+    canReachMatrix() {
+        if (this.isTechnomancer())
+            return true;
+        const deck = this.getCyberdeck() ?? this.getAnyCyberdeck();
+        return deck !== undefined && this.hasDirectNeuralInterface();
+    }
     /** Failed reads of a clue, by item name, for p.49's Trying Again
      *  (-2 per retry). In memory only: a save and reload is the "break"
      *  the rule says clears it. See utilities/clue-reading.ts. */
@@ -1173,6 +1209,14 @@ export class Player extends AbstractPlayer {
     }
     /** Routes Matrix combat damage into the jacked-in deck's hardware track. */
     takeMatrixDamage(boxes) {
+        // ELECTRON STORM ENDS WHEN ITS SPRITE IS HURT (SR5 p.257: "if the
+        // sprite takes any Matrix damage, all of its electron storms end
+        // immediately"). A sprite is an NPC, which is a Player, so the rule
+        // lives on the one method every Matrix hit goes through rather than
+        // in each thing that can deal one.
+        const self = this;
+        if (boxes > 0 && self.sustainedStorm)
+            self.sustainedStorm = undefined;
         const deck = this.getAnyCyberdeck();
         const taken = deck ? deck.takeDeckDamage(boxes) : 0;
         // DECK DAMAGE BEATS (web report 2026-09-02: "the damage to the deck is not moving in realtime"):

package/bundle/typescript/src/commands/game/sideQuest/models/room.js

@@ -124,9 +124,18 @@ export class Room extends AbstractRoom {
                 for (const [slot, item] of Object.entries(group)) {
                     if (!item)
                         continue;
-                    held.addItem(item);
+                    const piece = item;
+                    // WORN ARMOR COMES OFF RUINED (2026-09-15, with the NPC kits
+                    // that put real armor on guards): the jacket stopped the rounds
+                    // that killed the wearer, and that is what a jacket is for.
+                    // Guns and commlinks drop intact -- a PR 5 kill is still the
+                    // Ares Alpha, it is just not a free set of full body armor.
+                    if (piece.armorValue > 0 || piece.armorBonus > 0) {
+                        piece.ruin(`it took the rounds that dropped ${actor.name}`);
+                    }
+                    held.addItem(piece);
                     group[slot] = null;
-                    this.logger.write(`${actor.name}'s ${slot} falls with the body in ${this.name}.`);
+                    this.logger.write(`${actor.name}'s ${slot} falls with the body in ${this.name}${piece.ruined ? ' (ruined)' : ''}.`);
                 }
             }
         }

package/bundle/typescript/src/commands/game/sideQuest/models/scene.js

@@ -628,7 +628,23 @@ export class Scene extends AbstractScene {
         this.logger.write(`Actor with name ${actor.name} has been added to the scene.`);
         this.actors.set(actor.name, actor);
     }
-    removeActor(name) {
+    /**
+     * Take an actor out of the world.
+     *
+     * `spill` (default true) is whether what they carried lands on the
+     * floor. TRUE IS A BODY: a kill has already been stripped by
+     * Room.layOutBody, and anything left is the leftover a corpse drops.
+     * FALSE IS A DEPARTURE (utilities/ephemeral.ts despawnEphemerals): a
+     * ganger who walks off their corner, an officer whose sweep moved on,
+     * takes their gun with them. Before kits (catalog v21) ephemerals
+     * carried nothing so the distinction cost nothing; the day they got
+     * a Browning and an armor vest, walking away from a street corner
+     * rained both onto the pavement, per ganger, per block -- and the
+     * governor's founding denial is that an ephemeral cannot create
+     * obligations. A gun the world has to keep track of after the body
+     * is gone is exactly that.
+     */
+    removeActor(name, opts = {}) {
         const actor = this.actors.get(name);
         // Removal is cleanup, not an assertion: a concurrent kill resolution
         // (or any double-remove) finding the actor already gone is a no-op,
@@ -639,6 +655,10 @@ export class Scene extends AbstractScene {
             return;
         }
         const room = actor.currentLocation;
+        const spill = opts.spill !== false;
+        if (!spill && room) {
+            this.logger.write(`removeActor: ${actor.name} leaves ${room.name} with everything they carried.`);
+        }
         // One consolidated observer line for the whole spill, not one stilted
         // "on death drops" line per item -- and everything that falls is IN
         // PLAIN SIGHT (see Room.plainSightItems): the player just watched it
@@ -649,7 +669,7 @@ export class Scene extends AbstractScene {
         // "counter" that didn't exist in the room (the note had ridden a
         // crew member's pack from a different scene entirely).
         const fallSpot = actor.atSpot;
-        if (room && actor.inventory) {
+        if (spill && room && actor.inventory) {
             const items = actor.inventory.getAllItems();
             for (const item of items) {
                 const didDrop = actor.inventory.transferItemTo(item.name, room.inventory);
@@ -666,7 +686,7 @@ export class Scene extends AbstractScene {
         // holstered pistol are exactly the loot a runner expects to strip.
         // Without this, everything an NPC had equipped would silently vanish
         // from the world on death.
-        if (room && actor.equipment) {
+        if (spill && room && actor.equipment) {
             for (const group of Object.values(actor.equipment)) {
                 if (!group)
                     continue;