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

Mining rework + Lavaland removal #9613

Closed
wants to merge 66 commits into from
Closed

Mining rework + Lavaland removal #9613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
98511b9
Asteroid generation improvements
PowerfulBacon Jul 20, 2023
703d24d
Implements the gravity magnet without the UI and in a buggy state
PowerfulBacon Jul 20, 2023
7247117
Adds some basic code for the asteroid magnet border
PowerfulBacon Jul 20, 2023
837d168
Implements the basics of the asteroid magnet
PowerfulBacon Jul 21, 2023
afab214
Gravity magnet stuff
PowerfulBacon Jul 21, 2023
160918f
Asteroid magnet linking
PowerfulBacon Jul 22, 2023
7df45d8
Framework for metastation mining bay
PowerfulBacon Jul 22, 2023
d645d03
Wires and disposals
PowerfulBacon Jul 22, 2023
f62d5c4
Fixes fastDMM pipe props
PowerfulBacon Jul 22, 2023
5f25b64
Metastation atmospheric pipes
PowerfulBacon Jul 22, 2023
33f85e5
Fixes fastdmm pathfinding tag not included
PowerfulBacon Jul 22, 2023
3489d78
Some polish, adds gravity magnet to box shuttle
PowerfulBacon Jul 22, 2023
bb5c417
Adds in metastation lavaland removal
PowerfulBacon Jul 22, 2023
efe3dec
Some general fixes
PowerfulBacon Jul 22, 2023
2060052
Asteroid magnet now works with areas
PowerfulBacon Jul 23, 2023
80b208f
Improves asteroid ore generation
PowerfulBacon Jul 23, 2023
58d1d18
Adds ore scans to the orbital map
PowerfulBacon Jul 23, 2023
80fc71c
Reduces the amount that ore satchels can hold
PowerfulBacon Jul 23, 2023
2ec1b20
Adds in the gravity magnet deployer
PowerfulBacon Jul 23, 2023
9e7340c
Fixes some bugs with the metastation map
PowerfulBacon Jul 24, 2023
924090f
More mapping fixes
PowerfulBacon Jul 24, 2023
ca81b51
Adds in mineral damage instead of instant breaking
PowerfulBacon Jul 25, 2023
d6209b4
Adds in no sound to the damage
PowerfulBacon Jul 25, 2023
f6a5d6a
Dense rocks
PowerfulBacon Jul 25, 2023
060054c
Energy pickaxe basics
PowerfulBacon Jul 25, 2023
6e76de8
Energy pickaxe recharging
PowerfulBacon Jul 25, 2023
669c270
Adds the tow linker to shaft miners
PowerfulBacon Jul 26, 2023
c8d2a9a
Renames the mining device linker to device linker
PowerfulBacon Jul 26, 2023
d0b7635
Ensures a minimum asteroid size, power pickaxe QOL, fixes asteroid sc…
PowerfulBacon Jul 26, 2023
3aeb0e3
Cleans up some of the mining equipment
PowerfulBacon Jul 26, 2023
e39dc7b
Update energy_pickaxe.dm
PowerfulBacon Jul 26, 2023
9e90ffd
Update energy_pickaxe.dm
PowerfulBacon Aug 1, 2023
c8e7fad
Energy pickaxe upgrade completions
PowerfulBacon Aug 5, 2023
6260834
Update beacon.dm
PowerfulBacon Aug 5, 2023
3aa801b
Squashed commit of the following:
PowerfulBacon Aug 18, 2023
a788035
Fixes the merge conflict marker on metastation
PowerfulBacon Aug 18, 2023
cb525fe
grav
PowerfulBacon Aug 18, 2023
d5f515f
adds an energy pickaxe print
PowerfulBacon Aug 20, 2023
7beda8f
Fixes a merge conflict on metastation
PowerfulBacon Aug 21, 2023
13460f9
Fixes the mining ORM direction. Adds the placeholder room
PowerfulBacon Aug 21, 2023
85a5ca1
Resolves the merge conflict issue
PowerfulBacon Aug 21, 2023
d88af7d
Adds in placeholder text for unsprited things
PowerfulBacon Aug 21, 2023
2a82f4a
Makes the base energy pickaxe a bit better
PowerfulBacon Aug 21, 2023
9d3e89f
Fixes 2 lattices on 1 tile
PowerfulBacon Aug 21, 2023
0e26de2
Executes prettier
PowerfulBacon Aug 21, 2023
4168519
Fixes recharger not showing pickaxe charge, increases the minimum rad…
PowerfulBacon Aug 22, 2023
b3cb387
Asteroid interiors
PowerfulBacon Aug 26, 2023
cdd72d1
Adds in 3 more ruins from lavaland
PowerfulBacon Aug 26, 2023
93bc135
Update survival_pod.dmm
PowerfulBacon Aug 26, 2023
31aa255
Adds in the item base for the rope ladder before I rework deployables…
PowerfulBacon Aug 26, 2023
ef72087
Deployables
PowerfulBacon Aug 26, 2023
d285991
Merge remote-tracking branch 'upstream/master' into Turf-integrity-&-…
PowerfulBacon Aug 29, 2023
6b110c3
Merge remote-tracking branch 'upstream/master' into mining-rework
PowerfulBacon Aug 29, 2023
98157c1
Virtual multi-z support
PowerfulBacon Aug 28, 2023
cceb97b
Update to master
PowerfulBacon Aug 29, 2023
2c93c32
Update asteroid_magnet_controller.dm
PowerfulBacon Aug 29, 2023
eb4f30e
Proper asteroid underneaths
PowerfulBacon Sep 1, 2023
00c0686
Increases asteroid mineral counts
PowerfulBacon Sep 2, 2023
3de4a58
Miners spawn with an asteroid roundstart
PowerfulBacon Sep 2, 2023
c2034d0
Merge branch 'master' into mining-rework
PowerfulBacon Nov 13, 2023
c895550
ec
PowerfulBacon Nov 15, 2023
65cd8c6
Inlines get_step_multiz
PowerfulBacon Nov 29, 2023
74ea80f
Fixes depth calculations
PowerfulBacon Dec 2, 2023
1cbf278
Merge branch 'Vertical-directionality-rework' into mining-rework
PowerfulBacon Dec 2, 2023
289420c
Asteroid cavities now function with multi-z
PowerfulBacon Dec 2, 2023
c294ff2
Makes the baseturfs more sensible
PowerfulBacon Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
413 changes: 413 additions & 0 deletions _maps/RandomRuins/AsteroidRuins/blood_drunk_1.dmm
View file
Open in desktop

Large diffs are not rendered by default.

412 changes: 412 additions & 0 deletions _maps/RandomRuins/AsteroidRuins/blood_drunk_2.dmm
View file
Open in desktop

Large diffs are not rendered by default.

353 changes: 353 additions & 0 deletions _maps/RandomRuins/AsteroidRuins/cult_alter.dmm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.