March 2024 upstream merge #1207

GreaseMonk · 2024-04-09T15:46:50Z

About the PR

This includes all changes up to 9th of april 2024.

Here are my notes for this PR's merge conflicts:

Shuttle IFF Shuttle search function has been removed as the entire system is replaced.

1. Revert some changes to this pr perhaps?: space-wizards/space-station-14#25955

2. Check if CargoSystem.Orders this is relevant still // orderDatabase.Orders.Remove(order); # Frontier Was added by upstream, didn’t exist in our repo

SolutionTransferSystem got removed upstream so need to re apply these changes

Check if TriggerSystem.cs needs  var posText = $”({x}, {y})”;  or var posText = FormattedMessage.RemoveMarkup(_navMap.GetNearestBeaconString(uid)); bottom one is from upstream.
Some conflicts in ReagentGrinderComponent just check reagent grinder just incase merged incorrectly.
Something related to fryer system.

6. CrewMonitoryingServerSystem had changes check if PR 1053 still works

7.  Expedition console added something named “names_borer” (search) perhaps worth checking what this is.  

SalvageSystem replaced “this” with “_transform” in SpawnMission function to create SpawnSalvageMissionJob. Potentially revert back to ‘this’ or needs it added.
Check handheld mass scanner display, code was updated and there is a thing that happens only when it has a power cell draw component.

10. I reverted #25864 -> https://github.com/space-wizards/space-station-14/pull/25864 to old values so gas leaks are not 4x as strong 

10 and a half.  Check RCD / Shipyard RCD   

11. Revert prices of gases cost?
https://github.com/space-wizards/space-station-14/pull/25608/files
 
12. PR 631 infiltrator map update is undone with this upstream merge.  

Check Brass cargo purchase selling price (bumped it from 2500 to 5000)  CrateVendingMachineRestockAutoDrobe was missing - I added it again   
Check if this change is correct (use upstream one)

 15. Check ReagentGrinderIndustrialMachineCircuitboard recipe that was added, if it needs to be removed or cost changed.  
 
 16. PlastitaniumWindowDiagonal was added, needs to be checked and possibly conflicts with our current sprites of plastitanium from FoxxoTrystan

 17. Check this asteroid conflict to make sure this is correct.

18.  RadarConsole maxRange was reduced from 512 to 384   NewsReadCartridge renamed to NewsReaderCartridge -> correctly working ?

~~TODO shipyard rcd needs this check re-added~~
@metalgearsloth mentioned there is a bug with cross-map ftl still but unable to reproduce it. if someone here can find the issue and know how to reproduce it forward it to ss14 disc

Fix lathe material list bug

* Fix body bag id * migration

* Make clothing cheaper * bueah * proper price *

Fix tray scanner not updating it's range on change. Add range value to the tray scanner state.to synchronize it between client and server.

@deltanedas

* predict humanoid identity examine * actually server doesnt need proto anymore --------- Co-authored-by: deltanedas <@deltanedas:kde.org>

* meat and potatoes hahaha * DAMAGE yes * come on * Check again * Guhhhhh guh

* Ion Storm Laws Review Have reviewed the Ion Storm law dictionary and tidied it up. Specifically I've tried to keep the same number of entries in each section, or slightly increased them, where I've removed or altered a string. Of note, specific colours and "rainbow" have been removed from adjectives and replaced with words like "Cheese-Eating", as colours are kinda boring themselves and they've been a cause of a few accidentally-racist laws. * Resolve some feedback. * Remove the pull request joke, noooooo * Re-add big bite burgers as they are actually a thing * Append some more suggestions

Praise Ratvar

* First pass cleaning up server-only YAML errors. * Second pass

* Insectoid Gauze, Added racial marks to variants * removed excess r from gauze_moth_lowerleg_r * Update gauze.ftl * moved all markings to Overlay Category * fixed localization error * a

@deltanedas

Co-authored-by: deltanedas <@deltanedas:kde.org>

This command allows you to grant a player temporary privilege to join regardless of player cap, whitelist, etc. It does not bypass bans. The API for this is IConnectionManager.AddTemporaryConnectBypass(). I shuffled around the logic inside ConnectionManager. Bans are now checked before panic bunker.

