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.

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

PGF Turrets #3381

Merged
merged 5 commits into from
Sep 20, 2024
Merged

PGF Turrets #3381

merged 5 commits into from
Sep 20, 2024

Conversation

Erikafox
Copy link
Contributor

About The Pull Request

dreamseeker_AOOc6yOARb.mp4

Defines some pgf flavored laser turrets. Maps the light variant onto the Crying Sun as a replacement for the weak turrets currently installed (shouldn't be a major upgrade).
The turrets are:
Standard - uses the pgf assault rifle laser
Light - uses the pgf pistol laser
Heavy - uses the pgf sniper laser and a heavier disabler beam.

Also organizes the file slightly and renames the faction define for solcon (solgov -> solcon)

Why It's Good For The Game

More turret definitions is good. Also I need these for a ship.

Changelog

🆑
add: The PGF now has it's own turret offerings. They come in light, normal, and heavy flavor.
/:cl:

@Erikafox Erikafox requested review from FalloutFalcon and a team as code owners September 16, 2024 22:45
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Sep 16, 2024
@DIB-DOG
Copy link
Contributor

DIB-DOG commented Sep 17, 2024

Quick question, what do you have the new lasers defaulted to on the Crying Sun?

The turret control panel in the bridge of the Crying sun does not work in controlling the ship's lasers so whatever they are set to in the mapping is what they are set to permanently.

@Erikafox
Copy link
Contributor Author

Erikafox commented Sep 17, 2024

I'm just gonna go ahead and fix the turret control tbh.

Also they were set to lethal in editor so don't worry. Behavior is consistent

@DIB-DOG
Copy link
Contributor

DIB-DOG commented Sep 17, 2024

Not as simple as it looks. We're not allowed to make their tile "bridge" so they will connect to the controller. Which is the easiest "fix" (workaround) I know of.

Cool cool, I also took a peek at the files changed and saw the mode stayed the same so sorry for the obvious question there.

@FalloutFalcon FalloutFalcon added this pull request to the merge queue Sep 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 20, 2024
@Imaginos16 Imaginos16 added this pull request to the merge queue Sep 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 20, 2024
@FalloutFalcon FalloutFalcon added this pull request to the merge queue Sep 20, 2024
Merged via the queue into shiptest-ss13:master with commit 2bcf67a Sep 20, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Sep 22, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

https://github.com/user-attachments/assets/a8715ea0-0721-4025-8a5a-74296290ae77

Defines some pgf flavored laser turrets. Maps the light variant onto the
Crying Sun as a replacement for the weak turrets currently installed
(shouldn't be a major upgrade).
The turrets are:
Standard - uses the pgf assault rifle laser
Light - uses the pgf pistol laser
Heavy - uses the pgf sniper laser and a heavier disabler beam.

Also organizes the file slightly and renames the faction define for
solcon (solgov -> solcon)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
More turret definitions is good. Also I need these for a ship.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
add: The PGF now has it's own turret offerings. They come in light,
normal, and heavy flavor.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: FalloutFalcon <[email protected]>
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 24, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

https://github.com/user-attachments/assets/a8715ea0-0721-4025-8a5a-74296290ae77

Defines some pgf flavored laser turrets. Maps the light variant onto the
Crying Sun as a replacement for the weak turrets currently installed
(shouldn't be a major upgrade).
The turrets are:
Standard - uses the pgf assault rifle laser
Light - uses the pgf pistol laser
Heavy - uses the pgf sniper laser and a heavier disabler beam.

Also organizes the file slightly and renames the faction define for
solcon (solgov -> solcon)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
More turret definitions is good. Also I need these for a ship.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
add: The PGF now has it's own turret offerings. They come in light,
normal, and heavy flavor.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: FalloutFalcon <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants