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

Giving-the-PGF-some-more-love (PGF Cold Protections and Crying Sun Changes) #3210

Merged
merged 14 commits into from
Aug 25, 2024

Conversation

DIB-DOG
Copy link
Contributor

@DIB-DOG DIB-DOG commented Jul 15, 2024

About The Pull Request

This PR includes the following changes:

  • Slightly expands and adds to the bridge to be more comfortable to operate from.
  • Adds a security camera console to the bridge to allow for full bridge monitoring
  • Sets the Crying Sun and the the Nail's turrets to be set to lethal by default
  • The radiation crate in stowage now contains radiation suits for the Navy Engineers.
  • An additional standard vest added to marine officer's locker, should the coated variant not be desired.
  • Equipment in the marine armory has been adjusted to reflect its purpose of equipping the marines and the marines only.
  • Silkenweave jackets and Betiz hats now offer zero armor, but offer cold protection, for people moving onto frosty planets
  • Adds a dresser to the crew quarters
  • Removes two Ion engines and replaces them with combustion engines for a total of four combustion engines and two ion engines. Reconfigures the engine rooms to reflect this change.

Picture of the changed bridge:
Screenshot 2024-08-02 181827

Picture of the entire ship with areas:
Screenshot 2024-08-02 181846

Why It's Good For The Game

The changes to equipment on board the ship are good for players as it provides more options. Players will now have trade offs to consider when chosing their equipment in adverse conditions. Because of the PGF's strict uniform protocols, providing these options to players also allows them to enjoy different styles and looks whilst remaining lore friendly.

The changes to the ship's layout on the bridge is in response to the innability of the ship's command staff to be everywhere at once. By including more space to work on the bridge and a security camera console, the captain now has access to essential equipment in close proximity to their primary work station, the helm.

Finally, with the addition of combustion engines, including ships that utilize them more heavily makes for interesting variaton and challenge. Increasing engineering interaction.

Changelog

🆑
add: Added a standard vest to the armory office locker
add: Added a Security camera console to the bridge
balance: Silkenweave jackets and Betzu hats now provide cold protection but no armor
balance: Crying Sun now has 4 combustion/2 ion engines instead of 2/4
fix: Fixes turrets on the Crying Sun and its subshuttle, the Nail.
/:cl:

@DIB-DOG DIB-DOG requested a review from a team as a code owner July 15, 2024 00:01
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Jul 15, 2024
@DIB-DOG DIB-DOG changed the title Giving-the-PGF-some-more-love Giving-the-PGF-some-more-love (PGF Cold Protections and Crying Sun Changes) Jul 15, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 16, 2024
Copy link
Contributor

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

Signed-off-by: DIB-DOG <DaneOfThieves@gmail.com>
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 16, 2024
Copy link
Member

@Latentish Latentish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
Don't do this, if it is on an outside tile it needs to be a /external/dark for a ship. I know that makes turret controllers not work but this is not how to fix it. Also do not put a /external on the inside either.

image
Do something else with this table.

As this is a continuation of an old PR, I want you to add the previously stated crew changes, making the serageant "Marine Lieutenant", and bridge crew to "helmsman".

@DIB-DOG
Copy link
Contributor Author

DIB-DOG commented Jul 25, 2024

Just wanted to ask, in regard to the turrets. With the way that other ship's turrets are set up, they have their turrets set as being in a "Bridge" tile same as this PR. I did notice though, that in all the other ships with turrets, said turrets were tucked into the walls, not on outside platforms.

I don't think I can make the turrets work without them being in "Bridge" tiles, so I assume that's not the issue and the issue is more about their positioning? If the turrets were attached to a wall. Like on the Komodo for example, would that be alright?

Screenshot 2024-07-24 233931

@DIB-DOG
Copy link
Contributor Author

DIB-DOG commented Jul 29, 2024

Made the requested changes, looks a lot better now with the input I received so I appreciate the motivation. The role changes have been made as well as a change to the marine leader's cape so that it is now a "Marine Officer's Cape". Lastly, I reverted the turret fix that was using the bridge area changes and instead just shifted their starting mode to be lethal.

Preview of the new bridge table with more stuff.
Screenshot 2024-07-29 173818