…on-14 into march-2024-upstream-merge # Conflicts: # Content.Client/Lobby/LobbyState.cs # Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs # Content.Client/Paper/UI/PaperWindow.xaml.cs # Content.Client/Shuttles/UI/RadarControl.cs # Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml # Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs # Content.Client/Stylesheets/StyleNano.cs # Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml # Content.Server/Access/Systems/IdCardConsoleSystem.cs # Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs # Content.Server/Bed/Sleep/SleepingSystem.cs # Content.Server/Body/Components/RespiratorComponent.cs # Content.Server/Body/Systems/BodySystem.cs # Content.Server/Cargo/Systems/CargoSystem.Orders.cs # Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs # Content.Server/Chemistry/EntitySystems/SolutionTransferSystem.cs # Content.Server/Explosion/EntitySystems/ExplosionSystem.cs # Content.Server/Explosion/EntitySystems/TriggerSystem.cs # Content.Server/GameTicking/GameTicker.Player.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Kitchen/Components/ReagentGrinderComponent.cs # Content.Server/Labels/Label/LabelSystem.cs # Content.Server/Materials/MaterialReclaimerSystem.cs # Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs # Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs # Content.Server/Medical/SuitSensors/SuitSensorSystem.cs # Content.Server/Research/Systems/ResearchSystem.Client.cs # Content.Server/Resist/EscapeInventorySystem.cs # Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs # Content.Server/Salvage/SalvageSystem.Expeditions.cs # Content.Server/Salvage/SalvageSystem.Runner.cs # Content.Server/Salvage/SpawnSalvageMissionJob.cs # Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs # Content.Server/Shuttles/Systems/RadarConsoleSystem.cs # Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs # Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs # Content.Server/Species/Systems/NymphSystem.cs # Content.Server/StationEvents/Components/GasLeakRuleComponent.cs # Content.Server/VendingMachines/VendingMachineSystem.cs # Content.Server/VoiceMask/VoiceMaskerComponent.cs # Content.Shared.Database/LogType.cs # Content.Shared/Access/Components/IdCardConsoleComponent.cs # Content.Shared/Bed/Sleep/SharedSleepingSystem.cs # Content.Shared/Doors/Systems/SharedDoorSystem.cs # Content.Shared/Lock/LockSystem.cs # Content.Shared/Players/ContentPlayerData.cs # Content.Shared/Procedural/Dungeon.cs # Content.Shared/RCD/Components/RCDAmmoComponent.cs # Content.Shared/RCD/Components/RCDComponent.cs # Content.Shared/RCD/Systems/RCDSystem.cs # Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs # Content.Shared/Shuttles/BUIStates/NavInterfaceState.cs # Content.Shared/Species/Systems/ReformSystem.cs # Resources/Changelog/Changelog.yml # Resources/Locale/en-US/implant/implant.ftl # Resources/Locale/en-US/materials/materials.ftl # Resources/Locale/en-US/paper/paper-component.ftl # Resources/Locale/en-US/shuttles/console.ftl # Resources/Maps/Dungeon/lava_brig.yml # Resources/Maps/Shuttles/infiltrator.yml # Resources/Prototypes/Atmospherics/gases.yml # Resources/Prototypes/Body/Organs/reptilian.yml # Resources/Prototypes/Catalog/Cargo/cargo_armory.yml # Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml # Resources/Prototypes/Catalog/Cargo/cargo_botany.yml # Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml # Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml # Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml # Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml # Resources/Prototypes/Catalog/Cargo/cargo_engines.yml # Resources/Prototypes/Catalog/Cargo/cargo_food.yml # Resources/Prototypes/Catalog/Cargo/cargo_fun.yml # Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml # Resources/Prototypes/Catalog/Cargo/cargo_materials.yml # Resources/Prototypes/Catalog/Cargo/cargo_medical.yml # Resources/Prototypes/Catalog/Cargo/cargo_science.yml # Resources/Prototypes/Catalog/Cargo/cargo_security.yml # Resources/Prototypes/Catalog/Cargo/cargo_service.yml # Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml # Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml # Resources/Prototypes/Catalog/Fills/Crates/botany.yml # Resources/Prototypes/Catalog/Fills/Crates/engines.yml # Resources/Prototypes/Catalog/Fills/Crates/fun.yml # Resources/Prototypes/Catalog/Fills/Crates/service.yml # Resources/Prototypes/Catalog/Fills/Crates/vending.yml # Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml # Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml # Resources/Prototypes/Catalog/uplink_catalog.yml # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Clothing/Neck/mantles.yml # Resources/Prototypes/Entities/Clothing/Neck/medals.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml # Resources/Prototypes/Entities/Mobs/Species/reptilian.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml # Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml # Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml # Resources/Prototypes/Entities/Objects/Devices/pda.yml # Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml # Resources/Prototypes/Entities/Objects/Specific/Research/rped.yml # Resources/Prototypes/Entities/Objects/Tools/tools.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml # Resources/Prototypes/Entities/Structures/Dispensers/chem.yml # Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml # Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Entities/Structures/Machines/recycler.yml # Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml # Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml # Resources/Prototypes/Entities/Structures/Walls/asteroid.yml # Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml # Resources/Prototypes/Entities/Structures/Windows/window.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/GameRules/roundstart.yml # Resources/Prototypes/Procedural/Magnet/asteroid.yml # Resources/Prototypes/Procedural/salvage_loot.yml # Resources/Prototypes/Procedural/salvage_mods.yml # Resources/Prototypes/Recipes/Lathes/electronics.yml # Resources/Prototypes/Research/experimental.yml # Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml # Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/XenoArch/Effects/utility_effects.yml # Resources/Prototypes/tags.yml # Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json # Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json # Resources/Textures/Objects/Fun/toys.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-lawyer.png # Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json # Resources/Textures/Structures/Windows/plastitanium_window.rsi/full.png # Resources/Textures/Structures/Windows/plastitanium_window.rsi/meta.json # Resources/migration.yml

