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

[BOUNTY] Liquids try #3: Return of the pee #22169

Merged
merged 30 commits into from
Aug 8, 2024
Merged

[BOUNTY] Liquids try #3: Return of the pee #22169

merged 30 commits into from
Aug 8, 2024

Conversation

ToasterBiome
Copy link
Contributor

@ToasterBiome ToasterBiome commented Jun 3, 2024 •
edited
Loading

Document the changes in your pull request

Ports some of Monkestation/Monkestation2.0@8bbcd47
Ports Monkestation/Monkestation2.0#2072
Ports tgstation/tgstation#71430

fulfills https://forums.yogstation.net/threads/300-liquid-simulation-tgcode-edition-ss13-server.27154/

Adds liquids from Monkestation. Adds some basic ocean turfs.

Things this does have:
Liquids
Interaction with liquids
Admin ability to add/remove liquids
Drains?

Things this does not have:
TG plumbing (further PR)
Ocean generation (further PR)

Why is this good for the game?

More stuff to do and interact with = more fun

Testing

dreamseeker_z2PxOVK3J2
dreamseeker_o7TSK5nLuC

Wiki Documentation

will fill out

Changelog

🆑
rscadd: adds liquids
/:cl:

@ToasterBiome ToasterBiome requested review from a team as code owners June 3, 2024 21:17
@Yogbot-13 Yogbot-13 added DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Sprites This PR has spriting changes labels Jun 3, 2024
@ToasterBiome ToasterBiome added the DO NOT MERGE Should not be merged without express approval from a Head Dev label Jun 3, 2024
@neeshacark
Copy link
Contributor

finally, it is our time

@cowbot92
Copy link
Contributor

cowbot92 commented Jun 3, 2024

im gonna pee so hard

@AMyriad
Copy link
Contributor

AMyriad commented Jun 3, 2024

one step closer to ocean station inshallah

@AMyriad AMyriad added the Literally the best PR My god its beautiful label Jun 3, 2024
@wonderinghost
Copy link
Contributor

there better be jarate gameplay

@github-actions github-actions bot added the Admin This PR affects administrators label Jun 3, 2024
Yogbot-13 added a commit that referenced this pull request Jun 4, 2024
@Yogbot-13
TGS Test Merge (#22169)
74e71d1
Yogbot-13 added a commit that referenced this pull request Jun 4, 2024
@Yogbot-13
TGS Test Merge (#22169)
428471b
Yogbot-13 added a commit that referenced this pull request Jun 4, 2024
@Yogbot-13
TGS Test Merge (#22169)
dc32cb6
@Moltijoe
Copy link
Contributor

Moltijoe commented Jun 4, 2024

Is there any way to tell a difference between a liquid and gas at a glance? They both just seem to be translucent overlays

Yogbot-13 added a commit that referenced this pull request Jun 4, 2024
@Yogbot-13
TGS Test Merge (#22169)
622a8bd
@neeshacark
Copy link
Contributor

Is there any way to tell a difference between a liquid and gas at a glance? They both just seem to be translucent overlays

its pretty obvious

@Chubbygummibear
Copy link
Contributor

check out how hard i can

Yogbot-13 added a commit that referenced this pull request Jun 4, 2024
@Yogbot-13
TGS Test Merge (#22169)
f583ff6
@warface1234455
Copy link
Contributor

check out how hard i can

bro got a third stick

Yogbot-13 added a commit that referenced this pull request Jun 4, 2024
@Yogbot-13
TGS Test Merge (#22169)
69a9fa4
Yogbot-13 added a commit that referenced this pull request Jul 26, 2024
@Yogbot-13
TGS Test Merge (#22169)
004e8b9
@thecatastrophecat thecatastrophecat mentioned this pull request Jul 26, 2024
Closed
Yogbot-13 added a commit that referenced this pull request Jul 28, 2024
@Yogbot-13
TGS Test Merge (#22169)
c63e813
@Oblisk234 Oblisk234 mentioned this pull request Jul 29, 2024
Open
Yogbot-13 added a commit that referenced this pull request Aug 1, 2024
@Yogbot-13
TGS Test Merge (#22169)
b7e0cf9
Yogbot-13 added a commit that referenced this pull request Aug 2, 2024
@Yogbot-13
TGS Test Merge (#22169)
92a3ab3
Yogbot-13 added a commit that referenced this pull request Aug 3, 2024
@Yogbot-13
TGS Test Merge (#22169)
da06e33
Yogbot-13 added a commit that referenced this pull request Aug 6, 2024
@Yogbot-13
TGS Test Merge (#22169)
18c1b25
Yogbot-13 added a commit that referenced this pull request Aug 6, 2024
@Yogbot-13
TGS Test Merge (#22169)
3c59f37
Yogbot-13 added a commit that referenced this pull request Aug 6, 2024
@Yogbot-13
TGS Test Merge (#22169)
476259a
Moltijoe
Moltijoe approved these changes Aug 7, 2024
View reviewed changes
Copy link
Contributor

@Moltijoe Moltijoe left a comment

Choose a reason for hiding this comment

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

fine, i guess it's alright, i can make those tweaks in a different pr
nothing fundamentally flawed with the pr

@ToasterBiome ToasterBiome requested a review from Moltijoe August 7, 2024 20:24
Yogbot-13 added a commit that referenced this pull request Aug 7, 2024
@Yogbot-13
TGS Test Merge (#22169)
3f6a121
JamieD1
JamieD1 approved these changes Aug 7, 2024
View reviewed changes
Copy link
Contributor

@JamieD1 JamieD1 left a comment

Choose a reason for hiding this comment

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

:/

@Moltijoe Moltijoe merged commit 4c7d381 into master Aug 8, 2024
14 checks passed
@Moltijoe Moltijoe deleted the p3trotp branch August 8, 2024 19:54
Yogbot-13 added a commit that referenced this pull request Aug 8, 2024
@Yogbot-13
Automatic changelog generation #22169 [ci skip]
8b7dbd4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Moltijoe Moltijoe Moltijoe approved these changes

@cuackles cuackles cuackles approved these changes

@JamieD1 JamieD1 JamieD1 approved these changes

Assignees
No one assigned
Labels
Admin This PR affects administrators DME Edit This PR affects the yogstation.DME file DO NOT MERGE Should not be merged without express approval from a Head Dev Feature This adds new content to the game Literally the best PR My god its beautiful Sprites This PR has spriting changes Test Merge - Requested This PR is waiting for a test merge to be scheduled Test Merge - Scheduled This PR is waiting to be test merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.