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
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
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
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
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
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
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
Nemanja
a9d93e18c8
Mining Asteroid Treasure Vaults ( #31638 )
...
add interior rooms to the vgroid
2024-09-10 21:33:41 -06: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
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
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
bf79acd127
Salvage magnet revamp ( #23119 )
...
* Generic offering window
* More work
* weh
* Parity
* Progression meter
* magnet
* rona
* PG asteroid work
* code red
* Asteroid spawnings
* clams
* a
* Marker fixes
* More fixes
* Workings of biome asteroids
* A
* Fix this loading code
* a
* Fix masking
* weh
* Fixes
* Magnet claiming
* toe
* petogue
* magnet
* Bunch of fixes
* Fix default
* Fixes
* asteroids
* Fix offerings
* Localisation and a bunch of fixes
* a
* Fixes
* Preliminary draft
* Announcement fixes
* Fixes and bump spawn rate
* Fix asteroid spawns and UI
* More fixes
* Expeditions fix
* fix
* Gravity
* Fix announcement rounding
* a
* Offset tweak
* sus
* jankass
* Fix merge
2024-01-04 14:25:32 +11:00
DrSmugleaf
9ec80aad9a
Add missing constructor in RandomSpawnLootEntry struct ( #21721 )
2023-11-18 06:21:15 +13:00
metalgearsloth
816ee2e1ab
Gateway destinations ( #21040 )
...
* Gateway generation
* Gateway stuff
* gatewehs
* mercenaries
* play area
* Range fixes and tweaks
* weh
* Gateway UI polish
* Lots of fixes
* Knock some items off
* Fix dungeon spawning
Realistically we should probably be using a salvage job.
* wahwah
* wehvs
* expression
* weh
* eee
* a
* a
* WEH
* frfr
* Gatwey
* Fix gateway windows
* Fix gateway windows
* a
* a
* Better layer masking
* a
* a
* Noise fixes
* a
* Fix fractal calculations
* a
* More fixes
* Fixes
* Add layers back in
* Fixes
* namespaces and ftl
* Other TODO
* Fix distance
* Cleanup
* Fix test
2023-11-14 19:23:40 -07:00
DrSmugleaf
2d58d19b07
Make all prototype types partial ( #21374 )
2023-11-01 19:56:23 -07:00
metalgearsloth
036b9ef74f
Expeditions rework ( #18960 )
2023-09-19 22:52:01 +10:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
metalgearsloth
4fefd8b8b7
Add snow rocks to planets ( #17692 )
2023-06-28 21:32:01 +10:00
metalgearsloth
cca1a78384
Dungeon generation refactor ( #17121 )
2023-06-27 19:17:42 +10:00
deltanedas
a3c37edd69
use parts crates for rewards, show rewards in ui ( #17374 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-17 12:00:54 +10:00
metalgearsloth
ed1ff4df06
Ore tweaks ( #16930 )
...
- Guaranteed spawns in salvage
- Triple vein count
- Made it so rocks only drop 1 as it's kinda whacky (I believe they still convert differently to bars).
2023-05-30 21:40:36 -06:00
metalgearsloth
ea4440be44
Make ore loot use walls as a mask ( #16377 )
2023-05-14 22:01:29 -04:00
metalgearsloth
ae01618874
Revert "Revert "Replace ResourcePath with ResPath ( #15308 )" (#155… ( #15566 )
2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209
Revert "Replace ResourcePath with ResPath ( #15308 )" ( #15551 )
2023-04-20 11:43:54 +10:00
metalgearsloth
122350f19c
Salvage expeditions ( #12745 )
2023-04-20 10:43:13 +10:00
Ygg01
71f358a027
Replace ResourcePath with ResPath ( #15308 )
2023-04-19 23:39:17 +10:00
metalgearsloth
b0714ca45a
Dungeon fixes ( #14563 )
2023-03-10 21:19:27 +11:00
metalgearsloth
6157dfa3c0
Salvage dungeons ( #14520 )
2023-03-10 16:41:22 +11:00