github-actions · 2024-04-22T00:01:09Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-04-22T00:07:50Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

This reverts commit 227055a.

…eflect bonus based on walls used

…eme.

Crotalus and others added 19 commits April 8, 2024 09:46

Fix lathe materials list bug (#26826)

a9df8cf

Fix lathe material list bug

fix bodybag id case (#26823)

7188b50

* Fix body bag id * migration

Make bombsuits similar (#26806)

4a7aa30

Automatic changelog update

2bbae3e

Make clothing cheaper and split clothing restock (#26805)

6ce5370

* Make clothing cheaper * bueah * proper price *

Automatic changelog update

7f56ba0

Fix tray scanner not updating it's range. (#26789)

3d6d782

Fix tray scanner not updating it's range on change. Add range value to the tray scanner state.to synchronize it between client and server.

predict humanoid identity examine (#26769)

2f5c639

* predict humanoid identity examine * actually server doesnt need proto anymore --------- Co-authored-by: deltanedas <@deltanedas:kde.org>

Spears equippable to suit storage (#26724)

263469d

* meat and potatoes hahaha * DAMAGE yes * come on * Check again * Guhhhhh guh

Automatic changelog update

1486617

add ratvar to ion storm laws (#26833)

e64288a

Praise Ratvar

Server-only component YAML cleanup (#26836)

a0de0ab

* First pass cleaning up server-only YAML errors. * Second pass

Gauze Markings 3 - Revenge of the Wrap (#25481)

a1fcfed

* Insectoid Gauze, Added racial marks to variants * removed excess r from gauze_moth_lowerleg_r * Update gauze.ftl * moved all markings to Overlay Category * fixed localization error * a

Automatic changelog update

694ae00

dirty after calling SetAccesses (#26849)

6d695dd

Co-authored-by: deltanedas <@deltanedas:kde.org>

Automatic changelog update

862f820

github-actions bot added Docs Improvements or additions to documentation Sprites YML C# UI FTL labels Apr 9, 2024

GreaseMonk added 5 commits April 9, 2024 17:57

Fix syntax error

ea5d7f4

Fix import

1151db6

Fix RCDSystem errors

354fb68

Fix DoAfterArgs error

21b27d6

Fix a missing bracket

124e4b2

Security Shipyard Cleanup

1242af7

github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Apr 22, 2024

Update

6adc52e

github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Apr 22, 2024

Fix

3ec1e9c

github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Apr 22, 2024

Merge branch 'master' into march-2024-upstream-merge

b25965a

github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Apr 22, 2024

dvir001 added 17 commits April 22, 2024 03:28

Fix

a69a99b

Fix Part 2

4a941d0

More fixing

132b2bc

Update config.py

834440c

Gyro price holy hell

88d08c6

Update access.yml

71ddfaa

Small Gyro price fix

ef977e4

Attempts to power fix

227055a

Revert "Attempts to power fix"

389e384

This reverts commit 227055a.

Thrusters

8552726

Update lpbravo.yml

94643fc

Removed all walls reflect to balance all ships out not having weird r…

dd50319

…eflect bonus based on walls used

Update cove.yml

5121ede

Fix Sprites Location

01d2ef4

Disabled 3 new lobby art from upstream that don't fit the frontier th…

2cc5584

…eme.

M_EMP Radio fix

6ccd277

IFF Fix

0e4c98d

Cheackraze approved these changes Apr 23, 2024

View reviewed changes

Cheackraze merged commit 46d8815 into master Apr 23, 2024
14 of 15 checks passed

GreaseMonk deleted the march-2024-upstream-merge branch April 23, 2024 09:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

March 2024 upstream merge #1207

March 2024 upstream merge #1207

GreaseMonk commented Apr 9, 2024 •

edited

Loading

github-actions bot commented Apr 22, 2024

github-actions bot commented Apr 22, 2024

March 2024 upstream merge #1207

March 2024 upstream merge #1207

Conversation

GreaseMonk commented Apr 9, 2024 • edited Loading

About the PR

github-actions bot commented Apr 22, 2024

github-actions bot commented Apr 22, 2024

GreaseMonk commented Apr 9, 2024 •

edited

Loading