Stable Merge 1/19/25 #274
Merged
Stable Merge 1/19/25 #274
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
* Modified science spawners a bit since I realized including maints loot was undesireable * Linked Medical doors to buttons, redesigned the floor of the dining area a bit, placed more science spawners * Somehow I overlooked that I was importing the maints loot table instead of the sci loot table * Gave sci an EOD closet * named the evac shuttle
* named apcs, doors, air alarms, cameras, fire alarms, substations, SMESs * updated PostMapInitTest.cs to include Cell * added psychologist spawn * fixed scanner console link, fixed disposals conveyors, and more * added janitor service lights, maints firelocks, and more * added more fun maint rooms * improved head offices, kitchen, psych. added maints between science and arrivals * fixed spawners placed over solid objects * added unique evac shuttle, the Cilium * evac shuttle is now orientated correctly * added unique cargo shuttle * updated kitchen area * renamed Cell Station to Elkridge Depot, removed most main hall airlocks for smoother travel * general last-minute touch-ups around the bridge and sec * changed station name in PostMapInitTest.cs
* named apcs, doors, air alarms, cameras, fire alarms, substations, SMESs * updated PostMapInitTest.cs to include Cell * added psychologist spawn * fixed scanner console link, fixed disposals conveyors, and more * added janitor service lights, maints firelocks, and more * added more fun maint rooms * improved head offices, kitchen, psych. added maints between science and arrivals * fixed spawners placed over solid objects * added unique evac shuttle, the Cilium * evac shuttle is now orientated correctly * added unique cargo shuttle * updated kitchen area * renamed Cell Station to Elkridge Depot, removed most main hall airlocks for smoother travel * general last-minute touch-ups around the bridge and sec * changed station name in PostMapInitTest.cs * added Elkridge to default map pool * added myself to map_attribution.yml credits
Packed Update (decals mostly)
Co-authored-by: PJBot <[email protected]>
* fix rainbow plushie inhands * address requested changes * attribute sprites
* refactor wieldable events * fix inconsitency with wielding and use updated events * wieldable cosmetic refactoring * Update Content.Shared/Wieldable/Events.cs Co-authored-by: Centronias <[email protected]> * real Co-authored-by: ScarKy0 <[email protected]> --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: Centronias <[email protected]> Co-authored-by: ScarKy0 <[email protected]>
* lobby name cvar * panel width * skrek * server name localization fix * comment format fix Co-authored-by: Thomas <[email protected]> * remove redundant newline Co-authored-by: Thomas <[email protected]> * string.empty Co-authored-by: Thomas <[email protected]> * use SetWidth * Update Resources/Locale/en-US/lobby/lobby-gui.ftl --------- Co-authored-by: Thomas <[email protected]> Co-authored-by: slarticodefast <[email protected]>
Adds collision with bullets to lights
santa is keel.
* Moved the stand clear decal in front of the janitor's shutters up two pixels * added tech maints under most maints doors, fixed power issues in cargo, and fixed a couple minor issues
* Remove kessler, zombeteors gameodes * Probably should keep the protos in case an admin wants to torture players secretly * address slart review
* Added distinct ad and bye chatter to Dr. Gibb vending * Correcting revert mistake * Changed ad pack names to better match naming convention
* Special reagents now appear in the guidebook * Improved guidebook wording for reagent category
Required for space-wizards/RobustToolbox#5590 to not cause compile fails, but can be merged on its own
Fix chameleon PDA
Co-authored-by: dffdff2423 <[email protected]>
github-actions
bot
added
S: Untriaged
S: Needs Review
size/M
Changes: Map
PursuitInAshes
force-pushed
the
Stable-Merge
branch
from
316d9a5 to
64d603b
Compare
|
IPIntel CCVars are set correctly. DNM until the related privacy policy update can be pushed. |
|
Privacy policy update has been merged into Sector-Umbra/sector-umbra.net . |
TsjipTsjip
approved these changes
Jan 23, 2025
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.
About the PR
Merge wizden stable to 1/19/25.
Merge the following CD PRs:
cosmatic-drift-14/cosmatic-drift#533
cosmatic-drift-14/cosmatic-drift#534
cosmatic-drift-14/cosmatic-drift#512
cosmatic-drift-14/cosmatic-drift#536
Before Merging:
Test Paper Signing (And Paper Adjacent Activities)
Make Tsjip rerun that DB query before merging so we can notify vox players of changes.
Announce with the development ping (and @ ing the players who play vox, the list retreived from the above step) that the vox color values will be changing and to physically screenshot your vox's colors if you don't remember them.
Changelog
Upstream has been merged to 1/19/25. This includes CD PRs unrestricting vox colors, adding a broken down salvage shuttle, and tape recorders.