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
Ed
7d410d6094
Fix debris chunks loot spawning ( #33747 )
...
Update DungeonJob.PostGenBiome.cs
2024-12-06 11:15:23 +01:00
Ed
677e5194d6
Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync
...
# Conflicts:
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Server/Traits/TraitSystem.cs
# Content.Shared/CCVar/CCVars.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Resources/Maps/box.yml
# Resources/Maps/core.yml
2024-11-23 01:48:24 +03:00
Ed
a1966d8671
improve BiomeDunGen ( #33113 )
...
* improve BiomeDunGen
* forgot lol
* Update DungeonJob.PostGenBiome.cs
* Update DungeonJob.PostGenBiome.cs
2024-11-11 23:19:54 -06:00
Ed
51f4ec84d5
Demiplan polishing v3 ( #529 )
...
* Wizden PR copy
* sync
* Update DungeonJob.PostGenBiome.cs
* Update DungeonJob.PostGenBiome.cs
* some rebalance
* required exits and enters!
* room fill fix
* snakes nerf
* enable En-US localization for playtest
* guidebook update
* hotfix!!!
2024-11-02 17:46:19 +03:00
metalgearsloth
a2f99cc69e
VGRoid support ( #27659 )
...
* Dungeon spawn support for grid spawns
* Recursive dungeons working
* Mask approach working
* zack
* More work
* Fix recursive dungeons
* Heap of work
* weh
* the cud
* rar
* Job
* weh
* weh
* weh
* Master merges
* orch
* weh
* vgroid most of the work
* Tweaks
* Tweaks
* weh
* do do do do do do
* Basic layout
* Ore spawning working
* Big breaking changes
* Mob gen working
* weh
* Finalising
* emo
* More finalising
* reverty
* Reduce distance
2024-07-03 22:23:11 +10:00
