Upstream sync #1875
Merged
Upstream sync #1875
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
Added a period to an object description. Adds a period to silk's description. This is my first and last pull request.
I'm so dumb. Co-authored-by: Plykiya <[email protected]>
* Lowered reoccurencedelay to 45 * Lowered Further down to 20
Added a recipe for crafting menu
* Tipped .35 ammo * used layers instead of new sprites * remove the useless old sprites * changed the green slightly
Add minitile and brick decals overlay
* add * Update Resources/Textures/Parallaxes/attributions.yml * sprite change * address review --------- Co-authored-by: metalgearsloth <[email protected]>
Trolley
…141) Added display for amount of hits left in stun batons/stunprods. Co-authored-by: Plykiya <[email protected]>
* gastankening * fix price
Initial commit
* make door status use SendSignal * LastSignals and logic, add ClearSignal api too * make everything outputting a logic signal default to false * refactor ops **
Resolves issue #23059, for which the submitter wrote: Emergency toolboxes contain a crowbar, two flashlights (sometimes one), two breath masks, and two chocolate. With the addition of water bottles to survival boxes and emergency nitrogen tanks, I think emergency toolboxes should be updated to include said water bottles and emergency tanks. Would make these just a little bit more useful. It feels weird they don't have oxygen tanks when they have two breath masks, and since water bottles are now commonplace it would be a good idea to put them in a place where emergency food is stored as well.
…5162) This makes the life of forks slightly easier by letting you pass an environment variable instead of having to maintain this file yourself.
* Balancing my beloved Significantly nerfs deathnettles so botanists can't just take down jug's like it's no issue, we have guns, we should be using them * Additional Balancing Changes. * Losing my mind
Hops will love me
* Initial commit * Moved params to sound * Removed type tag * Removed null check * Forced default
* added books to roles * First pass * removed yaml to split pull requests into resprite first, then giving the books to assistants * new science
* LockVisualizer * Fix state * Clean some code * Make it component, fix tests fail * Fix for StateUnlocked Now it is possible to manually set the unlocked state and it will work! * Optimize LockVisualizer, add check for unlocked state * No todo I guess
* Add test for two chemistry issues 1. rounding issue with reaction processing when making chloral hydrate 2. reliable assert trip due to the ValidateSolution() heat capacity issue. * Fix FixedPoint2 arithmetic Fix internal floating point arithmetic in places where it could be avoided. Fix incorrect rounding mode used in other places (it should always floor, like regular int arithmetic). I had to add an explicit epsilon value for float -> FixedPoint2 because something like 1.05 is actually like 1.04999 and that'd cause it to be rounded down to 1.04. This fixes reaction reagent processing in cases where the reagent inputs can't cleanly divide. Previously, when making 30u chloral hydrate by adding the chlorine in 10u increments you'd end up with 0.04 chlorine left over. This was caused by division in the reaction code rounding up in some cases. Changing division here to always round down fixes it. * Attempt to fix heat capacity precision assert issues. Fixes #22126 First, we just increase the tolerance of the assert. It was way too low. Second, actually put a cap on float drift from one-off _heatCapacity changes. * Fix float -> FixedPoint2 epsilon for negative number, fix tests. * Fix DamageableTest * Oh yeah I need to call CleanReturnAsync
* Allow webp in lobby background files * Make lobby art webp images Reduces folder from 10 MB to 2.5 MB without only slight quality loss. * Update PutLobbyScreensHere.txt
* add * replace image with webp version waiting on #25184
* Porting & implementation * Fix two stupid errors * Human not humans * fix audio path * Fix test fails & update cooldown * Work on reviews & test fail * Rework nymph organ system. * Make the nymph organs nospawn. * IsDeadIC
Make seeds from clipped plants inherit the decreased health from parents. Also require one growth stage before clipping.
# Conflicts: # Content.Server/Administration/Systems/AdminSystem.cs # Resources/Locale/en-US/chat/sanitizer-replacements.ftl # Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
github-actions
bot
added
Status: Needs Review
lapatison
added a commit
to lapatison/locale-station-14
that referenced
this pull request
Feb 18, 2024
Morb0
pushed a commit
that referenced
this pull request
Feb 18, 2024
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.
Описание PR
Медиа
Проверки
Изменения