Pretty Disposals #1009

rosieposieeee · 2024-03-26T15:37:46Z

About the PR

Brings back the old disposal sprites, and adds a 'space' variant that warns you that it goes to space, for the maps that have spaced disposals (Hive's perma, Sub's everything.) (Otherwise, the space one is no different than a normal one.)

If anyone has a better idea than a generic yellow warning triangle I'll sprite it.

Why / Balance

The new sprites were ugly, and I had to make a new RSI for the space one anyway (or touch the upstream RSI, but I didn't want to.)

Media

I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog
🆑

tweak: Added Space Disposals with a warning sign on them, and made disposals pretty again.

github-actions · 2024-03-26T15:38:29Z

RSI Diff Bot; head commit 6694273 merging into 9b6fbd2
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Structures/Piping/disposal.rsi

State	Old	New	Status
condisposal			Added
conmailing			Added
conspace			Added
disposal-charging			Added
disposal-flush			Added
disposal			Added
dispover-charge			Added
dispover-full			Added
dispover-handle			Added
dispover-ready			Added
mailing-charging			Added
mailing-flush			Added
mailing			Added
mailover-handle			Added
space			Added

Edit: diff updated after 6694273

DangerRevolution · 2024-03-26T15:50:23Z

bringing back old sprite should be it's own PR for easy reversal should it be wanted/needed down the line

DangerRevolution · 2024-03-26T15:51:32Z

are all the pipes & unused intake sprites necessary in the new folder?

rosieposieeee · 2024-03-26T15:51:53Z

bringing back old sprite should be it's own PR for easy reversal should it be wanted/needed down the line

space disposals relies on it, otherwise i would have to touch upstream files

are all the pipes & unused intake sprites necessary in the new folder?

probably not, ill cut them out

DangerRevolution · 2024-03-26T15:53:33Z

bringing back old sprite should be it's own PR for easy reversal should it be wanted/needed down the line

space disposals relies on it, otherwise i would have to touch upstream files

you can PR the old sprites & PR the space sprites; and ask for the old sprites to be merged first so it works

rosieposieeee · 2024-03-26T15:53:59Z

bringing back old sprite should be it's own PR for easy reversal should it be wanted/needed down the line

space disposals relies on it, otherwise i would have to touch upstream files

you can PR the old sprites & PR the space sprites; and ask for the old sprites to be merged first so it works

yeah but if it was undone, you'd have to undo both anyway

IamVelcroboy · 2024-03-27T16:31:46Z

The question is, should I warn the prisoners in Hive....

After all, there is an observation window set up so other prisoners can point and laugh 😄

UnicornOnLSD · 2024-03-28T09:51:02Z

amazing, god bless my beloved old chutes

Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

FluffiestFloof

should fix the tests
thanks death

Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

rosieposieeee · 2024-03-28T19:50:19Z

lol

Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

IamVelcroboy · 2024-04-04T17:28:26Z

Looks fine to me. Just waiting to see if any other maintainers have thoughts...?

deltanedas

long live the king

Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

…json Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

github-actions · 2024-04-09T07:26:07Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

DEATHB4DEFEAT · 2024-04-11T05:15:00Z

Fix tests then this looks good.

Colin-Tel · 2024-05-26T15:03:58Z

Any update? Tests are still failing.

DangerRevolution

this should fix le PR

Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json

…json Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

rosieposieeee · 2024-05-27T03:36:53Z

laziness ops wins again

IamVelcroboy · 2024-07-20T18:04:50Z

👻

Timemaster99 · 2024-07-20T18:12:22Z

Should revive this

Resources/Prototypes/DeltaV/Entities/Structures/Piping/Disposal/space_disposal.yml

ghost · 2024-09-02T11:31:56Z

As the oldest open PR in the repo currently (the actual oldest one is Danger's Angle draft PR,) what's the consensus on if we want old disposals? I'm so used to the new sprite that I kinda forgot how nice this one looked.

Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

TadJohnson00 · 2024-09-05T05:27:43Z

I would like old disposals back, I think this is neat.

ghost

Yeah this looks fine. Let's try it.

initial commit

1b0b966

github-actions bot added Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Mar 26, 2024

oopshit conspace should not be an overlay

425a703

rosieposieeee added 2 commits March 26, 2024 11:56

minor fixes

5971e7a

fix icon when constructing

82eb77c

DEATHB4DEFEAT suggested changes Mar 28, 2024

View reviewed changes

Apply suggestions from code review

3c094d0

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

FluffiestFloof reviewed Mar 28, 2024

View reviewed changes

Apply suggestions from code review

2a15049

Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

rosieposieeee requested a review from DEATHB4DEFEAT April 4, 2024 01:30

github-actions bot added the Status: Needs Review label Apr 4, 2024

rosieposieeee requested a review from FluffiestFloof April 4, 2024 01:31

deltanedas previously approved these changes Apr 8, 2024

View reviewed changes

DEATHB4DEFEAT suggested changes Apr 9, 2024

View reviewed changes

Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.json Outdated Show resolved Hide resolved

Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.…

88aac25

…json Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

rosieposieeee dismissed deltanedas’s stale review via 88aac25 April 9, 2024 03:53

github-actions bot added the Status: Merge Conflict Fix your PR! label Apr 9, 2024

Merge remote-tracking branch 'upstream/master' into space-disposals

7fa8122

A-z-z-y added 2 commits May 4, 2024 16:49

Merge branch 'master' into space-disposals

a35c4c3

Merge branch 'master' into space-disposals

61a1ae3

A-z-z-y enabled auto-merge (squash) May 6, 2024 18:41

DangerRevolution reviewed May 26, 2024

View reviewed changes

auto-merge was automatically disabled May 27, 2024 03:35
Head branch was pushed to by a user without write access

Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.…

9fbe1f3

…json Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

rosieposieeee dismissed DEATHB4DEFEAT’s stale review via 9fbe1f3 May 27, 2024 03:35

rosieposieeee and others added 10 commits May 26, 2024 23:35

Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.…

ffcc308

…json Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.…

41f2442

…json Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.…

ab36458

…json Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.…

87cc260

…json Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.…

d025555

…json Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.…

3c4fd11

…json Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.…

5fa3bd8

…json Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.…

351996b

…json Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.…

cdcfd07

…json Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

Update Resources/Textures/DeltaV/Structures/Piping/disposal.rsi/meta.…

c412087

…json Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>

Merge branch 'master' into space-disposals

c0f334f

Timemaster99 reviewed Jul 20, 2024

View reviewed changes

Resources/Prototypes/DeltaV/Entities/Structures/Piping/Disposal/space_disposal.yml Outdated Show resolved Hide resolved

deltanedas and others added 2 commits September 2, 2024 12:14

lets try it

015561e

Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com> Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

Merge branch 'master' into space-disposals

6694273

ghost approved these changes Sep 5, 2024

View reviewed changes

ghost merged commit 02a4530 into DeltaV-Station:master Sep 5, 2024
13 checks passed

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pretty Disposals #1009

Pretty Disposals #1009

rosieposieeee commented Mar 26, 2024 •

edited

Loading

github-actions bot commented Mar 26, 2024 •

edited

Loading

DangerRevolution commented Mar 26, 2024

DangerRevolution commented Mar 26, 2024

rosieposieeee commented Mar 26, 2024 •

edited

Loading

DangerRevolution commented Mar 26, 2024

rosieposieeee commented Mar 26, 2024

IamVelcroboy commented Mar 27, 2024 •

edited

Loading

UnicornOnLSD commented Mar 28, 2024

FluffiestFloof left a comment

rosieposieeee commented Mar 28, 2024

IamVelcroboy commented Apr 4, 2024

deltanedas left a comment

github-actions bot commented Apr 9, 2024

DEATHB4DEFEAT commented Apr 11, 2024

Colin-Tel commented May 26, 2024

DangerRevolution left a comment

rosieposieeee commented May 27, 2024

IamVelcroboy commented Jul 20, 2024

Timemaster99 commented Jul 20, 2024

ghost commented Sep 2, 2024 •

edited by ghost

Loading

TadJohnson00 commented Sep 5, 2024

ghost left a comment

Pretty Disposals #1009

Pretty Disposals #1009

Conversation

rosieposieeee commented Mar 26, 2024 • edited Loading

About the PR

Why / Balance

Media

github-actions bot commented Mar 26, 2024 • edited Loading

DangerRevolution commented Mar 26, 2024

DangerRevolution commented Mar 26, 2024

rosieposieeee commented Mar 26, 2024 • edited Loading

DangerRevolution commented Mar 26, 2024

rosieposieeee commented Mar 26, 2024

IamVelcroboy commented Mar 27, 2024 • edited Loading

UnicornOnLSD commented Mar 28, 2024

FluffiestFloof left a comment

Choose a reason for hiding this comment

rosieposieeee commented Mar 28, 2024

IamVelcroboy commented Apr 4, 2024

deltanedas left a comment

Choose a reason for hiding this comment

github-actions bot commented Apr 9, 2024

DEATHB4DEFEAT commented Apr 11, 2024

Colin-Tel commented May 26, 2024

DangerRevolution left a comment

Choose a reason for hiding this comment

rosieposieeee commented May 27, 2024

IamVelcroboy commented Jul 20, 2024

Timemaster99 commented Jul 20, 2024

ghost commented Sep 2, 2024 • edited by ghost Loading

TadJohnson00 commented Sep 5, 2024

ghost left a comment

Choose a reason for hiding this comment

rosieposieeee commented Mar 26, 2024 •

edited

Loading

github-actions bot commented Mar 26, 2024 •

edited

Loading

rosieposieeee commented Mar 26, 2024 •

edited

Loading

IamVelcroboy commented Mar 27, 2024 •

edited

Loading

ghost commented Sep 2, 2024 •

edited by ghost

Loading