4a5bc15bd85f9dbcf2beef8247db18c7e6baabd7
5040 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Red
|
e6f5ed2450 |
Spell pre-examine (#1661)
* examine spells * fux * fix |
||
|
Alexsey Bezyuk
|
25df067d3f |
Backpacks description and categories (#1647)
* backpacks translation * leather categories * linter fix * Linter please * Описания * priority in craft * priorotize * eng comment * Update Content.Client/_CP14/Workbench/CP14WorkbenchWindow.xaml.cs |
||
|
Red
|
fa22152b42 |
Demiplane redesign again (again) (#1640)
* rooms generation fix?? * demiplane map returns * wawa * fix |
||
|
Morb
|
227c44561b |
Alert sprite size fix (#1637)
* Directly use vanilla alerts & make stamina as custom
* Fix mix size for alert of 96px
* Revert "Directly use vanilla alerts & make stamina as custom"
This reverts commit
|
||
|
Red
|
70bf2e1cf3 | Merge branch 'master' into ed-04-08-2025-upstream-sync | ||
|
Red
|
6b5c27125b |
Gathering resourses redesign (#1594)
* Add Crash to Windlands survival gamemode and map Introduces the CP14CrashToWindlandsRule and its component for a new survival gamemode where a ship crashes into wildlands. Adds the 'nautilus_ship' map, updates English and Russian locale files with new gamemode titles and descriptions, and modifies relevant prototype and map pool files to support the new mode. * fix FTL map * firebombing is real * fix biome dungen all grid overriding * Update PostMapInitTest.cs * Update DungeonJob.CP14Biome.cs * Refactor demiplane generation and crash rules Replaces the old demiplane job system with a new procedural location generation system (CP14LocationGenerationSystem and CP14SpawnProceduralLocationJob). Splits the crash-to-windlands rule into CP14CrashingShipRule (handles explosions) and CP14ExpeditionToWindlandsRule (handles map generation and FTL), with corresponding new components. Updates roundstart game rule prototype and moves/renames several files for clarity and modularity. * Refactor location generation to support optional seed and position Updated the GenerateLocation method to accept an optional seed and position, defaulting to a random seed if none is provided. Adjusted all call sites and the procedural job to support these changes, improving flexibility and consistency in procedural location generation. * procedural integration into game map * Demiplanes deletion * clear demiplane content * remapping procedural + frigid coast deletion * clear demiplane guidebook * dungeons generations * Refactor procedural location configs and add ComossIsland Consolidated and renamed procedural location and dungeonConfig prototypes for demiplane locations, replacing T1-prefixed and legacy IDs with new, consistent names. Updated map YAMLs to reference new location IDs and configs. Added a new ComossIsland location and dungeonConfig. Refactored code to support passing custom dungeon layers and removed unused ExamineProb field from CP14ProceduralLocationPrototype. * Enhance procedural world gen and location configs Improved procedural world generation by adding location generation probability, adjusting level ranges, and refining modifier uniqueness. Updated CP14ProceduralLocationPrototype and CP14ProceduralModifierPrototype, refactored node data generation logic, and made related test and map changes. Added new venicialis_fort station map and updated several procedural location and modifier YAMLs for consistency. * fix * connections room spawners * track finishing global world generation * real connection * Update PostMapInitTest.cs * Update venicialis.yml * Update venicialis.yml * fix raids, decrease city island sizes * Update migration.yml * Update migration.yml * fix shutdowning * Update CP14SpawnProceduralLocationJob.cs |
||
|
Ed
|
f2d9608a62 |
Merge remote-tracking branch 'upstream/stable' into ed-04-08-2025-upstream-sync
# Conflicts: # Content.Server/Chat/Managers/ChatSanitizationManager.cs # Content.Shared/Damage/Systems/SharedStaminaSystem.cs # Content.Shared/Eye/VisibilityFlags.cs # Content.Shared/Lock/LockSystem.cs # Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs # Resources/Prototypes/Recipes/Reactions/chemicals.yml # Tools/actions_changelogs_since_last_run.py |
||
|
Princess Cheeseballs
|
6ffec751ee | Flesh Stun Fix (#39324) | ||
|
Red
|
7298e14de7 |
Upstream stable sync (#1558)
* Adjust uplink buy button to be under item icon (#38596) * Adjusted uplink buy button to be under item icon * Put the discount subtext under the icon * Indent fixes, added margin --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> * Automatic changelog update * More guidebook fixes (#38699) * First commit - Resolving a few different pages, fixing typos and updating spellings and phrasing to be more coherent. * More slight changes * Reverting slightly the salvage page change * Fixing Science wording inconsistency * Few other small guidebook fixes - Updating NukeOps page to properly refer to "Corpsman" rather than "Agent". - Typo and slight wording change in Traitors.xml. - Updating small typos in Antagonists.xml and Zombies.xml pages. * Automatic changelog update * Fixes missing underwear FTLs (#38720) * Validate `ShaderPrototype` IDs (#38728) * Convert all shader prototype string literals to protoids in overlays * Convert more shader prototype literal strings to protoids * Convert ValidatePrototypeId to ProtoId * Later * Janitor Tool: Wire Brush (#38667) * Wow! It's -brush- * spacing. * Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * fixed changes --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * [BUGFIX] Fixed revenant malfunction ability not working properly only MediBots and Stasis bed (#38664) * fixed * clean up * orks fix smart * review fix 1 * more requested changes * less cursed * more descriptive description * better wording * Automatic changelog update * Tiny Tiny Cleanup of the EyeClosingSystem. (#38734) Update EyeClosingSystem.cs * Typofixes for figurine dialogue (#38737) * Typofixes for figurine dialogue * Forgot two * fix: Use PredictedQueueDel for gib spell (#38729) * Fix human skin tone distribution (#38701) * fix: don't default to uncharged sprite state for cells (#38730) * Fix Hristov description - remove inaccurate technical specs (#38746) - Removes inaccurate 'armor piercing 14.5mm shells' reference - Replaces it with a more funny description, matching the style of the other snipers and guns - Keeps ammunition type '.60 anti-materiel ammo' specification - Fixes issue #38590 Co-authored-by: Arthur Fiorese de Andrade <aandrade@cmcxs.gov.br> * Validate `ProtoId`s in tests (#38745) * Convert string literals to protoids in Content.Tests * Convert string literals to protoids or consts in Content.IntegrationTests * Fix linter failures Tricksy static using misled me * Validate remaining `ProtoId` strings (#38747) Validate remaining ProtoId strings * feat: allow mopping evaporating puddles (#38743) * Automatic changelog update * Cleanup warning in StomachSystem (#38748) you did not see this * Vox scars (#38592) * Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl * Revert "Added vox scars n'stuff, renamed vox_tattoos.ftl to just vox.ftl" This reverts commit c73da55ba3b39ddf93b493aecd85604c54dd8a15. * locale key fix * Changed top surgery scar names to be more generalized * Adjusted face scars * Formatting fixes --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> * Automatic changelog update * UnlockNode command to LEC. (#38751) * commit * Update UnlockNodeCommand.cs * commit * move command locale to its own file. * Update Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * fix: spellbooks can have infinite charges (#38376) * fix: spellbooks can have infinite charges * refactor: indicate infinite spellbook charges with null Not sure if I like this much better... * Automatic changelog update * Minor escape menu UX improvements (#38650) * Automatic changelog update * Meta.json cleanup - pins.rsi (#38781) cleanup * Log an error when adding an admin log containing a null char (#38782) * Log an error when adding an admin log containing a null char * Also log LogType and LogImpact * Remove them * Fix incorrect conditions on black pepper's forced cough (#38783) no one to blame but myself Co-authored-by: iaada <iaada@users.noreply.github.com> * Update Credits (#38786) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Fixing incorrect headset being given to QM visitor (#38785) * Stasis bed cleanup and bugfixes. (#38762) * Stasis bed sent to shed * Code Review * Code Review 2 * Automatic changelog update * Cleanup warnings: CS0414 (#38793) Cleanup * Move moth movement modifiers to the Base (#38795) * fix centcom pda (#38796) * Catchable items, playable basketball (#37702) * catching * fix * improve * fix linter * cleanup * fix prediction * do the same here * fix comment * Automatic changelog update * Fix storage voice control bug after handssystem refactor (#38810) * Automatic changelog update * Reducing the amount of space in the gogo hat (#38808) Reducing the amount of space in the hat from 7*4 to 4*3 to make a bit more sense with the fact it is only a hat. Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Automatic changelog update * Golden pai (#38549) * Golden pai * Make golden PAI public and rare * Golden PAI = legendary salvage * Automatic changelog update * Cleanup: Remove ``TelephoneComponent.RequiresPower`` (#38823) * Cleanup * Forgot about yml * Branded lighters addition (#35514) * newlighters * port complete * donk pocket box addition * should fix test fail, proper credit * captalisation issue * fixed * typo corrected * removed accidental change to combat bakery * fixed lock message, made NT flippo start fueled. * Requested changes * fixed discount dan * moved matchbox * requested changes, discount dan more broken than ever (somehow) * unbungle * uhhhhh * maybe fixes? * changed inheritance * fixed enum? * nevermind * finally fixed * breaking changes * inheritance unbungled * Automatic changelog update * Cleanup: Remove ``TryInsert`` method from the ``DisposableSystem`` and use event subscriptions instead (#38819) Cleanup * JumpBoots Attempt №2 (#36862) Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: unknown <wainzor1337@gmail.com> Co-authored-by: ScarKy0 <scarky0@onet.eu> * Automatic changelog update * Replace `ValidatePrototypeId` uses with `ProtoId` or `EntProtoId` (#38814) * The easy ones * For certain values of easy * Easy test * Hair * Fix sandbox violations * Sort usings * Fix SSD sleep misprediction (#38831) init * New science unlock: the H.A.R.M.P.A.C.K (#38824) * Automatic changelog update * Fix: Add cluwne translation in ftl (#38835) Fix * Artifact glue reagent (#38670) * a * Revert "a" This reverts commit 2b9ba4ea67a9395d30b7ab37c8065f627f1a961a. * f * dev it * a? * ad * forgor * Revert "f" This reverts commit 39228c7cbe4d28ba43b73580b55e01c3979eb869. * derandomisation! * reviv * flavor * fixe * dwwasdwasdwa * dwasdwasdwas * fuck you * Automatic changelog update * Contraband category fixes (#38698) * Adding contraband to some items missing it - This includes updating contraband to follow more consistently where items are expected to be used - Fixing the spacing in arrays to be more consistent with other files * Updating PPD to be Eng contra * Automatic changelog update * Added Vox Heterochromia (#38595) * Added Vox Heterochromia * Forgot to change moth to vox * minor formatting fix --------- Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com> * Automatic changelog update * Make mopping predicted (and some other stuff) (#38749) * refactor: move puddle evaporation + absorbents to shared * refactor: move SolutionRegeneration to shared * refactor: make AbsorbentSystem visuals clientside * style: general formatting/cleanup on touched files - Few logical simplifications - Add field for hard-coded sparkle effect ent - Switch stuff to Entity<T> No actual prediction fixes in this commit (though in retrospect I should've done this commit last). * fix: use predicted variants for predicted code * fix: average out evaporation rates in mixtures * refactor: move SolutionPurge to shared * style: Basic SolutionPurgeComponent field cleanup * fix: general prediction + timing + networking fixes - Moves client side visuals back to shared because other players exist - Don't accumulate CurTime in Purge/RegenerationSystem - Network the next update field in Purge/RegenerationSystem to deal with UI mispredictions??? * fix: add udder bug workaround Not needed for SolutionPurgeSystem which doesn't resolve solutions (probably fine that SolutionPurgeSystem doesn't cache since it's much rarer, though it probably should), and likely not needed for AbsorbentSystem since it only resolves against puddles which, I don't think can be in containers. * fix: don't divide by zero for evaporation speed = 0. * refactor: revert evaporation changes Will cherry-pick these out in another PR. Also reverting the evaporation speed bugfix since it's easier to revert all at once. :) * fix: component cleanup; autopause fields, use ProtoID * fix: remove unused AbsorbentComponentState * fix: ProtoId is not string * refactor: move PuddleSystem.UpdateAppearance to shared * style: general PuddleSystem.UpdateAppearance tweaks - Switch to Entity<T> - Use ProtoIds - Minor simplifications * fix: add udderly silly PVS workaround * cleanup * fix --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * fix: Register OnRequestMovePulledObject under the right system (#38484) * fix: Register OnRequestMovePulledObject under the right system * nukeops test flake * fix: correct ToggleableVisuals for toy sword and pirate helm (#38867) * Fix lingering ghost roles (and expand tests to catch it) (#38788) * Improve and expand `TakeRoleAndReturn` to fail on bug #38292 * fix #38292 and expanded test cases * use validated EntProtoIds for tests remove unusued using declarations * use const strings that match the TestPrototypes * Automatic changelog update * Fix non-humanoid mobs being destroyed on devour (#38087) * Allow non-preference living things to be added to a devourer's stomach * Fix ordering of devour logic * Minor refactor for whitelist on storage and food preference * Fix linter issue * Coerce workflow to run again; also fix bad indenting error * Code review changes * Automatic changelog update * Prefer file-scoped namespaces in `.editorconfig` (#38879) Prefer file-scoped namespaces in .editorconfig * Parroting Parrots part 1: Help maints! SQUAWK! Maints! (#38243) * parrots have ears. add poly * high tech parrot functionality * adjust times * add accent to radio message * don't spam everything all at once probably * learn about the existence of prob(float) * actually use Prob(float) correctly * newline * add pet spawner for poly * move chance to talk on radio to component * missing comment * minor edits and doc additions * the reviewerrrrrrr * parrot can't learn when crit or dead * increase default memory * rename poly to polly * crude way to ignore whispers. chatcode please * This is Polly. It is set to broadcast over the engineering frequency * add missing initialize * add displacement map for parrot ears * review comments - Errant * minor things * large rework * fix attempting to talk when entity has no channels * use list of active radios again to track channels * fix bad return, some comments * fix long learn cooldown * minor adjustments * use FromMinutes * the voices told me to make these changes * remove default reassignment * Review changes * remove polly's accent * decouple radio stuff from parrotsystem * minor stuff * split vocalization and parroting * minor review work * re-add missing check * add admin verb for clearing parrot messages * minor action icon update * oops * increase icon number text size * Admin erase parrot messages associated with players * part 1 beck review * add whitelist and blacklist for parrots * Downgrade missing component error to warning * Add comment * add some missing comments * Remove active radio entity tracking, use all inventory slots * Minor changes * small review stuff * review radio stuff * swap ears displacement to invisible death displacement * remove syncsprite * vscode why do yo have to hurt my feelings * review changes * use checkboth * Automatic changelog update * Predict RepairableSystem (#38886) * commit * Update SharedRepairableSystem.cs * compo * final touches. * Update RepairableComponent.cs * Update RepairableSystem.cs * Update Content.Shared/Repairable/RepairableSystem.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Replace usages of customTypeSerializer PrototypeIdListSerializer with something that doesn't take 20 separate words to type out (#37959) * Replace usages of customTypeSerializer PrototypeIdListSerializer with something that doesn't take 20 separate words to type out * Missed one * Missed another * Fix data field ids * Fix yaml linter and misc errors (#37444) * Fix yaml linter * Revert "fix cluwne pda pen slot (#35611)" This reverts commit |
||
|
Kyle Tyo
|
a52bf2a7c8 |
Convert a few debugging commands and the mapping setup command to LEC. (#38589)
* commit * Update MappingClientSideSetupCommand.cs * missed a spot * Update MappingClientSideSetupCommand.cs * whoopos * Update mappingclientsidesetup-command.ftl |
||
|
slarticodefast
|
2ac9948ba0 | Handle inventory template updating V2 (#39246) | ||
|
Pok
|
688c91b597 | Add scaling filter option (Nearest/Bilinear) (#39111) | ||
|
Red
|
5c0eb97571 |
Refactor food holder visual update logic (#1584)
Simplified UpdateVisuals method in CP14ClientCookingSystem by consolidating parameters and using component fields directly. Also ensured FoodData field is dirtied after updating visuals in CP14SharedCookingSystem to trigger proper synchronization. |
||
|
Red
|
5020be8ec6 |
Add supports for different skillpoints types (#1581)
* Refactor skill points to support multiple types Reworked the skill point system to support multiple types (e.g., Memory, Blood) instead of a single experience cap. Added CP14SkillPointPrototype, updated skill storage and UI to handle per-type points, and adjusted related logic and prototypes. Updated localization and assets to reflect these changes. * oopsie * Update human.yml * Update CP14SkillUIController.cs * Refactor skill storage to use skillPoints config Replaced 'experienceMaxCap: 0' with 'skillPoints: Memory: max: 0' in Skeletons T1, T2, and undead mob prototypes. This change standardizes skill storage configuration and improves clarity. |
||
|
Kryyto
|
23ce52c69e |
Refactor guard bell (#1553)
* Remove maps edits * fix from review * Remove unused CP14 alert levels (fixing YAML) * fix missing prototype CP14GuardBell * fix from review 2 * fix TriggerSystem partial --------- Co-authored-by: Jordan FUMA <@jfa> |
||
|
slarticodefast
|
b4e81cb8f2 |
Admin Tool: Observe entities in an extra viewport (#36969)
* camera * add console command * change verb name to camera * placeholder text * add button to player panel * orks are indeed the best * visibility flag fix * not a datafield * more follower fixes * more cleanup * add zooming * resizing real * remove commented out code * remove AddForceSend * comment * Use OS window and add some comments * fix comments and variable name * Needs RT update * Minor grammarchange * Fix warning * Cleanup * almost working... * fix bug * oswindow update * Remove need for RequestClosed. --------- Co-authored-by: beck-thompson <beck314159@hotmail.com> Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com> |
||
|
Perry Fraser
|
002afe8056 | Properly dispose of stale pipedata chunks for the atmos monitor (#38974) | ||
|
PJB3005
|
5895544ae1 | Merge remote-tracking branch 'upstream/master' into rt-265-update | ||
|
Perry Fraser
|
1ee7dffe6d | fix: fix non-access checking EntityTargetActions (#38731) | ||
|
Pieter-Jan Briers
|
af4ff4e9de |
Update content to remove redundant Robust math types (#38930)
Vector3, Vector4, Matrix4, and Quaternion are now gone. This switches us over to System.Numerics where applicable. |
||
|
Ed
|
f59de85047 |
Merge remote-tracking branch 'upstream/stable' into ed-21-07-2025-upstream-sync
# Conflicts: # Content.Client/Overlays/StencilOverlay.Weather.cs # Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs # Content.IntegrationTests/Tests/VendingMachineRestockTest.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.cs # Content.Shared/Damage/Systems/SharedStaminaSystem.cs # Content.Shared/Fluids/Components/EvaporationComponent.cs # Content.Shared/GameTicking/SharedGameTicker.cs |
||
|
pathetic meowmeow
|
d2ddbcbcda |
Implement SmartFridge functionality (#38648)
* Add SmartFridge * my nit so pick * my access so expanded and my whitelist so both * list -> hashset |
||
|
Red
|
8721f736e1 |
Cooking simulator 3: Pies (#1540)
* enum -> prototype * move sprites * more dirt sprites * some food data stucking fixing * pumpkin fix * pie move sprites * refactor components * pie refactor * remove outdated proto * new pie types * Update SliceableFoodSystem.cs * Refactor food cooking system and add fat flavor Added 'Fat' to the flavor profile. Refactored food cooking logic to use CreateFoodData and UpdateFoodDataVisuals instead of CookFood and ApplyFoodVisuals. Introduced RenameCooker property to CP14FoodCookerComponent to control entity renaming during cooking. Improved separation of food data creation and visual updates. * Update migration.yml * Refactor food visual and sliceable logic in cooking system Moved sliceable food logic from OnCookFinished to UpdateFoodDataVisuals for better encapsulation. Made UpdateFoodDataVisuals overridable and updated its usage in random food initialization. Added Rename field to CP14RandomFoodDataComponent and cleaned up unused BecomeSliceable field in CP14FoodCookerComponent. Updated pie_pan.yml to add SliceableFood and a new random food entity. * Update pie_pan.yml * fill levels |
||
|
Princess Cheeseballs
|
dec2d42a1d |
Crawling Part 1: The Knockdownening (#36881)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: ScarKy0 <scarky0@onet.eu> |
||
|
Tayrtahn
|
cfb0a95035 |
Fix mouse rotator error spam (#39071)
Ignore mouse rotation requests when the player is switching controlled entity |
||
|
IgorAnt028
|
41a175636b |
Fix bug with pipe color (#30645)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> |
||
|
rlebell33
|
23c190e9bc |
Dehardcoded Air Alarm's UI window title (#39072)
Extract the air alarm title to no longer be hardcoded |
||
|
Jackson Langley
|
2ce03ad651 |
Fix the max scanner distances (#39041)
* Good god * Satan's in my PC |
||
|
gogenych
|
9ce239494d | remove radio from chat selection (#1537) | ||
|
Quantum-cross
|
17559db1c7 |
Add supercritical sounds for ALL anomalies (#36425)
* add supercritical sounds for flesh anomaly and shadow anomaly * fix attribution yml * use sound collections, add TWO -- count em TWO tech anomaly supercrit sounds. * add sound for present anomaly * wrong soundcollection for flesh * actually add the present anomaly sound... * add fire anom sound * add gravity anomaly supercritical sound * add electric anomaly supercritical sound * add bluespace anomaly supercritical and explosion sound * add ice anomaly supercritical sound * add fluid anomaly supercritical sound * fix busted link * typo * add floral supercritical sound, fix typos * Add supercritical sounds to injected anomalies * add rock anomaly supercritical sound * supercritical sound follows the entity, important for injected anomalies * make the rock crit rumble a little less subtle at the start * use CC0 freesound alternatives where available * New pyro anomaly sound by GonTar * New sounds by GonTar. Change AnomalyComponent so that you can change the length of supercritical properly in the prototype. * oopsie, forgot the traps * use TimeSpan for duration |
||
|
Red
|
759778782c |
Cooking simulator 2: Soups (#1535)
* Update shield.yml * Add soup bowls Introduced new bowl entities (wooden, iron, gold, copper) for soups, including their sprites and prototype definitions. Added 'Soup' to the CP14FoodType enum and updated the food holder logic. Removed the unused CP14Plate tag from plate.yml and misc.yml. * Add misc soup ingredient sprites and metadata Introduced new 32x32 sprites for various soup ingredients, including flyagaric, flylumish, lumish, meat, meat2, meat_salad, mole, mud, pumpkin, sawdust, trash, and veg_stew. Added corresponding meta.json with state definitions and licensing information. * veg soup recipe for testing * soup displacement maps * meal displacement eating * fix double cookin plates * soup cooking * Update cooking_pot.yml * Refactor solution handling for cooking and containers Updated solution component names and types for cooking pots, bowls, buckets, barrels, and wells to improve consistency and functionality. Added and removed solution-related components, adjusted transfer logic, and cleaned up unused solution states and visual metadata. Also added food type checks in cooking system to prevent incorrect transfers. * new soup recipes * Unit test * fix * trading requests * Update CP14Cooking.cs * Update CP14Cooking.cs * audio improve, egg and bread fix * fix bugs * integration |
||
|
Red
|
7bb7ea2183 |
Cooking Simulator (#1529)
* frying pan start * fix data saving * Refactor cooking system and add localization support Refactored food data handling in the cooking system to use Visuals instead of FoodData on holders, improved food transfer logic, and added popups and examine messages for user feedback. Added English and Russian localization files for cooking examine and meal descriptions, and updated prototype files to increase plate solution volume and add a whitelist for the cooking furnace. * Refactor cooking system solution handling Removed Solution field from CP14FoodData and updated CP14SharedCookingSystem to use solution containers directly. Improved solution transfer, mixing, and overflow handling during cooking. Increased pan max volume from 30 to 100 in cooking_furnace.yml. * Improve cooking system trash handling and update food sprites Enhanced trash distribution in CP14SharedCookingSystem to randomly assign trash to plates, only adding all trash to the last plate. Updated meat_dish and salad prototypes to use new wooden plate sprites. Added wideAnimationRotation and DrainableSolution to cooking_furnace for improved functionality. * Remove unused usings and redundant comments in cooking components Cleaned up CP14 cooking-related components by removing unused using directives and empty XML comments. This improves code readability and maintainability. * Add tag-based cooking requirements and new meal recipes Introduces tag-based cooking requirement classes (TagRequired, TagBlocked, SolutionRequired) and updates the cooking system to support tag checks. Adds new tags for food items, updates food and meal prototypes to include relevant tags, and implements new meal recipes (Zellasian Breakfast, Monster Egg) with corresponding sprites and localization. Also refactors and renames some tag and structure prototype files for better organization. * Refactor and expand CP14 cooking recipes and tags Reworked meal recipes to use tag-based requirements, added new tags for food categorization (meat, cheese, vegetables, etc.), and removed hardcoded entity recipes for ham in cheese and stuffed potato. Updated and added new meal recipes (bread plate, ham in cheese, stuffed potato), localized their names and descriptions, and migrated/added corresponding sprites. Deprecated SolutionRequired requirement, cleaned up unused tags, and improved TagRequired/TagBlocked logic. Updated prototype files to use new tags and added missing tags to food entities. * Refactor and expand green salad recipes and assets Replaces the old green salad entity and workbench recipe with new cooking recipes for green salad and green salad with meat. Updates English and Russian localization, moves and adds new salad textures, and removes obsolete salad assets and trading request. * mashed potatoes * Add mashed potatoes with herbs meal Introduced a new 'mashed potatoes with herbs' meal, including English and Russian localization, recipe definition, and associated sprite. Updated the texture metadata and added the new image asset. * Update dye.yml * Fix frying pan item size and update plate recipe Moved the 'size: Ginormous' property to the correct component in frying_pen.yml. Renamed the plate recipe and result from 'CP14Plate' to 'CP14PlateWooden' in misc.yml for clarity. * Update meals.yml * Update migration.yml * fixes * fix heating food sounds * Nyranu temperature transmission * Update plate.yml * Cooking DoAfter works * burning logic * cooking more work * auto transform transformable * Update CP14SharedCookingSystem.DoAfter.cs * cool burning visuals! * Add MIT license headers to cooking system files Added sublicensing notice and MIT license header to all files in the CP14 cooking system. Also made minor code cleanups, such as removing unnecessary default initializations and improving XML documentation for clarity. * constant heating required * cooking visuals improve! * sandwiches with processed cheese + reagent burnt fuckuping * inhand pan sprites + FIRE fuckup * crafting & buying pan * fix predicting * random food spawner + chef closet * mapping update * Update frying_pen.yml * move WIP to blacksmith lol |
||
|
Kyle Tyo
|
b9ffd060d6 |
Predict DevourSystem. (#38970)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> |
||
|
Tayrtahn
|
c60910dfa6 |
Fix devices in terminal mispredicting power state (#38647)
* The simple solution * The better solution * Revert "The better solution" This reverts commit 611e56e031636734abab1ad3e77bf88b69a4de13. |
||
|
B_Kirill
|
0c92478e0a | Cleanup warnings: CS0649 (#38797) | ||
|
Perry Fraser
|
dbfe05d5cc | refactor: rework the new status effect system to use containers (#38915) | ||
|
Princess Cheeseballs
|
ac895a0db4 |
Stun and Stamina Visuals (#37196)
* Stun animation * Commit 2 * Almost working commit * Best commit * Minor cleanup and value adjustments * Fix animation data getting wasted and cleaned up some stuff * Don't animate if dead * AppearanceSystem is for chumps * Cleanup * More cleanup * More cleanup * Half working commit * Documentation * Works * ComponentHandleState my beloved * AppearanceComp compatibility * Address review * Borgar * AND NOW THE END IS NEAR * AppearanceSystem compliance (Real) * Don't need to log missing there * I actually hate mob prototypes so much you don't even know --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> |
||
|
Whatstone
|
9ad99cfa64 |
Make more objects spray paintable (Reviving #31328) (#37341)
* PaintableAirlockComponent and AirlockGroupPrototype have been replaced * Slightly redesigned SprayPainterSystem for greater versatility * Added handling of changes to the appearance of doors and storages * PaintableGroup prototypes have been created * Generating tabs with styles in the UI * Fix error with undiscovered layer * Slight improvement * Removed unnecessary property * The category for `PaintableGroup` was allocated to a separate prototype so that the engine itself would check if the category existed * Added canisters, but repainting doesn't work * Added localization to styles * Fix sprite changing * Added the ability to paint canisters * slight ui improvement * Fix yamllinter errors * Fix test * The UI now remembers which tab was open * Fix build (?) * Rename * Charges have been added to the spray painter * Added a charge texture for the spray painter * Now spray painter can paint decals * Increased number of charges * Spawning dummy objects has been replaced by PrototypeManager * added a signature about the painting of the object * fix * Code commenting * Fix upstream * Update Content.Shared/SprayPainter/Components/SprayPainterAmmo.cs Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> * review * Now decals can only be painted if the corresponding tab in the menu is open. * Fixed a bug with pipe and decal tabs not being remembered * Update EntityStorageVisualizerSystem.cs * record * loc * Cleanup * Revert electrified visuals * more cleanup, fix charges, del ammo4 * no empty file, remove meta component * closet exceptions, storage visualizer fixes * enable/disable decal through alt-verb * Fix missed merge conflicts * fix snap offset, button event handlers * simpler order, fix snap loc string * Remove PaintableViz.BaseRSI, no decal item, A-Z * State-respecting UI, BUI updates, FTL fixes * revert DecalPlacerWindow changes * revert unwanted changes, cleanup function order * Limit SprayPainterAmmo write access to AmmoSystem * Remove PaintedSystem * spray paint ammo lathe recipe, youtool listing * category as a list, groups as subtabs * Restore inhand copyright in meta.json * empty spray painter, recipe produces an empty one * allow alpha on spray painter decals * add comments * paintable wall lockers * Restrict painting more objects * Suggested event changes, event cleanup * component comments, fix ammo inhands * uncleanable decals, dirty styles on mapinit * organize paintables, separate emergency/closet grp * fix categories newline at EOF * airlock group whitespace cleanup * realphabetize * Clean up EntityStorageViz merge conflict markers * Apply requested changes * Apply suggestions from sowelipililimute's review Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> * betrayal most foul * Remove members from EntityPaintedEvent * No emerg. group, steelsec to secure, locker/closet * Enable repainting the medical wall locker * comments, no flags on PaintableVisuals * Remove locked variants from closets/wall closets * removable decals * off value consistency * can't paint away those bones * fix precedence * Remove AirlockDepartment, AirlockGroup protos Both unused. * whitelist consistency re: ammo component * add standing emergency closet styles * alphabetize the spray painter listings --------- Co-authored-by: Ertanic <black.ikra.14@gmail.com> Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com> Co-authored-by: pathetic meowmeow <uhhadd@gmail.com> |
||
|
Ed
|
932fd47861 | Update CP14WorkbenchWindow.xaml.cs | ||
|
slarticodefast
|
415ba2e274 |
reduced motion flash effect version 3 (#37824)
* V3 * Apply suggestions from code review |
||
|
slarticodefast
|
0484b7f07e |
Add VV button to the solution editor (#38889)
add vv button to solution editor |
||
|
Leon Friedrich
|
f915157b96 |
Fix yaml linter and misc errors (#37444)
* Fix yaml linter
* Revert "fix cluwne pda pen slot (#35611)"
This reverts commit
|
||
|
DrSmugleaf
|
00826aaad6 |
Replace usages of customTypeSerializer PrototypeIdListSerializer with something that doesn't take 20 separate words to type out (#37959)
* Replace usages of customTypeSerializer PrototypeIdListSerializer with something that doesn't take 20 separate words to type out * Missed one * Missed another * Fix data field ids |
||
|
Red
|
668e79111c |
Merge pull request #1511 from crystallpunk-14/ed-08-07-2025-upstream
Upstream sync try 2 (not squash) |
||
|
Red
|
ae077c3971 |
Revert "Upstream sync (#1509)" (#1510)
This reverts commit
|
||
|
Red
|
a35c718734 |
Upstream sync (#1509)
* Fix the tail wagging action being blocked by cuffs. (#38454) Update types.yml * Automatic changelog update * Remove redundant IoC Resolve in `EmptyOrWindowValidInTile` (#38446) Remove redundant IoC Resolve in EmptyOrWindowValidInTile * fix: trim five minutes of silence from bottle_clunk_2 (#38463) * Update patrons (#38470) * Forbid string literals for `SharedActionsSystem` methods (#38472) Forbid string literals for SharedActionsSystem methods * Chameleon Controller Implants can be deimplanted (#38439) * Automatic changelog update * Cleanup duplicate dependency in `AdminVerbSystem.Smites` (#38473) Cleanup duplicate dependency in AdminVerbSystem.Smites * fix: set correct layer visibility for power cell sprites (#38458) * fix: set correct layer visibility for power cell sprites * fix: use a default charge level for power cell sprites' appearance data * Remove Icon Smoothing for Airlocks, Doors, and Plastic Flaps, and Shutters from Walls (#38456) * Nuke Icon Smoothing * Update highsec.yml * Update plastic_flaps.yml * Scurrets (#38218) * Scurrets. * Add missing equipment YAML * Fix count of NamesFirstScurret * Resolve PR comments, wa. Also add like a bunch more wa replacements * ed * Update Resources/Textures/Mobs/Animals/scurret/displacement.rsi/meta.json * :rivflabbergasted: * Fixed spacings in scurret_last.ftl * Fix mangled endings of some last names * wawa * the scug has a spear for self defence * Automatic changelog update * Fail if we attempt to run publish on master (#38431) * Fail if we attempt to run publish on master BREAKING: FORKS REMOVE THIS * Update publish.yml * Fix styling for Admin Menu lists (#38261) * remove styleclass from playertab 'button' lines * cvar, fix button-style header alignment * Fix requested changes And also the extra cvar things I was meant to remove in the upstream merge * Tiny tweaks --------- Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> * Automatic changelog update * Add interaction test for retractable arm blade (#38452) * Add interaction test for retractable arm blade * Update for HandsSystem refactor * Revert "Update for HandsSystem refactor" This reverts commit e01bb9a7e318dd916240d57b30f48af9594bff1f. * Combine WaitAssertion blocks * Make... sloths... speak... slowly... (#38142) * Add SlowAccent * Apply SlowAccent to sloths * xmldocs * Automatic changelog update * Make gas tank UI a bit more network-happy (#38184) * fix: network gas tank output pressure * fix: don't overwrite gas tank output pressure during editing * allow to publish news without ui (#35262) * allow to publish news without ui * the hell was that * apply * apply review * sure Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * okay --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * add some documentation for visiting entity (#38475) * add some documentation for visiting entity to prevent someone from spending 5 minutes diving into the codebase * reviews Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com> --------- Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com> * SignalSwitchSystem: Check button is locked before toggling (#38474) Check button is locked before toggling * Automatic changelog update * Fix compile (#38477) * Fix wallmount interaction (#38111) * Automatic changelog update * Fix debug asserts when unequipping items (#38274) * Flask Visual Overhaul & YML Organizing (#38032) * Adding Back Baseline V1 Changes Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Readability Change Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * icon_open implementation, tidy up & attributions (fix lith/shiny flask ugly af open sprites) Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * good enough Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * No mo closed spills Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Inhands & Attributions Part 1 Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Inhands & Attributions Part 2 Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Flask Sounds & Attributions Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Cap flask inhands change Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Lith flask Inhand Changes Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Spacing * Fix? * Man... * Attributions Back in... * Im loosing it.. * REAL! * :/ * Again... * again :/ * Plz??? --------- Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com> * Automatic changelog update * Kills TurfHelpers (#37939) * Create TurfSystem equivalent for and obsolete TurfHelpers.GetTileRef * Fix EntitySystem uses of TurfHelpers.GetTileRef * Fix EntitySystem uses of TurfHelpers.TryGetTileRef * Fix construction condition uses of TurfHelpers.GetTileRef * Fix last use of TurfHelpers.IsBlockedTurf * Create TurfSystem equivalent to and obsolete TurfHelpers.GetContentTileDefinition * Fix uses of TurfHelpers.GetContentTileDefinition(TileRef) * Fix uses of TurfHelpers.GetContentTileDefinition(Tile) * Create TurfSystem equivalent to and obsolete TurfHelpers.IsSpace * Fix EntitySystem uses of TurfHelpers.IsSpace(Tile) * Fix EntitySystem uses of TurfHelpers.IsSpace(TileRef) * Fix remaining uses of TurfHelpers.IsSpace * Fix uses of TurfHelpers.GetEntitiesInTile * Delete TurfHelpers.cs * Add GetEntitiesInTile lookup methods * Convert some GetEntitiesInTile methods to LookupSystem extension methods * Use new GetEntitiesInTile methods * Recycle spiderweb hashset * Recycle floor tile hashset * Allow Maintainers to use customvote command (#38385) Changed from Moderator perm to Round perm * Automatic changelog update * Make role ban pannel pretty (#37952) * Make role ban pannel pretty * Removed unused depencency * refactor: wider panel (no jumping due to scroll in english lang) minor readability improvements --------- Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru> * Automatic changelog update * Generic Numeric Alerts (#38370) * Fix styles for group button in loadout menu (#38488) * Fix styles color for group button in loadout menu * Show selected item count in loadout group UI Updated the loadout group container to display the number of selected items in a group. Added a new localization string to support this feature in the UI. * Resolve required changes * Automatic changelog update * fix: mops with liquid can hit people again (#38486) * Automatic changelog update * Treat duplicate dependency warnings as errors (#38480) * Treat duplicate dependency warnings as errors * GitHub workflows * commas * Maybe we just don't use these? * I think we can get rid of these? * Retractable items get removed by handcuffs (#38441) * init * oops * happens * review * fix * Update Credits (#38493) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Fixed dirt tiles having identical names (#38500) * added prefix to planet dirt/grass * prefixes don't work, just doing renaming instead. * Readds the Hypereutactic Blade for traitors, adds Hypereutatic blade for Nukies (#37182) * adds hypereutactic back into the uplinks * Disables hum * Adds the Hypereutatic Blade for Nukies * Actually makes the sound so quiet no one can hear it * Apply suggestions from code review * Update Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Allow admins to export round logs to CSV files (#38206) * Automatic changelog update * MINOR SPELLING ERROR!!1!!1! (#38510) Spelling fix in the code of conduct Comunity ->Community * Staff of Healing for Pacifists (#38509) * Automatic changelog update * Command resolves. (#38519) * banlist-command * open-admin-notes-command * stealthmin-command * set-alert-level-command * remove unused usings * whitelist commands * Emotional Support Scurret locstrings (#38518) Missed during the atomization of the Wa Wa PR. * Content fix for `LocalizedCommands` `Loc` change (#38133) * Content fix for LocalizedCommands Loc change * Switch to LocalizationManager * Predict Flashes (#37640) Co-authored-by: ScarKy0 <scarky0@onet.eu> * Automatic changelog update * Remove excess `SingularityLevelChangedEvent` subscriptions (#38536) * Remove excess SingularityLevelChangedEvent subscriptions * RadiationSourceComponent too * Cleanup commented out code * Revisions and cleanup to dock and shuttle commands. (#38533) commit * Add wall-based ambient occlusion (#38276) * Add wall ambient occlusion * wawawewa * Work * cvars * Comment to make slart happy * Automatic changelog update * Update submodule to 263.0.0 (#38524) * update oasis (#37770) * Add uplink command minor revision and cleanup (#38532) * commit * Update AddUplinkCommand.cs * Fix IsSpace call (#38548) * Crew manifest command cleanup and LEC (#38544) commit * Re-Add Stamina Damage Resistances to Nukie & ERT Suits after the Test Merge. (#38526) * Add stamina damage resists to the bloodred suits. * Apply suggestions from code review --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Update cmd-adminwho-desc (#38539) Update admin-who-command.ftl * Added a handheld station map to the cyborg thruster module (#38541) * Added a station map to the borg thruster module * Removed HandheldStationMapBorg & replaced it with HandheldStationMapUnpowered * Automatic changelog update * fix: correct wall AO having weird sharp edges (macOS only?) (#38552) * Fix displacement map rendering in UI (#38042) Fix displacement map rendering |
||
|
Red
|
2fc34bface |
Workbench UI improve (#1508)
* grid workbench * categorization * Update CP14WorkbenchWindow.xaml.cs * conditions * categories |
||
|
Ed
|
7a8326d41e |
Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream
# Conflicts: # Content.Server/Audio/ContentAudioSystem.cs # Content.Server/Medical/HealthAnalyzerSystem.cs # Content.Server/Shuttles/Systems/ShuttleSystem.cs # Resources/Locale/en-US/navmap-beacons/station-beacons.ftl |
||
|
Tayrtahn
|
c565b44965 |
Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814)
* The easy ones * For certain values of easy * Easy test * Hair * Fix sandbox violations * Sort usings |
||
|
slarticodefast
|
b1fb01fed5 | Stable merge (#38822) |