forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 33
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.
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
[PORT] Map loader #389
Closed
lAstronautl
wants to merge
14
commits into
Workbench-Team:arumoon-server
from
lAstronautl:PORT-loader-map
Closed
[PORT] Map loader #389
lAstronautl
wants to merge
14
commits into
Workbench-Team:arumoon-server
from
lAstronautl:PORT-loader-map
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
This reverts commit f9d2a58.
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
…ace-station-14 into arumoon-server
…ion-14 into arumoon-server # Conflicts: # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/Holosign/HolosignSystem.cs # Content.Server/ServerInfo/ServerInfoManager.cs # Content.Shared/CCVar/CCVars.cs # Resources/Maps/Misc/terminal.yml # Resources/Maps/Nonstations/nukieplanet.yml # Resources/Maps/Test/dev_map.yml # Resources/Maps/metastation.yml # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml # Resources/Prototypes/Entities/Objects/Materials/ore.yml # Resources/Prototypes/Entities/Objects/Specific/chemistry.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Recipes/Lathes/medical.yml # Resources/Prototypes/Recipes/Lathes/tools.yml # Resources/Prototypes/Recipes/Reactions/chemicals.yml # Resources/Prototypes/tags.yml # Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json # Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # Resources/migration.yml
…ace-station-14 into arumoon-server # Conflicts: # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/ServerInfo/ServerInfoManager.cs # Content.Shared/CCVar/CCVars.cs # Resources/Maps/Misc/terminal.yml # Resources/Maps/Test/dev_map.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Materials/ore.yml # Resources/Prototypes/Entities/Objects/Specific/chemistry.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Recipes/Lathes/medical.yml # Resources/Prototypes/Recipes/Lathes/tools.yml # Resources/Prototypes/Recipes/Reactions/chemicals.yml # Resources/Prototypes/tags.yml # Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json # Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi/meta.json # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # Resources/migration.yml
* MappingShmapping * Locale * Fixes * reviewfixes * backlines # Conflicts: # Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/admeme/hand_teleporter.ftl # Resources/Prototypes/_CorvaxNext/Admeme/hand_teleporter.yml
…ace-station-14 into PORT-loader-map # Conflicts:
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
О запросе слияния
Cистема загрузки карт в прототипе карт
Почему / Баланс
Очень сильно развязывает руки маперам станций. Теперь можно делать планетарные базы, особенные обломки которые могут быть больше станции, 2 станции на разных картах или даже (через костыли) хоть какой то лаваленд
Технические детали
Добавлен новый type: StationAdditionalMap который позволяет загружать карты вместе со станцией

вот пример карты
Dev
которая при старте загружает картуReach
Требования
Кардинальные изменения
Новый
namespace Content.Server.Starshine.AdditionalMap
Чейнджлог
🆑 TheShuEd