Upstream sync #524
Merged
Upstream sync #524
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
* Backpacks * move to wearables * Update Resources/Prototypes/Catalog/uplink_catalog.yml * Update Resources/Prototypes/Entities/Clothing/Back/backpacks.yml --------- Co-authored-by: metalgearsloth <[email protected]>
* rework * update logic
* Kill the static InRangeUnOccluded * Adjusted 4 more EntitySystems that were missed.
# Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
Co-authored-by: poeMota <[email protected]>
* Added 18 new bounties + tags, couple of balance tweaks * Oops, 2 corn tags. * Fixed another duplicate from merge conflict * Fixed all arbitrage issues * Removed metamorphic glass/manly dorf bounty * Removed manly dorf bounty * Removed manly dorf bounty * Removed manly dorf bounty * Changed hiviz tag, removed commented out bounty * Removed extra line * Change HiViz tag * Removed unused tag * Removed LaceupShoes, changed HiViz * Changed flavor text for fruit bounty * Removed live mouse bounty
Use Log with generated sawmill name rather than explicitly named one for all non rule-based Content EntitySystems.
* ю * Fences * bench, stairs and fence shadow * small gate desc * empty * empty * destructible * price fix
The math for our pressure damage (barotrauma) system is directly taken from TG. The constants are the same and the math is almost the same. However there are two errors. 1. Pressure damage started being applied within the WARNING bounds, rather than the HAZARD bounds. This means you started taking low pressure damage at 50 kPa instead of the intended 20 kPa, and also the HUD icon didn't show "danger" like it should even if you were already taking damage. 2. The calculations for high pressure damage were wrong. These are supposed to be linearly scaled, but the function was wrong so the scaling didn't actually work properly (especially when considering the fixed bounds above). This appears to be the case because the function was taken from an incorrect comment in the original source, rather than the real math. Both of these issues are now fixed to match the TG behavior. Note that this somewhat nerfs pressure damage in non-extreme circumstances. e.g. a room at 40 kPa now gives NO pressure damage, whereas previously it would do full space damage. The description of the pressure alerts is wrong for "low" severity, but I can't be arsed to fix that right now. Alerts don't have a way to change the description depending on severity...
If a room's pressure drops it can become unbreathable long before people start taking pressure damage, and so also long before the air alarm starts reporting a danger state. I've increased the values so that the air alarm should show danger if the pressure becomes so low as to be unbreathable.
Price 8-6 TC
SS13 Criminal Record Icon Location REAL Adds a new Offset DataField to the StatusIcon Prototype. It effects status icon location on a per-pixel level. Not sure what else it could be used for, but hey, nothing wrong with generalizing. Also moves the mindshield icon priority to one, to fix an unreported bug with them covering non-job icons.
suit slot my beloved Co-authored-by: vanx <#vanxxxx>
* a * review * g
* reach update * fixgridatmos * invalid link error * move arrivals to the side * who are we if we just get squashmerged anyway * chocolate machine
* move faction prototype to shared * move faction exception and member stuff to shared * fix breaking changes for random stuff * move pettable friend stuff to shared * mostly fix * final fixy * dragonops * final fixy II * use querys and fix warpspeed fish (probably) * fixer * Rrrr! --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <[email protected]>
* Add reckless replay load button * A * More descriptive button
Fix borg chargers not working
* Improvements to the medical hud interface * Adds an icon for SSD players * Indentation fix * Update sprites, changes direction and adds new status icon. * Adds decomposing icon * Code cleaning * Changes Crit Icon sprite * Simplifies the decision structure * Changes copyright line * Changes Critical Icon sprite * Makes the Critical Icon border darker * Changes sprites to /tg/ station * Updates copyright * Makes Dead Icon animation slight faster * Code cleaning * Remove some unused imports * Code cleaning and rename icon * Minor code cleaning
* Create lone ops outfit and 60 TC radio * Changed lone op entity to use the new loneop outfit prototype * Fix shop --------- Co-authored-by: Plykiya <[email protected]>
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.
Восстановление удалённого pull request