Ed
5e6d1d0b3a
dungenore wawa
2025-05-29 22:14:14 +03:00
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
Tayrtahn
5a93099509
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
2025-05-21 22:10:52 -04:00
metalgearsloth
298f821bec
Ore + entitytable fixes ( #37675 )
...
* Ore + entitytable fixes
Iterate every dungeon not just last.
* Big shot
* Fixes
2025-05-21 12:43:17 -04:00
metalgearsloth
4afccdd5db
DungeonData rework ( #37172 )
...
* DungeonData rework
Back to fields, serializes better, just make new layers dumby.
* wawawewa
* Fix this
* Fixes
* review
* thanks fork
* fix
2025-05-18 03:10:30 +10:00
Ed
59e6435fe2
Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
# Content.Shared/Damage/Systems/SharedStaminaSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
# Resources/Prototypes/Procedural/vgroid.yml
2025-05-12 14:25:42 +03:00
metalgearsloth
bd69fc612a
Predicted internals ( #33800 )
...
* Predicted gas pumps
I wanted to try out atmos and first thing I found.
* a
* Atmos device prediction
- Canisters
- Tanks
- Internals
AirMixes aren't predicted so nothing on that front but all the UIs should be a lot closer.
* Remove details range
* Gas tank prediction
* Even more sweeping changes
* Alerts
* rehg
* Popup fix
* Fix merge conflicts
* Fix
* Review
2025-05-02 18:22:29 +10:00
Ed
5420469d62
Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync
...
# Conflicts:
# Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
2025-04-15 00:44:29 +03:00
J
af9526197a
Extracts magic strings from Tag calls ( #36305 )
...
* Extracts magic strings from Tag calls
When #36281 gets merged, the `TagSystem` methods will all give warnings. Let's fix those warnings before they even happen!
* Adds missing libraries
* Remove not yet implemented TagSystem changes
* Fix tag spelling error
Genuinely surprised there was only 1!
* Styling and proper type changes
* Styling
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
2025-04-04 20:20:19 -04:00
metalgearsloth
fa35c9623d
Revert "Purge uses of TransformComponent.Anchored.set. Also adds parentheses." ( #35332 )
2025-02-21 00:12:12 +11:00
TemporalOroboros
a4001fba1b
Purge uses of TransformComponent.Anchored.set. Also adds parentheses. ( #34938 )
2025-02-20 23:06:39 +11:00
Ed
bc53ed4aa5
Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
...
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Resources/Prototypes/Maps/centcomm.yml
2025-02-16 16:39:26 +03:00
Ed
7328f3449c
Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
...
# Conflicts:
# Content.IntegrationTests/Tests/EntityTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Procedural/DungeonSystem.Rooms.cs
# Content.Server/Procedural/RoomFillComponent.cs
# Content.Server/Procedural/RoomFillSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Projectiles/SharedProjectileSystem.cs
# Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/migration.yml
2025-02-16 11:58:47 +03:00
ElectroJr
eedc992d57
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into map-load-refactor
2025-02-16 16:52:51 +13:00
Ed
47cb8a0b08
RoomSpawner mask ( #33110 )
...
* RoolFill can now spaw rooms with any size
* tile ignoring
* upgrade interior
* simplify
* Update DungeonSystem.Rooms.cs
* center rooms
* Update RoomFillComponent.cs
* Update RoomFillComponent.cs
* Update DungeonSystem.Rooms.cs
* Remove roomfillcoponent from integration test
* Update EntityTest.cs
* remove nullable size, replaced with minsize and maxsize
* clear existing logic refactor
* delete this one
2025-02-12 15:47:48 +03:00
Ed
7abb9a9716
Update DungeonSystem.Rooms.cs
2025-02-10 13:32:56 +03:00
Ed
4aea4b853c
Minor procedural fixes pack ( #837 )
...
* demiplanE
* Update EntityTest.cs
* Update DungeonSystem.Rooms.cs
* Update EntityTest.cs
2025-02-03 17:09:09 +03:00
ElectroJr
b555a6049e
Even more engine changes
2024-12-24 21:00:53 +13:00
ElectroJr
6242567aff
Refactor map loading & saving
2024-12-23 02:42:17 +13: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
Ed
7d410d6094
Fix debris chunks loot spawning ( #33747 )
...
Update DungeonJob.PostGenBiome.cs
2024-12-06 11:15:23 +01:00
deltanedas
e436a50c36
fix exped caves generation ( #32890 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-11-24 09:49:31 +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
d67f7619c4
Edgefication ( #590 )
...
* bloat
* bloat 2
* bloat 3
* final bloat
* Update icon.ico
* Create integration_test_run.bat
* Arggh
* Disable some tests
* revert roomfill clearexisting changes
2024-11-18 14:40:52 +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
6147740f3e
Try fix master constantly fails ( #567 )
...
* try to fix
* Update entities.ftl
* Update entities.ftl
* Update entities.ftl
* Update entities.ftl
* Update entities.ftl
* Update entities.ftl
2024-11-09 13:07:12 +03:00
Ed
ebac4a2eec
Spellcasting upgrade ( #543 )
...
* move to gurps magic types
* spell traits, categorize spells
* Update TraitSystem.cs
* magic spells item provider
* Update twoHandedStaffs.yml
* Update CP14MagicManacostModifySystem.cs
* Update CP14SpellStorageSystem.cs
* some funny shit
* fix problems 1
* FIX
* more funny broken shit
* predict slowdown, fixes funny
* EntityTarget action
* fixes
* Update T1_sphere_of_light.yml
* fix demiplan loot centering
* predict movement!
2024-11-07 16:04:49 +03:00
Ed
53df2848c4
Demiplan polishing v4 ( #530 )
...
* 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!!!
* anchoring deletion
* trying fix caves
* Update RoomFillSystem.cs
* disable locations for test
* Update CP14SpawnRandomDemiplaneJob.cs
* Update required_layers.yml
* Revert "Update required_layers.yml"
This reverts commit 2dd33db282
2024-11-03 14:40:21 +03: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
Ed
2b9d949eea
Demiplan polishing 2 ( #528 )
...
* wizden PR copy
* starter rooms
* grass geode location, new modifiers
2024-11-02 00:59:55 +03:00
Ed
3b520ac69c
Demiplan modifiers ( #526 )
...
* simple modifiers
* modifier tag filtering
* Update CP14DemiplanSystem.Generation.cs
* Update rocks.yml
* move loot to modifier
* move enemies to modificators
* fix filtering
* modifier rariry
* reward and difficulty limits
* rebalance and optimize calculation
* Update test.yml
* wizden PR copy
* move all alchemy reagents to modifiers
2024-11-01 18:08:57 +03:00
MilenVolf
1b9d77a760
Replace obsolete Tile Access methods ( #32508 )
...
* Replace obsolete SetTile
* Remove obsolete GetTileRef & GetAllTiles
* Forgor
* Apply suggested `GetMapOrInvalid`
2024-09-29 01:27:47 +02:00
Nemanja
a9d93e18c8
Mining Asteroid Treasure Vaults ( #31638 )
...
add interior rooms to the vgroid
2024-09-10 21:33:41 -06:00
metalgearsloth
afd0618a60
Station AI ( #30944 )
...
* Station AI overlay
* implement
* Bunch of ports
* Fix a heap of bugs and basic scouting
* helldivers
* Shuffle interactions a bit
* navmap stuff
* Revert "navmap stuff"
This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.
* AI wires implemented
* Fix examines
* Optimise the overlay significantly
* Back to old static
* BUI radial working
* lots of work
* Saving work
* thanks fork
* alright
* pc
* AI upload console
* AI upload
* stuff
* Fix copy-paste shitcode
* AI actions
* navmap work
* Fixes
* first impressions
* a
* reh
* Revert "navmap work"
This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.
# Conflicts:
# Content.Client/Silicons/StationAi/StationAiOverlay.cs
* OD
* radar
* weh
* Fix examines
* scoop mine eyes
* fixes
* reh
* Optimise
* Final round of optimisations
* Fixes
* fixes
2024-08-28 10:57:12 +10:00
metalgearsloth
60b34b57f3
Fix dungeon spawn + ftl overlap ( #31413 )
...
* Fix dungeon spawn + ftl overlap
* Better fixes
2024-08-25 14:48:29 +10:00
Nemanja
c31ffff9ac
add new salv loot into the vgroid procgen ( #31290 )
...
add new loot into vgroid procgen
2024-08-24 12:06:37 +10:00
Nemanja
3cdd62b0dd
Mining Rebalance ( #30920 )
...
* first pass
* this shit too
* ok fix that shit
* buff
* actually fix that
2024-08-16 11:43:54 +10:00
Cojoke
b57174007c
Remove all Assigned Values that are Never Used ( #30110 )
...
Remove all Assigned Values that are never used
2024-07-18 20:22:23 -04:00
Ed
e1f429b6b3
DungeonSystem.Rooms bugfix ( #30125 )
...
Update DungeonSystem.Rooms.cs
2024-07-17 18:37:03 -04: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
Plykiya
f6bb10503f
Removes obsolete AnchorEntity() functions ( #28613 )
...
Obsolete anchor entity functions
Co-authored-by: plykiya <plykiya@protonmail.com >
2024-07-01 00:32:48 +10:00
eoineoineoin
b44b159431
Replace Matrix3 with System.Numerics.Matrix3x2 ( #27443 )
...
Replace Matrix3 with Matrix3x2
2024-06-02 14:07:41 +10:00
Tornado Tech
21bc3bfa22
Cleans up tag system ( #28272 )
...
* Updated tag system
* Added params methods
* Fixed tag integration tests
* Fixed params methods recursion
* Revert has All/Any tag one argument realisation
* Updated tag integration tests
* Shit happens
* Added individual List/HashSet methods, docs, tests
2024-06-02 11:11:19 +10:00
Emisse
952b7f4c4e
Haunted dungeon template ( #23768 )
...
* haunted dungeon
* Initial work
Still needs prefab gen work to make it interesting.
* ime a worm
* weh
* Work
* Slight tweaks
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2024-03-24 14:37:18 +11:00
Ed
ace8285440
Mineshaft ( #25733 )
...
* content
* catwalks
* fix fucking icons
* finish PR
* +1 room
* fix
2024-03-03 23:32:33 -07:00
metalgearsloth
a9502be29e
Revert "Fix chat bubbles ( #25643 )" ( #25645 )
...
* Revert "Fix chat bubbles (#25643 )"
This reverts commit 23d2c4d924#25256 )"
This reverts commit f284b43ff6
2024-02-28 00:51:20 +11:00
TemporalOroboros
f284b43ff6
Fixes obsolete Transform warnings in Content. ( #25256 )
...
* Fix TransformComponent.MapPosition warnings in Content.Client
* Fix TransformComponent.MapPosition warnings in Content.IntegrationTests
* Fix TransformComponent.MapPosition warnings in Content.Shared
* Fix TransformComponent.MapPosition warnings in Content.Server
* Fix TransformComponent.WorldPosition warnings in Content.Shared
* Fix TransformComponent.WorldPosition warnings in Content.Client
Excepts ClickableComponent b/c that needs to be ECS'd entirely later
* Fix TransformComponent.WorldPosition warnings in Content.Server
* Fix TransformComponent.WorldRotation warnings in Content.*
* Fix TransformComponent.MapPosition warnings I missed
* Fix TransformComponent.WorldMatrix warnings in Content.*
* Fix TransformComponent.InvWorldMatrix warnings in Content.*
* Fix TransformComponent.GetWorldPositionRotationMatrixWithInv warnings in Content.*
* Fix TransformComponent.GetWorldPositionRotationMatrix warnings in Content.*
* Fix TransformComponent.GetWorldPositionRotation warnings in Content.*
* Fix TransformComponent.Anchored.set warnings in Content.*
* Fix TransformComponent.Coordinates.set warnings in Content.*
* Fix TransformComponent.LocalPosition.set warnings in Content.*
* Fix TransformComponent.AttachToGridOrMap warnings in Content.*
* Fix TransformComponent.AttachParent warnings in Content.*
* Preempt TransformComponent.LocalRotation.set warnings in Content.Shared
* Preempt TransformComponent.LocalRotation.set warnings in Content.Client
* Preempt TransformComponent.LocalRotation.set warnings in Content.IntegrationTests
* Preempt TransformComponent.LocalRotation.set warnings in Content.Server
* Fix/Preempt the remaining obsolete TransformComponent properties/methods in Content.*
* ECS ClickableComponent
* Fix obsolete SharedTransformSystem methods in Content.*
* Fix ExplosionOverlay `SharedTransformSystem` dependency
* Maybe fix null eye position breaking tests
* MGS requested changes
2024-02-27 12:06:20 +11:00
Nemanja
2a6705818b
Make procgen use weighted variants ( #24669 )
2024-01-29 13:41:59 +11:00
metalgearsloth
3452521021
Fix exped dungeons ( #23654 )
...
mapBounds was null after one of my last changes. I changed the transform so it's just passed in directly as I don't think there was an easy way around it.
I checked magnet + roomfills still work.
2024-01-07 14:23:53 +11:00
metalgearsloth
f533a1a543
Add RoomFill markers ( #22293 )
...
* Add RoomFill markers
* weh
* Also deez
* Working
* Randomised fills working
* Fixes
* Fix lack of prototypes
* Fix tests
* Fix tests?
2024-01-04 15:17:04 +11:00
