Commit Graph

2643 Commits

Author SHA1 Message Date
Red
7b7a837cf8 City Gate fix + Comoss update (#1289)
* city gate fix

* Update comoss.yml

* fix

* Update migration.yml
2025-05-20 22:36:43 +03:00
Ed
be495f274c Skill progression system (#1263)
* delete skill trees

* Revert "delete skill trees"

This reverts commit 9d7fae73c4.

* learning refactor

* UI tweaks

* sword mastery skill

* telegraphy

* rapier mastery

* research table ui

* finish studing

* polish UI researching

* pyrokinetic

* more skill tree working

* heat adapt

* alchemist and metamagic update

* skill multiple effects support + metamagic bugg manapool

* impossible 😢

* skimitar gaming

* skimidi

* blacksmithing branch

* remove research restrictions

* remove species magic buff

* fix loc

* Update thaumaturgy.yml

* pip

* Delete skill_tree.yml
2025-05-14 12:43:43 +03:00
Ed
0fc9e28637 Demiplane maps aftertest tweaks (#1256)
* admin info panel in demiplane map

* fix core chasm destruction

* dimensit resource, more resources in demiplanes

* more fixes
2025-05-06 08:29:09 +03:00
Ed
aeedff5caa Demiplane exploration map (#1251)
* dehardcode nodeTreeControl part 1

* finish

* demiplane map system setup

* link map entity with station data!

* random demiplane map generation

* redesign demiplane map node tree

* center

* map generate v2

* location generation

* modifier generation

* missing location icons

* ui polish

* data refactor

* fix line color

* ejectabling

* split demiplane component into two

* blocker attempt

* revoking

* fix frontier calculation

* dimensit

* demiplane core room spawning

* demiplane cool destruction

* Update round_end.yml

* progression works now!

* Update CP14NodeTree.cs

* Update CP14NodeTree.cs

* documentation pass

* fix abusing, some balance pass

* demiplane naming fix

* см

* location names

* delete old keys

* Update buy.yml

* Update migration.yml

* fix guidebook

* Update misc.yml

* Update misc.yml
2025-05-05 15:19:44 +03: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
keronshb
0a394d4af5 Wizard Teleport Scroll (Teleport Location ECS) (#36424) 2025-04-28 19:42:24 +02:00
Ed
e7e55cdb5e fix viator 2025-04-26 18:09:44 +03:00
Viator-MV
834fad0533 fixes (#1223) 2025-04-26 12:21:01 +03:00
Southbridge
6a567cbcb8 Amber Station - Silo (#36764) 2025-04-24 11:24:07 -07:00
ScarKy0
9fd5ed6d05 Meta Silo n Dept Economy (#36885) 2025-04-24 10:28:50 -07:00
Southbridge
a7b2b0bf0f New Salvage Ruin - Hydro Outpost (#36826) 2025-04-23 16:56:31 -07:00
Ed
0996413d72 Structure Durability rebalance - Part 1 (#1205)
* walls rebalance pass

* windows and fence fix

* doors rebalance

* doors tweaks

* door construction rebalance

* Update WallWood.yml

* Update WallDirt.yml

* stone wall sfx

* ore rebalance

* Я не удержался и снес половину репы

* fix rsi

* Update windows.yml

* stonebrick constructions

* Update stonebrick.yml

* Update migration.yml

* Delete cargo_shuttle.yml

* Delete wall_marble.yml

* fix

* Update wooden.yml
2025-04-22 13:22:28 +03:00
Spessmann
939a732236 Added more salvage ruins (#36822) 2025-04-21 22:30:20 -07:00
TytosB
92a9740081 new salv ruins (#36798) 2025-04-21 07:25:26 -07:00
Spessmann
d792908e56 Add more ruins (#36785) 2025-04-20 19:16:52 -07:00
Spessmann
1c3bdd5ba5 Small ruin fixes (#36763) 2025-04-20 01:54:01 -07:00
TytosB
394c0c5414 loop lairlock lattice fix (#36758)
* sinful

* funeralofdeadbutterflies

* butterfly

* lattice fix
2025-04-19 23:51:13 -06:00
TytosB
5ad02a0844 New salv ruin- butterfly funeral (#36755) 2025-04-19 22:22:04 -07:00
TytosB
739917641d Salvage ruins- the deadly sins (#36754) 2025-04-19 21:32:19 -07:00
Spessmann
1aa397bcd6 Add More Ruins (#36752) 2025-04-19 21:27:20 -07:00
TytosB
10ca6cb179 fixgridatmos 2025-04-19 16:19:08 -05:00
TytosB
e561836a03 terrarium 2025-04-19 15:42:59 -05:00
Emisse
83db0689d6 Plasma ore silos and department eco (#36715) 2025-04-19 12:56:46 -06:00
Emisse
c9c94bb407 Elkridge - Silo (#36716) 2025-04-19 12:56:21 -06:00
Emisse
54242c6982 Fland Silo (#36724) 2025-04-19 12:56:11 -06:00
Emisse
313e48f911 Packed Silo (#36722) 2025-04-19 12:31:39 -06:00
Emisse
e93bfff6b0 Omega Silo (#36718) 2025-04-19 12:31:28 -06:00
Emisse
492ff9dbd7 Oasis Silo (#36720) 2025-04-19 12:31:12 -06:00
Emisse
85c6ef0fef Convex Silo (#36734) 2025-04-19 12:21:39 -06:00
Emisse
a94404b06b Loop Silo (#36733) 2025-04-19 12:21:28 -06:00
Emisse
30174276e5 Marathon Silo (#36732) 2025-04-19 12:21:15 -06:00
Emisse
03cabf91f6 Box Silo (#36723) 2025-04-19 12:21:01 -06:00
ScarKy0
e168f2007b init 2025-04-19 19:28:25 +02:00
ScarKy0
de8deaf6ad init 2025-04-19 19:18:22 +02:00
ScarKy0
efafd4f98d init 2025-04-19 19:11:17 +02:00
Ed
026a17be57 Raids (#1198)
* simpliest undead raid

* map fix

* Comoss big update

* fix raids

* Update demiplane_rifts.yml

* fix

* Update mobs.yml
2025-04-19 15:47:06 +03:00
ScarKy0
5c1cee58ba init 2025-04-19 13:30:30 +02:00
ScarKy0
92106c52b6 init 2025-04-19 13:21:07 +02:00
ScarKy0
25a73ce3eb init 2025-04-19 13:13:05 +02:00
ScarKy0
9bdba76f67 init 2025-04-19 12:48:50 +02:00
ScarKy0
d48948aae9 init 2025-04-19 12:17:09 +02:00
ScarKy0
61c3f944f0 init 2025-04-19 12:07:50 +02:00
Deerstop
b09c3f1e56 added silo, moved service request console 2025-04-19 18:54:29 +10:00
jbox1
919425911e Ore silos and department eco 2025-04-19 18:51:53 +10:00
Viator-MV
a57f613d91 all in 1 (#1192) 2025-04-18 18:00:21 +03:00
TytosB
68a1e5156a loop minor pipe fix (#36646)
pipe
2025-04-16 22:48:48 -07:00
Nox38
4e60387bd1 Fixed armory power! 2025-04-16 12:49:01 -07:00
Emisse
9cbcdabcfa Meta: Fix unintended wizard robes in dorm room (#36248) 2025-04-16 01:25:57 -06:00
Emisse
76fd2d0648 Elkridge - i forgot the funding allocation console (#36574) 2025-04-16 01:25:26 -06:00
IProduceWidgets
a3b68f7181 Oasis update, request comps etc. (#36582) 2025-04-15 15:48:44 -07:00