Rebase Time #57
Open
Rebase Time #57
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 7759d404c64b2f0701893dea9535cf73f8dc1a9c)
Fix major skill issue/Incorrect stealth messages appearing on readmin. (cherry picked from commit df631ff8a07325a889b45235120eec60fe844233)
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. (cherry picked from commit aba16198f6846d880b3a1c233b5e9252d21e6985)
(cherry picked from commit daff65582dba2d305d1d2a4fd6a7f7b82250efbd)
g (cherry picked from commit 66e8e05c462a61b808c5e194798176936890ef4e)
* UpdateUshankaPrototype * UpdateUshankaPrototype (cherry picked from commit 8537e279e18b59080d5b86795fac71906534085f)
* make sure to keep late join button disabled if requirements not met * more succinct representation of condition (cherry picked from commit cfc0ecbf80ab497a01443aea354f4ac3dc205b58)
(cherry picked from commit 653d53db13ce07542ccc1e84701b776948b8e4ba)
* Send what seleted for secret to admin chat * add line * Add localization support (cherry picked from commit 69a15ada7f83cd7ad6010c7d6ac80ab7fc6b1e23)
(cherry picked from commit cdfa7c3c7031ac01dd6a1479b6df7abc9e435190)
* remove deprecated entity coordinate extension functions. Reduces warning count by approximately 50 * final toCoords Removed * Remove all unused variables and dead code paths * remove always true variable, should be a cvar or something instead * remove superfluous variables from tests (cherry picked from commit 59e46aab93ca38f8d57fcad4e3a2c893737d9ad4)
(cherry picked from commit 52ca0c2ec280cccae16118a10cc48d9605db7394)
Drops busname + attenuation. (cherry picked from commit a25801b35b6170ce7b371957ec97f9db516f1094)
(cherry picked from commit f008732a188d9d7a6f5605c79bc07e6fb01fa92d)
Added chemical reaction for making crystal shards (cherry picked from commit b0416372632d963338475c04d743b6916d4a1d61)
(cherry picked from commit d830922603646574dcee23f2ffe79f953f437276)
* Transform cleanups * Fix build * ascension (cherry picked from commit cdfee5aa0c95ea626271136b9e6ad78ad2000f49)
* Add auto-mode to reagent grinder * Remove redundant stuff with DataField * Use margin instead of dummy control * Resolve grinder component (cherry picked from commit a606909d30477453bc23765df4c78f04b2ead522)
(cherry picked from commit 12a384ff258a6690b532532f432258ce8e915897)
* 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]> (cherry picked from commit 06b14f30cd9267abcb135e6031a273905cf1ba40)
As the title says. (cherry picked from commit 19caf1d9d3b7c1ea51ea8ee4d891ce07742176b9)
… 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 (cherry picked from commit 4cd2fbd076ac09d93e5258bf2b822360c77d1ea1)
The rounding at 0,0 got memed. (cherry picked from commit 28d05feea729485e934b488b8508f8f1f0d546ee)
* combine same-tile explosions in the same tick * ! --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 355d00a0f2529a5beac6426837fad129d45a41a6)
(cherry picked from commit 3a3652a767106b3111f93a0a0d2964d5259c2491)
Fix atmos deserialization (cherry picked from commit 985c4b40163a71737d229aa1c4513a93da8a6d23)
This increases the probability for the following effects caused by Ion Storms: Chance to affect a Station Borg: 50% -> 80% Chance to replace a Law: 10% -> 20% Chance to remove a Law: 10% -> 20% Chance to shuffle Laws: 10% -> 20% (cherry picked from commit 649af483e486e99785e9a1517fa3263c0723034e)
(cherry picked from commit 86a24db72a2d8208b3e1152a6e03021e3a2fde5d)
(cherry picked from commit 2e9c8f691c6a1e5f8e45899866a9fe443f9f4b50)
(cherry picked from commit 72c6a14d593ea6eafc7477292657166968c75401)
* lighthouse mini fix * more fix# --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* dirty after calling SetAccesses * fix door access * D * pro ops * nukeop --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Update safe.yml Signed-off-by: Null <[email protected]> * Fix Indentation --------- Signed-off-by: Null <[email protected]>
* Makes asteroids better? * remove unfinished prototype * oops --------- Co-authored-by: Velcroboy <[email protected]>
* fix deltav door access * Rerun tests --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: Null <[email protected]>
initial commit - removed unsuls - fixed maints access at bridge entrance - added instruments to perma, books, altered visitation window - removed secglasses from ward & hos office since theyre roundstart anyway - removed the random spawn pill canisters because they can have ambuzol -_- - connected toilets in perma to disposals - perma windows made only reinforced glass since the damage from electrocution is changed - gave sec some labellers for evidence lockers; evidence lockers added just outside brig - door'd the entrance to sec so it was less wildly open every time the power went out; doors are now all lawyers also in the hall; gave them a generator - adjusted role numbers slightly (less interns, more even dept counts)
* Brings back the clown hardsuit. * Will this fix?
* Give lollipops and gumballs random flavors * RandomizedCandy: Fix borg lollipop action * RandomizedCandy: Play sound when candy is fabricated * RandomizedCandy: Lollipop can now be put in mouth * RandomizedCandy: Quieten fab sound * RandomizedCandy: merge icons and reexport without pHYs chunk should speed up downloading these textures on 9600 baud modems * RandomizedCandy: loads more flavors and update description * RandomizedCandy: Fix duplicate candyFlavor IDs * RandomizedCandy: Fix attrib and preserve flavor order * RandomizedCandy: init on MapInit instead of ComponentInit * RandomizedCandy: Fix minor code style issues, file placement * RandomizedCandy: put new code into DeltaV namespace * RandomizedCandy: Removed redundant datafield tags Signed-off-by: no <[email protected]> --------- Signed-off-by: no <[email protected]>
Plasma to Phoron rename.
|
idk why its duplicating history but whatever this is the best way apparently |
nearlyNonexistent
added
enhancement
|
Hey, do you have a Discord? :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
its rebase time