Commit Graph

33993 Commits

Author SHA1 Message Date
Ed
677a326376 Update touch.yml 2025-06-15 23:53:01 +03:00
Ed
57ab882fb9 Update MOB_subterranean_leap.yml 2025-06-15 23:42:08 +03:00
Ed
73de5ebcbb Update jump.yml 2025-06-15 23:37:00 +03:00
Ed
fe8967bd67 fix 2025-06-15 23:32:16 +03:00
Ed
d01b8fe32c Update ice_ghost.yml 2025-06-15 23:21:32 +03:00
Ed
93966e37d4 actions refactor apply 2025-06-15 23:20:52 +03:00
Ed
ab8a5c3afd Sharedization of entityEffects and crystals slots system 2025-06-15 21:58:33 +03:00
Ed
ed1d9aca25 Update CP14SharedMagicSystem.InstantActions.cs 2025-06-15 21:48:20 +03:00
Ed
62cd6bfe9b Merge branch 'master' into ed-10-06-2025-upstream-sync 2025-06-15 21:44:16 +03:00
Ed
5328714752 fix c# 2025-06-15 21:43:58 +03:00
Ed
5046ad1aeb longer weather 2025-06-15 21:34:33 +03:00
CrystallEdge Server
6a8699a44c Automatic changelog update 2025-06-15 21:27:04 +03:00
Red
b24ec5bc80 Bugfixes (#1432)
* fix #1428

* CodTenAlt review

* fix map tests

* real this time

* fix #1429

* add wheat and cotton into victorian gardens trade faction

* Update PostMapInitTest.cs
2025-06-15 21:25:58 +03:00
CrystallEdge Server
4dfaf6a16e Automatic changelog update 2025-06-15 18:04:44 +03:00
Red
d30b51c982 Firewave (#1430)
* nerf spiders

* firebolt to firewave

* Update firebolt.yml

* rename file

* Update firewave.yml

* Update firewave.yml
2025-06-15 18:03:38 +03:00
Ed
2f4d60b7af Update moon_strike.yml 2025-06-15 17:12:30 +03:00
Tornado Tech
8498e8d1e0 feat: skill ui scale (#1423) 2025-06-15 15:05:24 +03:00
Ed
d9dc086588 Update CP14_Changelog.yml 2025-06-15 15:04:21 +03:00
Red
04f6627e16 Lumera patron (#1427)
* mind upgrade works only on followers

* wrath of lumera, removing memory points

* enable lumera for players

* add lumera to maps

* job desc update

* guidebook
2025-06-15 15:00:18 +03:00
Red
4be22326ce Gods part 6 (#1425)
* Skill scanning + bugfixes

* memory point examining

* Update base.yml

* predict skill examining

* moon beam lumera action

* balance
2025-06-15 01:50:16 +03:00
Red
71abce8db8 Skill scanning + bugfixes (#1424) 2025-06-14 19:04:33 +03:00
Tornado Tech
374ab05f24 git: remove issue templates (#1330) 2025-06-14 17:06:19 +03:00
Red
7760e8f628 God part 4 (#1422)
* projectile spell improve

* mind improve
2025-06-14 14:21:25 +03:00
Red
fc0beb5ccf Gods part 3 (#1421)
* apprice action, dead notice

* fix refollowing

* mist lumera action
2025-06-14 02:11:36 +03:00
Red
b932d56f15 Gods part 2 (#1420)
* spooky scary patreons

* Update CP14ReligionSystem.cs

* goodbye radio channel

* gods? no! Mana parasites! Muahahaha

* Update gods.yml

* Update primordial.yml
2025-06-13 19:21:09 +03:00
Ed
41689de5aa infinity mana restriction 2025-06-13 16:35:39 +03:00
Red
422a0c5e10 Gods and religions (#1405)
* basic religion vision

* block god interactions

* skill tree mob specify

* silvania setup??

* clustering shader optimization

* gods department & job

* random gods jobs

* Luxian god

* Update Nature.png

* Update sphere_of_light.yml

* god chat

* Update ChatSystem.cs

* OBSERVATION

* public observation and basic follower api

* shader tweaks

* improve shaders

* spawning and praying on altars

* altars ppvs override

* move pvs overridiation from altars to observers

* shader coloration

* spectral z mover

* god magic radius restricted

* guide how to believe in god

* sends messages to god when smoeone wanna become follower

* follower doAfter

* goodbye luxian, welcome lumera

* goodbye silvania, welcome merkas

* som polish and renamings

* gods fast travel

* Update altar.ftl

* some lumera sfx

* renouncing patrons!

* renounce followers

* followewr percentage calculation

* remove from player-facing

* fix

* Update sphere_of_light.yml

* Update base.yml
2025-06-13 14:15:48 +03:00
CrystallEdge Server
32be823619 Automatic changelog update 2025-06-13 13:26:38 +03:00
Fr0goo
542bd2d948 Flem Creature (#1402)
* added Flem Creature

a weird looking fish creature that will spawn in the demiplanes with open skies and herbals. that will attack you if you get too close

* fixed placement of lines

should be in the right places now

* changed location of fish outfit, ajusted the sprite, and made it not foldable

* added flem modifier and fixed some thingy

* Update attributions.yml

* Update mobs.yml

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-13 13:25:33 +03:00
CrystallEdge Server
54715c26a8 Automatic changelog update 2025-06-13 12:25:41 +03:00
SenorJaba
8ab0939698 Merchant's monocle and ability (#1413)
* New trading stuff

* Crafts skill tree

* More trading fixes, baby!

* Last trading fix I hope

* Merchants' supremacy

* Gimme money

* Readonly
2025-06-13 12:24:36 +03:00
CrystallEdge Server
7391b5a065 Automatic changelog update 2025-06-13 10:35:38 +03:00
Sefaia
1ea8291927 Added Big Crossbow Bolts to whitelist and created a new Entity spawn item for a quiver filled with iron big crossbow bolts. (#1418) 2025-06-13 10:34:32 +03:00
CrystallEdge Server
a9e8614d0b Automatic changelog update 2025-06-10 14:15:13 +03:00
firebat4321
d89ef56907 Firebolt (#1354)
* added firebolt spell yml, added to spellbook tree

* Added new sprites for Firebolt action/spellbook, in-game bolt sprite.

* Missing comma from fire .json file.

* Updated firebolt IDs to use own ID instead of Fireball's ID.

* Spell doesn't break on move now.

* Updated on soundHit effect

* Corrected Fireball IDs to Firebolt

* Updated copyright entries

* Update firebolt.yml

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-10 14:14:07 +03:00
CrystallEdge Server
c7302e16a6 Automatic changelog update 2025-06-10 13:41:27 +03:00
gogenych
3623a25033 copper loadout fix (#1414)
* copper loadout fix

* name fix
2025-06-10 13:40:19 +03:00
Ed
299d28f056 fff 2025-06-10 11:55:14 +03:00
Ed
c0f4098ca9 spell fixes 2025-06-10 11:49:35 +03:00
Ed
42d39a7c67 Merge remote-tracking branch 'upstream/stable' into ed-10-06-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Lock/LockSystem.cs
2025-06-10 11:33:34 +03:00
CrystallEdge Server
a51f579591 Automatic changelog update 2025-06-10 11:09:13 +03:00
Nim
f0a25ddef6 Two-handed crossbow (#1315)
* Crossbow

* bow

* size

* size crossbow

* PhysicalComposition
2025-06-10 11:08:07 +03:00
Nim
747f76242f Rocks with moss (#1412)
* rockmoss

* line
2025-06-10 11:07:13 +03:00
slarticodefast
d4c4606cf4 Revert tile aligned barsigns (#38185)
fixtures for bar signs (#37756)"
2025-06-10 00:02:31 +02:00
Errant
99b2955c09 HOTFIX Revert #38004 : Change C-4 back to syndicate contraband (#38177)
* Revert "Made C-4 Major contraband instead of syndicate contraband (#38004)"

This reverts commit 0a565469c7.

* remove changelog
2025-06-09 18:59:37 +02:00
Red
14efec2f47 Update actions_changelogs_since_last_run.py 2025-06-09 14:49:07 +03:00
Red
508aead876 Update actions_changelogs_since_last_run.py 2025-06-09 14:43:33 +03:00
CrystallEdge Server
50af3f1d23 Automatic changelog update 2025-06-09 14:37:01 +03:00
Viator-MV
e06e1bb7fc Druid stuff (#1396)
* staff

* Revert "staff"

This reverts commit bb7532e0b2.

* not resprite
2025-06-09 14:35:56 +03:00
CrystallEdge Server
4daaedb900 Automatic changelog update 2025-06-09 14:35:43 +03:00