Upstream20241215 #236
Merged
Upstream20241215 #236
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
More device configurator invalid entity serialization fixes
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
* fractional weights dont work in StationEvents * force-int * sure why not, we can keep floats I guess.
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
* Fix name duplication * Apply requested changes
* Add a maintenance panel to bar signs * Update Resources/Locale/en-US/wires/wire-names.ftl * AI interactions --------- Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Derelictn'tn't Borg! * Clean *sparkles* * Removed "S: Awaiting Changes"
* Added evac shuttle and fixed various issues brought up during playtests * Updated Amber with playtest feedback, removed waste loop and firelocks from evac shuttle
* vox guidebook regen update * damage number * skreee
Update DungeonJob.PostGenBiome.cs
…lopers. (space-wizards#33715) Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Predicted gas pumps I wanted to try out atmos and first thing I found. * a * Remove details range
* 圣诞歌曲 * Update Resources/Audio/StationEvents/attributions.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Added more holiday decorations
* Adds in-hand sprites to the warden beret. * Adds in-hand sprites to the warden cap. * resprite in-hand sprites to the warden cap.
…olors for effects (space-wizards#33558) * Update APE guidebook * Lang error * Update Resources/ServerInfo/Guidebook/Science/APE.xml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/ServerInfo/Guidebook/Science/APE.xml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/ServerInfo/Guidebook/Science/APE.xml Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> * Update Resources/ServerInfo/Guidebook/Science/APE.xml Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> --------- Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
* adds in-hand sprites to the safari hat. * Update copyright wording * visual fix * Resprite in-hand sprites. * linting meta.json
* Add meat tag to Five Alarm Burger * Revert "Add meat tag to Five Alarm Burger" This reverts commit e483b5e. * Re-add tag, but in notepad * Move tag down to follow hierarchy --------- Co-authored-by: LevitatingTree <None>
* Initial Commit * Moved all this to SS14 on it's own * Added prototype validation
* secret stash wrench fix * fix * cleanup --------- Co-authored-by: YourUsername <you@example.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Fixed various issued identified during playtests. * Fixed a firelock stuck closed * Added more cameras and moved others * Fixed an issue with disposals * Modified the map a bit after watching some matches and listening to feedback * Reworked sec some more. Moved perma out into its own separate ship (another design from Frontier) Also performed various improvements to the station. * Added final touches, ready to PR
* radio * color 2 * console-announcement * 5ed7aa
KeldWolf
requested review from
spanky-spanky,
DieselMohawk and
FluffMe
as code owners
github-actions
bot
added
S: Needs Review
|
RSI Diff Bot; head commit a41b1cb merging into 92eebd1 Resources/Textures/Clothing/Head/Hats/beret_warden.rsi
Resources/Textures/Clothing/Head/Hats/safarihat.rsi
Resources/Textures/Clothing/Head/Hats/warden.rsi
Resources/Textures/Mobs/Silicon/chassis.rsi
Resources/Textures/Objects/Devices/gates.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.
Routine Upstream merge for December 15, 2024