Merge Stable 7/1/25 #532
Merged
Merge Stable 7/1/25 #532
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
I love holopads
fix atmos setup
* waow * nice suggestion * nullable sound * fix stuff --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Still isn't really suitable to just map but at least it doesn't outright NRE anymore. Alternative to #34032
* Added a check for if the entity trying to drink is a borg. * Fixed missing namespace issue. * Improved code conciseness. * Removed borg chassis check, added stomach check. * Removed unused namespace --------- Co-authored-by: dankeaj <andrewjdanke@gmail.com>
* Removed protolathe from cargo on Amber * Removed protolathe from cargo on Cog * Revert "Removed protolathe from cargo on Amber" This reverts commit 422db6e34a54c9256e3e1aad2098b64ff4cf0f96. revert commit that should have been done on another branch
… chapelroid (#34044) Increases Marathon cryosleep size, added meteor shielding to chapelroid Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
…r devices (#34046) Adds more air alarms and sensors throughout Oasis Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
* loadouts update * Update loadout_groups.yml * darts to candles * Update Resources/Prototypes/Loadouts/dummy_entities.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Add myself to CODEOWNERS Basically just added myself where Nik was since I am also doing headmin things.
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* Allow to paint multiple airlocks * oh right
* Link Core cargo shuttle atmos devices * Remove configurator lines This matches what the DeviceNetworks in core.yml look like now. Hopefully it works?
* bagel update * fixgridatmos * fdsafds
* many changes * contentingregrationtests * serialized invalid removed * blank * "Changes and fixes as suggested" * blank * blank * added desk bells * engi rework rework rework * added gate to content integration * tweaks * aaa * bbb * added holopads * ccc * Update default.yml * hotfix * aaa * bbb * many many tweaks and fixes * aaa --------- Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Added Devicenetwork component to ensure the screens work
* Ensure Arrivals Blacklist in Bluespace Locker rule * While I'm at it, stop the QSI too * fix thing I broke somehow * Every bluespace locker arrivals blacklisted * Add ArrivalsBlacklist to the prototypes too
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit 9857ccd merging into f59adfb Resources/Textures/Effects/fire_greyscale.rsi
Resources/Textures/Objects/Specific/Medical/defib.rsi
Resources/Textures/Structures/Piping/disposal.rsi
Resources/Textures/Mobs/Customization/human_hair.rsi
Resources/Textures/Mobs/Pets/Smile/smile_displacement.rsi
Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi
Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi
Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi
Resources/Textures/Objects/Consumable/Food/ingredients.rsi
Resources/Textures/Objects/Misc/candles.rsi
Resources/Textures/Objects/Misc/module.rsi
|
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.