Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
df61d6d
Base for cyberware lines: pirates and ruins as people, with Nova Sect…
Jackriip Nov 15, 2026
5ad27cb
Cyberware lines: cheaper chrome models, a street ripperdoc, new chrom…
Jackriip Nov 15, 2026
7ac7d86
Chrome Read plays out over its subject on the reader's screen
Jackriip Nov 16, 2026
3272046
Chrome wheel, Chrome button, chrome keybinds and optics zoom
Jackriip Nov 16, 2026
c24cf3e
Prison inmates, guards and experiment subjects are people
Jackriip Nov 16, 2026
2ddc70b
Townsfolk, outpost and planet NPCs, strays and mission survivors are …
Jackriip Nov 16, 2026
d76b323
Base for chrome against converted NPCs: the chrome wheel stack with e…
Jackriip Nov 16, 2026
93f91ce
Optical camo hides from the prison's experiment forms; late cyberware…
Jackriip Nov 16, 2026
2aae3c3
Widowline gore: a laser wire with clean severs, a through-cut and the…
Jackriip Nov 16, 2026
664d696
Gorilla Arms gore: the piston punch, haymaker, hurl, ground pound and…
Jackriip Nov 16, 2026
41825a4
Gorilla Arms gore: the grab-slam
Jackriip Nov 16, 2026
9ff6b70
Gorilla Arms gore: the head clap, the limb rip and the backbreaker
Jackriip Nov 16, 2026
caac891
Traders pay for rare goods
Jackriip Nov 16, 2026
aec245a
Base for mission immersion: every NPC conversion with the mission waves
Jackriip Nov 16, 2026
a5743db
Mantis Blades gore: swings, torn arteries, the charged leap, the impa…
Jackriip Nov 16, 2026
93df2d0
More immersive missions
Jackriip Nov 16, 2026
fb7eef2
Mount the chrome cradle's rig on a mast
Jackriip Nov 16, 2026
77b6798
Dermal plating deflects bullets from the front
Jackriip Nov 16, 2026
8a3d183
Base for bounty combat sense: every NPC conversion with the bounty gu…
Jackriip Nov 16, 2026
0f6cef4
Bounty criminals and companions get combat sense against stun weapons
Jackriip Nov 16, 2026
3e57ad6
Base for bounty chrome: the chrome gore stack with every NPC conversi…
Jackriip Nov 16, 2026
8f3dc2b
Bounty criminals carry chrome; the cyberpsycho
Jackriip Nov 16, 2026
7f4d93f
Merge branch 'split/npc-pirates-ruins' into split/base-cyberware
Jackriip Nov 16, 2026
0980b72
Merge branch 'split/base-cyberware' into split/cyberware-lines
Jackriip Nov 16, 2026
71c90cb
Burnt-out chrome is a scrap row both ripperdocs buy
Jackriip Nov 16, 2026
639d8d6
A Widowline hit draws nothing over its target
Jackriip Nov 16, 2026
761c6df
Chrome scan test: an itemized read rates street chrome T1
Jackriip Nov 16, 2026
238f831
Zone shop test: expect the permissions of the new chrome models
Jackriip Nov 16, 2026
102f5fc
Merge branch 'split/cyberware-lines' into split/chrome-read
Jackriip Nov 16, 2026
180d4b6
Chrome scan test: an itemized read rates street chrome by its tier word
Jackriip Nov 16, 2026
9f5529a
Merge branch 'split/chrome-read' into split/chrome-wheel-zoom
Jackriip Nov 16, 2026
75fb512
Zone shop test: expect the permissions of the optics models
Jackriip Nov 16, 2026
5c6e28d
Merge branch 'split/chrome-wheel-zoom' into split/gore-widowline
Jackriip Nov 16, 2026
ce96c3a
Merge branch 'split/gore-widowline' into split/gore-gorilla
Jackriip Nov 16, 2026
efbe6ef
Merge branch 'split/gore-gorilla' into split/gore-gorilla-slam
Jackriip Nov 16, 2026
6c4e9f8
Merge branch 'split/gore-gorilla-slam' into split/gore-gorilla-finishers
Jackriip Nov 16, 2026
ea0dbc0
Merge branch 'split/gore-gorilla-finishers' into split/gore-mantis
Jackriip Nov 16, 2026
ee09cfb
Merge branch 'split/gore-mantis' into split/dermal-deflect
Jackriip Nov 16, 2026
18a7675
Merge branch 'split/cyberware-lines' into split/cradle-rig
Jackriip Nov 16, 2026
4eb5ee1
Merge branch 'split/npc-bounties' into split/npc-prison
Jackriip Nov 16, 2026
4650170
Prison barricade test: take the mess table out of the smoothing queue…
Jackriip Nov 16, 2026
6c6fdba
Merge branch 'split/npc-prison' into split/npc-ambient
Jackriip Nov 16, 2026
2eaf6b2
Merge branch 'split/npc-ambient' into split/base-mission-immersion
Jackriip Nov 16, 2026
94fb3b1
Merge branch 'split/mission-waves' into split/base-mission-immersion
Jackriip Nov 16, 2026
4c1bd60
Merge branch 'split/base-mission-immersion' into split/mission-immersion
Jackriip Nov 16, 2026
774e495
Hunting lure: watch the beast's death and deletion with RegisterSignals
Jackriip Nov 16, 2026
d23188d
Merge branch 'split/chrome-wheel-zoom' into split/base-chrome-npcs
Jackriip Nov 16, 2026
a85daa6
Merge branch 'split/npc-ambient' into split/base-chrome-npcs
Jackriip Nov 16, 2026
e9fa453
Merge branch 'split/base-chrome-npcs' into split/chrome-camo-npcs
Jackriip Nov 16, 2026
de826b2
Merge branch 'split/base-chrome-npcs' into split/trader-buybacks
Jackriip Nov 16, 2026
786a294
Mafia club mobsters do not go after someone their eyes cannot see thr…
Jackriip Nov 16, 2026
4b17e77
Merge branch 'split/npc-ambient' into split/base-bounty-combat-sense
Jackriip Nov 16, 2026
51eadb8
Merge branch 'split/bounty-guards' into split/base-bounty-combat-sense
Jackriip Nov 16, 2026
1d19134
Merge branch 'split/base-bounty-combat-sense' into split/bounty-comba…
Jackriip Nov 16, 2026
5ae59e4
Merge branch 'split/gore-mantis' into split/base-bounty-chrome
Jackriip Nov 16, 2026
669c479
Merge branch 'split/bounty-combat-sense' into split/base-bounty-chrome
Jackriip Nov 16, 2026
fcd78a4
Merge branch 'split/npc-shield' into split/base-bounty-chrome
Jackriip Nov 16, 2026
8919e23
Merge branch 'split/base-bounty-chrome' into split/bounty-chrome
Jackriip Nov 16, 2026
5305bc4
Take the mobsters' camo check out of bounty chrome
Jackriip Nov 16, 2026
6b28bd9
Merge pull request #555 from voidcrew/split/chrome-read
Jackriip Nov 16, 2026
1554b4b
Merge pull request #575 from voidcrew/split/chrome-camo-npcs
Jackriip Nov 16, 2026
85edfc9
Merge pull request #578 from voidcrew/split/bounty-chrome
Jackriip Nov 16, 2026
90182bc
Merge pull request #577 from voidcrew/split/bounty-combat-sense
Jackriip Nov 16, 2026
6df0557
Merge pull request #573 from voidcrew/split/cradle-rig
Jackriip Nov 16, 2026
cbc7be4
Merge pull request #576 from voidcrew/split/trader-buybacks
Jackriip Nov 16, 2026
93afa0e
Merge pull request #574 from voidcrew/split/dermal-deflect
Jackriip Nov 16, 2026
74a3bae
Merge pull request #572 from voidcrew/split/mission-immersion
Jackriip Nov 16, 2026
7ef2445
Chrome wheel, Chrome button, chrome keybinds and optics zoom
Jackriip Nov 16, 2026
d1e7195
Zone shop test: expect the permissions of the optics models
Jackriip Nov 16, 2026
204f5b3
Merge remote-tracking branch 'origin2/split/chrome-wheel-zoom' into HEAD
Jackriip Nov 16, 2026
cf07738
Merge remote-tracking branch 'origin2/split/gore-widowline' into HEAD
Jackriip Nov 16, 2026
f24a35a
Merge remote-tracking branch 'origin2/split/gore-gorilla' into HEAD
Jackriip Nov 16, 2026
a6036d8
Merge remote-tracking branch 'origin2/split/gore-gorilla-slam' into HEAD
Jackriip Nov 16, 2026
e4ed436
Merge remote-tracking branch 'origin2/split/gore-gorilla-finishers' i…
Jackriip Nov 16, 2026
c5c7a2b
Merge pull request #566 from voidcrew/split/gore-mantis
Jackriip Nov 16, 2026
686085a
Merge split/base-cyberware
Jackriip Nov 16, 2026
1d1a138
Merge split/base-mission-immersion
Jackriip Nov 16, 2026
72b86e9
Merge split/base-chrome-npcs
Jackriip Nov 16, 2026
0288649
Merge split/base-bounty-combat-sense
Jackriip Nov 16, 2026
cb96158
Merge split/base-bounty-chrome
Jackriip Nov 16, 2026
3e0da7c
Merge remote-tracking branch 'origin2/master' into HEAD
Jackriip Nov 16, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6683,6 +6683,7 @@
#include "voidcrew\_DEFINES\bounty_ai.dm"
#include "voidcrew\_DEFINES\bounty_board.dm"
#include "voidcrew\_DEFINES\bounty_bosses.dm"
#include "voidcrew\_DEFINES\bounty_chrome.dm"
#include "voidcrew\_DEFINES\bounty_criminals.dm"
#include "voidcrew\_DEFINES\bounty_identity.dm"
#include "voidcrew\_DEFINES\bounty_kingpin.dm"
Expand All @@ -6695,6 +6696,7 @@
#include "voidcrew\_DEFINES\drug_smuggling.dm"
#include "voidcrew\_DEFINES\dynamic_events.dm"
#include "voidcrew\_DEFINES\flags.dm"
#include "voidcrew\_DEFINES\gorilla_gore.dm"
#include "voidcrew\_DEFINES\gun_feel.dm"
#include "voidcrew\_DEFINES\hud.dm"
#include "voidcrew\_DEFINES\human_npcs.dm"
Expand All @@ -6703,6 +6705,7 @@
#include "voidcrew\_DEFINES\lich.dm"
#include "voidcrew\_DEFINES\lighting.dm"
#include "voidcrew\_DEFINES\loot.dm"
#include "voidcrew\_DEFINES\mantis_gore.dm"
#include "voidcrew\_DEFINES\maps.dm"
#include "voidcrew\_DEFINES\maths.dm"
#include "voidcrew\_DEFINES\metrics.dm"
Expand Down Expand Up @@ -6925,6 +6928,7 @@
#include "voidcrew\edits\modules\mob\mob.dm"
#include "voidcrew\edits\modules\mob\mob_defines.dm"
#include "voidcrew\edits\modules\mob\living\basic\lavaland\legion\spawn_legions.dm"
#include "voidcrew\edits\modules\mob\living\carbon\floored_fall.dm"
#include "voidcrew\edits\modules\mob\living\carbon\inventory.dm"
#include "voidcrew\edits\modules\mod\modules\modules_supply.dm"
#include "voidcrew\edits\modules\modular_computers\file_system\programs\budgetordering.dm"
Expand Down Expand Up @@ -7038,6 +7042,7 @@
#include "voidcrew\mapping\shuttles\syndicate\geneva.dm"
#include "voidcrew\mapping\shuttles\syndicate\hyena.dm"
#include "voidcrew\mapping\spawners\nanites.dm"
#include "voidcrew\modules\admin\chrome_test_kit.dm"
#include "voidcrew\modules\admin\feature_testing.dm"
#include "voidcrew\modules\admin\overmap_management.dm"
#include "voidcrew\modules\admin\overmap_management_bans.dm"
Expand Down Expand Up @@ -7110,6 +7115,8 @@
#include "voidcrew\modules\bounties\bounty_board.dm"
#include "voidcrew\modules\bounties\bounty_boss.dm"
#include "voidcrew\modules\bounties\bounty_boss_kits.dm"
#include "voidcrew\modules\bounties\bounty_chrome.dm"
#include "voidcrew\modules\bounties\bounty_combat_sense.dm"
#include "voidcrew\modules\bounties\bounty_companions.dm"
#include "voidcrew\modules\bounties\bounty_criminal.dm"
#include "voidcrew\modules\bounties\bounty_identity.dm"
Expand All @@ -7129,6 +7136,13 @@
#include "voidcrew\modules\bounties\bounty_turn_in.dm"
#include "voidcrew\modules\bounties\bounty_types.dm"
#include "voidcrew\modules\bounties\bounty_weapons.dm"
#include "voidcrew\modules\bounties\chrome\bounty_chrome_cascade.dm"
#include "voidcrew\modules\bounties\chrome\bounty_chrome_deadeye.dm"
#include "voidcrew\modules\bounties\chrome\bounty_chrome_gorilla.dm"
#include "voidcrew\modules\bounties\chrome\bounty_chrome_mantis.dm"
#include "voidcrew\modules\bounties\chrome\bounty_chrome_piledriver.dm"
#include "voidcrew\modules\bounties\chrome\bounty_chrome_redline.dm"
#include "voidcrew\modules\bounties\chrome\bounty_cyberpsycho.dm"
#include "voidcrew\modules\captain_management\captain_management.dm"
#include "voidcrew\modules\captain_management\command_transfer.dm"
#include "voidcrew\modules\captain_management\ship_applications.dm"
Expand Down Expand Up @@ -7187,24 +7201,44 @@
#include "voidcrew\modules\cryo\despawn.dm"
#include "voidcrew\modules\cryo\machine.dm"
#include "voidcrew\modules\cyberware\chrome_cradle.dm"
#include "voidcrew\modules\cyberware\chrome_hud.dm"
#include "voidcrew\modules\cyberware\chrome_wheel.dm"
#include "voidcrew\modules\cyberware\chrome_wheel_arms.dm"
#include "voidcrew\modules\cyberware\chrome_wheel_hud.dm"
#include "voidcrew\modules\cyberware\chrome_wheel_keybindings.dm"
#include "voidcrew\modules\cyberware\cradle_ui.dm"
#include "voidcrew\modules\cyberware\cyberware_anim.dm"
#include "voidcrew\modules\cyberware\cyberware_anim2.dm"
#include "voidcrew\modules\cyberware\cyberware_base.dm"
#include "voidcrew\modules\cyberware\cyberware_component.dm"
#include "voidcrew\modules\cyberware\cyberware_feedback.dm"
#include "voidcrew\modules\cyberware\cyberware_salvage.dm"
#include "voidcrew\modules\cyberware\cyberware_scan.dm"
#include "voidcrew\modules\cyberware\cyberware_scan_overlay.dm"
#include "voidcrew\modules\cyberware\cyberware_stealth.dm"
#include "voidcrew\modules\cyberware\cyberware_zoom.dm"
#include "voidcrew\modules\cyberware\parlor_fixtures.dm"
#include "voidcrew\modules\cyberware\ripperdoc_catalog.dm"
#include "voidcrew\modules\cyberware\street_doc_catalog.dm"
#include "voidcrew\modules\cyberware\ware_arm_utility.dm"
#include "voidcrew\modules\cyberware\ware_legend.dm"
#include "voidcrew\modules\cyberware\ware_line_berserk.dm"
#include "voidcrew\modules\cyberware\ware_line_camo.dm"
#include "voidcrew\modules\cyberware\ware_line_governor.dm"
#include "voidcrew\modules\cyberware\ware_line_mantis.dm"
#include "voidcrew\modules\cyberware\ware_line_models_a.dm"
#include "voidcrew\modules\cyberware\ware_line_sandy.dm"
#include "voidcrew\modules\cyberware\ware_line_widowline.dm"
#include "voidcrew\modules\cyberware\ware_line_zoom.dm"
#include "voidcrew\modules\cyberware\ware_military_arms.dm"
#include "voidcrew\modules\cyberware\ware_military_body.dm"
#include "voidcrew\modules\cyberware\ware_models_b.dm"
#include "voidcrew\modules\cyberware\ware_pro_combat.dm"
#include "voidcrew\modules\cyberware\ware_pro_utility.dm"
#include "voidcrew\modules\cyberware\ware_registry.dm"
#include "voidcrew\modules\cyberware\ware_second_wind.dm"
#include "voidcrew\modules\cyberware\ware_street.dm"
#include "voidcrew\modules\cyberware\ware_street_passives.dm"
#include "voidcrew\modules\derelict_outposts\derelict_layout.dm"
#include "voidcrew\modules\derelict_outposts\derelict_leash.dm"
#include "voidcrew\modules\derelict_outposts\derelict_outpost.dm"
Expand Down Expand Up @@ -7309,6 +7343,26 @@
#include "voidcrew\modules\hyperviolence\visuals\gut_motion.dm"
#include "voidcrew\modules\hyperviolence\visuals\hit_reactions.dm"
#include "voidcrew\modules\hyperviolence\visuals\npc_motion.dm"
#include "voidcrew\modules\hyperviolence\wire\_wire_defines.dm"
#include "voidcrew\modules\hyperviolence\wire\wire_cut.dm"
#include "voidcrew\modules\hyperviolence\wire\wire_garrote.dm"
#include "voidcrew\modules\hyperviolence\wire\wire_held.dm"
#include "voidcrew\modules\hyperviolence\wire\wire_seams.dm"
#include "voidcrew\modules\hyperviolence\wire\wire_sever_fx.dm"
#include "voidcrew\modules\hyperviolence\wire\wire_users.dm"
#include "voidcrew\modules\hyperviolence_gorilla\chrome_puppet_rig.dm"
#include "voidcrew\modules\hyperviolence_gorilla\chrome_use_release.dm"
#include "voidcrew\modules\hyperviolence_gorilla\gorilla_finisher.dm"
#include "voidcrew\modules\hyperviolence_gorilla\gorilla_haymaker.dm"
#include "voidcrew\modules\hyperviolence_gorilla\gorilla_looks.dm"
#include "voidcrew\modules\hyperviolence_gorilla\gorilla_pound.dm"
#include "voidcrew\modules\hyperviolence_gorilla\gorilla_pry.dm"
#include "voidcrew\modules\hyperviolence_gorilla\gorilla_punch.dm"
#include "voidcrew\modules\hyperviolence_gorilla\gorilla_slam.dm"
#include "voidcrew\modules\hyperviolence_gorilla\gorilla_swing.dm"
#include "voidcrew\modules\hyperviolence_gorilla\gorilla_throw.dm"
#include "voidcrew\modules\hyperviolence_gorilla\gorilla_thrust.dm"
#include "voidcrew\modules\hyperviolence_gorilla\hv_finisher_chrome.dm"
#include "voidcrew\modules\intents\_defines.dm"
#include "voidcrew\modules\intents\hud_integration.dm"
#include "voidcrew\modules\intents\hud_intent.dm"
Expand Down Expand Up @@ -7359,6 +7413,16 @@
#include "voidcrew\modules\loot\uniques\research.dm"
#include "voidcrew\modules\loot\uniques\syndicate.dm"
#include "voidcrew\modules\loot\uniques\wardrobe.dm"
#include "voidcrew\modules\mantis_gore\mantis_blade.dm"
#include "voidcrew\modules\mantis_gore\mantis_charge.dm"
#include "voidcrew\modules\mantis_gore\mantis_core.dm"
#include "voidcrew\modules\mantis_gore\mantis_housing.dm"
#include "voidcrew\modules\mantis_gore\mantis_impale.dm"
#include "voidcrew\modules\mantis_gore\mantis_lunge_fx.dm"
#include "voidcrew\modules\mantis_gore\mantis_rig.dm"
#include "voidcrew\modules\mantis_gore\mantis_scissor.dm"
#include "voidcrew\modules\mantis_gore\mantis_swing.dm"
#include "voidcrew\modules\mantis_gore\mantis_wounds.dm"
#include "voidcrew\modules\metrics\combat_metrics.dm"
#include "voidcrew\modules\metrics\economy_metrics.dm"
#include "voidcrew\modules\metrics\metrics_helpers.dm"
Expand All @@ -7384,6 +7448,8 @@
#include "voidcrew\modules\missions\mission_pad.dm"
#include "voidcrew\modules\missions\mission_target.dm"
#include "voidcrew\modules\missions\player_bounty.dm"
#include "voidcrew\modules\missions\site_dressing.dm"
#include "voidcrew\modules\missions\spawn_cover.dm"
#include "voidcrew\modules\missions\code\controllers\subsystem\missions.dm"
#include "voidcrew\modules\missions\missions\big_game_hunt.dm"
#include "voidcrew\modules\missions\missions\delivery.dm"
Expand All @@ -7396,6 +7462,7 @@
#include "voidcrew\modules\missions\missions\recovery.dm"
#include "voidcrew\modules\missions\missions\recovery_variants.dm"
#include "voidcrew\modules\missions\missions\rescue.dm"
#include "voidcrew\modules\missions\missions\rescue_survivor.dm"
#include "voidcrew\modules\missions\missions\research.dm"
#include "voidcrew\modules\missions\missions\suppression.dm"
#include "voidcrew\modules\missions\missions\survey.dm"
Expand Down Expand Up @@ -7800,6 +7867,7 @@
#include "voidcrew\modules\throwing\diagnostics.dm"
#include "voidcrew\modules\trade\anomaly_charts.dm"
#include "voidcrew\modules\trade\bag_rift_protection.dm"
#include "voidcrew\modules\trade\buyback_listed.dm"
#include "voidcrew\modules\trade\modsuit_bench.dm"
#include "voidcrew\modules\trade\outpost.dm"
#include "voidcrew\modules\trade\outpost_amenities.dm"
Expand Down
50 changes: 12 additions & 38 deletions tgui/packages/voidcrew_tgui/interfaces/ChromeCradle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,7 @@ const Rack = () => {

if (!has_occupant) {
return (
<div className="Cradle__empty">
The rack is dark. Drag yourself onto the slab to lie back and it wakes
up.
</div>
<div className="Cradle__empty">The rack is dark.</div>
);
}

Expand Down Expand Up @@ -477,7 +474,7 @@ const TileCard = (props: { ware: Ware }) => {
</div>
<div className="Cradle__hoverMeta">
<span style={{ color: accent }}>
T{ware.tier} {TIER_NAMES[ware.tier] || 'CHROME'}
{TIER_NAMES[ware.tier] || 'CHROME'}
</span>
<span>load {ware.load}</span>
{ware.capacity_bonus > 0 && <span>+{ware.capacity_bonus} cap</span>}
Expand Down Expand Up @@ -520,10 +517,7 @@ const Detail = () => {

if (!ware) {
return (
<div className="Cradle__empty">
Pick a piece from the rack. Anything you own shows up on the body before
the rig touches you.
</div>
<div className="Cradle__empty">Nothing selected.</div>
);
}

Expand All @@ -548,7 +542,7 @@ const Detail = () => {
</div>
<div className="Cradle__detailTier">
<span style={{ color: accent }}>
TIER {ware.tier} · {TIER_NAMES[ware.tier] || 'CHROME'}
{TIER_NAMES[ware.tier] || 'CHROME'}
</span>
<span className="Cradle__detailWhere">
{ware.state === 'installed'
Expand Down Expand Up @@ -603,7 +597,7 @@ const Detail = () => {
)}
{!!overCapacity && (
<div className="Cradle__evicts Cradle__evicts--bad">
No neural headroom. Shed load or find a Governor.
No neural headroom.
</div>
)}
</div>
Expand All @@ -614,7 +608,6 @@ const Detail = () => {
<ActionButton
tone="bad"
disabled={!mayOperate}
hint="Three-second extraction. The ware comes back out intact."
onClick={() => act('remove', { ref: ware.ref })}
>
EXTRACT
Expand All @@ -623,11 +616,7 @@ const Detail = () => {
<ActionButton
tone="good"
disabled={!mayOperate || !ware.fits}
hint={
ware.fits
? 'Four-second install. You will be briefly sedated.'
: 'Will not fit the current load budget.'
}
hint={ware.fits ? undefined : 'No neural headroom.'}
onClick={() => act('install', { ref: ware.ref })}
>
INSTALL
Expand Down Expand Up @@ -776,10 +765,7 @@ const StatusDeck = () => {
style={{ width: `${progress * 100}%` }}
/>
</div>
<div className="Cradle__note">
Hold still. Leaving the slab cancels the cycle. Nothing is lost, the
ware goes to the tray.
</div>
<div className="Cradle__note">Hold still.</div>
</div>
);
}
Expand All @@ -789,19 +775,13 @@ const StatusDeck = () => {
notes.push('Trade embargo. The rig will not work on you.');
}
if (!has_occupant) {
notes.push('The slab is empty. Drag yourself onto it to lie back.');
notes.push('The slab is empty.');
} else if (!occupant_is_user) {
notes.push(
`${occupant_name} is on the slab. The rig takes orders from its occupant only. You can still pop the parts tray.`,
);
notes.push(`${occupant_name} is on the slab.`);
} else if (!can_operate) {
notes.push(
'The rig refuses: you have to be conscious and unrestrained to consent to chrome work.',
);
notes.push('The rig needs you awake and free to say yes.');
} else {
notes.push(
'Rig idle. Highlight a piece in the rack, check it on the body, then commit.',
);
notes.push('Rig idle.');
}
if (tray_count > 0) {
notes.push(
Expand Down Expand Up @@ -841,34 +821,28 @@ const Controls = () => {
<ActionButton
tone="cool"
disabled={!mayOperate || !!tuneup_denial}
hint={
tuneup_denial ||
`Clears EMP scramble and repairs all installed chrome. ${tuneup_fee} cr.`
}
hint={tuneup_denial || undefined}
onClick={() => act('tuneup')}
>
{`TUNE-UP · ${tuneup_fee} CR`}
</ActionButton>
<ActionButton
tone="plain"
disabled={tray_count === 0}
hint="Anyone adjacent can pop the tray. Evicted chrome is never held hostage."
onClick={() => act('eject_tray')}
>
{`EJECT TRAY${tray_count > 0 ? ` · ${tray_count}` : ''}`}
</ActionButton>
<ActionButton
tone="plain"
disabled={loaded_credits <= 0 || !!busy}
hint="Returns the slab's loaded cash as a holochip."
onClick={() => act('eject_cash')}
>
EJECT CASH
</ActionButton>
<ActionButton
tone="plain"
disabled={!has_occupant}
hint="Gets the patient off the slab. Cancels any running cycle, the ware goes to the tray."
onClick={() => act('get_up')}
>
{occupant_is_user ? 'GET UP' : 'UNBUCKLE'}
Expand Down
9 changes: 9 additions & 0 deletions tools/gear_catalog/ratings/ammo.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"category": "ammo",
"groups": [
Expand Down Expand Up @@ -342,6 +342,15 @@
"reason": "Built into the peashooter, never on its own. Rated with the gun.",
"tier": "green"
},
"/obj/item/ammo_box/magazine/internal/cylinder/rev38/cyberware_holdout": {
"confidence": "high",
"group": "magazines built into a gun",
"hash": "",
"name": "holdout cylinder",
"rank": 8,
"reason": "Built into the Holdout revolver arm, never on its own. Rated with the gun.",
"tier": "yellow"
},
"/obj/item/ammo_box/magazine/internal/cylinder/rev38/housecall": {
"confidence": "high",
"group": "magazines built into a gun",
Expand Down
Loading
Loading