Commit Graph

33652 Commits

Author SHA1 Message Date
Red
581ca2f5ef OP Ballades (#1372) 2025-06-03 12:43:21 +03:00
TheKittehJesus
d4e9049576 Added reset all (non-free) skills (#1343)
* Added reset all (non-free) skills

* I don't know why I didn't do this the first time

* Formatting fixes

* Removed old code and made removal function iterate in reverse order
2025-06-03 10:58:21 +03:00
CrystallEdge Server
766f17e559 Automatic changelog update 2025-06-03 09:42:23 +03:00
TheKittehJesus
a070db91be Changed cashconverter to be anchorable on tables (#1371) 2025-06-03 09:41:17 +03:00
CrystallEdge Server
66df1d83c3 Automatic changelog update 2025-06-03 01:05:38 +03:00
ArZarLordOfMango
72735a627d fix moral (#1368) 2025-06-03 01:04:33 +03:00
CrystallEdge Server
5a78f44ed9 Automatic changelog update 2025-06-03 01:00:14 +03:00
paige404
881a504334 Reorganize slime ymls, adjust damage resistances and vulnerabilities for slimes (#1300) 2025-06-03 00:59:07 +03:00
CrystallEdge Server
186afe7ed8 Automatic changelog update 2025-06-03 00:39:24 +03:00
Red
43913d9d11 cozy (#1367) 2025-06-03 00:38:19 +03:00
Ed
8d8ad5130b Update actions_changelogs_since_last_run.py 2025-06-02 23:34:20 +03:00
CrystallEdge Server
7df16c306d Automatic changelog update 2025-06-02 23:01:22 +03:00
Red
d80ab67391 Update fire.yml (#1365) 2025-06-02 23:00:16 +03:00
Ed
2a5552f44c Update CP14Publish.yml 2025-06-02 22:40:23 +03:00
CrystallEdge Server
d239e33094 Automatic changelog update 2025-06-02 22:34:22 +03:00
Red
9da211a4e0 Ed 02 06 2025 changelog test 8 (#1364)
* Update fire.yml

* Update fire.yml

* Update fire.yml

* Create CP14_Changelog.yml

* Update PULL_REQUEST_TEMPLATE.md

* Update fire.yml

* some edge
2025-06-02 22:33:16 +03:00
CrystallEdge Server
50e629fa07 Automatic changelog update 2025-06-02 22:01:43 +03:00
Red
1a67ee82d6 Ed 02 06 2025 changelog test 7 (#1363)
* Update fire.yml

* Update fire.yml

* Update fire.yml

* Create CP14_Changelog.yml

* Update PULL_REQUEST_TEMPLATE.md

* Update fire.yml
2025-06-02 22:00:37 +03:00
Red
35d6c8041f Ed 02 06 2025 changelog test 6 (#1362)
* Update fire.yml

* Update fire.yml

* Update fire.yml

* Create CP14_Changelog.yml

* Update PULL_REQUEST_TEMPLATE.md

* Update fire.yml
2025-06-02 21:54:33 +03:00
CrystallEdge Server
f4c5a9c71a Автогенерация чейнджлога 2025-06-02 21:51:59 +03:00
Red
c0cda3fb8e Ed 02 06 2025 changelog test 5 (#1361)
* Update fire.yml

* Update fire.yml

* Update fire.yml

* Create CP14_Changelog.yml

* Update PULL_REQUEST_TEMPLATE.md
2025-06-02 21:49:08 +03:00
Red
c037af2f77 Ed 02 06 2025 changelog test 4 (#1360)
* Update fire.yml

* Update fire.yml

* Update fire.yml

* Create CP14_Changelog.yml
2025-06-02 21:44:46 +03:00
Red
96dc23c9ff Ed 02 06 2025 changelog test 3 (#1359)
* Update fire.yml

* Update fire.yml

* Update fire.yml
2025-06-02 21:40:15 +03:00
Red
3bdb9c646d Ed 02 06 2025 changelog test 2 (#1358)
* Update fire.yml

* Update fire.yml
2025-06-02 21:18:58 +03:00
Red
2b1cef9d72 Update fire.yml (#1357) 2025-06-02 21:16:07 +03:00
Red
08c1560a11 Update PULL_REQUEST_TEMPLATE.md 2025-06-02 21:11:11 +03:00
Red
acc8093f9a More economy fixes (#1356)
* fic

* Update base_instruments.yml

* fix

* Update chests.yml
2025-06-02 18:06:56 +03:00
Viator-MV
c939761737 skelemake (#1276)
* skelemake

* sharded

* mastery

* Not so slow cast

* ok no demi deipletion

* skillstorage and Species

* ressurection dead

* fixed

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-02 14:20:45 +03:00
Nim
5a2ccc3e08 Resprite (#1328)
* well resprite

* broken well

* Campfire

* meta

* Quantity
2025-06-02 14:16:42 +03:00
Ed
483a82fdd4 Update grasshighbush.yml 2025-06-02 11:34:01 +03:00
Ed
e953410205 Update peace_ballade.yml 2025-06-02 11:32:01 +03:00
Kit
c35052b9fa STOP POSTING ABOUT THE THING ALL MY FRIENDS ON TIK TOK SENT ME "THE THING" (#1353) 2025-06-02 10:21:51 +03:00
Red
f6dd89ea7a d (#1351) 2025-06-01 21:55:20 +03:00
Red
5c5a473ec0 More merchant content (#1349)
* energy crystals

* thaumaturgy trading
2025-06-01 19:21:41 +03:00
Ed
6fce9dcdaa Update trade_platform.yml 2025-06-01 16:14:08 +03:00
Ed
da45b9bba8 fixes 2025-06-01 15:56:38 +03:00
Red
a3ae67a762 Trade reputation rework + Merchants back + Mining contract (#1347)
* refactor unlocking

* fix contract debug crashing

* Update dev_map.yml

* bugfixes and content rebalance

* ore buy contract
2025-06-01 15:10:36 +03:00
Red
a99f2fcd50 Remove random reaction system (#1345)
* wow

* d
2025-06-01 15:01:32 +03:00
Alexsey Bezyuk
759e7c73d9 furnace radius (#1346) 2025-06-01 12:33:38 +03:00
Ed
bd783f9ec0 Update herbals.yml 2025-05-31 22:04:20 +03:00
Ed
1818f253ae chest fix 2025-05-31 18:07:14 +03:00
Red
10090292a1 Master fix (#1342)
* Update web.yml

* cocoon loot

* Update web.yml
2025-05-31 17:50:01 +03:00
Red
71527bb4eb Merge pull request #1341 from crystallpunk-14/ed-31-05-2025-web
Spider content update
2025-05-31 14:31:44 +03:00
Red
381e556a8d Upstream stable sync (#1326)
* Fix some paradox clone traits (#37467)

fix some paradox clone traits

* Automatic changelog update

* Animal Spawner Reorganization + Xeno Spawners (#36962)

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

* make small animals don't leave organs on gibbing (#37080)

* Automatic changelog update

* Fix goliath tentacle exploit (#37168)

* New Salvage Wrecks (#36884)

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Welding locker loot, migrate to EntityTable (#36977)

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Automatic changelog update

* No more one handing "snipers" (#33708)

* Automatic changelog update

* fix cl (#37477)

* Update submodule to 258.0.1 (#37480)

* Content changes for SetTiles change (#37229)

* Content changes for SetTiles change

* Retest with new engine changes

* Derp

* Update for new engine PR changes

* Update submodule to 259.0.0 (#37481)

* Revert "Fix goliath tentacle exploit (#37168)" (#37479)

* Revert "Fix goliath tentacle exploit (#37168)"

This reverts commit 6fbd0c9da1.

* wawawewa

* Predict sleeping action (#37414)

* Predict sleeping action

* reviews

* Automatic changelog update

* Soaked Smokes Volume Revert (#37482)

Reverted the volume of Dan's Soaked Smokes to their previous maximum.

* Automatic changelog update

* Fixed Two-Way Lever Sprites (#37390)

* New conveyor sprites - arrows!

* Revert "New conveyor sprites - arrows!"

This reverts commit 3b540be0d89d93af5028a9ae6533bbdf2954cb75.

* Reworked to only be the lever sprite update.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>

* Change plushie rotation on wide swing (#37484)

Changed swing rotation on shark, carp and snake plushies

* Fix prototypes and datadefs so they pass analyzer checks (again) (#37485)

Fix prototypes so they pass analyzer checks (again)

* Cleanup warnings in `SubFloorHideSystem` (#37488)

Cleanup warnings in SubFloorHideSystem

* Cleanup warnings in `ThrusterSystem` (#37489)

Cleanup warnings in ThrusterSystem

* Cleanup warnings in `PowerChargerVisualizerSystem` (#37491)

Cleanup warnings in PowerChargerVisualizerSystem

* Cleanup warnings in `MaterialStorageSystem` (#37492)

Cleanup warnings in MaterialStorageSystem

* Strip All Debug Verb (#37426)

* init

* yippee

* review

* permission check

* command

* loc

* review

* review

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Allow recycler to shred clothing (#31518)

* Allow recycler to shred clothing

* reduce

* change comments

* replace ClothMade with Recyclable

* Update Resources/Prototypes/Entities/Clothing/Head/hats.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* requested changes

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Omega Update (#37490)

* Automatic changelog update

* Cleanup warnings in `LatheSystem` (#37496)

Cleanup warnings in LatheSystem

* Shuttle speed bump (#37505)

* Shuttle speed bump

Will probably go to 80 when guns get bumped and we get CCD but just makes impacts more representative.

* cook

* Automatic changelog update

* Fix tile-events returns (#37502)

* Fix tile-events returns

Should really be continues.

* More

* More optimisations

* Predict pulling hands blocking (#37504)

Think I forgor to add this one when I split the 1 morbillion PRs out.

* Automatic changelog update

* Wall inheritance cleanup (#37436)

* Cleanup walls.yml

* quick check

* Fix tilewall cmd

* More Cleanup

* Arrnrtrayiage

* Remove double parenting

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Not exclusive whitelist diet. Vox regain access to old food. (#37497)

* Creates a secondary digestible whitelist that is not exclusive. Additionally reworks the Vox stomach.

* Update FoodSystem.cs

Remnants of an old attempt. Cleaning it.

* Update vox.yml

Remnants of an old attempt. Cleaning up.

* Whitelist no longer, now the diet exclusion var is a bool.

* Clean-up

* Update Content.Server/Body/Components/StomachComponent.cs

Typo fixing

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Body/Components/StomachComponent.cs

Clarifications.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Nutrition/EntitySystems/FoodSystem.cs

Typo fixing

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Resources/Prototypes/Body/Organs/vox.yml

Typo fixes

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Automatic changelog update

* Don't group damage in the HealthChange.cs guidebook text (#37507)

* Automatic changelog update

* Cleanup more `SpriteComponent` warnings (part 1) (#37508)

* Cleanup warnings in PuddleSystem

* Cleanup warnings in HandsSystem

* Cleanup warnings in EnsnareableSystem

* Cleanup warnings in ElectrocutionHUDVisualizerSystem
Also simplify some if statements

* Cleanup warnings in PlantHolderVisualizerSystem

* Cleanup warnings in AlertLevelDisplaySystem

* Cleanup warnings in TetherGunSystem

* Fix error in PlantHolderVisualizerSystem

* I hate var _

* Give VGRoid its name back (#37513)

* Automatic changelog update

* Allow protected grids to be repaired (#36989)

* Allow protected grids to be repaired

* Probably implement it

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Automatic changelog update

* Cleanup more `SpriteComponent` warnings (part 2) (#37522)

* Cleanup warnings in DamageMarkerSystem

* Cleanup warnings in CuffableSystem

* Cleanup warnings in DeployableTurretSystem

* Cleanup warnings in StorageContainerVisualsSystem

* Cleanup warnings in ItemMapperSystem

* Cleanup warnings in ItemCounterSystem

* Cleanup warnings in RandomSpriteSystem

* Cleanup warnings in PowerCellSystem

* Cleanup warnings in ParticleAcceleratorPartVisualizerSystem

* Cleanup warnings in PaperVisualizerSystem

* Cleanup warnings in PoweredLightVisualizerSystem

* Cleanup warnings in LightBulbSystem

* Cleanup warnings in EmergencyLightSystem

* Cleanup warnings in DoorSystem

* Cleanup warnings in ClockSystem

* Cleanup warnings in BuckleSystem

* Cleanup warnings in JukeboxSystem

* Cleanup more `SpriteComponent` warnings (part 2) (#37527)

* Cleanup warnings in MagazineVisualsSpriteTest

* Cleanup warnings in WiresVisualizerSystem

* Cleanup warnings in GunSystem.SpentAmmo

* Cleanup warnings in GunSystem

* Cleanup warnings in GunSystem.ChamberMagazine

* Cleanup warnings in MeleeWeaponSystem.Effects

* Cleanup warnings in ToggleableLightVisualsSystem

* Cleanup warnings in StatusIconOverlay

* Cleanup warnings in SpriteFadeSystem

* Cleanup warnings in PdaVisualizerSystem

* Cleanup warnings in EnvelopeSystem

* Cleanup warnings in MechSystem

* Cleanup warnings in MappingOverlay

* Cleanup warnings in LockVisualizerSystem

* Cleanup warnings in DragDropSystem

* Cleanup warnings in GhostSystem

* Cleanup warnings in TriggerSystem.Proximity

* Cleanup warnings in DragonSystem

* Cleanup warnings in PortableScrubberVisualsSystem

* File-scoped namespace for PortableScrubberVisualsSystem

* Cleanup warnings in `DisplacementMapSystem` (#37511)

* Cleanup warnings in DisplacementMapSystem

* docs update

* Suggested simplification

* Xenoborgs part 3 (#36867)

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>

* Convex update (#37533)

* Automatic changelog update

* The Hatening / Hide hair when hats are equipped (#36818)

* changed HideLayerClothing on some entities YAML

* Use HideLayerClothing with slots, layers does not work for some reason

* Hattened again

* Mooore ! I touched the clown mask, beware

* Fix typo from "Slide" to "Side"

* Build issue, test with commenting out error part

* Trying again...

* Trying for fix

* Automatic changelog update

* Buff metal foam grenades (#37476)

* Buff metal foam grenades

* oh and cant forget my main

* Yeah, no, trolling someone because they didn't powergame a crowbar shiftstart is bad

* Automatic changelog update

* Fix tethergun overlay (#37510)

* Fix tethergun overlay

* slice

* wah

* Update TetherGunOverlay.cs

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Automatic changelog update

* HumanoidCharacterProfile and IdCardConsoleComponent constants moved to cvar. Sync id card length with character name length (#35407)

* commit

* mark TODOs

* compiles

* cleanup

* cleanup

* oops

* changed my mind

* requested changes

* genpop fix

* Automatic changelog update

* Remove Basic Hardsuit & Associated Files (#37315)

* Remove Basic Hardsuit

* retaliatory action

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* MindRemoveRole refactor (#34880)

* MindRemoveRole refactor

* role removal logstring rework

* zombiesystem fix

* Buff singularity rad collectors (#37475)

* Automatic changelog update

* TemperatureProtection now works directly on entities (#37544)

* init

* review

* review

* Network SolutionScanner (#37541)

* init

* doc

* Make SharpComponent work with Hands (#37543)

* init

* review

* Cleanup `TryAddDisplacement` warnings (#37545)

Cleanup TryAddDisplacement warnings

* DungeonData rework (#37172)

* DungeonData rework

Back to fields, serializes better, just make new layers dumby.

* wawawewa

* Fix this

* Fixes

* review

* thanks fork

* fix

* shuttle impacts port (#37422)

* initial

* adjust densities and thruster hp

* Fix evil hack

* Last stuff

* review, cleanup

* admin RW

* minor cleanup

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Update submodule to 260.0.0 (#37546)

wawawewa

* Automatic changelog update

* Improve fax machine UI (#33825)

* fax upgraded

* improve resizable

* move Paper type settings & change margins

* change margins & Aling of text

* Rearrange Fax UI

Group paper-type with print-file.
Group refresh button with destination list.

Add some panels to differenciate functionality for faxing an inserted
sheet of paper and printing a local file to a new paper.

* Whitespace

* Remove unnecessary style definition

* Remove whitespace

---------

Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>

* Automatic changelog update

* Persist construction menu favorites server-side (#35867)

* Persist construction menu favorites to player profile

* Use `ProtoId`s for construction favorites

* Validate construction favorites updates from the client

* Actually await the async database call

* Automatic changelog update

* Properly add rainbow skirt to passenger loadout this time (#37501)

* Update Credits (#37556)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

* Cleanup more `SpriteComponent` warnings (part 4) (#37550)

* Cleanup warnings in ClickableSystem

* Cleanup warnings in FultonSystem

* Cleanup warning in HolidaySystem

* Cleanup warning in DoAfterOverlay

* Cleanup warning in EntityHealthBarOverlay

* Cleanup warning in SmokeVisualizerSystem

* Cleanup warning in VaporVisualizerSystem

* Cleanup warning in ColorFlashEffectSystem

* Cleanup warnings in StealthSystem

* Cleanup warnings in TrayScannerSystem

* Cleanup warnings in InventoryUIController

* Cleanup warnings in HideMechanismsCommand

* Cleanup warning in ShowMechanismsCommand

* Cleanup warnings in EntityPickupAnimationSystem

* Cleanup warnings in PointingSystem

* Cleanup warning in StickyVisualizerSystem

* Cleanup warnings in TabletopSystem

* Cleanup warnings in PillSystem

* Cleanup warnings in DiceSystem

* Cleanup warnings in ProjectileSystem

* tweak: Allow cutter machines to be linked to ore silos (#37554)

* Automatic changelog update

* Predict subdermal implants (#37538)

* AutomaticAtmosSystem uses MassDataChangedEvent, clarifies TileMassMultiplier (#37548)

* Initial commit, no tile changes, just mass

* Rename TileMassMultiplier to TileDensityMultiplier

* Fix prisoner closet UI not working (#37558)

Fix prisoner closet UI

* Telecoms Resprite (#35811)

* Medical and Science Servers

Resprited  medical and science servers

* Delete server-off-Recovered.png

* Telecoms and Camera Servers

* Add Copyright

* Fix Rsi

* Minor Stripe Displacement Fix

* Telecoms Sprites

* Telecoms Display Update

Partial Update of the Sprites, Copyright and some YML and JSON changes

* Fix Linter and YML and Finalize

* Remember Lost Router Child

Fix Linter Again (hopefully) and add sprite to entertainment and wireless camera routers

* Requested Review Changes and ect

Changed how the servers dictate how to display whether they have no keys or if they have a mix of keys.

* Re-Run Checks

* Handful of requested changes

* Fix?

* Revert Last

* old yeller

* pushforpr

* Remove Old Files

* Fix Json

* fix rsi for real...?

* Fix Camera Servers

Servers were still calling to telecoms instead of the server sprites

* New Telecom Darken Attempt #1

* Slight stripe change

* Random Whitespace fix

* Fix2boogaloo

* Automatic changelog update

* Amber Station: armory restock (#37432)

* Salvage Job Board (#37549)

* Salvage Job Board

* More development

* Small boy

* Computer yaml (partial)

* UI

* Rank unlock logic

* Job label printing

* appraisal tool integration

* Jobs

* add board to QM locker

* boom!

* command desc

* mild rewording

* ackh, mein pr ist brohken

* Automatic changelog update

* Make research clients grid-local (#36821)

* Limit RD servers to the station grid

* the sluth

* Automatic changelog update

* Improve TryAllReactionsTest (#35356)

* Update TryAllReactionsTest.cs

* mix categories

* Update TryAllReactionsTest.cs

* Jigger transfer amount (#35962)

* Automatic changelog update

* Atmos Air Grenades (#37531)

* Automatic changelog update

* De-loot salvage, add reward crates (#37561)

* Automatic changelog update

* Amber Station - Added Job Board (#37565)

* Automatic changelog update

* Add Blatantly Nuclear to Nuke Songs (#35927)

* Nukies are so back

* Catch this webedit

* Webedit 2: Epic Webedit Fail

* Automatic changelog update

* Add ImplicitRoofComponent (#36112)

* Add ImplicitRoofComponent

So shuttles get marked as rooved.

* Early-out

So the new render doesn't suck up perf unnecessarily.

* Automatic changelog update

* Rebuild ATS Anchor room and add indestructible spine. (#37560)

* Automatic changelog update

* Adds marker component to roof markers (#35453)

* Adds marker component to roof markers

So now you can show and hide them properly.

* a

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Bomb Deliveries (#37069)

* init

* BOMB!!!

* review

* partial review

* review

* Automatic changelog update

* Stelloxadone (#37131)

init

* Cryoxadone Tweaks (#37132)

fuck cryox

* Traumoxadone (#37236)

* fuck salicylic acid

* small tweak based on playtest

* meh

* locale

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Automatic changelog update

* Aloxadone Tweaks (#37239)

alox

* Automatic changelog update

* Make Nukie and Wizard Comms Console not announce who it was sent by (#37567)

* Make Nukie and Wizard Comms Console not announce who it was sent by.

* Add doc-comment to field

* Automatic changelog update

* A lone operative successfully nuking the station now actually ends the round. (#36498)

LoneOpsSpawn is now of an indefinite duration -- it lasts until either the LoneOp dies or the nuke detonates. This means a few things.

* Automatic changelog update

* Cleanup atmos air grenade code (#37568)

cleanup

* Fix item stuck check (#37570)

* Automatic changelog update

* Convex job board update (#37579)

* Automatic changelog update

* Fix research server test fail (#37562)

* add: water vapor hurts slimes (#32751)

* water vapor hurts slimes

* 3 looks good

* Update Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Cleanup more `SpriteComponent` warnings (part 5) (#37590)

* 1 warning in KudzuVisualizerSystem

* 2 warnings in ChameleonProjectorSystem

* 1 warning in MarkerSystem

* 2 warnings in ItemSystem

* 1 warning in GhostToggleSelfVisibility

* 1 warning in FoamVisualizerSystem

* 1 warning in ClickableTest

* 1 warning in ThrownItemVisualizerSystem

* 2 warnings in InfantSystem

* 1 warning in ChasmFallingVisualsSystem

* 1 warning in PotencyVisualsSystem

* 2 warnings in OrbitVisualsSystem

* 2 warnings in BeamSystem

* 1 warning in JitteringSystem

* 1 warning in CardboardBoxSystem

* 2 warnings in StationAiSystem

* 2 warnings in FirelockSystem

* 2 warnings in CargoSystem.Telepad

* 1 warning in StasisBedSystem

* 2 warnings in WeldableVisualizerSystem

* 2 warnings in DeliveryVisualizerSystem

* 1 warning in TimerTriggerVisualizerSystem

* 1 warning in StorageFillVisualizerSystem

* 2 warnings in RadiationCollectorSystem

* 2 warnings in BorgSwitchableTypeSystem

* 1 warning in TurnstileSystem

* 1 warning in SurveillanceCameraVisualsSystem

* 1 warning in BurnStateVisualizerSystem

* 2 warnings in CableVisualizerSystem

* 1 warning in JetpackSystem

* Black Scarf Icon Fix (#37589)

* forgot like a dumbass

* attributions

* Add keybind for swapping hands in the other direction (#37588)

add swap hands reverse

* Automatic changelog update

* Force Wall Tweaks (#37525)

* Reduces forcewall time to 10 seconds

* Increases force wall action delay to 15

* Adds Special Wall Layer

* Fixes indenting. Changes Mask and Layer to Special Wall Layer

* Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automatic changelog update

* Make early salvage jobs easier (#37598)

* Box Station - Added Job board (#37602)

* Automatic changelog update

* remove ignition functional from welder component (#37586)

* a

* webedit

* EntityLootTable deleted (#37604)

* Make Holy water evaporate like normal water (#37611)

holy water evaporates

* Automatic changelog update

* Cleanup `SpriteComponent` warnings in map renderer (#37609)

* 3 warnings in EntityPainter

* 1 warning in MapPainter

* Pepper makes you cough (#36358)

* Automatic changelog update

* Elkridge - Salv job board and overhaul (#37600)

* Automatic changelog update

* Magazine Sprite Fix (#37615)

* first

* long mag + mk58 color

* loop salvage job board (#37618)

* Remove `ParallaxVV` property from `ParallaxComponent` (#37617)

Delete ParallaxVV

* Mirror Shield Contraband Fix (#37620)

easy change

* Cleanup 2 warnings in `ReagentDispenserSystem` (#37622)

* Cleanup 2 warnings in ReagentDispenserSystem

* Eh, let's be specific

* Add validation test for `ExplosionPrototype`s (#37621)

* Add validation test for ExplosionPrototype

* Remove runtime validation in prototype

* Researchable & Printable Hyper Capacity Cells (#37619)

* wowwww batterie

* americanized the spelling of "maximised" to "maximized"

* changed recipe to be more unique from microreactors

* addressing requested changes

* Automatic changelog update

* Updated Salvage Guidebook. (#37593)

Co-authored-by: RedBookcase <Usualmoves@gmail.com>

* Automatic changelog update

* Give kammerer tighter spread so it's not a complete downgrade to the enforcer (#37616)

* Automatic changelog update

* Cleanup more `SpriteComponent` warnings (part 6) (#37607)

* 1 warning in MechAssemblyVisualizerSystem

* 2 warnings in RecyclerVisualizerSystem

* 1 warning in ClusterGrenadeVisualizerSystem

* 2 warnings in BarSignSystem

* 4 warnings in AlertControl

* 1 warning in ToolSystem

* 2 warnings in PinpointerSystem

* 2 warnings in ClientSpriteMovementSystem

* 2 warnings in OptionsVisualizerSystem

* 1 warning in FlatpackSystem

* 1 warning in ZombieSystem

* 1 warning in StackSystem

* 1 warning in MiningOverlay

* 1 warning in FlippableClothingVisualizerSystem

* Guard clause for MechAssemblyVisualizerSystem

* Get SpriteSystem in AlertControl constructor

* Galosh Slowdown Fix (#37628)

Begone Galosh

* Automatic changelog update

* Submodule Update 260.1.0 (#37633)

* CompFactory updates (#37559)

* Fixed Missing or Misconfigured Locale Keys (#37595)

* Fixes and adds many localization keys from #34343
Open

* Fix comment, that is not how that works.

* Update Resources/Locale/en-US/components/screen-component.ftl

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Fixes cmd-parse-failure-int -> cmd-parse-failure-integer in OptionsUIController.cs, removes cmd-parse-failure-int from options-menu.ftl

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* add reduced motion drug overlay (#37584)

* reduced motion flash effect

* reduced motion drug overlay

* Revert "reduced motion flash effect"

This reverts commit e350b2899d0acc78c9833b5bc23a9680e03b2736.

* Automatic changelog update

* Bombsuit Description Fix (#37631)

simple as that

* New fun meteors (#37327)

* New fun meteors

* Forgot about newline

* Fix

* Wow, a new test

* Okay

* Fix

* Fix 2

* I hope this is correct enough

* Attribution

* Attribution 2

* Automatic changelog update

* Slime storage QoL (#37592)

* Automatic changelog update

* Cleanup warning CS0414 (#37648)

* Fland Update (Salvage Job Computer) (#37653)

* Bagel Update (Salvage Job Computer) (#37652)

* Automatic changelog update

* Marathon Update (#37654)

* Automatic changelog update

* Omega Update (Salvage Job Computer) (#37655)

* Automatic changelog update

* Packed Update (Salvage Job Computer) (#37656)

* Automatic changelog update

* Epinephrine Antihistamine effect, Histamines not radioactive (#37460)

* Added Epinephrine antihistamine effect when at least 45u. Removed Histamines causing Radiation damage.

* Indentation fixed

* had coffee, able to see how to fix indentation now.

* Automatic changelog update

* Fix Misplaced Mapping CL Entries (#37670)

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Adding fungal soil (#36245)

Co-authored-by: aliser <20380250+murolem@users.noreply.github.com>

* Box Station - Added GenPop (Sec redesigned) (#37663)

* Automatic changelog update

* Automatic changelog update

* Optimise storage a quadrillion times (#37638)

* Optimise storage a quadrillion times

* How sweaty can we get

* Add fast angle checks

* Fix chunk indices

* Optimise the refresh method

Helps on client a lot as the clientside is suboptimal atm.

* Better name

* wawawewa

* Add single-angle path

* Okay FINE rider

* Automatic changelog update

* fix soil locale (#37674)

* fix soil locale

* xdd

* Reach Update (#37669)

* Automatic changelog update

* Limit shuttle collision damage (#37578)

* outlaw the usage of spacecraft as weapons of mass destruction

* adjust slowdown

* Automatic changelog update

* Use velocity along normal for shuttle impacts (#37667)

* Use velocity along normal for shuttle impacts

Scrapes shouldn't have the same level of destruction as full-on ramming anymore. Also detecting scrapes should be a lot easier for future stuff.

* Update Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs

* Update submodule to 260.2.0 (#37684)

* Automatic changelog update

* inhands for Syndicate Things (and thief beacon) (#37682)

* initial

* splitting this b

* thief bacon 1 handed

* why is test fail

* dont fail please

* "requires"

* evil tests

* Remove static logger calls in `LateJoinGui` (#37688)

* Cleanup 2 static logger calls in LateJoinGui

* That's not how that works

* Ore + entitytable fixes (#37675)

* Ore + entitytable fixes

Iterate every dungeon not just last.

* Big shot

* Fixes

* make some stuff require two hands (#37683)

* get splitted

* thievy 1 handed

* scarko changes

* Automatic changelog update

* Fix glass external airlocks using the standard airlock emergency access lights. (#37666)

Update emergency_unlit.png

* Change Arachnid Layering (#36357)

* 1 commit ops

* untouching this before anyone has to tell me

* Add microwave-nukedisk interaction (#36114)

* Add microwave-nukedisk interaction

* popup

* Fix UninitializedSaveTest

* Automatic changelog update

* Screaming for cyborgs (#32329)

* Automatic changelog update

* Tweak "Help a fellow traitor" objective to allow yellowtexting (#37679)

init

* Automatic changelog update

* Evac Shuttle Wode update (#37223)

* Cleanup warnings in `NodeVisualizationOverlay` (#37707)

Cleanup 2 warnings in NodeVisualizationOverlay

* Cleanup warnings in `AtmosPipeAppearanceSystem` (#37706)

* Cleanup 2 warnings in AtmosPipeAppearanceSystem

* Let's use the Entity<T> version

* todo comment

* Optimize parallax VRAM usage (#37180)

* Disable parallax texture preloading

Many parallax layers are specific to a single map and will likely never be loaded for the duration of the game. Save VRAM by not loading them always.

Requires engine master

* Put generated parallax identifier in texture name

Makes it show up properly in debugging tools

* Don't load generated parallaxes multiple times

Many parallax prototypes re-use the same generated parallax configs. These generated parallaxes were being loaded multiple times at once, which was a massive waste of VRAM.

We now move these into a separate cache for deduplication. I had to write a lot of logic to handle loading cancellation and ref counting. Yay.

Also fixes some spaghetti with the previous parallax loading system: cancellation didn't work properly, give proper names to generated texture names, etc.

This saves like 100+ MB of VRAM.

* Automatic changelog update

* Cleanup warning in `GridInRange` (#37699)

Cleanup warning in GridInRange

* Significantly improve Tesla generator power stability (#37626)

* Significantly improve Tesla generator power stability

* Second round of balancing

* Automatic changelog update

* Update `SharedBiomeSystem` methods to use `Entity<T>` (#37698)

* Fix warning in TryGetBiomeTile

* Overload TryGetBiomeTile

* Overload more methods, fix internal warnings

* Update TryGetEntity uses

* Update TryGetTile uses

* Cleanup TryGetDecals use

* Formatting

* Two more warnings while we're here

* Add disposal signalers (#37535)

* Add disposal signalers

* Sprite changes

* Some requested changes

* Requested changes + change spelling to be with two l's to be consistent with the remote signaller

* Automatic changelog update

* Tweak "Escape" objective to allow yellowtexting (#37680)

init

* Automatic changelog update

* Rat King Chat Indicator (#37184)

* Rat King Chat Indicator

* BUFFRATWHEN

* Added it to the crown wawa

* Ignore this

* Whats the limit for stuff I can put here?

* Fix da merge conflicts for real this time

* WE DID ITgit add -A

* Errant Requested Changes

* Add gold and silver material crates, balance cargo mat crate prices (#37713)

* Automatic changelog update

* Fix storage (#37714)

The one path I forgot to get the relative index.

* comment out slotblocker yaml (#37827)

* comment out slotblocker yaml

* let me fix this real quick xD

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* hotfix the hotfix, slot blocker changelog (#37845)

remove changelog for slot blockers due to being reverted

* HOTFIX Cryochem revert (#37844)

* Revert "Traumoxadone (#37236)"

This reverts commit 55ec2632a8.

* Revert "Cryoxadone Tweaks (#37132)"

This reverts commit 406bfa3308.

* Revert "Stelloxadone (#37131)"

This reverts commit f415ad51c3.

* whitespace test fail evasive maneuver

* changelog 1984

* Fix storage fastpath logical oversight (#37852)

* entityloottable conflicts fix

* dungenore wawa

* cs fix, demiplane fix

* Update check-trailing-whitespace.yml

* global whitelist fix

* return vanilla vgroid gen

* Update onion.yml

* try fix new lines

* fix reagent guidebook

* Update GuideReagentReaction.xaml.cs

* Update GuideReagentReaction.xaml.cs

* Update GuideReagentReaction.xaml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: kosticia <kosticia46@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Tezzaide <ewankayne@hotmail.co.uk>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Chartman <connorhartman95@gmail.com>
Co-authored-by: RedBookcase <crazykid1590@gmail.com>
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: Jessey van Hoeijen <114107545+LMSNoise@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Spanky <scott@wearejacob.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Qerd <73325910+BigfootBravo@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com>
Co-authored-by: Banedon <15725971+Lanedon@users.noreply.github.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: Ilya246 <57039557+Ilya246@users.noreply.github.com>
Co-authored-by: eoineoineoin <helloworld@eoinrul.es>
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
Co-authored-by: YotaXP <yotaxp@gmail.com>
Co-authored-by: paige404 <59348003+paige404@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
Co-authored-by: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com>
Co-authored-by: Spangs04 <40036609+Spangs04@users.noreply.github.com>
Co-authored-by: Nox <nebulousnox38@gmail.com>
Co-authored-by: Oleshe <125771937+0leshe@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
Co-authored-by: Super <84590915+SuperGDPWYL@users.noreply.github.com>
Co-authored-by: qwerltaz <69696513+qwerltaz@users.noreply.github.com>
Co-authored-by: SeamLesss <kai.julian.watson@gmail.com>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Deerstop <edainturner@gmail.com>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
Co-authored-by: Entvari <195642967+Entvari@users.noreply.github.com>
Co-authored-by: SpeltIncorrectyl <66873282+SpeltIncorrectyl@users.noreply.github.com>
Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Co-authored-by: Kittygyat <202250949+Kittygyat@users.noreply.github.com>
Co-authored-by: FrostRibbon <107171544+FrostRibbon@users.noreply.github.com>
Co-authored-by: Minty642 <42335609+Minty642@users.noreply.github.com>
Co-authored-by: aliser <20380250+murolem@users.noreply.github.com>
Co-authored-by: mubururu_ <139181059+muburu@users.noreply.github.com>
Co-authored-by: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>
Co-authored-by: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: AsnDen <75905158+AsnDen@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: Wolfkey-SomeoneElseTookMyUsername <wolfkey75@gmail.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
2025-05-31 00:25:16 +03:00
Ed
0dd379dec3 Merge branch 'master' into ed-27-05-2025-upstream-sync 2025-05-30 23:24:23 +03:00
Ed
42fd0fe070 Update GuideReagentReaction.xaml 2025-05-30 23:14:33 +03:00
Ed
4a0c76ba76 Update GuideReagentReaction.xaml.cs 2025-05-30 23:14:22 +03:00
Ed
d5b15f6816 Update GuideReagentReaction.xaml.cs 2025-05-30 21:05:19 +03:00
Nim
b28c5605b9 zombie speed (#1337) 2025-05-30 18:22:39 +03:00
Ed
a0956a399a fix reagent guidebook 2025-05-30 15:43:23 +03:00