Upstream sync #579
Merged
Upstream sync #579
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
Co-authored-by: poeMota <[email protected]>
Co-authored-by: lapatison <[email protected]>
Co-authored-by: lzk <[email protected]>
fix_slime_storage
Vitals now functions correctly
* Increase availibility of combat knives to security * whitelisted combatknife in secbelt for Diona * Revert SecDrobe change for MGS
* lower max firestacks to 10, refactor flammable * fix * uncap fire stack damage, lower fire stack damage
* Maints Exit Sign * change description * id, sprites changed from maints to exit prototype now has an unshaded layer so it can be seen in the dark.
add emitter crates back to cargo + changes the contents of an emittercrate from emitter to emitterflatpack :+1:
* fix cargo teleporter * don't delete orders * basado
Revert "Maints Exit Sign (#26831)" This reverts commit 9051020.
Make do-afters belonging to other players shaded Co-authored-by: Plykiya <[email protected]>
* Add NukeOps Test * Update EvacShuttleTest to also check mapinit * Update RuleMaxTimeRestartTest * Fix cvar cleanup * A * Revert some changes * comments * Add MappingTests * Finally fix the test * A
* Properly network ClumsyComponent * Fix being able to climb and bonk at the same time. Also properly subscribe to AttemptClimbEvent by-ref. * Update Content.Shared/Interaction/Components/ClumsyComponent.cs
therearetwowaystodothis
* Add Truncheon to Secbelt Whitelist * Update belts.yml * Added Truncehon Tag in Tags.yml * Update security.yml * Update security.yml
* Always display item status panel fully Initial feedback from the UI changes seems to be that a lot of people go "why is there empty space" so let's fix that. * Fix item status middle hand being on the wrong side I think I switched this around when fixing the left/right being inverted in the UI code. * Minor status panel UI tweaks Bottom-align contents now that the panel itself doesn't dynamically expand, prevent weird gaps. Clip contents for panel * Fix clipping on implanters and network configurators. Made them take less space. For implanters the name has to be cut off, which I did by adding a new ClipControl to achieve that in rich text. * Update visibility of item status panels based on whether you have hands at all. This avoids UI for borgs looking silly. Added a new "HandUILocation" enum that doesn't have middle hands to avoid confusion in UI code. * Use BulletRender for laser guns too. Provides all the benefits like fixing layout overflow and allowing multi-line stuff. Looks great now. This involved generalizing BulletRender a bit so it can be used for not-just-bullets. * Fix geiger word wrapping if you're really fucked
* Content changes & tests for engine prototype validation PR * A
saltern stool Co-authored-by: deltanedas <@deltanedas:kde.org>
add the trash bag puts the trash bag in the advanced cleaning module
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.
No description provided.