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.

Sign up for GitHub

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

Jump to bottom

Loop station i added a paper tray and brb sign to hop and tinyfans to the freezer #34872

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Loop station i added a paper tray and brb sign to hop and tinyfans to the freezer #34872

wants to merge 8 commits into from
+1,453 −19

Conversation

TytosB
Copy link
Contributor

@TytosB TytosB commented Feb 4, 2025 •
edited
Loading

About the PR

title. also i added catwalks to the solar arrays

Why / Balance

freezer needs fans to keep in cold. hop need more paper and brb sign

Technical details

Media

Requirements

Breaking changes

Changelog

@ss14-map-server
Copy link

This PR contains new or changed maps:

  • loop.yml

Maps are being rendered. This comment will be updated if rendering them is done.
02/04/25 08:11

@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/L Denotes a PR that changes 1000-4999 lines. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Map Changes: Might require knowledge of mapping. and removed size/L Denotes a PR that changes 1000-4999 lines. labels Feb 4, 2025
@TytosB TytosB changed the title Loo station i added a paper tray and brb sign to hop and tinyfans to the freezer Loop station i added a paper tray and brb sign to hop and tinyfans to the freezer Feb 4, 2025
@TytosB
Copy link
Contributor Author

TytosB commented Feb 4, 2025

why the fuck is there a merg conflict all i did was add catwalks and shit

@K-Dynamic
Copy link
Contributor

Can you use directional fans for the freezer doors

@southbridge-fur
Copy link
Contributor

the merge conflict may be due to the master version having some changes that are independent from your local branch

@TytosB
Copy link
Contributor Author

TytosB commented Feb 5, 2025

the merge conflict may be due to the master version having some changes that are independent from your local branch

odd, i pulled from the updated branch before i started making changes specifically to avoid that issue.

@ArtisticRoomba ArtisticRoomba added P3: Standard Priority: Default priority for repository items. T: New Feature Type: New feature or content, or extending existing content S: Needs Review Status: Requires additional reviews before being fully accepted DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. A: Mapping Area: Maps, or tools used for mapping and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Feb 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A: Mapping Area: Maps, or tools used for mapping Changes: Map Changes: Might require knowledge of mapping. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. P3: Standard Priority: Default priority for repository items. S: Needs Review Status: Requires additional reviews before being fully accepted T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@TytosB @K-Dynamic @southbridge-fur @ArtisticRoomba