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

[MDB IGNORE] Ротация астеройдов. Новый астеройд. #13533

Merged
merged 13 commits into from
Sep 29, 2024
+80,551 −1
Merged

[MDB IGNORE] Ротация астеройдов. Новый астеройд. #13533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
412dc9d
New asteroid map, rename old, little code changes in mapping.dm for a…
KatoMarika Sep 9, 2024
b18f446
add asteroid/asteroid_rich.dmm
KatoMarika Sep 9, 2024
dd20b0a
fix
KatoMarika Sep 9, 2024
838e3c6
moar fixes for asteroid/asteroid_rich.dmm
KatoMarika Sep 9, 2024
44b80c7
f
KatoMarika Sep 9, 2024
5824265
apc fix
KatoMarika Sep 9, 2024
6a8d7c2
Fix apc again
KatoMarika Sep 9, 2024
19581e2
shuttle door fix, dorm buttons fix
KatoMarika Sep 11, 2024
8238c75
New caves, relocate structures, fix buttons, fix doors
KatoMarika Sep 13, 2024
bc6118c
fix telecomm apc
KatoMarika Sep 13, 2024
6954e08
Camera fix
KatoMarika Sep 13, 2024
ee8a978
Change some areas, little fixes, moar fluff
KatoMarika Sep 13, 2024
1f4263c
add science rig
KatoMarika Sep 24, 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
3 changes: 2 additions & 1 deletion code/controllers/subsystem/mapping.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,8 @@ SUBSYSTEM_DEF(mapping)
// load mining
if(global.config.load_mine)
if(config.minetype == "asteroid")
LoadGroup(FailedZs, "Asteroid", "asteroid", "asteroid.dmm", default_traits = ZTRAITS_ASTEROID)
var/asteroidmap = pick("asteroid_classic.dmm", "asteroid_rich.dmm")
LoadGroup(FailedZs, "Asteroid", "asteroid", asteroidmap, default_traits = ZTRAITS_ASTEROID)
else if(config.minetype == "prometheus_asteroid")
LoadGroup(FailedZs, "Asteroid", "prometheus_asteroid", "prometheus_asteroid.dmm", default_traits = ZTRAITS_ASTEROID)
else if (!isnull(config.minetype))
Expand Down
0 maps/asteroid/asteroid.dmm → maps/asteroid/asteroid_classic.dmm
View file
Open in desktop
File renamed without changes.
Loading
Loading