Submarine Station #123
Closed
Submarine Station #123
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
crying emoji
AAAAAAAAAAAAAAAAAAAAAAAAAAAAGGGGGGGGGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
kinda done ???
|
I should be able to fire it up in a little bit and check it out. I haven't really gone through it yet other than what others have reviewed already. |
- removed medborg spawns - removed ratking spawns - fixed hall centerpieces to be smaller - fixed pig spot being airtight (lol) - fixed everywhere else that i didn't realize was airtight due to windoors & windows - fixed unreachable curtains - fixed HoL room - removed blocking conveyors, added caution decals around them - added beacon components to warps - added missing fax name in food court - fixed up whats missing in the kitchens - fixed missing windows - other tiny tweaks
- ame crates down to 2 - missed some flower decals - missed a railing - beacon adjustments
|
Conflicts weren't resolved before the initial build, so this wont make it into the first build |
We still have a little ways to go in terms of a review. I'll give the thumbs up when it's ready. |
- no more cult walls - less clown loot - less machine boards in board room - less plushies - juiced up zookeepers maints room, gave them a tranquilizer! - adjusted sec doors - added corpsman spawn, adjusted room - moved up jury slightly - added HVs below more windows around sec, LVs under more reinforced windows - made it three doors to get into the armory from maints just to waste your whole emag - improved two way mirror area
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
1 similar comment
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: Colin-Tel <[email protected]>
github-actions
bot
removed
S: Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Closing as stale due to no activity |
|
Most of the discussion on this map has happened in Discord. But I'll send them a reminder if they want to reopen or not. |
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 3, 2025
## Mirror of PR #25926: [Fix air not existing in corner window tiles](space-wizards/space-station-14#25926) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `24fd1a93ff59ca8d6091ca15205c776ec2144146` PR opened by <img src="https://avatars.githubusercontent.com/u/20659419?v=4" width="16"/><a href="https://github.com/MACMAN2003"> MACMAN2003</a> at 2024-03-08 05:40:47 UTC PR merged by <img src="https://avatars.githubusercontent.com/u/19864447?v=4" width="16"/><a href="https://github.com/web-flow"> web-flow</a> at 2024-03-08 07:50:34 UTC --- PR changed 10 files with 50 additions and 0 deletions. The PR had the following labels: - No C# --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > the corner walls are untouched because they didn't have this issue (they actually held the solution) > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > fixes space-wizards/space-station-14#25924 > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > > - [x] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > <!-- > List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes. > --> > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > > <!-- > Make sure to take this Changelog template out of the comment block in order for it to show up. > 🆑 > - add: Added fun! > - remove: Removed fun! > - tweak: Changed fun! > - fix: Fixed fun! > --> > 🆑 > - fix: Diagonal windows no longer space you when in a pressurized environment. </details> Co-authored-by: MACMAN2003 <[email protected]>
LaryNevesPR
pushed a commit
to LaryNevesPR/Estacao-Andromeda
that referenced
this pull request
Jan 11, 2025
Fixes the pronouns in the character preview to not show they/them pronouns for characters that use it/its <!-- 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 just adds another condition in the fluent file that controls the character preview text. Essentially, characters that use it/its pronouns will go from: "This is [character]. They are X years old." to "This is [character]. It is X years old." --- # 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 --> - [x] Probably test it, maybe. --- <!-- 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 --> # 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: Azzy - fix: Fixed they/them pronouns being displayed for it/its characters in the character preview.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
About the PR
BRRRRRR
It's a fucking submarine baby.
Submarine is a medium-to-high pop map focused around its central Hospital, with a Clinic for non-emergency checkups, a Pharmacy for those pesky Botanists to ask for kudzu-making goop, and a long-term terminal ward for those who sadly cannot be healed physically. For those that cannot be healed mentally, the brig doubles as a psych ward!
It also features a bio-dome style zoo, a labyrinth with a DANGEROUS...! minotaur, and a beautiful park with an ice skating rink. (The maprender really fucks up non-tile decal work; I swear it looks nice!) More maints silliness will probably come when I have time, but otherwise it already has a few points of interest to keep people occupied. I tried my best to fill out every department to the best of my understanding of them, but I'm very open to suggestions to make them better, as long as it doesn't make the station TOO much bigger. (I would suggest atmos mains and anyone who actually knows how singulos work to please double check that biz, I don't know anything.)
Tested and works on the current build. Still has the stock courser evac shuttle but I've already spent all week on this, I'll swap that out for something more fun later. I'll keep an eye on whatever else we add as the rebase continues that needs to be mapped, and add it in whenever I can, plus I'm sure there'll be a lot of bugs caught if we start testing.
Oh and this also includes the parkstation benches.
Media
Changelog
🆑