Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactors cargo to reside in the codebase #20030

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open

Refactors cargo to reside in the codebase #20030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
a8f6cdc
cargo stuff
nauticall Sep 30, 2024
aa600c0
insanity
nauticall Sep 30, 2024
337afd1
cargo changes 1
nauticall Oct 6, 2024
25d870d
cargo 2
nauticall Oct 6, 2024
036c21b
the version that works
nauticall Oct 10, 2024
fb842a3
everything except details works
nauticall Oct 10, 2024
87d5ac0
everything exc. cargo control now
nauticall Oct 10, 2024
a82d7d1
hallelujah
nauticall Oct 11, 2024
0795631
fat trimming
nauticall Oct 11, 2024
9dfe226
Merge remote-tracking branch 'origin/master' into cargo_code
nauticall Oct 11, 2024
0c6f9da
cl
nauticall Oct 11, 2024
1263644
sector price changes
nauticall Oct 11, 2024
cad4a61
cargo.json removal
nauticall Oct 11, 2024
f1dafaf
changes accesses to strings
nauticall Oct 11, 2024
6239611
tweaks
nauticall Oct 12, 2024
f555e83
tweaks and documentation
nauticall Oct 13, 2024
3d04c1a
Fluffy code review (1)
nauticall Oct 13, 2024
5133539
more spring cleaning
nauticall Oct 13, 2024
6d4e5c9
guh
nauticall Oct 13, 2024
ce58955
categorization and beautifying
nauticall Oct 13, 2024
228bada
search + item tweaking
nauticall Oct 13, 2024
75af4e4
cl
nauticall Oct 13, 2024
43a55f7
nifty changes
nauticall Oct 13, 2024
997ce3e
hospitality housekeeping
nauticall Oct 13, 2024
5e3a41d
tidying
nauticall Oct 13, 2024
395f765
more item tweaks
nauticall Oct 14, 2024
029d016
tweaks + uncommenting reset_cargo
nauticall Oct 16, 2024
6da44fc
more error fixing
nauticall Oct 16, 2024
0dee196
oopsie
nauticall Oct 16, 2024
ad19318
changing guard condition logic
nauticall Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions aurorastation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1764,6 +1764,8 @@
#include "code\modules\battlemonsters\items\furniture\dueling_area.dm"
#include "code\modules\blob\blob.dm"
#include "code\modules\cargo\bounty.dm"
#include "code\modules\cargo\cargo_categories.dm"
#include "code\modules\cargo\cargo_suppliers.dm"
#include "code\modules\cargo\export_scanner.dm"
#include "code\modules\cargo\exports.dm"
#include "code\modules\cargo\randomstock.dm"
Expand Down Expand Up @@ -1791,6 +1793,22 @@
#include "code\modules\cargo\exports\sheets.dm"
#include "code\modules\cargo\exports\tools.dm"
#include "code\modules\cargo\exports\weapons.dm"
#include "code\modules\cargo\items\atmos.dm"
#include "code\modules\cargo\items\cargo_items.dm"
#include "code\modules\cargo\items\cartridges.dm"
#include "code\modules\cargo\items\engineering.dm"
#include "code\modules\cargo\items\hospitality.dm"
#include "code\modules\cargo\items\hydroponics.dm"
#include "code\modules\cargo\items\medical.dm"
#include "code\modules\cargo\items\mining.dm"
#include "code\modules\cargo\items\miscellaneous.dm"
#include "code\modules\cargo\items\operations.dm"
#include "code\modules\cargo\items\recreation.dm"
#include "code\modules\cargo\items\robotics.dm"
#include "code\modules\cargo\items\science.dm"
#include "code\modules\cargo\items\security.dm"
#include "code\modules\cargo\items\supply.dm"
#include "code\modules\cargo\items\weaponry.dm"
#include "code\modules\cargo\random_stock\_defs.dm"
#include "code\modules\cargo\random_stock\large.dm"
#include "code\modules\cargo\random_stock\t1_common.dm"
Expand Down
Loading
Loading