Upstream sync #536
Merged
Upstream sync #536
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
* Check for CRLF in actions workflow Make emisse weep * Copy paste bottom text * I would like to thank StackOverflow for this spite PR. * Mention file name in message because the workflow tab doesn't display it. * dos2unix everything
* Removed Cannabis from thief objectives * Removed the steal group and from cannabis prototypes
Update borg_modules.yml Changes basic welder in borg tool module to industrial welder
* Adds variations to immovable rod * slash oopsie * Changed prototypes from being hardcoded to being defined in the rules component * Changed from 10% chance to 5% * Changes based on feedback * Fix nullable error * Moved randomized logic to .yaml. Probabilities of alternate rods add up to 5%.
Fixed some icon warnings Co-authored-by: wrexbe <[email protected]>
Fix name of "Close PRs on master" workflow
Don't crash if an invalid value is given.
Adds versions of the holoprojectors (janitoral, fan, and field) that start without a battery and changes the lathe recipe to use these instead. This is consistant with flashlights, which when made do not start with a cell. Also it's a bit silly to have cargo printing a bunch of these to sell.
It's missing the tag that's needed for it to go back in the glass storage box.
…ities to act as jammers (#26342) * Add DeviceNetworkJammerComponent & System Allows for entities to "jam" DeviceNetwork packets. Whenever a device attempts to send a packet, the DeviceNetworkJammerSystem listens for the BeforePacketSentEvent. From there if any entity with the jammer component is within range of either the sender or receiver of the packet the event will be cancelled. Additionally jammers can only block packets in certain networks. If a packet is not being transmitted in one of the networks it can block then even if the jammer is in range the event will not be cancelled. The range is stored in the jammer component along with the networks it can jam. Jammable network ids are stored as strings which seems to be how custom networks are stored (E.g. network ids for suit sensors). To allow for all of this, the BeforePacketSentEvent was modified to provide the NetworkId. * Make JammerSystem for the radio jammer use the DeviceNetworkJammer. Remove redundant event. * Replace calls to TryDistance with InRange
Updated calls to SharedPhysicsSystem methods
* Cleaner Grenade Added Cleaner Grenade * Sprite update Draw issue moment * Removed from jani closet | added box of cleanades
* Wearable Instrument Base + Changed harmonica base Created the BaseWornInstrument base and updated the Harmonica to use it, being equipable in the neck slot. * Update instruments_wind.yml * compositions are cool and awesome
* Fix mailing units turning into disposal units while recharging. The states were hardcoded. * Fix error handling * Make default states constants
* nerf ninja steal objective * fubar
… containers (#26430) * Reduces size of smaller cartons * Fix trash bottles/cartons --------- Co-authored-by: Velcroboy <[email protected]>
* Fix atmos NAN error * Remove redundant yaml entries
* Update furniture.yml * Update curtains.yml * Update Resources/Prototypes/Entities/Structures/Decoration/curtains.yml Co-authored-by: Tayrtahn <[email protected]> --------- Co-authored-by: Futuristic-OK <[email protected]> Co-authored-by: Tayrtahn <[email protected]>
* Check for CRLF in actions workflow Make emisse weep * Copy paste bottom text * I would like to thank StackOverflow for this spite PR. * Mention file name in message because the workflow tab doesn't display it. * dos2unix everything
* Fix cuffs breaking after they stop being pulled * Do proper interaction check for UncuffAttempt * Minor cleanup Take as much out as possible from _net.IsServer() if blocks. Misc cleanup
Co-authored-by: lapatison <[email protected]>
Co-authored-by: lzk <[email protected]> Co-authored-by: lapatison <[email protected]>
Co-authored-by: lzk <[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.
No description provided.