Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Adicionar Gaxstation#80

Merged
rbertoche merged 20 commits intorbertoche:piratafrom
dasprino007:gaxstation
Jun 4, 2024
Merged

Adicionar Gaxstation#80
rbertoche merged 20 commits intorbertoche:piratafrom
dasprino007:gaxstation

Conversation

@dasprino007
Copy link
Copy Markdown
Collaborator

Essa PR é pra colocar Gaxstation no pirata

About the PR

Mapa novo lol

Why / Balance

adicionamos um mapa novo low pop que vai trazer mais variedade do pirata

Media

image

@github-actions
Copy link
Copy Markdown

github-actions bot commented Jun 4, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@rbertoche rbertoche merged commit 8de1e4a into rbertoche:pirata Jun 4, 2024
VMSolidus added a commit to Simple-Station/Einstein-Engines that referenced this pull request Oct 9, 2024
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

This PR ports the "Gax" map directly from Estação Pirata, making some
changes and corrections.
This PR ports rbertoche/space-station-14#80
Gax is a recreated ss13 map, originally from YogStation (SS13)

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->



---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![Gax-0](https://github.com/user-attachments/assets/88e4daa5-0de1-4a68-b6ae-d957056a1b29)


</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: A new map called NCS Gax has been added to rotation.

---------

Signed-off-by: Ichaie <167008606+Ichaie@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Remuchi pushed a commit to WWhiteDreamProject/wwdpublic that referenced this pull request Oct 19, 2024
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

This PR ports the "Gax" map directly from Estação Pirata, making some
changes and corrections.
This PR ports rbertoche/space-station-14#80
Gax is a recreated ss13 map, originally from YogStation (SS13)

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

![Gax-0](https://github.com/user-attachments/assets/88e4daa5-0de1-4a68-b6ae-d957056a1b29)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: A new map called NCS Gax has been added to rotation.

---------

Signed-off-by: Ichaie <167008606+Ichaie@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Maps/Pools/default.yml
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants