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

Almayer: Dirty Up The Ship (Lower Deck) #4089

Closed
wants to merge 29 commits into from

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Aug 2, 2023

About the pull request

Transforms the lower decks maintenance areas into a far more dirty, disorganized, area to be in. Emphasizing how many areas of the ship are in dire need of drydock repairs.

Sees the addition of a old 'tank repair bay' in one of the empty hanger rooms. Featuring a broken tank.
Also sees the addition of a 'ammo storage room' north of briefing. Featuring all of the ships remaining HEAP magazines and SADARs.

I hope to get to the upper deck in a separate PR.

(There should not be any actual real hidden HEAP ammo or anything akin to that.)

Major Things Worth Mentioning

  • The 'ammo store room' contains a lot of empty HEAP magazines and several SADARS and L42A's, the SADARS and guns are props and are non-functional. There is a single "HEAP" magazine with 5 bullets in it, but the bullets are standard rounds, with the magazine explicitly stating this.
  • There are two damaged sentry guns in maintenance. These guns contain a single rubber bullet, are set to fire on anyone, and can not be deconstructed or used by the marines in any way.
  • The items in the Tank bay are all props, no tank gear is useable except for the Tanker helmet.
  • There's a single 'empty space' tile in maint that will kill you if you walk into it. However it is sectioned off by a lot of barriers and warnings, it is set up to make it unlikely someone will accidently run into it.

Explain why it's good for the game

Aesthetics.

The Almayer is intended to be a ship in very desperate need of repairs. Transforming the unused areas of the ship into a more derelict apperance may help impart this to the player.

No major balance change has been effected to these maint areas. Aside from being more cluttered and dank.

Testing Photographs and Procedure

Screenshots & Videos

Screenshot 2023-07-31 15 46 16
Screenshot 2023-07-31 12 04 17
Screenshot 2023-07-31 11 57 42
Screenshot 2023-07-31 00 02 18
Screenshot 2023-07-28 23 46 33
Screenshot 2023-07-28 10 11 58
Screenshot 2023-07-31 17 35 48

Changelog

🆑
maptweak: Lower deck maint of the Almayer is significantly more run down.
maptweak: Tank repair bay has been placed in the north-east of hanger. Behold the Tank in all its glory.
maptweak: Ammo storage room can be found north of briefing. All the remaining HEAP magazines can be found there.
/:cl:

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 2, 2023
@github-actions github-actions bot added the Mapping did you remember to save in tgm format? label Aug 2, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 2, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 3, 2023
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 7, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@Steelpoint Steelpoint marked this pull request as ready for review August 7, 2023 13:07
@Steelpoint
Copy link
Contributor Author

All right, I think we're good.

morrowwolf and others added 2 commits August 7, 2023 13:49
# About the pull request

This PR adds the Auxiliary Support Officer.

Read more here:
<https://docs.google.com/document/d/1aZLVaIwopVj_tant1Wcjuqo0_Ov70IL3U-UHfg7P7wo/edit?usp=sharing>

Main points:
Auxiliary Support Officer oversees the hangar, the intel team, the
engineering department, and the requisitions department.

Chief Engineer has been demoted to O1.

Requisitions Officer renamed to Quartermaster and is now a Gunnery
Sergeant.

For the duration of testing the following is true:

The Auxiliary Support Officer may not deploy. 

The Chief Engineer will be given explicit authority over construction
and control of the Forward Operating Base. The Chief Engineer, and
Maintenance Technicians under them, may deploy freely if there is an
Auxiliary Support Officer. If there is not an Auxiliary Support Officer
the Chief Engineer may deploy with permission from the Acting Commander
and Maintenance Technicians may deploy with the permission of the Chief
Engineer. The Chief Engineer is not required to assist with FOB
construction unless ordered to. One member of Engineering, or the
Auxiliary Support Officer, should be aboard the ship at all times.

The Quartermaster will have unchanged deployment standards as the
Requisitions Officer. Cargo Technicians may deploy if given permission
by the Quartermaster, Auxiliary Support Officer, or aCO. The Mess
Technician will be formally put under the Quartermaster in Requisitions.


# Explain why it's good for the game

Explained in above linked documentation.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog

:cl: Morrow, Thwomper
add: Added Auxiliary Support Officer
add: Auxiliary Support Officer oversees the hangar, the intel team, the
engineering department, and the requisitions department
add: Chief Engineer has been demoted to O1.
add: Requisitions Officer is now "Quartermaster" and a Gunnery Sergeant.
/:cl:

---------

Co-authored-by: harryob <[email protected]>
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 7, 2023
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 7, 2023
@Steelpoint
Copy link
Contributor Author

Merge conflicts are painful

@morrowwolf
Copy link
Member

TM'ing this because this is cool. I have some vague concerns regarding effects being always on but we'll see and our playerbase is bound to find anything hidden ASAP

Copy link
Member

@morrowwolf morrowwolf left a comment

Choose a reason for hiding this comment

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

Alright a few things off the bat:

The ammo room needs toned down a bit, less just stuff

The hole that leads to ASRS pit is neat but is too much

Only one meme turret

Remove the broken XM38 tac shotgun and XM40 pulse rifle

Wrong area set southwest of hangar in maint

Barrel pile in south maint should be more like a few stacked barrels

Cocooned people gotta go

More to come I'm sure. There are some concerns about just general object density but I'll need to run it by others.

@morrowwolf morrowwolf marked this pull request as draft August 8, 2023 09:24
@Steelpoint
Copy link
Contributor Author

Requested changes made

@Steelpoint Steelpoint marked this pull request as ready for review August 8, 2023 14:05
@github-actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Aug 16, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 22, 2023
@cm13-github
Copy link
Contributor

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

@github-actions github-actions bot removed the Stale beg a maintainer to review your PR label Aug 23, 2023
@Steelpoint
Copy link
Contributor Author

100% going to get back to this, but likely in a week or so. Just need to clear some time to fix it.

@Steelpoint Steelpoint closed this Sep 1, 2023
@Steelpoint Steelpoint deleted the AlmayerDirty branch July 17, 2024 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mapping did you remember to save in tgm format? Merge Conflict PR can't be merged because it touched too much code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants