Date: Thu, 5 Nov 2026 19:08:24 -0800
Subject: [PATCH 13/72] Test a build with no source hull instead of the removed
copy option
---
.../unit_tests/voidcrew_outpost_admin_checkpoints.dm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/voidcrew/modules/unit_tests/voidcrew_outpost_admin_checkpoints.dm b/voidcrew/modules/unit_tests/voidcrew_outpost_admin_checkpoints.dm
index 1c5180e476f..3a11f251887 100644
--- a/voidcrew/modules/unit_tests/voidcrew_outpost_admin_checkpoints.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_outpost_admin_checkpoints.dm
@@ -137,13 +137,14 @@
sleep(2)
TEST_ASSERT(!drones_left, "Drones did not go home after the build")
- // An original still in service is left alone: the rebuild is an extra copy.
+ // A snapshot with no source, as a load from an earlier round has, leaves other ships alone.
rebuilt.abandoned = FALSE
rebuilt.ship_account.account_balance = 777
var/datum/ship_checkpoint/copy_source = capture_copy(home, rebuilt, "copyowner")
TEST_ASSERT_NOTNULL(copy_source, "Could not capture the rebuilt ship")
+ copy_source.source_ship = null
send_to_transit(home, rebuilt)
- job = new(null, copy_source, operator, FALSE, TRUE)
+ job = new(null, copy_source, operator)
TEST_ASSERT(job.prepare(), "The copy rebuild did not start: [job.error]")
TEST_ASSERT_NULL(job.original_ref, "A copy rebuild took over the ship in service")
job.rush()
@@ -160,7 +161,8 @@
// Stop before the first piece: the bay is freed and nothing is left behind.
var/datum/ship_checkpoint/stop_source = capture_copy(home, rebuilt, "copyowner")
TEST_ASSERT_NOTNULL(stop_source, "Could not capture the ship to test Stop")
- job = new(null, stop_source, operator, FALSE, TRUE)
+ stop_source.source_ship = null
+ job = new(null, stop_source, operator)
TEST_ASSERT(job.prepare(), "The rebuild to stop did not start: [job.error]")
TEST_ASSERT(!job.committed, "The rebuild placed a piece before it could be stopped")
panel.manage_outpost(home, operator, "rebuild_stop", list("ref" = REF(job)))
From c434a0d7e0630fcf86e0d79bed51f43affa4c6b2 Mon Sep 17 00:00:00 2001
From: Jackriip <97582790+Jackriip@users.noreply.github.com>
Date: Thu, 5 Nov 2026 20:08:44 -0800
Subject: [PATCH 14/72] Check stocked and empty fixtures on both load paths
---
voidcrew/modules/unit_tests/voidcrew_ship_saves.dm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/voidcrew/modules/unit_tests/voidcrew_ship_saves.dm b/voidcrew/modules/unit_tests/voidcrew_ship_saves.dm
index abef1eac420..00b1da6a0ef 100644
--- a/voidcrew/modules/unit_tests/voidcrew_ship_saves.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_ship_saves.dm
@@ -1283,12 +1283,16 @@
var/lathes = 0
var/plasma_tanks = 0
var/air_tanks = 0
+ var/stocked_vendors = 0
var/obj/docking_port/mobile/voidcrew/port = ship.shuttle
for(var/turf/tile as anything in port.return_turfs())
if(!(get_area(tile) in port.shuttle_areas))
continue
for(var/obj/item/loose in tile)
TEST_FAIL("[where]: the ship came with a loose [loose.type]")
+ // A locker on the list fills itself on first opening. Any other never does.
+ for(var/obj/structure/closet/locker in tile)
+ TEST_ASSERT_EQUAL(!!locker.contents_initialized, !is_type_in_typecache(locker, GLOB.ship_save_stocked_fixtures), "[where]: [locker.type] has the wrong stock")
for(var/obj/machinery/machine in tile)
if(istype(machine, /obj/machinery/autolathe))
lathes++
@@ -1306,8 +1310,14 @@
TEST_ASSERT(controller.cell?.charge > 0, "[where]: an APC came back with no charged cell")
if(istype(machine, /obj/machinery/vending))
var/obj/machinery/vending/vendor = machine
+ var/vendor_stock = 0
for(var/datum/data/vending_product/product as anything in vendor.product_records + vendor.hidden_records + vendor.coin_records)
- TEST_ASSERT_EQUAL(product.amount, 0, "[where]: a vending machine came back stocked")
+ vendor_stock += product.amount
+ if(is_type_in_typecache(vendor, GLOB.ship_save_stocked_fixtures))
+ stocked_vendors++
+ TEST_ASSERT(vendor_stock > 0, "[where]: [vendor.type] should come back stocked")
+ else
+ TEST_ASSERT_EQUAL(vendor_stock, 0, "[where]: [vendor.type] should come back empty")
if(istype(machine, /obj/machinery/door))
var/obj/machinery/door/door = machine
TEST_ASSERT(!length(door.req_access) && !length(door.req_one_access), "[where]: a door kept its access")
@@ -1317,6 +1327,7 @@
TEST_ASSERT(lathes, "[where]: the upgraded autolathe did not come back")
TEST_ASSERT(plasma_tanks, "[where]: the plasma tank did not come back")
TEST_ASSERT(air_tanks, "[where]: the air tank did not come back")
+ TEST_ASSERT(stocked_vendors, "[where]: the hull's stocked vendor did not come back")
/// A save loaded in the round it was made: only once the old hull is out of service, and it then replaces it.
/datum/unit_test/voidcrew_ship_saves_hull/retrieval/same_round
From 7a90596451ef56ee3945ff8fd6bf582d2aad5b7f Mon Sep 17 00:00:00 2001
From: Jackriip <97582790+Jackriip@users.noreply.github.com>
Date: Sat, 7 Nov 2026 11:47:20 -0800
Subject: [PATCH 15/72] Charge misc parts for a ship save by hull mass only
---
voidcrew/_DEFINES/ship_saves.dm | 2 --
.../modules/ship_saves/ship_save_survey.dm | 15 +++-----
.../modules/unit_tests/voidcrew_ship_saves.dm | 36 ++++++++-----------
wiki/content/player-outposts.md | 2 +-
wiki/content/ship-parts.md | 2 +-
5 files changed, 20 insertions(+), 37 deletions(-)
diff --git a/voidcrew/_DEFINES/ship_saves.dm b/voidcrew/_DEFINES/ship_saves.dm
index ad7a1aafc6b..f9f2d0f9e0f 100644
--- a/voidcrew/_DEFINES/ship_saves.dm
+++ b/voidcrew/_DEFINES/ship_saves.dm
@@ -6,8 +6,6 @@
#define SHIP_SAVE_PRICE_MIN 5
/// A hull costs one misc part per this much mass, rounded up.
#define SHIP_SAVE_MASS_PER_PART 150
-/// Machines the price table doesn't name cost one misc part per this many, rounded up.
-#define SHIP_SAVE_MACHINES_PER_PART 15
/// How long a hull's survey is good for while a window is open on it.
#define SHIP_SAVE_SURVEY_LIFE (10 SECONDS)
/// A hull plan longer than this isn't sent to the screen or kept.
diff --git a/voidcrew/modules/ship_saves/ship_save_survey.dm b/voidcrew/modules/ship_saves/ship_save_survey.dm
index b27bff30b14..7ebcda8660a 100644
--- a/voidcrew/modules/ship_saves/ship_save_survey.dm
+++ b/voidcrew/modules/ship_saves/ship_save_survey.dm
@@ -3,8 +3,8 @@
#define SHIP_SAVE_PRICE(part_class, each_machine, label_text) list("class" = part_class, "each" = each_machine, "label" = label_text)
/**
- * What the machines a save keeps cost. Subtypes inherit, and a later, more specific entry wins: a null
- * takes a subtype back off the table, so it counts among the other machines.
+ * What the machines a save keeps cost. Machines not on this table are free. Subtypes inherit, and a later,
+ * more specific entry wins: a null takes a subtype back off the table.
*/
GLOBAL_LIST_INIT(ship_save_priced_machines, zebra_typecacheof(list(
/obj/machinery/ship_combat/laser_turret = SHIP_SAVE_PRICE(PART_CLASS_COMBAT, 1, null),
@@ -76,7 +76,6 @@ GLOBAL_LIST_INIT(ship_save_priced_machines, zebra_typecacheof(list(
var/static/list/plan_rank = list("w" = 1, "s" = 2, "t" = 3, "e" = 4, "#" = 5, "g" = 6, "o" = 7)
var/static/list/class_mark = list(PART_CLASS_COMBAT = "w", PART_CLASS_SCIENCE = "s", PART_CLASS_TRADE = "t")
var/mass = 0
- var/other_machines = 0
/// Line name -> list("class", "each", "count")
var/list/lines = list()
var/list/plan_rows = list()
@@ -110,8 +109,6 @@ GLOBAL_LIST_INIT(ship_save_priced_machines, zebra_typecacheof(list(
object_mark = class_mark[price["class"]]
else if(istype(machine, /obj/machinery/power/shuttle_engine))
object_mark = "e"
- else if(!is_type_in_typecache(machine, GLOB.outpost_checkpoint_infrastructure))
- other_machines++
if(object_mark && plan_rank[object_mark] < plan_rank[mark])
mark = object_mark
plan_row += mark
@@ -119,14 +116,14 @@ GLOBAL_LIST_INIT(ship_save_priced_machines, zebra_typecacheof(list(
var/crew = 0
for(var/list/definition in job_definitions)
crew += definition["slots"] || 1
- var/list/survey = ship_save_price_bill(lines, mass, other_machines)
+ var/list/survey = ship_save_price_bill(lines, mass)
survey["mass"] = mass
survey["crew"] = crew
survey["plan"] = ship_save_encode_plan(plan_rows)
return survey
/// Rounds each line up and adds them into bill, total and cost.
-/proc/ship_save_price_bill(list/lines, mass, other_machines)
+/proc/ship_save_price_bill(list/lines, mass)
SHOULD_NOT_SLEEP(TRUE)
var/list/items_by_class = list()
var/total = 0
@@ -142,10 +139,6 @@ GLOBAL_LIST_INIT(ship_save_priced_machines, zebra_typecacheof(list(
if(hull_parts)
misc_items += list(list("name" = "Hull, [mass] t", "count" = null, "parts" = hull_parts))
total += hull_parts
- var/other_parts = CEILING(other_machines / SHIP_SAVE_MACHINES_PER_PART, 1)
- if(other_parts)
- misc_items += list(list("name" = "Other machines", "count" = other_machines, "parts" = other_parts))
- total += other_parts
if(total < SHIP_SAVE_PRICE_MIN)
misc_items += list(list("name" = "Yard minimum", "count" = null, "parts" = SHIP_SAVE_PRICE_MIN - total))
total = SHIP_SAVE_PRICE_MIN
diff --git a/voidcrew/modules/unit_tests/voidcrew_ship_saves.dm b/voidcrew/modules/unit_tests/voidcrew_ship_saves.dm
index 00b1da6a0ef..08f9fd123b5 100644
--- a/voidcrew/modules/unit_tests/voidcrew_ship_saves.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_ship_saves.dm
@@ -2,7 +2,6 @@
#define SHIP_SAVE_TEST_SLOTS 3 // SHIP_SAVE_SLOTS
#define SHIP_SAVE_TEST_PRICE_MIN 5 // SHIP_SAVE_PRICE_MIN
#define SHIP_SAVE_TEST_MASS_PER_PART 150 // SHIP_SAVE_MASS_PER_PART
-#define SHIP_SAVE_TEST_MACHINES_PER_PART 15 // SHIP_SAVE_MACHINES_PER_PART
#define SHIP_SAVE_TEST_PLAN_MAX 8000 // SHIP_SAVE_PLAN_MAX_LENGTH
#define SHIP_SAVE_TEST_PASSWORD_PRICE 3 // SHIP_PASSWORD_PRICE
#define SHIP_SAVE_TEST_FORMAT 1 // SHIP_SAVE_FORMAT
@@ -452,7 +451,7 @@
var/list/classes = list()
for(var/list/entry as anything in survey["bill"])
classes += entry["class"]
- TEST_ASSERT_EQUAL(classes.Join(","), "combat,science,trade,misc", "The bill's classes are in the wrong order")
+ TEST_ASSERT_EQUAL(classes.Join(","), "combat,science,trade", "The bill's classes are in the wrong order")
TEST_ASSERT_EQUAL(bill_class(survey, "combat")["parts"], 3, "Wrong combat total")
var/list/combat_items = bill_class(survey, "combat")["items"]
var/list/first_combat = combat_items[1]
@@ -465,16 +464,13 @@
TEST_ASSERT_EQUAL(bill_line(survey, "science", "Chem dispenser")?["parts"], 1, "A chem dispenser did not cost 1 science")
TEST_ASSERT_EQUAL(bill_class(survey, "science")["parts"], 1, "A drink dispenser counted as a chem dispenser")
TEST_ASSERT_EQUAL(bill_line(survey, "trade", "Cargo console")?["parts"], 1, "A cargo console did not cost 1 trade")
- var/list/others = bill_line(survey, "misc", "Other machines")
- TEST_ASSERT_EQUAL(others?["count"], 1, "Only the drink dispenser should be an other machine")
- TEST_ASSERT_EQUAL(others?["parts"], 1, "One other machine did not round up to a part")
- TEST_ASSERT_NULL(bill_line(survey, "misc", "Yard minimum"), "A hull over the minimum paid it")
- TEST_ASSERT_EQUAL(survey["total"], 6, "Wrong total")
+ TEST_ASSERT_NULL(bill_class(survey, "misc"), "Machines off the price table were charged in misc")
+ TEST_ASSERT_EQUAL(survey["total"], 5, "Wrong total")
TEST_ASSERT_EQUAL(survey["cost"]["combat"], 3, "The charge disagrees with the bill")
TEST_ASSERT_EQUAL(survey["cost"]["science"], 1, "The charge disagrees with the bill")
TEST_ASSERT_EQUAL(survey["cost"]["trade"], 1, "The charge disagrees with the bill")
- TEST_ASSERT_EQUAL(survey["cost"]["misc"], 1, "The charge disagrees with the bill")
- TEST_ASSERT_EQUAL(ship_save_cost_text(survey["cost"]), "3 combat, 1 science, 1 trade and 1 misc parts", "Wrong words for the price")
+ TEST_ASSERT_NULL(survey["cost"]["misc"], "The charge disagrees with the bill")
+ TEST_ASSERT_EQUAL(ship_save_cost_text(survey["cost"]), "3 combat, 1 science and 1 trade parts", "Wrong words for the price")
// A label wins, a subtype inherits, and a name with no label comes from the type.
var/list/price = GLOB.ship_save_priced_machines[/obj/machinery/rnd/production/protolathe/department/science]
@@ -487,30 +483,27 @@
if(!iseffect(thing))
qdel(thing)
-/// The misc lines and the minimum, with nothing but numbers.
+/// The hull line and the minimum, with nothing but numbers.
/datum/unit_test/voidcrew_ship_saves/proc/check_bill_rounding()
- var/list/kitted = ship_save_price_bill(list(), 650, 25)
- var/list/hull_line = bill_line(kitted, "misc", "Hull, 650 t")
+ var/list/hull_only = ship_save_price_bill(list(), 650)
+ var/list/hull_line = bill_line(hull_only, "misc", "Hull, 650 t")
TEST_ASSERT_EQUAL(hull_line?["parts"], 5, "650 t did not round up to 5 parts")
TEST_ASSERT_NULL(hull_line?["count"], "The hull line has a count")
- var/list/other_line = bill_line(kitted, "misc", "Other machines")
- TEST_ASSERT_EQUAL(other_line?["parts"], 2, "25 machines did not round up to 2 parts")
- TEST_ASSERT_EQUAL(other_line?["count"], 25, "The other machines line lost its count")
- TEST_ASSERT_EQUAL(kitted["total"], 7, "Wrong total for a kitted hull")
- var/list/exact = ship_save_price_bill(list(), SHIP_SAVE_TEST_MASS_PER_PART * 5, SHIP_SAVE_TEST_MACHINES_PER_PART)
+ TEST_ASSERT_EQUAL(hull_only["total"], 5, "Wrong total for a bare hull")
+ var/list/exact = ship_save_price_bill(list(), SHIP_SAVE_TEST_MASS_PER_PART * 6)
TEST_ASSERT_EQUAL(exact["total"], 6, "An exact multiple was rounded up again")
// A tiny hull pays the minimum exactly, and the bill says why.
- var/list/tiny = ship_save_price_bill(list(), 150, 1)
+ var/list/tiny = ship_save_price_bill(list(), 150)
TEST_ASSERT_EQUAL(tiny["total"], SHIP_SAVE_TEST_PRICE_MIN, "A tiny hull did not pay exactly the minimum")
TEST_ASSERT_EQUAL(tiny["cost"]["misc"], SHIP_SAVE_TEST_PRICE_MIN, "The minimum isn't paid in misc parts")
- TEST_ASSERT_EQUAL(bill_line(tiny, "misc", "Yard minimum")?["parts"], SHIP_SAVE_TEST_PRICE_MIN - 2, "The minimum line doesn't make up the difference")
+ TEST_ASSERT_EQUAL(bill_line(tiny, "misc", "Yard minimum")?["parts"], SHIP_SAVE_TEST_PRICE_MIN - 1, "The minimum line doesn't make up the difference")
TEST_ASSERT_NULL(bill_line(tiny, "misc", "Yard minimum")?["count"], "The minimum line has a count")
- var/list/nothing = ship_save_price_bill(list(), 0, 0)
+ var/list/nothing = ship_save_price_bill(list(), 0)
TEST_ASSERT_EQUAL(length(bill_class(nothing, "misc")["items"]), 1, "An empty hull billed lines for nothing")
TEST_ASSERT_EQUAL(nothing["total"], SHIP_SAVE_TEST_PRICE_MIN, "An empty hull did not pay the minimum")
var/list/lines = list("Defense turret" = list("class" = "combat", "each" = 0.5, "count" = 6))
- TEST_ASSERT_EQUAL(bill_line(ship_save_price_bill(lines, 0, 0), "combat", "Defense turret")?["parts"], 3, "Six turrets at 1 per 2 are not one line of 3")
+ TEST_ASSERT_EQUAL(bill_line(ship_save_price_bill(lines, 0), "combat", "Defense turret")?["parts"], 3, "Six turrets at 1 per 2 are not one line of 3")
set_parts(misc = SHIP_SAVE_TEST_PRICE_MIN)
GLOB.ship_saves.refresh("tinyhull")
@@ -1668,7 +1661,6 @@
#undef SHIP_SAVE_TEST_SLOTS
#undef SHIP_SAVE_TEST_PRICE_MIN
#undef SHIP_SAVE_TEST_MASS_PER_PART
-#undef SHIP_SAVE_TEST_MACHINES_PER_PART
#undef SHIP_SAVE_TEST_PLAN_MAX
#undef SHIP_SAVE_TEST_PASSWORD_PRICE
#undef SHIP_SAVE_TEST_TOO_LONG
diff --git a/wiki/content/player-outposts.md b/wiki/content/player-outposts.md
index e7a42caab7e..895b3153786 100644
--- a/wiki/content/player-outposts.md
+++ b/wiki/content/player-outposts.md
@@ -171,7 +171,7 @@ The bay's own **shipyard console**, found only in the bay itself, has two tabs:
You have three save slots. Dock a ship you command in a ship bay, choose a slot and pay [ship parts](ship-parts.md) to save it there. The hull needs at least one cryopod. Saving to a slot that already holds a ship overwrites that save, and you pay again.
-The price depends on what is aboard, and the console lists it before you pay. Weapons and defenses cost combat parts, research and chemistry machines cost science parts, cargo and mining machines cost trade parts, and the hull and everything else cost misc parts. Every save costs at least 5 parts in total. You need enough of each class. Whatever you take off the ship before saving is not charged for, and is not in the save.
+The price depends on what is aboard, and the console lists it before you pay. Weapons and defenses cost combat parts, research and chemistry machines cost science parts, cargo and mining machines cost trade parts, and the hull costs misc parts. Every save costs at least 5 parts in total. You need enough of each class. Whatever you take off the ship before saving is not charged for, and is not in the save.
Get a saved ship back for free, either from **Saved Ships** in the lobby's join menu, which launches it with you aboard, or from the **Saved ships** tab of a shipyard console in any ship bay, where the delivery drones build it. Each save works once: using it uses it up and frees the slot.
diff --git a/wiki/content/ship-parts.md b/wiki/content/ship-parts.md
index f0c6b2dd7ba..3e7e2de1300 100644
--- a/wiki/content/ship-parts.md
+++ b/wiki/content/ship-parts.md
@@ -81,6 +81,6 @@ Open the **Shipyard** from the join menu to see your balance and the prices of h
Unlocks are permanent. Buying a theme or module lets you select it for future launches of that hull without paying again, and losing a ship does not erase your purchases. See [Buying & Upgrading Ships](ship-upgrades.md) for choosing a loadout and [Ship Catalog](ship-catalog.md) for the available hulls.
-[Saving a ship](player-outposts.md) in a ship bay also costs parts, in the classes that match what is aboard: combat parts for weapons, science parts for research and chemistry machines, trade parts for cargo and mining machines, and misc parts for the hull and everything else. Every save costs at least 5 parts in total.
+[Saving a ship](player-outposts.md) in a ship bay also costs parts, in the classes that match what is aboard: combat parts for weapons, science parts for research and chemistry machines, trade parts for cargo and mining machines, and misc parts for the hull. Every save costs at least 5 parts in total.
A ship's join password can be paid for with parts of any class. Setting or changing it costs **3 parts**; clearing it is free.
From f4827ce3f4c3bc36491ef04e9d7b5e7ba36aa0ff Mon Sep 17 00:00:00 2001
From: Jackriip <97582790+Jackriip@users.noreply.github.com>
Date: Sat, 7 Nov 2026 11:53:02 -0800
Subject: [PATCH 16/72] Stop reading the removed checkpoint prices in the gear
catalog
---
tools/gear_catalog/offers.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/gear_catalog/offers.py b/tools/gear_catalog/offers.py
index ba71d9a219e..7d252b7a3d3 100644
--- a/tools/gear_catalog/offers.py
+++ b/tools/gear_catalog/offers.py
@@ -214,8 +214,6 @@ def add(shop,name,source,price=0,vouchers=0,**kw):
add('Player outpost upgrades',dm.val(upgrade,'name'),dm.loc(upgrade),dm.val(upgrade,'price'),sku_type=upgrade,stock='installation gated',notes='Treasury buys upgrade blueprint; not a ship purchase',field_sources=f_sources(dm,upgrade,['price','id']))
# Other paid registry services; ship purchase prices deliberately excluded.
for file,needle,name,const in [
- ('voidcrew/modules/player_outposts/outpost_checkpoints.dm','OUTPOST_CHECKPOINT_SAVE_COST','save ship checkpoint','OUTPOST_CHECKPOINT_SAVE_COST'),
- ('voidcrew/modules/player_outposts/outpost_checkpoints.dm','OUTPOST_CHECKPOINT_UPDATE_COST','update ship checkpoint','OUTPOST_CHECKPOINT_UPDATE_COST'),
('voidcrew/modules/player_outposts/outpost_management_ui.dm','OUTPOST_ADVERT_COST','galaxy advertisement','OUTPOST_ADVERT_COST'),
('voidcrew/modules/player_outposts/outpost_ship_bay.dm','OUTPOST_SHIP_BAY_COST','install ship bay','OUTPOST_SHIP_BAY_COST')]:
add('Player outpost registry',name,dm.cite(file,needle),dm.eval(const),notes='Paid from treasury; runtime eligibility applies')
From abfe59821c48dadefbec51799dd7f920a40003a0 Mon Sep 17 00:00:00 2001
From: Jackriip <97582790+Jackriip@users.noreply.github.com>
Date: Sat, 7 Nov 2026 13:41:44 -0800
Subject: [PATCH 17/72] Add an admin verb that gives a ship's R&D server
research
---
voidcrew/modules/admin/feature_testing.dm | 51 +++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/voidcrew/modules/admin/feature_testing.dm b/voidcrew/modules/admin/feature_testing.dm
index 86b9469d882..11fe27eefb8 100644
--- a/voidcrew/modules/admin/feature_testing.dm
+++ b/voidcrew/modules/admin/feature_testing.dm
@@ -840,3 +840,54 @@ ADMIN_VERB(spawn_contested_cache_now, R_ADMIN|R_DEBUG, "Overmap: Spawn Contested
message_admins("[key_name_admin(user)] surfaced a contested cache at overmap ([coords[1]], [coords[2]]).")
log_admin("[key_name(user)] surfaced a contested cache.")
BLACKBOX_LOG_ADMIN_VERB("Spawn Contested Cache")
+
+// ===== RESEARCH =====
+
+ADMIN_VERB(give_ship_research, R_ADMIN|R_DEBUG, "Research: Give Ship Research", "Research nodes on a ship's R&D server for free, without points, rewards or gates.", ADMIN_CATEGORY_DEBUG)
+ var/obj/structure/overmap/ship/ship = voidcrew_admin_pick_ship(user, "Give Ship Research")
+ if(!ship)
+ return
+ var/obj/machinery/rnd/server/ship/server
+ for(var/obj/machinery/rnd/server/ship/candidate as anything in GLOB.ship_research_servers)
+ if(!QDELETED(candidate) && candidate.stored_research && (get_area(candidate) in ship.shuttle?.shuttle_areas))
+ server = candidate
+ break
+ if(!server)
+ to_chat(user, span_warning("[ship.display_name || ship.name] has no ship R&D server with a disk installed."))
+ return
+ var/datum/techweb/web = server.stored_research
+ var/mode = tgui_alert(user, "[web.researched_nodes.len] nodes researched. Give how many?", "Give Ship Research", list("Some", "All", "Cancel"))
+ if(!mode || mode == "Cancel")
+ return
+ var/amount = INFINITY
+ if(mode == "Some")
+ amount = tgui_input_number(user, "How many nodes, following the tree from what is already researched?", "Give Ship Research", 20, length(SSresearch.techweb_nodes), 1)
+ if(!amount)
+ return
+ if(QDELETED(server) || server.stored_research != web)
+ to_chat(user, span_warning("The server or its disk changed."))
+ return
+ var/given = 0
+ if(mode == "All")
+ for(var/node_id in SSresearch.techweb_nodes)
+ if(web.researched_nodes[node_id])
+ continue
+ web.hidden_nodes -= node_id
+ web.research_node(SSresearch.techweb_nodes[node_id], TRUE, FALSE, FALSE)
+ given++
+ else
+ // Researching a node makes its children available, so the tree fills in order.
+ var/list/refused = list()
+ while(given < amount)
+ var/list/open = web.available_nodes - refused
+ if(!length(open))
+ break
+ var/node_id = pick(open)
+ if(web.research_node(SSresearch.techweb_nodes[node_id], TRUE, FALSE, FALSE))
+ given++
+ else
+ refused[node_id] = TRUE
+ to_chat(user, span_notice("Gave [given] nodes to [ship.display_name || ship.name]. It now has [server.saved_research_count()] beyond the starting tree."))
+ message_admins("[key_name_admin(user)] gave [given] research nodes to [ship.display_name || ship.name].")
+ log_admin("[key_name(user)] gave [given] research nodes to [ship.display_name || ship.name].")
+ BLACKBOX_LOG_ADMIN_VERB("Give Ship Research")
From 035f2656e3a329b43a1642411cd184ccf4deddac Mon Sep 17 00:00:00 2001
From: Jackriip <97582790+Jackriip@users.noreply.github.com>
Date: Sat, 7 Nov 2026 13:41:44 -0800
Subject: [PATCH 18/72] Pay for the hull in credits and carry upgrades,
research and funds in ship saves
Credits stand in for misc parts only. Weapons, lab and cargo machines still
need their parts, and in return a save keeps their stock part upgrades, the
ship R&D server's researched nodes and completed experiments, and ship funds
bought with trade parts. Also keeps restocked fixtures stocked after master's
clear_stock and suit unit changes.
---
tgstation.dme | 1 +
.../interfaces/SavedShipCards.tsx | 22 +-
.../interfaces/ShipCheckpoint.tsx | 161 ++++++++++-
voidcrew/_DEFINES/ship_saves.dm | 10 +-
.../outpost_checkpoint_machinery.dm | 4 +-
.../outpost_checkpoint_rebuild.dm | 8 +-
.../outpost_checkpoint_snapshot.dm | 15 +-
.../player_outposts/outpost_checkpoints.dm | 11 +-
voidcrew/modules/research/server.dm | 12 +-
.../modules/ship_saves/ship_save_capture.dm | 9 +
.../modules/ship_saves/ship_save_console.dm | 58 +++-
.../ship_saves/ship_save_construction.dm | 10 +
.../modules/ship_saves/ship_save_lobby.dm | 5 +
.../modules/ship_saves/ship_save_progress.dm | 260 +++++++++++++++++
.../modules/ship_saves/ship_save_survey.dm | 113 +++++++-
voidcrew/modules/ship_saves/ship_saves.dm | 31 +-
.../unit_tests/voidcrew_checkpoints.dm | 4 +-
.../modules/unit_tests/voidcrew_ship_saves.dm | 266 +++++++++++++++++-
wiki/content/player-outposts.md | 13 +-
wiki/content/ship-parts.md | 2 +-
20 files changed, 948 insertions(+), 67 deletions(-)
create mode 100644 voidcrew/modules/ship_saves/ship_save_progress.dm
diff --git a/tgstation.dme b/tgstation.dme
index ac431c1dc3e..6a695475e47 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -7613,6 +7613,7 @@
#include "voidcrew\modules\ship_saves\ship_save_console.dm"
#include "voidcrew\modules\ship_saves\ship_save_construction.dm"
#include "voidcrew\modules\ship_saves\ship_save_lobby.dm"
+#include "voidcrew\modules\ship_saves\ship_save_progress.dm"
#include "voidcrew\modules\ship_saves\ship_save_store.dm"
#include "voidcrew\modules\ship_saves\ship_save_survey.dm"
#include "voidcrew\modules\ship_saves\ship_saves.dm"
diff --git a/tgui/packages/voidcrew_tgui/interfaces/SavedShipCards.tsx b/tgui/packages/voidcrew_tgui/interfaces/SavedShipCards.tsx
index d26e5db3b2e..f11b4f1fea3 100644
--- a/tgui/packages/voidcrew_tgui/interfaces/SavedShipCards.tsx
+++ b/tgui/packages/voidcrew_tgui/interfaces/SavedShipCards.tsx
@@ -9,6 +9,7 @@ export type BillLine = {
name: string;
count: number | null;
parts: number;
+ carry?: BooleanLike;
};
export type BillClass = {
@@ -24,6 +25,8 @@ export type ShipSurvey = {
plan?: string | null;
bill?: BillClass[];
total?: number;
+ research?: number;
+ funds?: number;
};
export type SavedShip = ShipSurvey & {
@@ -180,10 +183,9 @@ const FitLine = (props: {
);
const machineCount = (bill: BillClass[], id: PartClass) =>
- (bill.find((line) => line.class === id)?.items || []).reduce(
- (total, item) => total + (item.count || 1),
- 0,
- );
+ (bill.find((line) => line.class === id)?.items || [])
+ .filter((item) => !item.carry)
+ .reduce((total, item) => total + (item.count || 1), 0);
/** Weapons by name, then how much lab and cargo gear it carries. */
const Fit = (props: { bill: BillClass[] }) => {
@@ -275,6 +277,18 @@ export const SlotCard = (props: {
)}
{!!save.bill &&
}
+ {!!save.research && (
+
+ )}
+ {!!save.funds && (
+
+ )}