Port Parkstation Benches #88

rosieposieeee · 2023-10-02T21:19:34Z

About the PR

Motha freakin benches baby.

Comes with all the parkstation ones that are also on frontier.

The corner sofa doesn't buckle but otherwise they're functional. Should spice up mapping a bunch.

Media

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

Changelog

🆑

add: Added benches, sofas, and pews!

github-actions · 2023-10-02T21:20:14Z

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

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi

State	Old	New	Status
left			Added
middle			Added
right			Added

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi

State	Old	New	Status
left			Added
middle			Added
right			Added

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi

State	Old	New	Status
arm_left			Added
arm_right			Added
left			Added
middle			Added
right			Added

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi

State	Old	New	Status
arm_left			Added
arm_right			Added
corner			Added
left			Added
middle			Added
right			Added

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi

State	Old	New	Status
arm_left			Added
arm_right			Added
corner			Added
left			Added
middle			Added
right			Added

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi

State	Old	New	Status
left			Added
middle			Added
right			Added

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi

State	Old	New	Status
left			Added
middle			Added
right			Added

Edit: diff updated after 858ab04

FluffiestFloof · 2023-10-02T21:21:25Z

Resources/Prototypes/DeltaV/Parkstation/benches.yml

This is looks like a duplicate of Resources/Prototypes/SimpleStation14/benches.yml

I contractually have to fuck up one thing with every PR I ever send. Sorry.

DebugOk

SimpleStation14 would be yet another addition namespace that has to be watched. I'm going to need to think on that first before looking into this.

Marked as requested changes to blocked merging

rosieposieeee · 2023-10-02T21:28:14Z

SimpleStation14 would be yet another addition namespace that has to be watched. I'm going to need to think on that first before looking into this.

Marked as requested changes to blocked merging

Would it be better if i just moved these files into a DeltaV version?

DEATHB4DEFEAT · 2023-10-02T21:45:50Z

SimpleStation14 would be yet another addition namespace that has to be watched. I'm going to need to think on that first before looking into this.
Marked as requested changes to blocked merging

Would it be better if i just moved these files into a DeltaV version?

it's clearer that it was originally SimpleStation14's if in the SimpleStation14 namespace, and some may look at it as you claiming it as yours
Nyano took the Corvax round notifications and put it in the Nyano namespace (IIRC without making it clear where they got it from originally), which I complained about

DebugOk · 2023-10-02T21:47:14Z

SimpleStation14 would be yet another addition namespace that has to be watched. I'm going to need to think on that first before looking into this.
Marked as requested changes to blocked merging

Would it be better if i just moved these files into a DeltaV version?

it's clearer that it was originally SimpleStation14's if in the SimpleStation14 namespace, and some may look at it as you claiming it as yours Nyano took the Corvax round notifications and put it in the Nyano namespace (IIRC without making it clear where they got it from originally), which I complained about

I agree, it'd be best to leave them as is

DEATHB4DEFEAT

Psp was lazy with the sources

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/meta.json

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/meta.json

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/meta.json

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/meta.json

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/meta.json

Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/meta.json

…s/parkbench_bamboo.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

…s/parkbench_wooden.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

…s/pews.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

…s/sofa_corp.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

…s/steel_bench.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

Addressed

…s/steel_bench.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

…s/steel_bench_white.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

DEATHB4DEFEAT · 2023-10-02T21:59:10Z

guh
All my suggestions done in separate commits
You can go to the files tab and add them to a batch, then commit

DebugOk · 2023-10-02T22:02:35Z

guh All my suggestions done in separate commits You can go to the files tab and add them to a batch, then commit

Our poor workflow runs. Thank god they're free. This'll probably cause a rate limit though

DEATHB4DEFEAT · 2023-10-02T22:03:08Z

guh All my suggestions done in separate commits You can go to the files tab and add them to a batch, then commit

Our poor workflow runs. Thank god they're free. This'll probably cause a rate limit though

Oh god, yeah

* Branch contents * Update attributions.yml * Update speech_emote_sounds.yml

* prevent natural existence of the vape * nospawn the vape

@deltanedas

