Tret Industrial Complex + Away Site Exoplanet Generation #19054
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
DreamySkrell
commented
Apr 28, 2024
•
DreamySkrell
commented
|
!wip |
BotBOREALIS
added
the
WIP
github-actions
bot
added
the
🗺️ Mapping - Away Ship/Away Site
added 22 commits
May 6, 2024 17:35
|
!review |
BotBOREALIS
added
Review Required
and removed
WIP
FluffyGhoster
requested changes
May 27, 2024
code/modules/maps/map_template.dm
Outdated
Comment on lines
45
to
48
| /// `themes` should be assoc map of `/turf/unsimulated/marker/...` path to `/datum/exoplanet_theme/...` path. | ||
| /// Exoplanet generation is not used if `themes` is null. | ||
| /// See docs of `/datum/map_template/ruin/away_site`. | ||
| /datum/map_template/proc/load_new_z(var/no_changeturf = TRUE, var/list/themes = null) |
There was a problem hiding this comment.
This isn't the correct place to shove the exoplanet generation in, do it exoplanet side, not in the generic template maploader
code/modules/maps/map_template.dm
Outdated
Comment on lines
83
to
88
| //exoplanet generation | ||
| if(themes) | ||
| for(var/marker_turf_type in themes) | ||
| var/datum/exoplanet_theme/exoplanet_theme_type = themes[marker_turf_type] | ||
| var/datum/exoplanet_theme/exoplanet_theme = new exoplanet_theme_type() | ||
| exoplanet_theme.generate_map(initial_z, 1, 1, 254, 254, marker_turf_type) |
maps/_common/mapsystem/map.dm
Outdated
| exoplanet_themes = away_site.exoplanet_themes | ||
|
|
||
| // actually load it | ||
| if (template.load_new_z(themes=exoplanet_themes)) |
added 6 commits
May 27, 2024 23:07
Arrow768
approved these changes
May 31, 2024
Alberyk
approved these changes
Jun 1, 2024
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.