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 Jan 17, 2022

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

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
/:cl:

@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 Jan 17, 2022
@ToasterBiome
Copy link
Contributor

felinid interactions actually pretty funny

@KillerOrcaCora
Copy link
Contributor

KillerOrcaCora commented Jan 17, 2022

if you need custom feline bikini sprites, just give the word. (Very serious)

@maxion12345
Copy link
Contributor Author

linter green mmm yes

@UselessTheremin
Copy link
Contributor

if you need custom feline bikini sprites, just give the word. (Very serious)

main question is why the heck would they need a different lookin bikini they are humans with ears and a tail slapped on

@maxion12345
Copy link
Contributor Author

i've got work for the next few days ergo this will remain stagnant for now

especially because I can't seem to understand how shove/throwing works and I'll need time to bang my head against the proverbial wall in order to complete this pr

@KillerOrcaCora
Copy link
Contributor

if you need custom feline bikini sprites, just give the word. (Very serious)

main question is why the heck would they need a different lookin bikini they are humans with ears and a tail slapped on

Might as well add to the list of felind only equipable drip wont be the first or the last.

@maxion12345
Copy link
Contributor Author

declaring this as ready, shoving into pools wasn't feasible (I couldn't figure out how to make it work)

you can throw people into pools though, so maybe its better from a balance perspective.

@maxion12345 maxion12345 marked this pull request as ready for review January 25, 2022 05:22
@maxion12345 maxion12345 requested review from a team as code owners January 25, 2022 05:22
@JamieD1
Copy link
Contributor

JamieD1 commented Jan 26, 2022

@wejengin2

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.

It's only on box, which is fine for now, might be worth testmerging this

@JamieD1
Copy link
Contributor

JamieD1 commented Feb 2, 2022

Fix cornflakes

@patpol4 patpol4 added the Merge conflict Files are conflicting with current live changes. label Feb 6, 2022
@maxion12345
Copy link
Contributor Author

NO

@maxion12345
Copy link
Contributor Author

NOT AGAIN

@maxion12345
Copy link
Contributor Author

the fucking horror files refuse to go away, i cant discard them at all its extremely fucking annoying

@maxion12345
Copy link
Contributor Author

pools closed for now these fucking horror changes refuse to leave so I cannot actually fix the merge conflict
I'll probably end up making a new branc- oh, I cant, because the changes are there greattt

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

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. Merge conflict Files are conflicting with current live changes. 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.

9 participants