Upstream sync #1003
Merged
Upstream sync #1003
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
* 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
* hotfix meta power * fixed AME * add missing cargo shuttle pilot console to cargo
* Update vessel_warning.ogg Remove DC offset and apply short fade out. * Update attributions.yml * Update attributions.yml
* No more Ai Spacing * Move guard into earlier guard statement
Arachnid stomach yaml fix Arachnids had their stomach `updateInterval` set to 1.5, 50% slower than normal. But this doesn't actually slow down the speed that the stomach digests things, only the rate at which it updates to check if enough time has passed. (See https://github.com/space-wizards/space-station-14/blob/23f0b304f284d2600cb2c6b4c9d36fdca7f99ec4/Content.Server/Body/Systems/StomachSystem.cs#L57 ) This PR changes arachnid stomachs to have a `digestionDelay` of 30 (20 is default) to achive the desired effect. Stasis beds are also bugged in a similar manner. They are intended to slow down the digestion speed, but similarly all they do is change the update rate. But fixing that requires actual code changes and is out of scope for this commit.
* mindcomponent namespace * wip MindRole stuff * admin player tab * mindroletype comment * mindRolePrototype redesign * broken param * wip RoleType implementation * basic role type switching for antags * traitor fix * fix AdminPanel update * the renameningTM * cleanup * feature uncreeping * roletypes on mind roles * update MindComponent.RoleType when MindRoles change * ghostrole configuration * ghostrole config improvements * live update of roleType on the character window * logging stuff and notes * remove thing no one asked for * weh * Mind Role Entities wip * headrev count fix * silicon stuff, cleanup * exclusive antag config, cleanup * jobroleadd overwerite * logging stuff * MindHasRole cleanup, admin log stuff * last second cleanup * ocd * move roletypeprototype to its own file, minor note stuff * remove Roletype.Created * log stuff * roletype setup for ghostroles and autotraitor reinforcements * ghostrole type configs * adjustable admin overlay * cleanup * fix this in its own PR * silicon antagonist * borg stuff * mmi roletype handling * spawnable borg roletype handling * weh * ghost role cleanup * weh * RoleEvent update * polish * log stuff * admin overlay config * ghostrolecomponent cleanup * weh * admin overlay code cleanup * minor cleanup * Obsolete MindRoleAddedEvent * comment * minor code cleanup * MindOnDoGreeting fix * Role update message * fix duplicate job greeting for cyborgs * fix emag job message dupe * nicer-looking role type update * crew aligned * syndicate assault borg role fix * fix test fail * fix a merge mistake * fix LoneOp role type * Update Content.Client/Administration/AdminNameOverlay.cs Co-authored-by: slarticodefast <[email protected]> * Update Content.Shared/Roles/SharedRoleSystem.cs Co-authored-by: slarticodefast <[email protected]> * comment formatting Co-authored-by: slarticodefast <[email protected]> * change logging category Co-authored-by: slarticodefast <[email protected]> * fix a space Co-authored-by: slarticodefast <[email protected]> * use MindAddRoles Co-authored-by: slarticodefast <[email protected]> * get MindComponent from TryGetMind Co-authored-by: slarticodefast <[email protected]> * move var declaration outside loop * remove TryComp * take RoleEnum behind the barn * don't use ensurecomp unnecessarily * cvar comments * toggleableghostrolecomponent documentation * skrek * use EntProtoId * mindrole config * merge baserolecomponent into basemindrolecomponent * ai and borg silicon role tweaks * formatting Co-authored-by: slarticodefast <[email protected]> * I will end you (the color) Co-authored-by: slarticodefast <[email protected]> * use LocId type for a locale id * update RoleEvent documentation * update RoleEvent documentation * remove obsolete MindRoleAddedEvent * refine MindRolesUpdate() * use dependency Co-authored-by: slarticodefast <[email protected]> * inject dependency Co-authored-by: slarticodefast <[email protected]> * roleType.Name no longer required * reformatted draw code logic * GhostRoleMarkerRoleComponent comment * minor SharedRoleSystem cleanup * StartingMindRoleComponent, unhardcode roundstart silicon * Update Content.Shared/Roles/SharedRoleSystem.cs * remove a whitespace --------- Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: PJBot <[email protected]>
* updates decals * more decal work, more dinginess in certain areas * added decals under doors
|
Important Review skippedMore than 25% of the files skipped due to max files limit. The review is being skipped to prevent a low-quality review. 124 files out of 210 files are above the max files limit of 75. Please upgrade to Pro plan to get higher limits. You can disable this status message by setting the Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
github-actions
bot
added
S: Untriaged
size/M
Changes: Sprites
|
RSI Diff Bot; head commit 8c98985 merging into 74d02f2 Resources/Textures/Structures/Wallmounts/posters.rsi
Resources/Textures/Objects/Fun/toys.rsi
Resources/Textures/Structures/Wallmounts/signs.rsi
|
Rxup
approved these changes
Jan 12, 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.
🆑