From 81d7dc43487269a1c5278231066b60f8105988db Mon Sep 17 00:00:00 2001
From: joaco545 <38332230+Joaco545@users.noreply.github.com>
Date: Mon, 26 Jan 2026 22:04:45 -0300
Subject: [PATCH 01/15] Initial draft of the Cargo Redesign proposal
---
src/design-proposals/cargo_redesign.md | 232 +++++++++++++++++++++++++
1 file changed, 232 insertions(+)
create mode 100644 src/design-proposals/cargo_redesign.md
diff --git a/src/design-proposals/cargo_redesign.md b/src/design-proposals/cargo_redesign.md
new file mode 100644
index 0000000..bf93010
--- /dev/null
+++ b/src/design-proposals/cargo_redesign.md
@@ -0,0 +1,232 @@
+# Cargo Overhaul
+
+| Designers | Implemented | GitHub Links |
+|---|---|---|
+| Joaco545 | :x: No | TBD |
+
+Special thanks to ThatOneMoon, Pink, Sophia, Goobie, Moxie, and Urist. You helped flesh out this idea a ton <3
+
+
+## Overview
+
+Overhauls how cargo works by replacing the ATS with Traders that visit the station over the shift.
+
+## Background
+
+Cargo 2.0’s objective is to remove the “bluespacing” magic of things from normal rounds, making bluespace a more mysterious force, leaving it for the station’s purpose of researching it.
+The replacement for the game's magic instant teleportation comes in the form of Traders that visit the station, maintaining a more authentic way of how things would work on a real life space station.
+
+Inspired by https://static.slugcat.systems/salvage/
+
+## Features to be added
+
+### Traders
+Trader ships will start visiting the station and FTLing to a nearby position in space. Each ship will stay for some amount of time before leaving.
+During the time they are near the station, they can be contacted by cargo to check the ship's manifest and buy things from them.
+Traders can be haggled with to get a better deal, or pay extra to gain better favor (Reduce annoyance).
+Traders who are going to the station to make deliveries may also carry mail for the station's workers.
+Traders may advertise different missions that the station can take.
+- Traders may advertise increased prices for certain items they are looking for (bounties). While you can haggle for bounty prices, they run out of patience much sooner.
+- Traders may advertise a Hold mission, where cargo needs to hold onto some crates for a bit while another ship comes to take them later. The "holding price" can be haggled too.
+- Other mission types may be added later.
+
+### Deliveries
+When things are bought through the station's cargo request terminal, a delivery will be generated. After enough time passes, a delivery ship will be sent to the station with both deliveries and mail.
+There are 2 options for deliveries:
+- A NanoTrasen delivery ship:tm: that delivers the cargo and then leaves.
+- A Trader that was going that way anyway, so it might as well deliver the goods to stay on NT's good side.
+
+Traders that are going to the station anyways (are not contacted by FTL-Comms) may also carry regular mail deliveries.
+
+
+Once Scrip is added, players could also buy things with Scrip, and get delivered by a non-NT trader or delivery ships.
+Traitors could also get their things delivered by traders, being smuggled onto the station this way, but after a discussion (https://discord.com/channels/1276640157511979008/1276653734767755294/1465387091998281769), the idea grew enough to become its own design doc for further down the line.
+
+### FTL Antenna
+A static device like the station’s anchor, which, when powered, can be used to scan signals from FTL ships
+
+### FTL Communications Computer
+The FTL-C Computer is a new computer that allows cargo to scan FTL space in search of trader signals.
+If a signal is found, it would allow them to check a trader's manifest and communicate with the trader to call them over.
+Needs to be connected to an FTL Antenna via a networking tool
+
+### External Radio Communications Computer
+The ERC Computer is a new computer that allows cargo to communicate with nearby trader ships, letting them check their manifest, place buy orders, and track any mission they have.
+
+### Haggling
+Traders can be haggled with in order to get better prices for buying or selling. Each trader has a preset price change tolerance and a range of possible patience values. Traders will haggle you back, so the actual value of the offer after haggling will be somewhere in the middle of the original price and your offer.
+All traders have a "final offer" line that they will say when they are out of patience, but they may try to fake you out by using this line when they are still willing to haggle more.
+
+### Annoyance
+Annoying a trader won't have much effect, but annoying many traders will spread the word that this station is not worth the trouble.
+
+### Trader Types
+Not on this first push.
+
+
+
+
+### region Bullet points
+
+Add Traders
+- Visiting ships, 10-30 mins then warp away
+- Buy low, Sell high
+- Mail deliveries
+ - Add fingerprint locked creates
+- Bounties
+- Hold Orders (another ship will come get this crates soon, don't loose em)
+- Haggling for non-deliveries?
+
+NT Deliveries
+- Replaces ATS, brings things cargo bought
+- Does not need calling with the ERCC
+
+Other faction deliveries
+- Crew ordered things (with Scrip)
+- Hidden manifests
+ - Emagging a FTL-C or ERC allows access to viewing the manifest
+ - Certain antags could also get access to the manifest (Fence antag; See UristMcWiki's Thief Rework)
+
+Other events?
+- Disaster relief being asked to the station
+
+Pirate ambushes (Separate doc for Player Trader and Pirates)
+- Ship with hostile Pirate NPC's or mid-round Antag spawn
+- Has loot inside
+- Reward if crew/ship is captured?
+- If player controlled, a computer allows you to get the manifest shown to the ERCC when warped to station
+
+Syndicate contraband (Will be made a separate doc) (delivery methods https://discord.com/channels/1276640157511979008/1276653734767755294/1465387091998281769)
+- Deliverred via ship, depending on order size you get (Option discarded for easy metagaming)
+ - Mail (paper)
+ - Mail (box)
+ - Create (ID/Fingerprint locked)
+ - Big wooden crate (for mechs)
+- Fallback options
+ - PDA can act as beacon to fulton contra over?
+ - Keeps Syndicate brand boxes
+- Add transport costs?
+
+### endregion Bullet Points
+
+
+## Game Design Rationale
+
+Removing the magic teleportation of things/spawning out of thin air to make a more authentic game, while making things slower by having to wait for the traders to deliver the goods.
+This also introduces some round variation, as each trader will buy and sell different things. Maybe you can get a discounted artifact from some local archaeologist, or sell a used artifact to a research company just passing by!
+
+
+## Roundflow & Player interaction
+
+The first random traders will start showing up soon after the round starts (min 5 minutes wait to give players some prep time?)
+
+Having to wait for all their batched orders to arrive will be a slowing factor for cargo, but it will also introduce variations into the rounds as each trader will be different than the last (With a big enough trader ship pool).
+
+Cargoninans will be expected to buy things needed by the station from the traders, plus things that they plan to sell to the highest bidder.
+As different companies have different needs, they need to recognize who will buy things over the market price (bounties) to generate the most profit possible.
+
+As a way to de-incentivize certain behaviours, an "annoyance counter" will be added, representing how annoyed traders are at the station's cargo department.
+
+
+## Administrative & Server Rule Impact (if applicable)
+
+Cargo SOP will need to be amended to take into account the time it takes for Traders to appear after things are bought on the cargo console.
+
+
+## Technical Considerations
+
+### Trader Ships
+- Each trader ship will start with a random timer designating how long they will stay near the station.
+ - Soft ship limit can be enforced by not having any more trade ships on the FTL-C.
+
+- A trader will have a list of things they sell. This is their manifest.
+ - A hidden manifest can be implemented for antags to use. They usually contain contraband items.
+ - This feature is mostly for other people to build on. (eg: Urist's Fence for thief rework, or the Interdyne Chemist to get some special restocks).
+
+- Each trader will come with a list of missions the station can partake in.
+ - For now, they will be heavily weighted towards Bounties, till enough mission types can be added to make it more interesting.
+ - Some missions will need to be completed before the trader leaves, and some will have other triggers for completion.
+
+
+## Delivery ships
+- Unlike traders, delivery ships won't have anything to offer but what has been asked for.
+
+- They will arrive, announce themselves, and leave as soon as the ship is clear of any people and deliveries.
+
+
+### Mapping Trader Ships
+- Different styles for each corporation
+ - A corporation could have a fleet of smaller and larger ships.
+ - Ships could share shape (ship model), but with different paint jobs.
+ - Smaller traders could have more cozy ships, or repurposed vessels? (eg: Big Ore Trader using a standard ship vs Local Salvaging Crew having a scrappy salvage vessel).
+
+- Use a modified ATS spawning and sell zones in a hidden compartment to hide the spawning of crates and selling of bounties. Usage of conveyors and airtight flaps is encouraged.
+ - Spawn zones modified to have a buy queue (Kills "not enough space" error message).
+ - Spawns crates from the queue in an interval to simulate cargo being moved on the back of the ship.
+ - Sell areas modified to instantly sell any crates placed on them.
+
+
+### FTL Antenna
+- A big device that needs to be powered and connected to the FTL-C Computer with a networking tool
+ - (Optional) When a connection is started, power usage increases
+ - (Optional) The power usage could depend on how high the signal gain is
+
+
+### FTL-Commnications Computer
+- Requires the FTL Antenna to be connected via a networking tool to function (Look at how artifact scanners work).
+
+- Minigame that lets you tune the antenna's FTL comms to find traders that are "warping" (not spawned) near the station.
+ - Adjust Azimuth and Elevation, read radio gain, and adjust again till you hit a trader with a high enough gain to connect.
+
+- When tuned lets you see the cargo manifest of a ship and also allows you to call it to the station for trade.
+ - Emmaging enables looking at the hidden manifest of ships that have it.
+
+
+### External Radio Communications Computer
+- 2 Tabs
+ - Ship Manifests Tab:
+ - Allows you to see the manifests of nearby ships and place orders on them.
+ - Emmaging enables looking at the hidden manifest of ships that have it.
+ - You can haggle the price of the order. Bigger orders can get a bigger discount.
+ - Being too unreasonable (haggling too far or too many attempts) will annoy the trader, who may refuse to complete the order and leave as soon as they can.
+
+ - Will allow you to see the remaining time before they warp away.
+ - Will allow you to dismiss the trader early, freeing up a spot for another trader to come (soft trader limit).
+
+ - Missions Tab:
+ - Let's you track active bounties on the different ships.
+ - Let's you track other missions (like hold orders).
+
+
+### Haggling
+- Each trader has 2 values:
+ - Price Change Tolerance: How much they are willing to go over or under the price for selling and buying, respectively.
+ - Patience: How many attempts the player gets before getting annoyed and rejecting the haggle outright.
+
+- Traders haggling back will take a value between the original price and your offer.
+ - Exception: The offer is in their favor (you sell cheap or buy high).
+
+
+### Annoyance
+- Annoyance is a counter that increases when players act in ways that are not good for the traders, and decreases when favorable deals are struck with the traders.
+
+- When the annoyance counter is high enough, traders will stop allowing haggling.
+ - If the annoyance counter keeps increasing, they will stop visiting the station if they don't have a purpose. This includes refusing to come over when contacted, and stop allowing trade altogether.
+ - It is a QM's job not allow this to happen.
+
+- Each trader has their own annoyance threshold. This is done to make sure that the station is not suddenly cut off from trade.
+
+- Annoyance triggers:
+ - If a player is on a trading ship, the ship will not FTL away. If you leave traders waiting to leave for a long time they, will get annoyed.
+ - Failed haggling attempts will annoy traders.
+ - Failing missions (may also incur a fine).
+ - Damage to trader ships will ANNOY traders a lot.
+ - This includes hacking doors.
+ - If damage is serious enough, they may hightail it. Any players remaining on board will be round removed as their body left with the trader ship.
+ - (To determine later) Display a message on the common channel about them leaving? Play some claxon to indicate the ship is emergency warping away soon?
+
+
+### Removals
+- Remove the ATS.
+- Remove the Mail Teleporter.
+- Remove the bounties computer in favor of the missions.
From 54914cc57e392b861c0aaa87d3ac4b28157e5352 Mon Sep 17 00:00:00 2001
From: joaco545 <38332230+Joaco545@users.noreply.github.com>
Date: Mon, 26 Jan 2026 22:13:24 -0300
Subject: [PATCH 02/15] Formating fixes
---
src/design-proposals/cargo_redesign.md | 88 +++++++++++++-------------
1 file changed, 44 insertions(+), 44 deletions(-)
diff --git a/src/design-proposals/cargo_redesign.md b/src/design-proposals/cargo_redesign.md
index bf93010..5d066aa 100644
--- a/src/design-proposals/cargo_redesign.md
+++ b/src/design-proposals/cargo_redesign.md
@@ -72,7 +72,7 @@ Add Traders
- Visiting ships, 10-30 mins then warp away
- Buy low, Sell high
- Mail deliveries
- - Add fingerprint locked creates
+ - Add fingerprint locked creates
- Bounties
- Hold Orders (another ship will come get this crates soon, don't loose em)
- Haggling for non-deliveries?
@@ -84,8 +84,8 @@ NT Deliveries
Other faction deliveries
- Crew ordered things (with Scrip)
- Hidden manifests
- - Emagging a FTL-C or ERC allows access to viewing the manifest
- - Certain antags could also get access to the manifest (Fence antag; See UristMcWiki's Thief Rework)
+ - Emagging a FTL-C or ERC allows access to viewing the manifest
+ - Certain antags could also get access to the manifest (Fence antag; See UristMcWiki's Thief Rework)
Other events?
- Disaster relief being asked to the station
@@ -98,13 +98,13 @@ Pirate ambushes (Separate doc for Player Trader and Pirates)
Syndicate contraband (Will be made a separate doc) (delivery methods https://discord.com/channels/1276640157511979008/1276653734767755294/1465387091998281769)
- Deliverred via ship, depending on order size you get (Option discarded for easy metagaming)
- - Mail (paper)
- - Mail (box)
- - Create (ID/Fingerprint locked)
- - Big wooden crate (for mechs)
+ - Mail (paper)
+ - Mail (box)
+ - Create (ID/Fingerprint locked)
+ - Big wooden crate (for mechs)
- Fallback options
- - PDA can act as beacon to fulton contra over?
- - Keeps Syndicate brand boxes
+ - PDA can act as beacon to fulton contra over?
+ - Keeps Syndicate brand boxes
- Add transport costs?
### endregion Bullet Points
@@ -137,15 +137,15 @@ Cargo SOP will need to be amended to take into account the time it takes for Tra
### Trader Ships
- Each trader ship will start with a random timer designating how long they will stay near the station.
- - Soft ship limit can be enforced by not having any more trade ships on the FTL-C.
+ - Soft ship limit can be enforced by not having any more trade ships on the FTL-C.
- A trader will have a list of things they sell. This is their manifest.
- - A hidden manifest can be implemented for antags to use. They usually contain contraband items.
- - This feature is mostly for other people to build on. (eg: Urist's Fence for thief rework, or the Interdyne Chemist to get some special restocks).
+ - A hidden manifest can be implemented for antags to use. They usually contain contraband items.
+ - This feature is mostly for other people to build on. (eg: Urist's Fence for thief rework, or the Interdyne Chemist to get some special restocks).
- Each trader will come with a list of missions the station can partake in.
- - For now, they will be heavily weighted towards Bounties, till enough mission types can be added to make it more interesting.
- - Some missions will need to be completed before the trader leaves, and some will have other triggers for completion.
+ - For now, they will be heavily weighted towards Bounties, till enough mission types can be added to make it more interesting.
+ - Some missions will need to be completed before the trader leaves, and some will have other triggers for completion.
## Delivery ships
@@ -156,74 +156,74 @@ Cargo SOP will need to be amended to take into account the time it takes for Tra
### Mapping Trader Ships
- Different styles for each corporation
- - A corporation could have a fleet of smaller and larger ships.
- - Ships could share shape (ship model), but with different paint jobs.
- - Smaller traders could have more cozy ships, or repurposed vessels? (eg: Big Ore Trader using a standard ship vs Local Salvaging Crew having a scrappy salvage vessel).
+ - A corporation could have a fleet of smaller and larger ships.
+ - Ships could share shape (ship model), but with different paint jobs.
+ - Smaller traders could have more cozy ships, or repurposed vessels? (eg: Big Ore Trader using a standard ship vs Local Salvaging Crew having a scrappy salvage vessel).
- Use a modified ATS spawning and sell zones in a hidden compartment to hide the spawning of crates and selling of bounties. Usage of conveyors and airtight flaps is encouraged.
- - Spawn zones modified to have a buy queue (Kills "not enough space" error message).
- - Spawns crates from the queue in an interval to simulate cargo being moved on the back of the ship.
- - Sell areas modified to instantly sell any crates placed on them.
+ - Spawn zones modified to have a buy queue (Kills "not enough space" error message).
+ - Spawns crates from the queue in an interval to simulate cargo being moved on the back of the ship.
+ - Sell areas modified to instantly sell any crates placed on them.
### FTL Antenna
- A big device that needs to be powered and connected to the FTL-C Computer with a networking tool
- - (Optional) When a connection is started, power usage increases
- - (Optional) The power usage could depend on how high the signal gain is
+ - (Optional) When a connection is started, power usage increases
+ - (Optional) The power usage could depend on how high the signal gain is
### FTL-Commnications Computer
- Requires the FTL Antenna to be connected via a networking tool to function (Look at how artifact scanners work).
- Minigame that lets you tune the antenna's FTL comms to find traders that are "warping" (not spawned) near the station.
- - Adjust Azimuth and Elevation, read radio gain, and adjust again till you hit a trader with a high enough gain to connect.
+ - Adjust Azimuth and Elevation, read radio gain, and adjust again till you hit a trader with a high enough gain to connect.
- When tuned lets you see the cargo manifest of a ship and also allows you to call it to the station for trade.
- - Emmaging enables looking at the hidden manifest of ships that have it.
+ - Emmaging enables looking at the hidden manifest of ships that have it.
### External Radio Communications Computer
- 2 Tabs
- - Ship Manifests Tab:
- - Allows you to see the manifests of nearby ships and place orders on them.
- - Emmaging enables looking at the hidden manifest of ships that have it.
- - You can haggle the price of the order. Bigger orders can get a bigger discount.
- - Being too unreasonable (haggling too far or too many attempts) will annoy the trader, who may refuse to complete the order and leave as soon as they can.
+ - Ship Manifests Tab:
+ - Allows you to see the manifests of nearby ships and place orders on them.
+ - Emmaging enables looking at the hidden manifest of ships that have it.
+ - You can haggle the price of the order. Bigger orders can get a bigger discount.
+ - Being too unreasonable (haggling too far or too many attempts) will annoy the trader, who may refuse to complete the order and leave as soon as they can.
- Will allow you to see the remaining time before they warp away.
- Will allow you to dismiss the trader early, freeing up a spot for another trader to come (soft trader limit).
- - Missions Tab:
- - Let's you track active bounties on the different ships.
- - Let's you track other missions (like hold orders).
+ - Missions Tab:
+ - Let's you track active bounties on the different ships.
+ - Let's you track other missions (like hold orders).
### Haggling
- Each trader has 2 values:
- - Price Change Tolerance: How much they are willing to go over or under the price for selling and buying, respectively.
- - Patience: How many attempts the player gets before getting annoyed and rejecting the haggle outright.
+ - Price Change Tolerance: How much they are willing to go over or under the price for selling and buying, respectively.
+ - Patience: How many attempts the player gets before getting annoyed and rejecting the haggle outright.
- Traders haggling back will take a value between the original price and your offer.
- - Exception: The offer is in their favor (you sell cheap or buy high).
+ - Exception: The offer is in their favor (you sell cheap or buy high).
### Annoyance
- Annoyance is a counter that increases when players act in ways that are not good for the traders, and decreases when favorable deals are struck with the traders.
- When the annoyance counter is high enough, traders will stop allowing haggling.
- - If the annoyance counter keeps increasing, they will stop visiting the station if they don't have a purpose. This includes refusing to come over when contacted, and stop allowing trade altogether.
- - It is a QM's job not allow this to happen.
+ - If the annoyance counter keeps increasing, they will stop visiting the station if they don't have a purpose. This includes refusing to come over when contacted, and stop allowing trade altogether.
+ - It is a QM's job not allow this to happen.
- Each trader has their own annoyance threshold. This is done to make sure that the station is not suddenly cut off from trade.
- Annoyance triggers:
- - If a player is on a trading ship, the ship will not FTL away. If you leave traders waiting to leave for a long time they, will get annoyed.
- - Failed haggling attempts will annoy traders.
- - Failing missions (may also incur a fine).
- - Damage to trader ships will ANNOY traders a lot.
- - This includes hacking doors.
- - If damage is serious enough, they may hightail it. Any players remaining on board will be round removed as their body left with the trader ship.
- - (To determine later) Display a message on the common channel about them leaving? Play some claxon to indicate the ship is emergency warping away soon?
+ - If a player is on a trading ship, the ship will not FTL away. If you leave traders waiting to leave for a long time they, will get annoyed.
+ - Failed haggling attempts will annoy traders.
+ - Failing missions (may also incur a fine).
+ - Damage to trader ships will ANNOY traders a lot.
+ - This includes hacking doors.
+ - If damage is serious enough, they may hightail it. Any players remaining on board will be round removed as their body left with the trader ship.
+ - (To determine later) Display a message on the common channel about them leaving? Play some claxon to indicate the ship is emergency warping away soon?
### Removals
From 83f72226aadff0b379ca993b07f83eea7240eb33 Mon Sep 17 00:00:00 2001
From: joaco545 <38332230+Joaco545@users.noreply.github.com>
Date: Mon, 26 Jan 2026 22:15:47 -0300
Subject: [PATCH 03/15] More formating fixes
---
src/design-proposals/cargo_redesign.md | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/design-proposals/cargo_redesign.md b/src/design-proposals/cargo_redesign.md
index 5d066aa..7f4535a 100644
--- a/src/design-proposals/cargo_redesign.md
+++ b/src/design-proposals/cargo_redesign.md
@@ -183,19 +183,19 @@ Cargo SOP will need to be amended to take into account the time it takes for Tra
### External Radio Communications Computer
-- 2 Tabs
- - Ship Manifests Tab:
- - Allows you to see the manifests of nearby ships and place orders on them.
- - Emmaging enables looking at the hidden manifest of ships that have it.
- - You can haggle the price of the order. Bigger orders can get a bigger discount.
- - Being too unreasonable (haggling too far or too many attempts) will annoy the trader, who may refuse to complete the order and leave as soon as they can.
+2 Tabs:
+- Ship Manifests Tab:
+ - Allows you to see the manifests of nearby ships and place orders on them.
+ - Emmaging enables looking at the hidden manifest of ships that have it.
+ - You can haggle the price of the order. Bigger orders can get a bigger discount.
+ - Being too unreasonable (haggling too far or too many attempts) will annoy the trader, who may refuse to complete the order and leave as soon as they can.
- Will allow you to see the remaining time before they warp away.
- Will allow you to dismiss the trader early, freeing up a spot for another trader to come (soft trader limit).
- - Missions Tab:
- - Let's you track active bounties on the different ships.
- - Let's you track other missions (like hold orders).
+- Missions Tab:
+ - Let's you track active bounties on the different ships.
+ - Let's you track other missions (like hold orders).
### Haggling
From 182f143861a3000c928878b31ec7f2ba0f73f23b Mon Sep 17 00:00:00 2001
From: joaco545 <38332230+Joaco545@users.noreply.github.com>
Date: Thu, 29 Jan 2026 01:12:09 -0300
Subject: [PATCH 04/15] Adjusted the "Special thanks" section with the
requested names
---
src/design-proposals/cargo_redesign.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/design-proposals/cargo_redesign.md b/src/design-proposals/cargo_redesign.md
index 7f4535a..bee6a88 100644
--- a/src/design-proposals/cargo_redesign.md
+++ b/src/design-proposals/cargo_redesign.md
@@ -4,7 +4,7 @@
|---|---|---|
| Joaco545 | :x: No | TBD |
-Special thanks to ThatOneMoon, Pink, Sophia, Goobie, Moxie, and Urist. You helped flesh out this idea a ton <3
+Special thanks to ThatOneMoon, literallyablueberryguy, Sophia Impetus, [Goobie](https://github.com/pirakaplant), Moxie_Is_Moxie, and UristMcWiki. You helped flesh out this idea a ton <3
## Overview
From 6d7daff18076627d3e9d11a52c65e56892923f70 Mon Sep 17 00:00:00 2001
From: joaco545 <38332230+Joaco545@users.noreply.github.com>
Date: Wed, 4 Feb 2026 01:42:06 -0300
Subject: [PATCH 05/15] + Minor spelling changes + Scrip clarification + Added
first support image; Trader Ship Example for hiding how crates work
---
src/design-proposals/cargo_redesign.md | 24 +++++++++++-------
.../cargo_redesign/Trader Ship Example.jpg | Bin 0 -> 39707 bytes
2 files changed, 15 insertions(+), 9 deletions(-)
create mode 100644 src/design-proposals/cargo_redesign/Trader Ship Example.jpg
diff --git a/src/design-proposals/cargo_redesign.md b/src/design-proposals/cargo_redesign.md
index bee6a88..1e0ab45 100644
--- a/src/design-proposals/cargo_redesign.md
+++ b/src/design-proposals/cargo_redesign.md
@@ -39,7 +39,7 @@ There are 2 options for deliveries:
Traders that are going to the station anyways (are not contacted by FTL-Comms) may also carry regular mail deliveries.
-Once Scrip is added, players could also buy things with Scrip, and get delivered by a non-NT trader or delivery ships.
+Once Scrip is added, players could also buy things with Scrip, and get delivered by a non-NT trader or delivery ships. (NT would be acting as the intermediate party, letting their emploees use Scrip to buy small silly things)
Traitors could also get their things delivered by traders, being smuggled onto the station this way, but after a discussion (https://discord.com/channels/1276640157511979008/1276653734767755294/1465387091998281769), the idea grew enough to become its own design doc for further down the line.
### FTL Antenna
@@ -107,6 +107,8 @@ Syndicate contraband (Will be made a separate doc) (delivery methods https://dis
- Keeps Syndicate brand boxes
- Add transport costs?
+How to image: 
+
### endregion Bullet Points
@@ -118,11 +120,11 @@ This also introduces some round variation, as each trader will buy and sell diff
## Roundflow & Player interaction
-The first random traders will start showing up soon after the round starts (min 5 minutes wait to give players some prep time?)
+The first random traders will start showing up soon after the round starts (minimum 5 minute wait time to give players some prep time?)
Having to wait for all their batched orders to arrive will be a slowing factor for cargo, but it will also introduce variations into the rounds as each trader will be different than the last (With a big enough trader ship pool).
-Cargoninans will be expected to buy things needed by the station from the traders, plus things that they plan to sell to the highest bidder.
+Cargo is expected to buy things needed by the station from the traders, plus things that they plan to sell to the highest bidder.
As different companies have different needs, they need to recognize who will buy things over the market price (bounties) to generate the most profit possible.
As a way to de-incentivize certain behaviours, an "annoyance counter" will be added, representing how annoyed traders are at the station's cargo department.
@@ -137,26 +139,29 @@ Cargo SOP will need to be amended to take into account the time it takes for Tra
### Trader Ships
- Each trader ship will start with a random timer designating how long they will stay near the station.
- - Soft ship limit can be enforced by not having any more trade ships on the FTL-C.
+ - Soft ship limit can be enforced by not having any more trade ships on the FTL-C, or allow cargo to buy things till the current delivery ship is cleared
-- A trader will have a list of things they sell. This is their manifest.
+- A trader will have a list of things they sell. That is their manifest.
- A hidden manifest can be implemented for antags to use. They usually contain contraband items.
- - This feature is mostly for other people to build on. (eg: Urist's Fence for thief rework, or the Interdyne Chemist to get some special restocks).
+ - This feature is mostly for other people to build on. (eg: Urist's Fence support antag on his thief rework proposal, or the Interdyne Chemist to get some special restocks).
- Each trader will come with a list of missions the station can partake in.
- - For now, they will be heavily weighted towards Bounties, till enough mission types can be added to make it more interesting.
- - Some missions will need to be completed before the trader leaves, and some will have other triggers for completion.
+ - For now, they will be heavily weighted towards Bounties, until enough mission types can be added to make it more interesting.
+ - Some missions will need to be completed before the trader leaves, while others will have different triggers for completion.
-## Delivery ships
+### Delivery ships
- Unlike traders, delivery ships won't have anything to offer but what has been asked for.
- They will arrive, announce themselves, and leave as soon as the ship is clear of any people and deliveries.
+ - They will get annoyed if they are left waiting for too long
### Mapping Trader Ships
- Different styles for each corporation
- A corporation could have a fleet of smaller and larger ships.
+ - This depends on corporation size and lore (Megacorp (NT), Big (Cybersun/Gorlex), Medium (Animal rights consortium), Small (random independent traders))
+
- Ships could share shape (ship model), but with different paint jobs.
- Smaller traders could have more cozy ships, or repurposed vessels? (eg: Big Ore Trader using a standard ship vs Local Salvaging Crew having a scrappy salvage vessel).
@@ -165,6 +170,7 @@ Cargo SOP will need to be amended to take into account the time it takes for Tra
- Spawns crates from the queue in an interval to simulate cargo being moved on the back of the ship.
- Sell areas modified to instantly sell any crates placed on them.
+
### FTL Antenna
- A big device that needs to be powered and connected to the FTL-C Computer with a networking tool
diff --git a/src/design-proposals/cargo_redesign/Trader Ship Example.jpg b/src/design-proposals/cargo_redesign/Trader Ship Example.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f1852e5c3dfd4acd290fb22e704a763f12530a05
GIT binary patch
literal 39707
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
j^0DprYNZJIpJ0YPv)Y
Date: Wed, 4 Feb 2026 02:12:59 -0300
Subject: [PATCH 06/15] Consultation with lore team successful?
---
src/design-proposals/cargo_redesign.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/design-proposals/cargo_redesign.md b/src/design-proposals/cargo_redesign.md
index 1e0ab45..fd0dc7f 100644
--- a/src/design-proposals/cargo_redesign.md
+++ b/src/design-proposals/cargo_redesign.md
@@ -16,7 +16,7 @@ Overhauls how cargo works by replacing the ATS with Traders that visit the stati
Cargo 2.0’s objective is to remove the “bluespacing” magic of things from normal rounds, making bluespace a more mysterious force, leaving it for the station’s purpose of researching it.
The replacement for the game's magic instant teleportation comes in the form of Traders that visit the station, maintaining a more authentic way of how things would work on a real life space station.
-Inspired by https://static.slugcat.systems/salvage/
+Initially inspired by https://static.slugcat.systems/salvage/
## Features to be added
@@ -161,6 +161,8 @@ Cargo SOP will need to be amended to take into account the time it takes for Tra
- Different styles for each corporation
- A corporation could have a fleet of smaller and larger ships.
- This depends on corporation size and lore (Megacorp (NT), Big (Cybersun/Gorlex), Medium (Animal rights consortium), Small (random independent traders))
+ - Each corporation should have it's own set of decals to make each ship theirs (eg: big NT logo, or red highlights for syndicate)
+ - After consulting with the lore people, I was told it would not be common for the competition to sell stuff directly, as such new companies will need to be created. Eg: CarpPro, a company that sells fishing products; MorningStar Dynamics, a company that resells mercenary gear
- Ships could share shape (ship model), but with different paint jobs.
- Smaller traders could have more cozy ships, or repurposed vessels? (eg: Big Ore Trader using a standard ship vs Local Salvaging Crew having a scrappy salvage vessel).
From 07abac232f74c40cf7a3a1d761fa3d4ca99c8f6b Mon Sep 17 00:00:00 2001
From: joaco545 <38332230+Joaco545@users.noreply.github.com>
Date: Wed, 4 Feb 2026 03:12:08 -0300
Subject: [PATCH 07/15] + More consultation with lore team + Ship type
definitions started
---
src/design-proposals/cargo_redesign.md | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/design-proposals/cargo_redesign.md b/src/design-proposals/cargo_redesign.md
index fd0dc7f..613aa89 100644
--- a/src/design-proposals/cargo_redesign.md
+++ b/src/design-proposals/cargo_redesign.md
@@ -60,10 +60,20 @@ All traders have a "final offer" line that they will say when they are out of pa
### Annoyance
Annoying a trader won't have much effect, but annoying many traders will spread the word that this station is not worth the trouble.
-### Trader Types
-Not on this first push.
+### Ship Types
+Flagships - THE Flaghship. Has all the luxary for whoever owns it - Only for admemes (Think NT Super-VIP visit, probably has a death squad protecting them)
+Traders
+ - Big - Ships with tons of cargo space, they exist for moving freight across the vast distances of space
+ - Intermediate - Most common type of trader ship. Designed to go station to station, trading for goods
+ - Independent/Small - Small ships offering limited things
+Mail Carriers - Ships dedicated to moving large ammounts of mail through a territory.
+ - In between Intermediate and Small, designed for last light year (last mile) delivery
+
+
+- After consulting with the lore people, I was told it would not be common for the competition to sell stuff directly, as such new companies will need to be created. Eg: CarpPro, a company that sells fishing products; MorningStar Dynamics, a company that resells mercenary gear
+ - After even more consultation with the lore people, it has been determined that traders under Sol Gov could be a thing (as in registered under Sol Gov)
### region Bullet points
@@ -162,7 +172,6 @@ Cargo SOP will need to be amended to take into account the time it takes for Tra
- A corporation could have a fleet of smaller and larger ships.
- This depends on corporation size and lore (Megacorp (NT), Big (Cybersun/Gorlex), Medium (Animal rights consortium), Small (random independent traders))
- Each corporation should have it's own set of decals to make each ship theirs (eg: big NT logo, or red highlights for syndicate)
- - After consulting with the lore people, I was told it would not be common for the competition to sell stuff directly, as such new companies will need to be created. Eg: CarpPro, a company that sells fishing products; MorningStar Dynamics, a company that resells mercenary gear
- Ships could share shape (ship model), but with different paint jobs.
- Smaller traders could have more cozy ships, or repurposed vessels? (eg: Big Ore Trader using a standard ship vs Local Salvaging Crew having a scrappy salvage vessel).
From 95a668df6ad44218a8d8bfa2aff79d2bb4c80e3b Mon Sep 17 00:00:00 2001
From: joaco545 <38332230+Joaco545@users.noreply.github.com>
Date: Fri, 6 Feb 2026 19:48:10 -0300
Subject: [PATCH 08/15] - Removed bulletpoints
---
src/design-proposals/cargo_redesign.md | 46 --------------------------
1 file changed, 46 deletions(-)
diff --git a/src/design-proposals/cargo_redesign.md b/src/design-proposals/cargo_redesign.md
index 613aa89..df13716 100644
--- a/src/design-proposals/cargo_redesign.md
+++ b/src/design-proposals/cargo_redesign.md
@@ -76,52 +76,6 @@ Mail Carriers - Ships dedicated to moving large ammounts of mail through a terri
- After even more consultation with the lore people, it has been determined that traders under Sol Gov could be a thing (as in registered under Sol Gov)
-### region Bullet points
-
-Add Traders
-- Visiting ships, 10-30 mins then warp away
-- Buy low, Sell high
-- Mail deliveries
- - Add fingerprint locked creates
-- Bounties
-- Hold Orders (another ship will come get this crates soon, don't loose em)
-- Haggling for non-deliveries?
-
-NT Deliveries
-- Replaces ATS, brings things cargo bought
-- Does not need calling with the ERCC
-
-Other faction deliveries
-- Crew ordered things (with Scrip)
-- Hidden manifests
- - Emagging a FTL-C or ERC allows access to viewing the manifest
- - Certain antags could also get access to the manifest (Fence antag; See UristMcWiki's Thief Rework)
-
-Other events?
-- Disaster relief being asked to the station
-
-Pirate ambushes (Separate doc for Player Trader and Pirates)
-- Ship with hostile Pirate NPC's or mid-round Antag spawn
-- Has loot inside
-- Reward if crew/ship is captured?
-- If player controlled, a computer allows you to get the manifest shown to the ERCC when warped to station
-
-Syndicate contraband (Will be made a separate doc) (delivery methods https://discord.com/channels/1276640157511979008/1276653734767755294/1465387091998281769)
-- Deliverred via ship, depending on order size you get (Option discarded for easy metagaming)
- - Mail (paper)
- - Mail (box)
- - Create (ID/Fingerprint locked)
- - Big wooden crate (for mechs)
-- Fallback options
- - PDA can act as beacon to fulton contra over?
- - Keeps Syndicate brand boxes
-- Add transport costs?
-
-How to image:
-
-### endregion Bullet Points
-
-
## Game Design Rationale
Removing the magic teleportation of things/spawning out of thin air to make a more authentic game, while making things slower by having to wait for the traders to deliver the goods.
From deef43a7942041ce6ef600d61648c6a24326c23e Mon Sep 17 00:00:00 2001
From: joaco545 <38332230+Joaco545@users.noreply.github.com>
Date: Fri, 6 Feb 2026 20:24:41 -0300
Subject: [PATCH 09/15] - No images to make it faster
---
src/design-proposals/cargo_redesign.md | 2 --
.../cargo_redesign/Trader Ship Example.jpg | Bin 39707 -> 0 bytes
2 files changed, 2 deletions(-)
delete mode 100644 src/design-proposals/cargo_redesign/Trader Ship Example.jpg
diff --git a/src/design-proposals/cargo_redesign.md b/src/design-proposals/cargo_redesign.md
index df13716..ba15048 100644
--- a/src/design-proposals/cargo_redesign.md
+++ b/src/design-proposals/cargo_redesign.md
@@ -135,8 +135,6 @@ Cargo SOP will need to be amended to take into account the time it takes for Tra
- Spawns crates from the queue in an interval to simulate cargo being moved on the back of the ship.
- Sell areas modified to instantly sell any crates placed on them.
-
-
### FTL Antenna
- A big device that needs to be powered and connected to the FTL-C Computer with a networking tool
- (Optional) When a connection is started, power usage increases
diff --git a/src/design-proposals/cargo_redesign/Trader Ship Example.jpg b/src/design-proposals/cargo_redesign/Trader Ship Example.jpg
deleted file mode 100644
index f1852e5c3dfd4acd290fb22e704a763f12530a05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 39707
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