Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Conversation

@maxion12345
Copy link
Contributor

@maxion12345 maxion12345 commented Feb 9, 2022

had to just delete the other branch shit was turbofucked my man

todo

  • snip
    snip
  • Throw people into pools
    currently the pool acts like an invisible wall and you will be stopped

Document the changes in your pull request

Port of BeeStation/BeeStation-Hornet#3160

Adds pools from NSV13, replacing the boxing rings on each station. The holodeck's boxing ring is bigger and more sexy looking anyways.

Wiki Documentation

update photo

Changelog

Edit the changelog below to reflect the changes made by this PR, even if the changes are minor - required for every PR.
If you add a name after the ':cl', that name will be used in the changelog. Leave it empty to use your GitHub name.

🆑 PowerfulBacon, KMC, Cdey, Maxim
rscadd: Added pool to boxstation, metastation, and the luxury shuttle (no more jpeg of a beach)
/:cl:

@maxion12345 maxion12345 requested review from a team as code owners February 9, 2022 20:56
@Yogbot-13 Yogbot-13 added DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Mapping Will result in a change to a map. Sound This PR changes audio files Sprites This PR has spriting changes labels Feb 9, 2022
Copy link
Contributor

@patpol4 patpol4 left a comment

Choose a reason for hiding this comment

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

Double pipe on box here:
firefox_719bX3f27k

For meta:
firefox_nKx3GGclBE
Fix the pointless T junction,
check for duplicates,
move the line one to the left so its not so close to the pool
move the table so it's not right next to the pool, also maybe chairs? idk might change those later if it's bad ingame

Also move assistant spawns on both maps a bit so they dont spawn right next to the pools and instantly fall in there by accident.

@maxion12345 maxion12345 requested a review from patpol4 February 10, 2022 02:22
@maxion12345
Copy link
Contributor Author

Double pipe on box here: firefox_719bX3f27k

For meta: firefox_nKx3GGclBE Fix the pointless T junction, check for duplicates, move the line one to the left so its not so close to the pool move the table so it's not right next to the pool, also maybe chairs? idk might change those later if it's bad ingame

Also move assistant spawns on both maps a bit so they dont spawn right next to the pools and instantly fall in there by accident.

done, I moved that uniform on the table over to where the cups used to be (you can get cups from the water machine idk why they had a table)

Copy link
Contributor

@patpol4 patpol4 left a comment

Choose a reason for hiding this comment

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

Map is fine

@patpol4 patpol4 added Map - Approved This PR's mapping side has been approved by a mapping maintainer Awaiting - Action - Maintainer This PR is awaiting an action from a maintainer labels Feb 10, 2022
@patpol4
Copy link
Contributor

patpol4 commented Feb 10, 2022

previous PR #13114

@patpol4 patpol4 added Awaiting - Action - Maintainer This PR is awaiting an action from a maintainer and removed Awaiting - Action - Maintainer This PR is awaiting an action from a maintainer labels Feb 10, 2022
@JamieD1 JamieD1 merged commit 7cb0a04 into yogstation13:master Feb 12, 2022
Yogbot-13 added a commit that referenced this pull request Feb 12, 2022
@maxion12345 maxion12345 deleted the pools2 branch February 12, 2022 19:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Awaiting - Action - Maintainer This PR is awaiting an action from a maintainer DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Map - Approved This PR's mapping side has been approved by a mapping maintainer Mapping Will result in a change to a map. Sound This PR changes audio files Sprites This PR has spriting changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants