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

Alternate Corporate Coats Wave 1 #392

Merged
merged 12 commits into from
May 22, 2024
Merged

Alternate Corporate Coats Wave 1 #392

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
db7c84d
CorporateCoatsWaveone
LovelyLophi May 2, 2024
341e875
Merge branch 'Simple-Station:master' into Coatmaxxing
LovelyLophi May 4, 2024
a1361ce
Fixes a cargo arbitrage Issue
LovelyLophi May 4, 2024
53a5b8b
Update Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
LovelyLophi May 4, 2024
4baf12b
Merge branch 'master' into Coatmaxxing
LovelyLophi May 4, 2024
566b096
Fixed copyright
LovelyLophi May 4, 2024
c6428e6
Merge branch 'Coatmaxxing' of https://github.com/LovelyLophi/Einstein…
LovelyLophi May 4, 2024
33c60dd
Merge branch 'master' into Coatmaxxing
VMSolidus May 6, 2024
d6d8664
Merge branch 'Coatmaxxing' of https://github.com/LovelyLophi/Einstein…
LovelyLophi May 8, 2024
3ba155d
Merge branch 'master' into Coatmaxxing
LovelyLophi May 14, 2024
83245cd
Merge branch 'master' into Coatmaxxing
DangerRevolution May 18, 2024
f6d2035
Merge branch 'master' into Coatmaxxing
LovelyLophi May 22, 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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockClothesFilled
cost: 7250 #DeltaV
cost: 8050 #Einstein Engines
LovelyLophi marked this conversation as resolved.
Show resolved Hide resolved
category: Service
group: market

Expand Down
Loading