* Automatic changelog update * Make NPC names proper nouns & fix some genders (#20534) * Proper names & genders * Uppercase proper names * Make Smile female * fix bingus wrinkly head (#20531) * rouny meat and steak (#20526) * lost friendship flavor * add rouny steak * rouny special meat * rouny meat textures --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311) * Explosive wet floor sign & janitorial suicide vest * fix attributions * Remove name & desc from explosive wet floor sign * Make wet floor sign chameleonable * Automatic changelog update * Minor slippery stuff (#20535) * Update submodule to 162.2.0 (#20570) * Predicted armor (#20560) * clean up some lines in smile the slime prototype (#20552) * Revert "Use full file path for temp replays (#19002)" (#20545) * Add EyesGlasses into ClothesMate (#20523) * Automatic changelog update * Fix Punpun crew monitor sensor (#20484) * Automatic changelog update * EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394) Co-authored-by: metalgearsloth <[email protected]> * Automatic changelog update * Make arcades hackable again (#20555) * Automatic changelog update * Health alert tweaks (#20557) * Automatic changelog update * Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564) * Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent * Nukeops todo and cleanup * Remove Active field * Add EndedGameRuleComponent * bartender suit (#20521) * give me a drink bartender * guh * aARG * Necropolis and mine walls (#20578) * Automatic changelog update * archaic accent tweaks (#20567) * Automatic changelog update * Add confirmation to kick and respawn in the admin player actions panel (#20542) * Remove windows-latest CI runs, remove unused build-test-release.yml (#20540) * Change .editorconfig to keep existing attribute arrangement (#20538) * Automatic changelog update * Catch replay start and end errors on round restarts (#20565) * Update trivial components to use auto comp states (#20539) * Fix role unbans not applying in real time (#20547) * Disable AHelp buttons when no player is selected, update button styling (#20568) * Automatic changelog update * Added a toggle fullscreen button (default F11) (#20272) * Added a toggle fullscreen button (default F11) * Removed un-needed comments * Review Requested Changes * Fixed Acidental Spacing Change * bwoink, removed extraneous code * nothing, litterally * Automatic changelog update * Fix not networking markings (#20588) * Automatic changelog update * Update RobustToolbox to v162.2.1 (#20590) * Automatic changelog update * Glorfcode (force say on damage/stun/crit) (#20562) * Automatic changelog update * Fix AHelp progressively showing more AHelp panels (#20591) * Automatic changelog update * caninsert entitystorage tweaks (#20589) * Automatic changelog update * Fix mapping actions crashing on load (#20592) * Fix loading a map with a ThirstComponent crashing the game (#20594) * Fix electrocution displaying real name of disguised players (#20603) * Organ fixes (#20488) * Automatic changelog update * Kettle medical rework (#20435) * Initial try at medical rework for kettle * Re-add decal decorations to Kettle's medical * Add more lockers to kettle's med * Actually upload kettle's map, not its proto * Automatic changelog update * Added blocked visuals to volumetric pump (#20610) * Automatic changelog update * Move TimedDespawn to engine (#20515) * Update submodule to 163.0.0 (#20616) * Remove v0.1 version number from local main menu screen (#20617) * Remove cloneData parameter from AutoNetworkedField (#20596) * Update submodule to 164.0.0 (#20618) * fix cognizine ghost role (#20632) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Move ID layer one pixel to correct alignment (#20630) * Update nukie hardsuit descriptions (#20529) * Make holofans destructable (#20445) * Automatic changelog update * bowl is open (#20453) Co-authored-by: deltanedas <@deltanedas:kde.org> * Add TestPair.WaitCommand() (#20615) * Rename ThreatPrototype and mark fields as required (#20611) * Adjust hard bomb shape (#20608) * dragon refactor, objectives and use GenericAntag (#20201) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Added generic empty liquids tank (#20563) * Move view variables verb to the top of the list with no category and localize it (#20546) * saltern update (#20325) Co-authored-by: deltanedas <@deltanedas:kde.org> * Fix followers leaking (#20643) * Add Winter Boots (#20622) * add * fix prototype * Add QM mantle (#20621) * add * fix prototype * Automatic changelog update * Slime mobs breathe nitrogen and resprite their organs (#20577) * Slimes breathe nitrogen and resprite their organs * ups * mmm * Automatic changelog update * Fix the new lizard horn's consistency + issue (#20620) * fix * add * Revert "add" This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711. * Add RandomHumanoidAppearance component to for space ninjas (#20605) * Automatic changelog update * Space cat breathes space (#20550) * Space cat breathes space Made Space Cat lungs ROBUST * Made Space Cat's lungs ROBUST 2.0 * Automatic changelog update * Wide anomaly locator (#20581) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * add textures * fix encoding * fix 2 * Automatic changelog update * Fixed Telescopic Shield Lighting (#20650) * Fixed Telescopic Shield Lighting Bug fix #20199 * no need for these at all --------- Co-authored-by: Nemanja <[email protected]> * Automatic changelog update * Add a special hardsuit for nukie medic (#20471) * Automatic changelog update * Carry over other mutations when doing species mutation (#20551) * Automatic changelog update * Add Spanish accent to poncho and sombrero (#20377) --------- Co-authored-by: PJBot <[email protected]> Co-authored-by: Psychpsyo <[email protected]> Co-authored-by: deltanedas <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Nemanja <[email protected]> Co-authored-by: ravage <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: LEVELcat <[email protected]> Co-authored-by: Repo <[email protected]> Co-authored-by: nikthechampiongr <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Doru991 <[email protected]> Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: Skarletto <[email protected]> Co-authored-by: NULL882 <[email protected]> Co-authored-by: lunarcomets <[email protected]> Co-authored-by: Miro Kavaliou <[email protected]> Co-authored-by: Kara <[email protected]> Co-authored-by: Kacper Urbańczyk <[email protected]> Co-authored-by: TsjipTsjip <[email protected]> Co-authored-by: daerSeebaer <[email protected]> Co-authored-by: Fluffiest Floofers <[email protected]> Co-authored-by: Flareguy <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: Kevin Zheng <[email protected]> Co-authored-by: drteaspoon420 <[email protected]> Co-authored-by: Ubaser <[email protected]> Co-authored-by: Nim <[email protected]> Co-authored-by: Kacper Urbańczyk <[email protected]> Co-authored-by: Tox Cruize <[email protected]> Co-authored-by: Ed <[email protected]> Co-authored-by: Michael Cu <[email protected]>

* Head * change icon * Not necessary * Buh

Rebinds as /ghost instead

* Port all the things * Fix all the things * Bluespace doesn't exist apparently * Add missing lathe recipes * Not in this PR's scope * Not necessary for this

* Near-sighted trait from SIMPLE STATION 14 AKA PARKSTATION COMING NOW TO THE REBASE!!!! FUNNY CODE MADE BY DEATH (allegedly)[joke]{unless?} After i figure out what does a component not have a setter mean. * Aparently this was needed The trait doesnt appear in the traits so thats funny. * The - update Aparently its very important. --------- Signed-off-by: Colin-Tel <[email protected]> Co-authored-by: Colin-Tel <[email protected]>

* The book * locale the book. * uncomment mail about that book * imo useless trailing space * Add book to spawner * fix

* Kanabou * samurai crate

* Add holograms! * Updated localization files

* Reverse Engineering. It's engineering. It's reversed. I implemented Bluespace Crystals to get everything to work. I may have missed some recipes in the Lathes. Otherwise, everything seems like it just works. Blukie suits baby. * Fixing the Bonus mechanic out of testing. * Fixing Attributions. * Fixing Attributions again because it won't let me put in multiple links into one string. * Not dealing with Techfabs right now, integration tests will not pass with them. * Added appropriate comments --------- Co-authored-by: Colin-Tel <[email protected]>

Signed-off-by: Fluffiest Floofers <[email protected]>

bench time baby

b8b19f2

github-actions bot added Changes: Sprites Changes: YML Changes any yml files labels Oct 2, 2023

FluffiestFloof reviewed Oct 2, 2023

View reviewed changes

goodbye

119588c

DebugOk previously requested changes Oct 2, 2023

View reviewed changes

DEATHB4DEFEAT suggested changes Oct 2, 2023

View reviewed changes

rosieposieeee and others added 7 commits October 2, 2023 17:54

Update Resources/Textures/SimpleStation14/Structures/Furniture/Benche…

94f040d

…s/parkbench_bamboo.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

Update Resources/Textures/SimpleStation14/Structures/Furniture/Benche…

f274309

…s/parkbench_bamboo.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

Update Resources/Textures/SimpleStation14/Structures/Furniture/Benche…

d1d5cf1

…s/parkbench_wooden.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

Update Resources/Textures/SimpleStation14/Structures/Furniture/Benche…

cfe7ca0

…s/parkbench_wooden.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

Update Resources/Textures/SimpleStation14/Structures/Furniture/Benche…

a0d3596

…s/pews.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

Update Resources/Textures/SimpleStation14/Structures/Furniture/Benche…

dd09073

…s/sofa_corp.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

Update Resources/Textures/SimpleStation14/Structures/Furniture/Benche…

ecf963c

…s/steel_bench.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

rosieposieeee and others added 3 commits October 2, 2023 17:55

Update Resources/Textures/SimpleStation14/Structures/Furniture/Benche…

695fcc4

…s/steel_bench.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

Update Resources/Textures/SimpleStation14/Structures/Furniture/Benche…

fb243fe

…s/steel_bench_white.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

Update Resources/Textures/SimpleStation14/Structures/Furniture/Benche…

7d69a50

…s/steel_bench_white.rsi/meta.json Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: rosieposie <[email protected]>

rosieposieeee force-pushed the sofa branch from 1bae03b to 858ab04 Compare October 5, 2023 00:44

VMSolidus and others added 4 commits October 4, 2023 20:44

Vulpakin Rebalance (DeltaV-Station#69)

bec5290

* Branch contents * Update attributions.yml * Update speech_emote_sounds.yml

Automatic Changelog Update (DeltaV-Station#69)

c3a3039

Prevent natural existence of the vape (DeltaV-Station#79)

b1b5463

* prevent natural existence of the vape * nospawn the vape

Automatic Changelog Update (DeltaV-Station#79)

2582df0

github-actions and others added 24 commits October 4, 2023 20:44

Automatic Changelog Update (DeltaV-Station#80)

caa4dcc

hol (DeltaV-Station#95)

5b57032

Insulative Gear research and items (DeltaV-Station#93)

0b5a5fc

* Head * change icon * Not necessary * Buh

Automatic Changelog Update (DeltaV-Station#93)

9166c4c

Prevent /suicide (DeltaV-Station#84)

b8c6349

Rebinds as /ghost instead

.38 special and revolvers (DeltaV-Station#92)

c2ae9e7

* Port all the things * Fix all the things * Bluespace doesn't exist apparently * Add missing lathe recipes * Not in this PR's scope * Not necessary for this

Automatic Changelog Update (DeltaV-Station#92)

6dd6c76

Tips (DeltaV-Station#81)

eb6ef03

Automatic Changelog Update (DeltaV-Station#81)

da28ccd

Update changelog system (DeltaV-Station#75)

d984953

Nyanotrasen epistemic lore book (DeltaV-Station#82)

f737f56

* The book * locale the book. * uncomment mail about that book * imo useless trailing space * Add book to spawner * fix

Automatic Changelog Update (DeltaV-Station#82)

3b5dc7f

Kanabou + Samurai crate (DeltaV-Station#83)

304ede2

* Kanabou * samurai crate

Automatic Changelog Update (DeltaV-Station#83)

c07ede9

Add hologram shader (DeltaV-Station#68)

631eb18

* Add holograms! * Updated localization files

Automatic Changelog Update (DeltaV-Station#68)

f7bea3a

Martial Artist PDA (DeltaV-Station#89)

5ef18eb

Signed-off-by: Fluffiest Floofers <[email protected]>

Automatic Changelog Update (DeltaV-Station#89)

d8f0293

Bluespace is real (DeltaV-Station#96)

c1d551c

One book mail but three books (DeltaV-Station#97)

9a5b552

fix missing prototype (DeltaV-Station#98)

6d824b4

rosieposieeee force-pushed the sofa branch from 858ab04 to 6d824b4 Compare October 5, 2023 00:45

github-actions bot added Changes: Map Changes: UI and removed Changes: YML Changes any yml files labels Oct 5, 2023

rosieposieeee closed this Oct 5, 2023

rosieposieeee deleted the sofa branch February 7, 2024 03:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port Parkstation Benches #88

Port Parkstation Benches #88

rosieposieeee commented Oct 2, 2023

github-actions bot commented Oct 2, 2023 •

edited

Loading

FluffiestFloof Oct 2, 2023

rosieposieeee Oct 2, 2023

DebugOk left a comment

rosieposieeee commented Oct 2, 2023

DEATHB4DEFEAT commented Oct 2, 2023

DebugOk commented Oct 2, 2023

DEATHB4DEFEAT left a comment

DEATHB4DEFEAT commented Oct 2, 2023

DebugOk commented Oct 2, 2023

DEATHB4DEFEAT commented Oct 2, 2023

Port Parkstation Benches #88

Port Parkstation Benches #88

Conversation

rosieposieeee commented Oct 2, 2023

About the PR

Media

github-actions bot commented Oct 2, 2023 • edited Loading

FluffiestFloof Oct 2, 2023

Choose a reason for hiding this comment

rosieposieeee Oct 2, 2023

Choose a reason for hiding this comment

DebugOk left a comment

Choose a reason for hiding this comment

rosieposieeee commented Oct 2, 2023

DEATHB4DEFEAT commented Oct 2, 2023

DebugOk commented Oct 2, 2023

DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

DEATHB4DEFEAT commented Oct 2, 2023

DebugOk commented Oct 2, 2023

DEATHB4DEFEAT commented Oct 2, 2023

github-actions bot commented Oct 2, 2023 •

edited

Loading