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.

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

Catch-Up Cherry Pick 1 #540

Merged
merged 252 commits into from
Jul 20, 2024

Conversation

DEATHB4DEFEAT
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT commented Jul 12, 2024

Description

I went from the next commit after the latest mirror to before 2db374988c.


TODO

  • Figure out how to live update the editor dummy
  • Stop editor sliders lagging a ton
  • Fix runtime errors or whatever
  • Do some playtesting, see what happens
  • Pick more PRs

Changelog

🆑

  • add: Merged ~250-500 WizDen PRs

ElectroJr and others added 30 commits July 11, 2024 19:40
As far as I know, the Box of Hugs only spawns on the clown and is used in the construction of a honkbot such that if the clown decided earlier to craft a honkbot or if the low price of some 3000 spesos is insufficient this bounty is impossible. Similarly, Donk Pockets are not a renewable resource and it has happened that a station has eaten too many for the bounty to be completed only to get it in rotation and esssentially lose a bounty slot forever. I would like it if each bounty was at least theoretically possible on any station it's likely to occur in, and there are too many where there aren't enough of these obtainable to complete the bounty, which is no fun.
* 2-digit nodes

* 3-digits instead

* Fix exclusive bounds
Add trace to action error logs
* When another player late joins it will correctly update the UI locally

* Resolve passengers not displaying the correct message in late join

* Improve final boolean comparison of button disabled state to be a bit neater
* Remove HasAtmosphereMethodEvent

* Remove GetTileMixturesMethodEvent

* Remove GetTileMixtureMethodEvent

* Remove GetAdjacentTilesMethodEvent

* Add TileMixtureEnumerator

* Remove GetAdjacentTileMixturesMethodEvent

* Remove IsTileSpaceMethodEvent

* Remove HotspotExposeMethodEvent

* Remove pipe net method events

* Remove device method events

* Use Entity<T>

* Misc fixes

* A

* Theres probably a few more of these

* Fix other resolve errors
* Minor ItemToggleSystem tweaks

* Update visuals on startup

* Remove SetIgnited

* Misc toggle fixes

* Update ItemToggleHotComponent.cs
* Ported over code for delta-v to fix bounties

* Added requested changes

* Removed the station arg from "IsBountyComplete". It is unneeded and all calls just use a null value for it anyways
* Removed inconsistent broadcast cooldown whenever the "Announce" button is pressed on the communications terminal.

* Revert "Removed inconsistent broadcast cooldown whenever the "Announce" button is pressed on the communications terminal."

This reverts commit c730d6499b6908f6ae7c52e21d5338fa3b7eb80e.

* Reapply "Removed inconsistent broadcast cooldown whenever the "Announce" button is pressed on the communications terminal."

This reverts commit 3c2d66af865a11ca55eb0e98db58a955c0d70c00.

* -Removed cooldown entirely
Add DoorBumpOpener to space dragon.yml
* use nav beacon locations for announcements

* :thumbs_up:
* Give 'em something to talk about

* Wire panel visuals

* Wire graphics tweak

* More ads and thanks

* More ads for a noisy arcade

* New screen for space villain machines

* Implement EmitSoundIntervalComponent and a bunch of arcade noises

* Require power for sounds

* Allow earlier startup intervals

* Orange glow

* Audio attributions

* Include the PR link

* Replace EmitSoundInterval with expanded SpamEmitSound

* Remove pacman-themed arcade sounds

* Documentation good.

* Updated methods to use Entity<T>

* Refactored SpamEmitSound to get rid of accumulator and chance.

* Fixed prewarm logic

* Moved stuff to Shared

* Fix outdated YAML

* Better prediction, auto pause handling

* Make enable/disable reset the timer instead of trying to save it.
* add SaveItemLocation keybind

* make item direction public to avoid having to change between Angle for no reason

* add item location saving

* show

* Added a better save keybind, made it draw saved positions, and trying to save in a position it has already been saved in removes that position.

* w

* code style

* Make taken spots appear blue

* style

* !

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: notquitehadouken <[email protected]>
Co-authored-by: I.K <[email protected]>
* dynamic alert sprite

* fix fat cooldowns
* add Name field to SpeechVerbPrototype

* extra locale for voice mask ui

