Ed
|
d5fbdbdec0
|
Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
# Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
# Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
# Resources/Prototypes/Entities/Effects/chemistry_effects.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/GameRules/meteorswarms.yml
# Resources/Prototypes/Procedural/dungeon_configs.yml
|
2025-05-27 12:21:14 +03:00 |
|
Errant
|
1b7651184c
|
Limit shuttle collision damage (#37578)
* outlaw the usage of spacecraft as weapons of mass destruction
* adjust slowdown
|
2025-05-21 20:37:36 +10:00 |
|
Ilya246
|
356dabb9c9
|
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>
|
2025-05-18 03:11:08 +10:00 |
|
Ed
|
ef6d973301
|
Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync
# Conflicts:
# Content.Client/Parallax/ParallaxControl.cs
# Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
# Content.Server/Labels/Label/LabelSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Fluids/Components/EvaporationComponent.cs
# Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
# README.md
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/Pools/deathmatch.yml
# Resources/Prototypes/Maps/arenas.yml
|
2025-04-30 20:31:50 +03:00 |
|
slarticodefast
|
e1a1150257
|
Allow fire extinguishers and sprays to push grids you are standing on (#31754)
* allow fire extinguishers and sprays to push grids
* add cvar and reduce pushback
* EmoGarbage Review - Resolve Conflicts
* Ensure grid parenting
---------
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
|
2025-04-18 13:41:27 +10: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 |
|
Simon
|
eff25810c5
|
[ChangeCVarCommand] Mapping Command (#35239)
[ChangeCVarCommand] MappingCommand
|
2025-02-18 11:26:08 +01:00 |
|
Ed
|
4a2c3c9d59
|
clean up CVars
|
2025-01-11 13:01:53 +03:00 |
|
Ed
|
cd736e4fd4
|
Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Shared/Lock/LockSystem.cs
# Resources/Maps/oasis.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/audio.yml
|
2024-12-11 14:49:02 +03:00 |
|
metalgearsloth
|
11dbf50ed6
|
Add delay to AutoOrient (#33479)
It functions identically to how V1 of orientation worked and it's incredibly annoying.
|
2024-11-23 17:52:58 +01:00 |
|
Ed
|
fff97fa819
|
adapt
|
2024-11-23 03:12:45 +03:00 |
|
Simon
|
806e1e46cb
|
Separate CCVars into separate files
|
2024-11-12 03:10:25 +01:00 |
|