From 65c80e4ae9a2e15ca38bacf71d4abe13cced62af Mon Sep 17 00:00:00 2001 From: Jackriip <97582790+Jackriip@users.noreply.github.com> Date: Tue, 17 Nov 2026 13:09:02 -0800 Subject: [PATCH] Remove the helm bluespace jump A crew member could jump the ship out of the round from the helm, which deleted everyone aboard, including players who had no idea it was coming. Ship parts now bank only at round end. The round-end fleet jump is unchanged. --- .../voidcrew_tgui/interfaces/HelmComputer.tsx | 18 --- .../styles/interfaces/HelmComputer.scss | 2 +- voidcrew/modules/metrics/ship_metrics.dm | 59 ++++----- .../overmap/code/modules/overmap/ship.dm | 13 +- .../modules/roundend/roundend_ship_report.dm | 8 +- .../ship_purchase/ship_economy_database.dm | 2 +- voidcrew/modules/shuttle/helm/_helm.dm | 115 +----------------- .../modules/shuttle/ship_parts/extraction.dm | 42 +------ .../ship_parts/extraction_briefcase.dm | 4 +- .../modules/shuttle/ship_parts/ship_item.dm | 6 +- .../modules/shuttle/ship_parts/user_client.dm | 4 +- wiki/content/coming-from-tg.md | 2 +- wiki/content/money-and-trade.md | 2 +- wiki/content/new-player-guide.md | 2 +- wiki/content/piloting.md | 7 -- wiki/content/ship-parts.md | 7 +- wiki/content/ship-upgrades.md | 2 +- 17 files changed, 44 insertions(+), 251 deletions(-) diff --git a/tgui/packages/voidcrew_tgui/interfaces/HelmComputer.tsx b/tgui/packages/voidcrew_tgui/interfaces/HelmComputer.tsx index c02a15afba8..f6651103d7d 100644 --- a/tgui/packages/voidcrew_tgui/interfaces/HelmComputer.tsx +++ b/tgui/packages/voidcrew_tgui/interfaces/HelmComputer.tsx @@ -325,7 +325,6 @@ type Data = { * research to meet. Null the rest of the time. */ zone_advisory: { label: string; critical: BooleanLike } | null; - calibrating: BooleanLike; undockCooldown: BooleanLike; undockCooldownRemaining: number; undockLocked: BooleanLike; @@ -1344,9 +1343,6 @@ const AlertStrip = () => { if (data.cargoShuttlePresent) { alerts.push(['warn', 'Cargo shuttle docked']); } - if (data.calibrating) { - alerts.push(['warn', 'Bluespace jump calibrating']); - } if (data.autopilot?.engaged) { alerts.push([ 'info', @@ -4670,7 +4666,6 @@ const OpsRow = () => { nebulaHideWarmup, nebulaHideRemaining, zone_transitioning, - calibrating, dockOptions, speed, dockAssistMaxSpeed, @@ -4882,19 +4877,6 @@ const OpsRow = () => { } onClick={() => act('distress')} /> - act('bluespace_jump')} - /> ); }; diff --git a/tgui/packages/voidcrew_tgui/styles/interfaces/HelmComputer.scss b/tgui/packages/voidcrew_tgui/styles/interfaces/HelmComputer.scss index 2d68ad35d93..23ccfd2cfab 100644 --- a/tgui/packages/voidcrew_tgui/styles/interfaces/HelmComputer.scss +++ b/tgui/packages/voidcrew_tgui/styles/interfaces/HelmComputer.scss @@ -1762,7 +1762,7 @@ $caption: 1.6cqw; position: absolute; inset: 0; display: grid; - grid-template-columns: repeat(5, 1fr); + grid-template-columns: repeat(4, 1fr); gap: 0.6cqw; padding: 0.8cqw; } diff --git a/voidcrew/modules/metrics/ship_metrics.dm b/voidcrew/modules/metrics/ship_metrics.dm index 3726da357be..dcf8d965a4f 100644 --- a/voidcrew/modules/metrics/ship_metrics.dm +++ b/voidcrew/modules/metrics/ship_metrics.dm @@ -42,9 +42,8 @@ // Not written for the crash that abandonment itself causes. details: // last_hit_by_id, last_hit_by, last_hit_by_npc, seconds_since_hit. // ship_repaired A failed hull comes back into service. -// ship_removed The hull leaves the round. subject = reason: bluespace_jump, -// derelict_despawned, never_crewed_despawned or deleted. details: -// age_seconds, crew; parts_extracted and crew_aboard for a jump. +// ship_removed The hull leaves the round. subject = reason: derelict_despawned, +// never_crewed_despawned or deleted. details: age_seconds, crew. // ship_force_docked A ship's interdictor forces another player ship to dock with it. // ship = the ship that did it, ckey = interdictor operator. details: // target_ship_id, target_ship. @@ -160,10 +159,6 @@ var/metric_spawned_at /// TRUE once the removal row is written; nothing more is recorded about the hull. var/metric_removed = FALSE - /// Why the hull is about to leave the round, when the caller knows (a bluespace jump). - var/metric_removal_reason - /// Extra details for the removal row, set with metric_removal_reason. - var/list/metric_removal_details /// The last ship to land a weapon hit on this one, and when. var/metric_last_hit_by_id var/metric_last_hit_by_name @@ -378,19 +373,9 @@ return record_metric(METRIC_SHIP, "ship_repaired", ship = ship, zone = ship_metric_zone(ship)) -/// The helm is about to jump the ship out of the round. -/proc/ship_metric_jumping(obj/structure/overmap/ship/ship, parts_extracted) - if(!ship) - return - ship.metric_removal_reason = "bluespace_jump" - ship.metric_removal_details = list( - "parts_extracted" = parts_extracted || 0, - "crew_aboard" = length(ship.shuttle?.get_all_humans()), - ) - /** * The hull is leaving the round: its shuttle is about to be detached. Every removal path - * (derelict despawn, bluespace jump, deletion) detaches the shuttle first, so this is the last + * (derelict despawn, deletion) detaches the shuttle first, so this is the last * moment the hull still has its id. Closes any open NPC encounter first. */ /proc/ship_metric_removed(obj/structure/overmap/ship/ship) @@ -399,36 +384,34 @@ watched.metric_stop_watching() // even with metrics off, so no area refs outlive the hull if(!ship_metric_live(ship)) return - var/reason = ship.metric_removal_reason - var/list/details = ship.metric_removal_details ? ship.metric_removal_details.Copy() : list() + var/reason + var/list/details = list() details["age_seconds"] = ship_metric_seconds_since(ship.metric_spawned_at) if(ship_metric_is_npc(ship)) var/obj/structure/overmap/ship/npc/npc_ship = ship npc_metric_end_encounter(npc_ship, outcome = "hull_removed") - if(!reason) - if(!isnull(npc_ship.disarmed_despawn_at)) - reason = "disarmed_salvage_expired" - else if(ship.abandoned) - reason = "derelict_despawned" - else if(istype(ship, /obj/structure/overmap/ship/npc/pirate/nt_patrol)) - var/obj/structure/overmap/ship/npc/pirate/nt_patrol/patrol = ship - reason = patrol.warping_out ? "warped_out" : "deleted" - else - reason = "deleted" + if(!isnull(npc_ship.disarmed_despawn_at)) + reason = "disarmed_salvage_expired" + else if(ship.abandoned) + reason = "derelict_despawned" + else if(istype(ship, /obj/structure/overmap/ship/npc/pirate/nt_patrol)) + var/obj/structure/overmap/ship/npc/pirate/nt_patrol/patrol = ship + reason = patrol.warping_out ? "warped_out" : "deleted" + else + reason = "deleted" details["pool_slot_freed"] = npc_ship.spawner_resolved details["encounters"] = npc_ship.metric_encounter_count details["damage_taken"] = round(npc_ship.metric_damage_taken) details["boarded_by"] = LAZYLEN(npc_ship.metric_boarded_by) record_metric(METRIC_PIRATE, "npc_despawned", ship = ship, zone = ship_metric_zone(ship), subject = reason, details = details) else - if(!reason) - if(ship.abandoned) - reason = "derelict_despawned" - // The derelict sweep's fast path for hulls nobody ever crewed - else if(ship.crewless_since && !length(ship.manifest) && !LAZYLEN(ship.ship_team?.members)) - reason = "never_crewed_despawned" - else - reason = "deleted" + if(ship.abandoned) + reason = "derelict_despawned" + // The derelict sweep's fast path for hulls nobody ever crewed + else if(ship.crewless_since && !length(ship.manifest) && !LAZYLEN(ship.ship_team?.members)) + reason = "never_crewed_despawned" + else + reason = "deleted" details["crew"] = LAZYLEN(ship.ship_team?.members) record_metric(METRIC_SHIP, "ship_removed", ship = ship, zone = ship_metric_zone(ship), subject = reason, details = details) ship.metric_removed = TRUE diff --git a/voidcrew/modules/overmap/code/modules/overmap/ship.dm b/voidcrew/modules/overmap/code/modules/overmap/ship.dm index 76bc3dd86c7..ab1c497fdf6 100644 --- a/voidcrew/modules/overmap/code/modules/overmap/ship.dm +++ b/voidcrew/modules/overmap/code/modules/overmap/ship.dm @@ -1485,18 +1485,13 @@ * Removes the ship from the round. * * force = TRUE deletes the hull outright; otherwise the ship is left behind as an - * abandoned derelict for someone else to claim. - * - * ignore_crew exists for the bluespace jump, which is meant to take the crew with - * it - the helm asks for confirmation first, and extraction runs before the call. - * Without it the crew check below rejected every jump ever attempted, silently: - * anyone flying the ship is by definition standing on it, and do_jump() is the - * only caller there has ever been. + * abandoned derelict for someone else to claim. A forced delete refuses while anyone + * is aboard. */ -/obj/structure/overmap/ship/proc/destroy_ship(force, ignore_crew = FALSE) +/obj/structure/overmap/ship/proc/destroy_ship(force) // For backward compatibility, redirect to abandon_ship unless forced if(force) - if(!ignore_crew && length(shuttle?.get_all_humans()) > 0) + if(length(shuttle?.get_all_humans()) > 0) return FALSE message_admins("\[SHUTTLE]: [shuttle?.name] has been FORCE deleted!") log_shuttle("[shuttle?.name] has been force deleted!") diff --git a/voidcrew/modules/roundend/roundend_ship_report.dm b/voidcrew/modules/roundend/roundend_ship_report.dm index a868cd080eb..606480e4cb5 100644 --- a/voidcrew/modules/roundend/roundend_ship_report.dm +++ b/voidcrew/modules/roundend/roundend_ship_report.dm @@ -66,12 +66,8 @@ GLOBAL_LIST_EMPTY(roundend_departed_ships) if(body ? body.stat == DEAD : !departing) dead++ if(departing) - switch(ship.metric_removal_reason) - if("bluespace_jump") - status = "Jumped out" - else - status = ship.abandoned ? "Abandoned" : "Lost" - bad_status = TRUE + status = ship.abandoned ? "Abandoned" : "Lost" + bad_status = TRUE else if(ship.has_crash_landed) status = "Wrecked" bad_status = TRUE diff --git a/voidcrew/modules/ship_purchase/ship_economy_database.dm b/voidcrew/modules/ship_purchase/ship_economy_database.dm index b5ccef603f6..256aabe7a6a 100644 --- a/voidcrew/modules/ship_purchase/ship_economy_database.dm +++ b/voidcrew/modules/ship_purchase/ship_economy_database.dm @@ -5,7 +5,7 @@ * Based on user decisions: * - Account-wide credits (ckey only, no character_slot) * - Part classes: combat, science, trade, misc - * - Parts must be extracted via bluespace jump or round end + * - Parts must be extracted at round end * - Pending extractions queue for failed extraction retry * - Account-wide ship unlocks * diff --git a/voidcrew/modules/shuttle/helm/_helm.dm b/voidcrew/modules/shuttle/helm/_helm.dm index 70201f04c4e..27d3c1655af 100644 --- a/voidcrew/modules/shuttle/helm/_helm.dm +++ b/voidcrew/modules/shuttle/helm/_helm.dm @@ -1,10 +1,3 @@ -#define JUMP_STATE_OFF 0 -#define JUMP_STATE_CHARGING 1 -#define JUMP_STATE_IONIZING 2 -#define JUMP_STATE_FIRING 3 -#define JUMP_STATE_FINALIZED 4 -#define JUMP_CHARGE_DELAY (20 SECONDS) -#define JUMP_CHARGEUP_TIME (3 MINUTES) /// Minimum gap between hails sent from one console. A hail fans out to every helm /// in the view ring and lands in each one's comms log, so it needs a floor. #define HAIL_SEND_COOLDOWN (3 SECONDS) @@ -45,14 +38,6 @@ var/list/concurrent_users = list() /// Is this console view only? I.E. cant dock/etc var/viewer = FALSE - /// When are we allowed to jump - var/jump_allowed - /// Current state of our jump - var/jump_state = JUMP_STATE_OFF - ///if we are calibrating the jump - var/calibrating = FALSE - ///holding jump timer ID - var/jump_timer /// Last known ship state for detecting changes var/last_ship_state /// Last known integrity percent for threshold detection @@ -373,7 +358,6 @@ data["repairCurrent"] = 0 data["repairTotal"] = 0 - data["calibrating"] = calibrating data["canThrust"] = current_ship.can_thrust() data["otherInfo"] = list() for (var/obj/structure/overmap/object as anything in current_ship.close_overmap_objects) @@ -793,87 +777,6 @@ . = ..() attempt_ship_connection() -/obj/machinery/computer/helm/proc/calibrate_jump(inline = FALSE) - if(jump_allowed < 0) - say("Bluespace Jump Calibration offline. Please contact your system administrator.") - return - if(current_ship.state != OVERMAP_SHIP_FLYING) - say("Bluespace Jump Calibration detected interference in the local area.") - return - if(world.time < jump_allowed) - var/jump_wait = DisplayTimeText(jump_allowed - world.time) - say("Bluespace Jump Calibration is currently recharging. ETA: [jump_wait].") - return - if(jump_state != JUMP_STATE_OFF && !inline) - // Guards against href exploits calling this more than once per client. It used - // to return in total silence, which meant any jump that failed mid-sequence - // bricked the console for the rest of the round with no way to tell. - say("Bluespace Jump sequence already underway.") - return - message_admins("[ADMIN_LOOKUPFLW(usr)] has initiated a bluespace jump in [ADMIN_VERBOSEJMP(src)]") - jump_timer = addtimer(CALLBACK(src, PROC_REF(jump_sequence), TRUE), JUMP_CHARGEUP_TIME, TIMER_STOPPABLE) - current_ship?.ship_notify("Bluespace jump calibration initialized. Calibration completion in [JUMP_CHARGEUP_TIME/600] minutes.", "BLUESPACE", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50) - calibrating = TRUE - return TRUE - -/** - * Aborts a jump, whether it is still calibrating or already running the launch - * sequence, and puts the console back to a state that can jump again. - * - * jump_state has to be reset here: leaving it non-OFF makes calibrate_jump() - * refuse every future attempt. deltimer() has to cover the sequence timers too - - * jump_timer only ever held the initial calibration timer, so a cancel after - * calibration finished left the chain running and unstoppable. - */ -/obj/machinery/computer/helm/proc/cancel_jump() - current_ship?.ship_notify("Pylon Disengaged. Jump cancelled.", "BLUESPACE", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify.ogg', 50) - reset_jump() - -/// Clears all jump state and any pending sequence timer. -/obj/machinery/computer/helm/proc/reset_jump() - calibrating = FALSE - jump_state = JUMP_STATE_OFF - if(jump_timer) - deltimer(jump_timer) - jump_timer = null - -/obj/machinery/computer/helm/proc/jump_sequence() - switch(jump_state) - if(JUMP_STATE_OFF) - jump_state = JUMP_STATE_CHARGING - SStgui.close_uis(src) - if(JUMP_STATE_CHARGING) - jump_state = JUMP_STATE_IONIZING - current_ship?.ship_notify("Bluespace Jump Calibration completed. Ionizing Bluespace Pylon.", "BLUESPACE", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50) - if(JUMP_STATE_IONIZING) - jump_state = JUMP_STATE_FIRING - current_ship?.ship_notify("Bluespace Ionization finalized; preparing to fire Bluespace Pylon.", "BLUESPACE", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50) - if(JUMP_STATE_FIRING) - jump_state = JUMP_STATE_FINALIZED - current_ship?.ship_notify("Bluespace Pylon launched.", "BLUESPACE", SHIP_NOTIFY_NOTICE, 'sound/effects/magic/lightning_chargeup.ogg', 50) - jump_timer = addtimer(CALLBACK(src, PROC_REF(do_jump)), 10 SECONDS, TIMER_STOPPABLE) - return - jump_timer = addtimer(CALLBACK(src, PROC_REF(jump_sequence), TRUE), JUMP_CHARGE_DELAY, TIMER_STOPPABLE) - -/obj/machinery/computer/helm/proc/do_jump() - jump_timer = null - current_ship?.ship_notify("Bluespace Jump Initiated.", "BLUESPACE", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50) - if(!current_ship) - reset_jump() - return - // Extract ship parts from all players on the ship before jumping - var/parts_extracted = extract_ship_parts_from_ship(current_ship, "bluespace_jump") - ship_metric_jumping(current_ship, parts_extracted) - // ignore_crew: the jump is supposed to take the crew with it, and the console - // asked for confirmation before any of this started. - if(current_ship.destroy_ship(TRUE, ignore_crew = TRUE)) - return - // Never strand the console in a state it cannot leave - a failed jump has to be - // retryable, and the crew has to hear that it failed. - current_ship.ship_notify("Bluespace Pylon misfire. Jump aborted; recalibration required.", "BLUESPACE", SHIP_NOTIFY_DANGER, 'voidcrew/sound/notify.ogg', 50) - stack_trace("Bluespace jump failed to destroy ship [current_ship] - the console has been reset.") - reset_jump() - /obj/machinery/computer/helm/connect_to_shuttle(mapload, obj/docking_port/mobile/voidcrew/port, obj/docking_port/stationary/dock) if(!istype(port)) return @@ -1279,15 +1182,6 @@ else current_ship.command_course(BURN_STOP) return - if("bluespace_jump") - if(calibrating) - cancel_jump() - return - else - if(tgui_alert(usr, "Do you want to bluespace jump? Your ship and everything on it will be removed from the round.", "Jump Confirmation", list("Yes", "No")) != "Yes") - return - calibrate_jump() - return if("dock") // Dock into whatever is actually here. Previously this refused // outright whenever a ruin or planet shared the tile, so the only @@ -1384,7 +1278,7 @@ // eats every button without a word is indistinguishable from a broken one - // and until complete_dock() learned to give up (abort_stalled_dock() in // ship.dm) a stalled move really could pin the ship here for good. - if(action in list("dock", "undock", "change_heading", "set_course", "stop", "autopilot", "autopilot_cancel", "change_burn_percentage", "toggle_engine", "bluespace_jump", "active_scan", "act_overmap", "hide_in_nebula", "cancel_nebula_hide", "unhide_from_nebula")) + if(action in list("dock", "undock", "change_heading", "set_course", "stop", "autopilot", "autopilot_cancel", "change_burn_percentage", "toggle_engine", "active_scan", "act_overmap", "hide_in_nebula", "cancel_nebula_hide", "unhide_from_nebula")) say("Manoeuvring systems busy: [current_ship.get_state_readout()]. Stand by.") playsound(src, 'sound/machines/terminal/terminal_error.ogg', 30) return @@ -1394,12 +1288,5 @@ #undef HELM_DRUNK_CHANCE_PER_POINT #undef HELM_DRUNK_MAX_CHANCE #undef HELM_DRUNK_THRESHOLD -#undef JUMP_STATE_OFF -#undef JUMP_STATE_CHARGING -#undef JUMP_STATE_IONIZING -#undef JUMP_STATE_FIRING -#undef JUMP_STATE_FINALIZED -#undef JUMP_CHARGE_DELAY -#undef JUMP_CHARGEUP_TIME #undef HAIL_SEND_COOLDOWN #undef TYPING_SOUND_COOLDOWN diff --git a/voidcrew/modules/shuttle/ship_parts/extraction.dm b/voidcrew/modules/shuttle/ship_parts/extraction.dm index 6f2d435ee48..e2038bd8474 100644 --- a/voidcrew/modules/shuttle/ship_parts/extraction.dm +++ b/voidcrew/modules/shuttle/ship_parts/extraction.dm @@ -1,9 +1,7 @@ /** * Ship Parts Extraction System * - * Handles extracting ship parts from players when: - * - Bluespace jump is completed - * - Round ends + * Handles extracting ship parts from players when the round ends. * * Parts must be inside an extraction briefcase on the player's person * to be extracted. The player holding the briefcase gets the parts added to their account. @@ -155,44 +153,6 @@ GLOBAL_LIST_EMPTY(extracted_this_round) return loose_parts -/** - * Extract parts from all players on a ship - * Called during bluespace jump - * - * @param ship - The ship structure (/obj/structure/overmap/ship) - * @param extraction_type - Description for logging - * @return Total number of parts extracted - */ -/proc/extract_ship_parts_from_ship(obj/structure/overmap/ship/ship, extraction_type = "bluespace_jump") - if(!ship) - return 0 - - var/obj/docking_port/mobile/shuttle = ship.shuttle - if(!shuttle) - return 0 - - var/total_extracted = 0 - - // Get all mobs in shuttle areas - for(var/area/shuttle_area in shuttle.shuttle_areas) - for(var/mob/living/player in shuttle_area) - if(!player.client) - continue - - // Warn about loose parts before extraction - var/list/loose_parts = find_loose_ship_parts_on_mob(player) - if(length(loose_parts)) - to_chat(player, span_warning("You have [length(loose_parts)] ship part(s) NOT in an extraction briefcase! These will NOT be extracted!")) - - var/list/extracted = extract_ship_parts_from_player(player, extraction_type) - for(var/part_class in extracted) - total_extracted += extracted[part_class] - - if(total_extracted > 0) - log_game("SHIP_EXTRACTION: Extracted [total_extracted] total parts from ship [ship.name] via [extraction_type]") - - return total_extracted - /** * Extract parts from all players at round end * Called from the round end hook diff --git a/voidcrew/modules/shuttle/ship_parts/extraction_briefcase.dm b/voidcrew/modules/shuttle/ship_parts/extraction_briefcase.dm index b303932127c..d168d9f66d7 100644 --- a/voidcrew/modules/shuttle/ship_parts/extraction_briefcase.dm +++ b/voidcrew/modules/shuttle/ship_parts/extraction_briefcase.dm @@ -7,7 +7,7 @@ * - Lockable with a 5-digit PIN (set by player) * - Can be hacked: screwdriver to open panel, then multitool (40 seconds) * - Can be broken into via EMAG (lock destroyed permanently) - * - Only parts inside this case are extracted on bluespace jump / round end + * - Only parts inside this case are extracted at round end */ /// Storage datum for extraction case - only accepts ship parts @@ -37,7 +37,7 @@ /obj/item/storage/briefcase/secure/extraction/examine(mob/user) . = ..() . += span_notice("This case can hold up to [atom_storage.max_slots] ship parts.") - . += span_notice("To bank its parts, stay alive and carry the case in your hands or inventory when your ship bluespace jumps or the round ends. Inside a backpack counts; leaving it on the floor does not. The current carrier receives the parts.") + . += span_notice("To bank its parts, stay alive and carry the case in your hands or inventory when the round ends. Inside a backpack counts; leaving it on the floor does not. The current carrier receives the parts.") . += span_notice("Only one standard extraction case is banked per person; champion's cases are banked in addition. Loose ship parts are not extracted.") . += span_notice("Use the Request Extraction Case verb in the IC tab for a free standard case if you aren't already carrying an extraction case.") . += span_notice("Use in-hand to set a PIN code and lock it.") diff --git a/voidcrew/modules/shuttle/ship_parts/ship_item.dm b/voidcrew/modules/shuttle/ship_parts/ship_item.dm index 4fc8951b93c..8eda74c3be5 100644 --- a/voidcrew/modules/shuttle/ship_parts/ship_item.dm +++ b/voidcrew/modules/shuttle/ship_parts/ship_item.dm @@ -5,12 +5,12 @@ * Uses part classes: combat, science, trade, misc * Parts are NOT automatically redeemed - they must be: * 1. Placed in an extraction briefcase - * 2. Extracted via bluespace jump or round end + * 2. Extracted at round end * Parts NOT in a briefcase will be lost! */ /obj/item/ship_parts name = "ship parts" - desc = "Ship parts used for unlocking ships. Put these in an extraction briefcase before jumping - loose parts won't be extracted!" + desc = "Ship parts used for unlocking ships. Put these in an extraction briefcase before the shift ends - loose parts won't be extracted!" icon = 'voidcrew/modules/shuttle/ship_parts/icons/ship_item.dmi' icon_state = "misc" w_class = WEIGHT_CLASS_SMALL @@ -22,7 +22,7 @@ . = ..() . += span_notice("This is a [part_class]-class ship part.") . += span_warning("Must be stored in an extraction briefcase to be extracted!") - . += span_notice("Parts are extracted when you bluespace jump or when the round ends.") + . += span_notice("Parts are extracted when the round ends.") . += span_notice("No briefcase? Get a free one with the Request Extraction Case verb in the IC tab.") // Combat parts (red) - found in wrecks, combat zones diff --git a/voidcrew/modules/shuttle/ship_parts/user_client.dm b/voidcrew/modules/shuttle/ship_parts/user_client.dm index e8d82039a85..7d2bdd9a423 100644 --- a/voidcrew/modules/shuttle/ship_parts/user_client.dm +++ b/voidcrew/modules/shuttle/ship_parts/user_client.dm @@ -6,7 +6,7 @@ * * Economy Model: * - CREDITS: Earned at round-end, spent on ships - * - PARTS: Found in-game (exploration/loot), extracted via bluespace jump or round end + * - PARTS: Found in-game (exploration/loot), extracted at round end * * Part Classes: * - Combat: Found in wrecks, combat zones @@ -279,7 +279,7 @@ // Spawn the case var/obj/item/storage/briefcase/secure/extraction/extraction_case = new(player.loc) if(extraction_case) - to_chat(src, span_notice("An extraction case has been provided. Put ship parts inside and pick it up before a bluespace jump or round end. Carrying it inside a backpack counts; the current carrier receives the parts.")) + to_chat(src, span_notice("An extraction case has been provided. Put ship parts inside and pick it up before the round ends. Carrying it inside a backpack counts; the current carrier receives the parts.")) to_chat(src, span_warning("Warning: This case can be stolen, hacked, or broken into with an EMAG!")) else to_chat(src, span_warning("Failed to create case. Please try again.")) diff --git a/wiki/content/coming-from-tg.md b/wiki/content/coming-from-tg.md index 0dba14b7c6a..b7c9f493d24 100644 --- a/wiki/content/coming-from-tg.md +++ b/wiki/content/coming-from-tg.md @@ -11,7 +11,7 @@ If you have played /tg/station, most of your muscle memory transfers. Surgery, c There is no station and no arrivals shuttle. You start on a small crewed ship parked on the safe edge of a galaxy map, and that ship is the entire round for you. See [The Overmap](overmap.md). -You cannot call the emergency shuttle. Attempting it tells you so. There is no evac, no escape pods to fight over, and no round-end alert level theatre. A ship that wants out of the round can charge a bluespace jump at its own helm, which removes that ship and everyone on it from the round, that is as close as Voidcrew gets to escaping, and it is a per-crew decision, not a server-wide one. +You cannot call the emergency shuttle. Attempting it tells you so. There is no evac, no escape pods to fight over, and no round-end alert level theatre. Because there is no station, there is also no permanent geography. Your medbay is a room on your ship that a random module roll gave you, and another crew's ship might not have one at all. diff --git a/wiki/content/money-and-trade.md b/wiki/content/money-and-trade.md index 24d65f99193..b3b9ba936b0 100644 --- a/wiki/content/money-and-trade.md +++ b/wiki/content/money-and-trade.md @@ -16,7 +16,7 @@ Voidcrew has no station budget and no paychecks. Earn credits by selling salvage !!! tip "What vouchers are for" Vouchers buy the tier of gear no shop will sell for money: syndicate MODsuit hardware, ship shield and interdiction boards, military-grade [cyberware](cyberware.md), top-tier [exploit software](ship-hacking.md), and the charts that reveal rare ruins. If you want any of that, you have to go somewhere dangerous. -There is also a persistent currency, [ship parts](ship-parts.md), banked through an extraction case when you bluespace jump or the round ends. Spend banked parts on permanent hull, theme and module unlocks in the [shipyard](ship-upgrades.md). Your parts balance is separate from the credits in your ship's bank. +There is also a persistent currency, [ship parts](ship-parts.md), banked through an extraction case when the round ends. Spend banked parts on permanent hull, theme and module unlocks in the [shipyard](ship-upgrades.md). Your parts balance is separate from the credits in your ship's bank. ## The ship bank diff --git a/wiki/content/new-player-guide.md b/wiki/content/new-player-guide.md index 0d6b5561e3d..7e9ffe8dab8 100644 --- a/wiki/content/new-player-guide.md +++ b/wiki/content/new-player-guide.md @@ -58,7 +58,7 @@ Danger and reward both scale with how far from the star you fly. The safe inner Most of what you find is yours only for the round. [Ship parts](ship-parts.md) are the exception: they are the persistent currency that unlocks hulls, themes and modules for every future round, and found parts only carry over if you extract them. -Use **Request Extraction Case** in the **IC** tab, pick up the case, and put up to five parts inside. Carry it when the round ends or your ship makes a bluespace jump out; inside a backpack counts. You must be alive and connected. Each account extracts once per round, from its first standard case plus any champion's cases carried alongside it. Loose parts in your bag do not extract. If you played a character and remain connected at round end, you also get one random part directly into your account, even if you died. See [Ship Parts](ship-parts.md) for the full extraction rules. +Use **Request Extraction Case** in the **IC** tab, pick up the case, and put up to five parts inside. Carry it when the round ends; inside a backpack counts. You must be alive and connected. Each account extracts once per round, from its first standard case plus any champion's cases carried alongside it. Loose parts in your bag do not extract. If you played a character and remain connected at round end, you also get one random part directly into your account, even if you died. See [Ship Parts](ship-parts.md) for the full extraction rules. ## Staying alive diff --git a/wiki/content/piloting.md b/wiki/content/piloting.md index 42f2cfc6e1d..46583caefc0 100644 --- a/wiki/content/piloting.md +++ b/wiki/content/piloting.md @@ -98,10 +98,3 @@ Fuel use scales with your ship's **mass**, so a bigger hull costs more per burn ## Damage and disabling Below 50% hull integrity the helm refuses every command. Rebuilding hull mass (replacing destroyed floor and wall tiles) brings it back, and a ship that crash-landed needs 65% before it flies again. See [Ship Combat](ship-combat.md). - -## Bluespace jump - -The **Bluespace** button calibrates a jump out of the system. Calibration takes three minutes, then the pylon fires. - -!!! danger "A bluespace jump ends your round" - Your ship and everyone on it are removed from the round permanently. This is the "we are done, cash out" button, not a fast-travel option. The console asks you to confirm; press Bluespace again during calibration to cancel. diff --git a/wiki/content/ship-parts.md b/wiki/content/ship-parts.md index 3e5c9477b45..6b6780e572c 100644 --- a/wiki/content/ship-parts.md +++ b/wiki/content/ship-parts.md @@ -51,15 +51,12 @@ The PIN protects access to the contents, but someone can still steal the whole c ## Banking your parts -You can extract in either of two ways: - -- **Bluespace jump:** carry the case aboard your ship when it jumps out of the system from the [helm](piloting.md#bluespace-jump). -- **Round end:** carry the case when the round ends. You do not have to be aboard a ship for this. +Carry the case when the round ends. You do not have to be aboard a ship for this. At extraction, you must be **alive, connected and still controlling your character**. Unconscious characters can extract; corpses, disconnected characters and characters you have ghosted out of cannot. !!! warning "Check your case before leaving" - Loose parts never extract, even if they are in your backpack. The parts must be inside a case you are carrying. A bluespace jump removes the ship and everyone aboard from the round, so agree with your crew before using it. + Loose parts never extract, even if they are in your backpack. The parts must be inside a case you are carrying. The **current carrier** receives the parts. The case is not bound to whoever requested it or set its PIN. You can carry a locked case and bank its contents without knowing the code. diff --git a/wiki/content/ship-upgrades.md b/wiki/content/ship-upgrades.md index 7a8b7fbb9b1..c126af8f222 100644 --- a/wiki/content/ship-upgrades.md +++ b/wiki/content/ship-upgrades.md @@ -13,7 +13,7 @@ Parts come in four classes: **combat, science, trade and misc**. You need each c ### Getting parts home -Use **Request Extraction Case** under the **IC** tab, put up to five parts inside, and carry the case when your ship bluespace jumps or the round ends. A case inside your backpack counts; loose parts do not. You must be alive and connected, and the current carrier receives the parts. Each account extracts once per round, from one standard case plus any champion's cases carried alongside it. Read [Banking your parts](ship-parts.md#banking-your-parts) before leaving with a haul. +Use **Request Extraction Case** under the **IC** tab, put up to five parts inside, and carry the case when the round ends. A case inside your backpack counts; loose parts do not. You must be alive and connected, and the current carrier receives the parts. Each account extracts once per round, from one standard case plus any champion's cases carried alongside it. Read [Banking your parts](ship-parts.md#banking-your-parts) before leaving with a haul. ## The shipyard