* SpeechVerb ui and handling

* raaaaaaaaa

* reeeeeeeeal

Co-authored-by: Tayrtahn <[email protected]>

* fix sort

* did you hear john syndicate died of ligma

* Update Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Tayrtahn <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
* Separated "thank you" messages from general ads

* Moved MessagePackPrototype to shared, cleaned up AdvertiseComponent, and actually killed AdvertisementsPackPrototype.
+More suggests changes.

* Rename PackPrototypeID to Pack in both components.
* Fix master

* this

* messages

* Fix missing verb name parrot

* Fix messagePack for blockgame and spacevillain

---------

Co-authored-by: ShadowCommander <[email protected]>
Fix major skill issue/Incorrect stealth messages appearing on readmin.
Makes electrocution damage based on the voltage of the wire and bring down the damage to a sane level. It's no longer primarily based on the power being received.

LV Cable -> 10 damage
MV Cable -> 20 damage
HV Cable -> 30 damage

Having a primarily power-based damage system causes there to be massive fluctuations in damage based on things outside of a regular player's control, like the station power output. This removes a lot of player agency and turns grilles into a risky gamble where they can either do no damage or instantly fry the player due to simply being hooked up to the engine.

While this may be a more accurate simulation in some regards, the reality of the gameplay is that it's often just frustrating, resulting in constant death traps as players brushing against electrified grilles and punching wires take absurd amounts of damage. By making them flat rates, it's possible to actually balance the damage output.
* UpdateUshankaPrototype

* UpdateUshankaPrototype
* make sure to keep late join button disabled if requirements not met

* more succinct representation of condition
* Send what seleted for secret to admin chat

* add line

* Add localization support
Added chemical reaction for making crystal shards
* Add auto-mode to reagent grinder

* Remove redundant stuff with DataField

* Use margin instead of dummy control

* Resolve grinder component
* polymorph changes

Adds poly proto ids to polymorph action event and checks for proto id when performing

* nullable proto id

* Replaces instances of Polymorph prototype with a proto id and tryindex

* birdup

---------

Co-authored-by: metalgearsloth <[email protected]>
… shared (#25813)

* Moved abstract spill methods to shared; added prediction to spill container verb.

* Rerun tests

* Requested changes

* Note Client behavior in Spill method docs
@DEATHB4DEFEAT
Copy link
Member Author

I summon Solidus to fix the last few random lil errors for me.

@DEATHB4DEFEAT DEATHB4DEFEAT marked this pull request as ready for review July 18, 2024 07:27
DEATHB4DEFEAT and others added 4 commits July 18, 2024 00:28
This was removed in #25280 as the relevant DB entities didn't go outside the DB layer anymore. SS14.Admin however still uses them directly (as it only supports Postgres), so the interface is still useful there.
Copy link
Contributor

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

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 18, 2024
@DEATHB4DEFEAT

This comment was marked as spam.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 19, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT removed the Status: Needs Cleanup Someone has to clean this before merging label Jul 20, 2024
Update coats.yml

Update books.yml

Hack solution for missing sprite

Fix more missing items

Cherrypick a force merge

Fix brig access

Revert "Cherrypick a force merge"

This reverts commit f2c9c57.

GUH

Fix more errors

Update lighthouse.yml

Update lighthouse.yml

Fix tests

Test Moment

fix character editor

remove hyperlink books
Copy link
Contributor

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

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 20, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT merged commit 3c56706 into Simple-Station:master Jul 20, 2024
12 checks passed
@DEATHB4DEFEAT DEATHB4DEFEAT deleted the wizden-mass-pick-1 branch July 20, 2024 05:24
SimpleStation14 added a commit that referenced this pull request Jul 20, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT removed the Status: Do Not Merge Do not merge label Jul 20, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT mentioned this pull request Sep 21, 2024
5 tasks
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Sep 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Config Changes any configuration files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Priority: 2-High Needs to be resolved as soon as possible Size: 1-Very Large For especially large issues/PRs Status: Needs Review Someone please review this Type: Codebase An issue with the codebase Type: Feature Creation of or significant changes to a feature Type: Port Brings something to here from another codebase
Projects
None yet
Development

Successfully merging this pull request may close these issues.