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

Qol improvements for the ghost bar #23421

Merged

Conversation

Fluffyzack21
Copy link
Contributor

What Does This PR Do

Made the ghost bar kitchen a bit bigger and added a vender and added a couple of Trash bins

Why It's Good For The Game

QOL improvements for the ghost bar are good, they have nowhere to put trash and the kitchen is a bit small

Images of changes

Screenshot 2023-11-30 140647

Testing

Spawned myself in at ghost bar and saw everything was working fine and had air to breath

Changelog

🆑
tweak: increased ghost bar kitchen size and added some trash bins
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally Map Edit This PR will modify a map labels Nov 30, 2023
@Fluffyzack21
Copy link
Contributor Author

Fluffyzack21 commented Nov 30, 2023

Oh yeah and updated picture of ghost bar from the fix that I did
Screenshot 2023-11-30 150247

@S34NW
Copy link
Member

S34NW commented Dec 2, 2023

Please merge upstream/master into your branch to fix CI failing due to external factors.

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Dec 7, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally labels Dec 16, 2023
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Dec 20, 2023
Copy link
Member

@S34NW S34NW left a comment

Choose a reason for hiding this comment

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

image
I think you may have messed something up with the merge master

@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting merge This PR is ready for merge labels Dec 31, 2023
@Fluffyzack21
Copy link
Contributor Author

image I think you may have messed something up with the merge master

when I merged the master on it fucked the entire PR

@Fluffyzack21 Fluffyzack21 force-pushed the QOL-improvements-for-the-ghost-bar branch from 0906f80 to d63c8b4 Compare December 31, 2023 12:42
@S34NW S34NW merged commit a069966 into ParadiseSS13:master Dec 31, 2023
11 checks passed
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Dec 31, 2023
Oyu07 pushed a commit to Oyu07/Paradise that referenced this pull request Jan 2, 2024
* Added some garbage bins, added a vender for the ghost bar kitchen

* Fixed the floor under a table

* Moved the shadycig vender a bit more to the wall and removed a beaker that I placed on accident

* Removed a wall behind a vender

* fuck you merge masters

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
@Fluffyzack21 Fluffyzack21 deleted the QOL-improvements-for-the-ghost-bar branch January 28, 2024 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Map Edit This PR will modify a map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants