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

Quadrants, Security Levels, Monsters and Mayhem (Levels). #440

Closed
wants to merge 57 commits into from
Closed

Quadrants, Security Levels, Monsters and Mayhem (Levels). #440

wants to merge 57 commits into from

Conversation

michaelchessall
Copy link
Contributor

drafted for your viewing pleasure.

@michaelchessall
add trade_beacon.dm
cc17549
@michaelchessall
Create trade_beacon.tmpl
392de09
@michaelchessall
Update tradebeacon.dm
658b1b1
@michaelchessall
Update trade_beacon.tmpl
72510d8
@michaelchessall
Fix SQL file
a4f7f9a 
remove comma
@michaelchessall
update trade beacon
9f9d035
@michaelchessall
Update trade_beacon.tmpl
b4e1ba8
@michaelchessall
Update tradebeacon.dm
c9a97bf
@michaelchessall
updates
409aaad
@michaelchessall
Merge branch 'PersistentSS13:dev' into dev
c892e67
@michaelchessall
update files
44936b6
@michaelchessall
TRADE BEACON UPDATE
034bd06 
Adds trade beacons to persistence, devices scattered across the overmap that give access to unique import/export opportunities. This includes a new network device that lets networks take control of trade beacons. The entire system is in place and functional, but we still need to add imports/exports and a variety of trade beacons. I will save that for future updates.
@michaelchessall
Merge branch 'dev' of https://github.com/FaurnsGoldberg/Nebula into dev
e0814fe
@michaelchessall
removed old files
dc44d19
@michaelchessall
Delete tradebeacon.dm
ac18716
@michaelchessall
Update _persistence.dme
4e23eaa
@michaelchessall
Update trade_beacon_program.dm
7dc1b2e
@michaelchessall
fix map units tests
7261a26
@michaelchessall
Fix unit tests, all_trade_beacons list
0500438
@michaelchessall
fix unit tests
f500804
@michaelchessall
Update _persistence.dme
b8a8350
@michaelchessall
Update network.dm
6085c60
@michaelchessall
Update cargo_telepads.dm
9f21dda
@michaelchessall
Merge branch 'dev' of https://github.com/FaurnsGoldberg/Nebula into dev
3fcae62
@michaelchessall
Update cargo_telepads.dm
3c60d1b
@michaelchessall
fix unit tests, improve readability
9f61421
@michaelchessall
include return on init
69bc0a2
@michaelchessall
Update trade_beacons.dm
b276e77
@michaelchessall
fix unit tests
66e5a60
@michaelchessall
fix unit tests????
a4b2754
michaelchessall and others added 21 commits March 14, 2023 18:30
@michaelchessall
Update trade_beacons.dm
b57d1c1
@michaelchessall
fix unit tests
4095407
@michaelchessall
Update trade_beacons.dm
bc08eb5
@michaelchessall
fix unit tests
62536d2
@michaelchessall
fix err
eca3ad0
@michaelchessall
Update trade_beacons.dm
84d7567
@michaelchessall
Update trade_beacons.dm
7ec419f
@michaelchessall
Update trade_beacons.dm
b6e288c
@michaelchessall
z
70a4976
@michaelchessall
Update trade_beacons.dm
921a612
@michaelchessall
Update trade_beacons.dm
6d2ad29
@michaelchessall @PsyCommando
Update mods/persistence/modules/trade_beacons/trade_beacons.dm
7db1021 
Co-authored-by: PsyCommando <[email protected]>
@michaelchessall @PsyCommando
Update code/modules/economy/cargo_telepads.dm
4dfa4b2 
Co-authored-by: PsyCommando <[email protected]>
@michaelchessall @PsyCommando
Update code/modules/economy/cargo_telepads.dm
d8da389 
Co-authored-by: PsyCommando <[email protected]>
@michaelchessall
Quadrants, Security Levels, Hostility Levels, Asteroid tables
adfcd92
@michaelchessall
fix err
d939d6e
@michaelchessall
Merge branch 'dev' into dev
afad724
@michaelchessall
buy_import
4a1c399
@michaelchessall
Merge branch 'dev' of https://github.com/FaurnsGoldberg/Nebula into dev
06c91d2
@michaelchessall
fix
92f3676
@michaelchessall
push before sleep
88e770c
@PsyCommando PsyCommando added 🆕 enhancement New feature or request 🚀 ship/overmap Things related to flying ships, ship systems, ship creation, ship events, and the overmap in general 🌌 Map/Map Gen Things related to maps, map generation, layouts, etc.. labels Mar 19, 2023
@PsyCommando PsyCommando added this to the Outreach Map Pre-Release milestone Mar 19, 2023
@PsyCommando PsyCommando linked an issue Mar 19, 2023 that may be closed by this pull request
fancy overmap sector stuff that brawler never made an issue for like I asked him to. #441
Open
@PsyCommando
Copy link
Collaborator

Btw, pls try not to cram everything into a single PR as much as possible. It'll be faster to review/merge this in separate parts.

@PsyCommando
Copy link
Collaborator

Btw, you're pushing your dev branch. That's not a good idea. Make a new branch instead, because you're going to accumulate a lot of crud and fuck up your revision history.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@michaelchessall michaelchessall

Labels
🌌 Map/Map Gen Things related to maps, map generation, layouts, etc.. 🆕 enhancement New feature or request 🚀 ship/overmap Things related to flying ships, ship systems, ship creation, ship events, and the overmap in general
Projects
None yet
Milestone
Outreach Map Pre-Release
Development

Successfully merging this pull request may close these issues.

fancy overmap sector stuff that brawler never made an issue for like I asked him to.
2 participants
@michaelchessall @PsyCommando