@DIB-DOG DIB-DOG requested a review from Latentish July 29, 2024 22:53
@DIB-DOG
Copy link
Contributor Author

DIB-DOG commented Jul 31, 2024

Re-organized the table to look nicer, image below

Screenshot 2024-07-30 222642

@Latentish Latentish dismissed their stale review August 2, 2024 22:58

addressed I believe

@Latentish
Copy link
Member

I'll TM this, but I need you to update your image, and show what your firelocks under the windows look like. I believe I know but I would like it for posterity.

@DIB-DOG
Copy link
Contributor Author

DIB-DOG commented Aug 2, 2024

Can do! Here's the images you requested

This is beneath the bridge window shutters:
Screenshot 2024-08-02 181658

These are the firelocks beneath said bridge windows:
Screenshot 2024-08-02 181735

Little bonus showing the areas on the bridge for absolute confirmation on areas:
Screenshot 2024-08-02 181835

@Latentish
Copy link
Member

Cool. Saw this on live, no problems that I see.

@@ -37,7 +37,7 @@
"outfit": "/datum/outfit/job/gezena/assistant",
"slots": 2
},
"Marine Sergeant": {
"Marine Lieutenant": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make this guy an officer maybe? Or was that discussed already?
He probably should be one, cause command.

Copy link
Contributor Author

@DIB-DOG DIB-DOG Aug 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely something I'll run past Latency. I just left it as it was originally, so I'd say it depends if it was a part of the original intent or just something that got overlooked. It would certainly make sense to have however.

@thgvr thgvr added this pull request to the merge queue Aug 25, 2024
Merged via the queue into shiptest-ss13:master with commit 550f707 Aug 25, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Aug 26, 2024
…anges) (shiptest-ss13#3210)

<!-- 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. -->

## About The Pull Request
This PR includes the following changes:

- Slightly expands and adds to the bridge to be more comfortable to
operate from.
- Adds a security camera console to the bridge to allow for full bridge
monitoring
- Sets the Crying Sun and the the Nail's turrets to be set to lethal by
default
- The radiation crate in stowage now contains radiation suits for the
Navy Engineers.
- An additional standard vest added to marine officer's locker, should
the coated variant not be desired.
- Equipment in the marine armory has been adjusted to reflect its
purpose of equipping the marines and the marines only.
- Silkenweave jackets and Betiz hats now offer zero armor, but offer
cold protection, for people moving onto frosty planets
- Adds a dresser to the crew quarters
- Removes two Ion engines and replaces them with combustion engines for
a total of four combustion engines and two ion engines. Reconfigures the
engine rooms to reflect this change.

Picture of the changed bridge:
![Screenshot 2024-08-02
181827](https://github.com/user-attachments/assets/47b234f1-eb8a-422d-9853-66fbdf383927)

Picture of the entire ship with areas:
![Screenshot 2024-08-02
181846](https://github.com/user-attachments/assets/d3a6dd90-9766-4978-8a00-21d8d00f9258)


<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
The changes to equipment on board the ship are good for players as it
provides more options. Players will now have trade offs to consider when
chosing their equipment in adverse conditions. Because of the PGF's
strict uniform protocols, providing these options to players also allows
them to enjoy different styles and looks whilst remaining lore friendly.

The changes to the ship's layout on the bridge is in response to the
innability of the ship's command staff to be everywhere at once. By
including more space to work on the bridge and a security camera
console, the captain now has access to essential equipment in close
proximity to their primary work station, the helm.

Finally, with the addition of combustion engines, including ships that
utilize them more heavily makes for interesting variaton and challenge.
Increasing engineering interaction.
<!-- 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. -->

## Changelog

:cl:
add: Added a standard vest to the armory office locker
add: Added a Security camera console to the bridge
balance: Silkenweave jackets and Betzu hats now provide cold protection
but no armor
balance: Crying Sun now has 4 combustion/2 ion engines instead of 2/4
fix: Fixes turrets on the Crying Sun and its subshuttle, the Nail.
/: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. -->

---------

Signed-off-by: DIB-DOG <DaneOfThieves@gmail.com>
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.

None yet

4 participants