Ed
b581f5d132
Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync
...
# Conflicts:
# .github/workflows/check-trailing-whitespace.yml
# Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
# Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs
# Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Shared/Light/Components/SunShadowCycleComponent.cs
# Resources/Prototypes/Damage/modifier_sets.yml
# Resources/Prototypes/Maps/Pools/default.yml
2025-06-23 16:37:22 +03:00
Kyle Tyo
546bfd0a30
MapManager warnings cleanup Server Edition 2003 ( #36781 )
...
* now you see me
* unused depen
* test fail fix attempt 1
* test fail fix attempt 2
* fix test fail attempt 3
* shot in the dark.
* Does this work?
* import cleanup
* taking a shot at this.
* Convert PersistenceSaveCommand to LocalizedEntityCommands.
* requested changes
* requested changes. also dealt with improperly named private const
* Update Content.Server/GameTicking/GameTicker.Spawning.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Update Content.Server/GameTicking/GameTicker.Spawning.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Convert PlanetCommand to LocalizedEntityCommand
* Update BiomeSystem.cs
* Update Content.Server/Salvage/SalvageSystem.Runner.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Update Content.Server/Procedural/DungeonSystem.Rooms.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Update Content.Server/Salvage/SpawnSalvageMissionJob.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Update Content.Server/Station/Systems/StationBiomeSystem.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* revert to latest master.
* slartis suggestion.
* Update SetMapAtmosCommand.cs
* cleanup
* Update PersistenceSaveCommand.cs
* finish localizing persistencesavecommand
* this is icky, I change.
* :sigh:
* revert whatever I did here?
* oh I see, some inconsistencies.
* revert this
* Update PlanetCommand.cs
* move this ftl to the commands folder
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-06-09 02:09:42 +02:00
Ed
26d81b684b
Weather refill ( #1175 )
...
* refillable by weather
* fix
2025-04-13 01:01:22 +03:00
Ed
edc67dd280
Storm nerf ( #1107 )
...
* weather lightning nerf
* port storm weather to gamerule events
* fix
2025-03-31 23:46:21 +03:00
Ed
9d6e023bd0
Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2
...
# Conflicts:
# Content.Client/Administration/AdminNameOverlay.cs
# Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
# Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
# Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
# Content.Client/SubFloor/SubFloorHideSystem.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Cloning/CloningSystem.cs
# Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
# Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs
# Content.Server/Roles/ParadoxCloneRoleComponent.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/CCVar/CCVars.Interface.cs
# Content.Shared/Cloning/CloningEvents.cs
# Content.Shared/Cloning/CloningSettingsPrototype.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Light/Components/SunShadowCycleComponent.cs
# Content.Shared/Storage/StorageComponent.cs
# Resources/Changelog/Admin.yml
# Resources/Changelog/Changelog.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/en-US/paradox-clone/role.ftl
# Resources/Maps/bagel.yml
# Resources/Maps/loop.yml
# Resources/Prototypes/Chemistry/mixing_types.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Entities/Effects/puddle.yml
# Resources/Prototypes/Entities/Mobs/Player/clone.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Objectives/paradoxClone.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi/equipped-EYES-arachnid.png
2025-03-31 12:41:37 +03:00
Ed
011e90a5d1
Weather gameplay effects ( #1089 )
...
* pipa
* Weather effects
* Weather in demiplanes!
* demiplane enter roofs
* Demiplane ruins
* Update weather.yml
* Update paper.yml
* Update paper.yml
2025-03-30 17:27:05 +03:00
Tayrtahn
86aa82f2b6
Cleanup: Remove redundant prototype name specifications ( #35793 )
...
* Remove redundant prototype name specifications
* These can stay
2025-03-19 19:30:31 +01:00
Ed
acc9886242
Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2
...
# Conflicts:
# Content.Client/Options/UI/OptionsMenu.xaml
# Content.IntegrationTests/Tests/PostMapInitTest.cs
2025-03-03 23:23:40 +03:00
Tayrtahn
6f925dd610
Fix prototypes so they pass analyzer checks ( #35435 )
2025-02-24 15:21:59 +11:00
Ed
07e0606ecf
Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream
...
# Conflicts:
# Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
2025-02-23 23:07:55 +03:00
metalgearsloth
a457551108
Roof data rework ( #35388 )
2025-02-23 18:23:00 +11:00
metalgearsloth
1984235f0f
Ignore weather on rooved tiles ( #35214 )
...
Might want more flexibility in future but weather needs some polish and this is fine for now.
2025-02-16 16:55:41 +01:00
Ed
4cd9e41469
Mist + Lampposts ( #472 )
...
* lamppost
* mist weather
* maps update
* Update weather.yml
* Update meta.json
2024-09-29 13:07:30 +03:00
Ed
ff412a65ba
Weather fix ( #30857 )
...
* weather fix
* localize errors
2024-08-26 01:20:47 +10:00
Ed
a1e66cfbb4
clean up weather systems ( #28792 )
...
* clean up weather systems
* Update WeatherComponent.cs
* Update SharedWeatherSystem.cs
* some fix
* Update SharedWeatherSystem.cs
* Update WeatherComponent.cs
* Update WeatherComponent.cs
* revert autoPause
* Update SharedWeatherSystem.cs
2024-06-18 20:27:34 +10:00
Tayrtahn
4a83c36585
Code cleanup: Dirty(Comp) ( #26238 )
...
* Replaced uses of Dirty(Component) with Dirty(Uid, Component)
Modified some systems (notably pulling-related) to use uids.
* Missed a few
* Revert changes to pulling
* No
2024-03-19 23:27:02 -04:00
Ed
4aa72af574
Convert "IgnoreWeatherComponent" into "BlockWeatherComponent" ( #26135 )
...
* ignore
* doc
2024-03-15 18:36:09 -04:00
metalgearsloth
0d728b930b
Fix weather audio ( #21949 )
2023-11-28 23:35:38 +11:00
metalgearsloth
269c93245d
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2023-11-27 22:12:34 +11:00
DrSmugleaf
2d58d19b07
Make all prototype types partial ( #21374 )
2023-11-01 19:56:23 -07:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 ( #21318 )" ( #21319 )
2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio ( #20862 )
2023-10-29 14:58:23 +11:00
DrSmugleaf
f560f88eb5
Remove 700 usages of Component.Owner ( #21100 )
2023-10-19 12:34:31 -07:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
metalgearsloth
22ae0e7ed8
Fix weather blocking in some instances ( #14561 )
2023-03-11 14:11:19 +11:00
metalgearsloth
46b27a68ff
Weather tweaks ( #14271 )
2023-03-07 12:28:50 +11:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11:00
metalgearsloth
81a1c6d7de
Weather effects ( #12528 )
...
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com >
2023-01-17 20:26:52 +11:00
