Commit Graph

11635 Commits

Author SHA1 Message Date
Deserty0
29cbf0560f Cleanup 2025-10-29 23:06:20 +10:00
Deserty0
f53c68d272 123 2025-10-27 00:22:59 +10:00
Deserty0
44b757a033 Merge remote-tracking branch 'upstream/master' into des-fishing 2025-10-26 22:45:15 +10:00
nukkuminen
1824d60fb8 big ears (#1836) 2025-10-24 14:49:47 +03:00
kin98
1870a8d33f server crashes when using instant fire explosion entity on dead entities (#1824)
Fixes #1823
2025-10-12 14:55:34 +03:00
nukkuminen
72d9dc8713 cleaner qol (#1827) 2025-10-12 14:55:15 +03:00
Kit
ad7e8bea56 various changes part 3 or smth (#1825)
* yippie

* minor spelling error

* refix
2025-10-07 12:14:43 +03:00
Deserty0
88575e2286 I am become Death, the Code Destroyer 2025-10-05 16:48:09 +10:00
Viator-MV
7b78f3e9b7 Map update (#1821)
* comeback

* fixes

* fix
2025-10-03 13:47:24 -04:00
kin98
f528427e68 Added Flamable and Heat damage to Incendiary reagent (#1815)
* Added Flamable and Heat damage to igni

* fixed wrong formating

* adjusted flamable reaction multiplier

---------

Co-authored-by: kin98 <schupsi@msn.com>
2025-10-02 06:24:58 -04:00
nukkuminen
e8ae76eae5 QOL (#1817) 2025-10-01 12:57:13 -04:00
nukkuminen
67704f953f cats now climb on tables (#1816)
* cats now climb on tables

* pulling
2025-10-01 11:49:33 -04:00
nukkuminen
bdcd379363 Kitties! Cats! Small carcats! (#1814)
* todo finish after cbt

* alright. it's working, somehow

* colored cars

* i'll fucking smash my head against the wall

* colored cars with spots

* i can't belive my eyes

* spawners, localization and some stuff

* rat hunters

* resolving stuff

* and this one too

* car

* car 2

* car 3

* 13

* car 4

* car 5

* car 6

* i hate rats

* car 7

* finally

* alldun!

* CARCATS 2 IS REAL
2025-10-01 17:44:08 +03:00
nukkuminen
5cd90ec7e8 Tweaks for the alchemy (#1764)
* buff the antidote poison

* fix the hallucinogenic solution

* antidote isn't antidoting now
2025-10-01 07:36:06 -04:00
Nim
60946749a8 Snail (#1753)
* snail

* sack snail

* gib on step

* comment

* chance step trigger

* timed spawner

* Respirator

* GhostRole

* Speech

* Hunger

* Thirst
2025-09-30 12:27:58 -04:00
nukkuminen
bce80d4026 Merge pull request #1813 from oldschoolotaku/OH-GOD-IT-BURNS
Custom burning sprites
2025-09-30 08:02:49 -04:00
Red
621ee3fa73 Hotfix (#1811)
* fix #1809

* fairies disable
2025-09-28 23:53:15 +03:00
Kit
f6ef53e24e Spell/Shield tweaks (#1804)
* Spell changes

* shield changes
2025-09-27 22:17:27 +03:00
Red
51a3fb53aa God rays (#1803)
* god rays

* fix

* fix?
2025-09-27 22:14:11 +03:00
Kit
835cfa951f Merge pull request #1789 from KittyCat432/silva-buffs
Silva buffs and liquid mana buffs
2025-09-26 12:31:02 -04:00
Nim
d16e4aaf2f Fixs zombie and loot (#1799)
* loot zombie

* fix
2025-09-26 00:26:03 +03:00
nukkuminen
66379b65d1 added funny facial hair (#1797)
* added funny facial hair

* fixed atributions

* new mustages
2025-09-25 14:25:10 +03:00
Nim
3b7d6579b6 Microbalance of Vampires (#1773)
* micro vamp

* breakOnMove

* revert CP14ActionDoAfterSlowdown
2025-09-23 13:23:39 +03:00
Kit
4623afed40 Demiplane difficulty rework (#1798)
* yea thats alot

* russian translation and fix

* Update Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-09-23 13:19:47 +03:00
Kit
14e1fd9247 fix 2025-09-22 18:03:21 -04:00
Kit
fa2c1968f8 Requested changes 2025-09-22 17:44:54 -04:00
Nim
13ec48b980 Microbalance weapon (#1790)
* Microbalance weapon

* dagger

* dagger2

* shield

* fix
2025-09-22 13:38:47 +03:00
Nim
81164228ee Debaff rat (#1794)
* debaff rat

* XP
2025-09-21 13:47:14 +03:00
Deserty0
90797f88b6 help me 2025-09-19 22:22:56 +10:00
Kit
43b8c8dbb9 wow buffs 2025-09-17 20:52:57 -04:00
Ed
3501e12ff2 Set sound to null and remove unused sprite in spells
Set the 'sound' property to null for hell_ballade and mana_ballade spell actions to explicitly disable sound. Removed an unused Sprite component from water_creation.yml to clean up the configuration.
2025-09-18 00:28:48 +03:00
Red
930caa30b3 Magic spell refactor part 2 (#1757)
* DoAfter support for Actions (#38253)

* Adds Action DoAfter Events

* Adds DoAfterArgs fields to DoAfterComp

* Adds a base doafter action

* Adds Attempt action doafter logic

* Adds doafter logic to actions

* Changes Action Attempt Doafter and action doafter to take in Performer and the original use delay. Use delay now triggers when a repeated action  is cancelled.

* Readds the TryPerformAction method and readds request perform action into the action doafter events

* Adds a force skip to DoAfter Cancel so we can skip the complete check

* Adds a Delay Reduction field to the comp and to the comp state

* Fixes doafter mispredict, changes doafter comp check to a guard clause, sets delay reduction if it exists.

* Cancels ActionDoAfter if charges is 0

* Serializes Attempt Frequency

* Comment for rework

* Changes todo into a comment

* Moves doafterargs to doafterargscomp

* Adds DoAfterArgs comp to BaseDoAfterAction

* Removes unused trycomp with actionDoAfter

* Replaces DoAfterRepateUseDelay const with timespan.zero

* Removes unused usings

* Makes SharedActionsSystem partial, adds DoAfter partial class to ActionSystem, moves ActionDoAfter logic to the SharedActionsSystem.DoAfter class

* Cleanup and prediction

* Renames OnActionDoAfterAttempt to OnActionDoAfter, moves both to Shared Action DoAfter

* Removes ActionAttemptDoAfterEvent and moves its summaries to ActionDoAfterEvent. Converts OnActionDoAfterAttempt into TryStartActionDoAfter

* Removes Extra check for charges and actiondoafters

* Sloptimization

* Cleanup

* Cleanup

* Adds param descs

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* Refactor CP14 action emote and speech handling

Moved emote and speech logic from magic spell components to dedicated CP14 action components and systems. Removed CP14MagicEffectEmotingComponent and related event handling, introducing CP14ActionEmotingComponent and updating event subscriptions. Updated resource consumption and performed logic to use new action-based components. Adjusted affected prototypes and removed obsolete code.

* kicking in

* Refactor athletic spell actions and remove mana cost calc

Reworked dash and sprint spell YAMLs to use modular effect events and updated their action properties. Removed the unused CalculateManacost method from CP14SharedMagicSystem.cs. Also removed the startDelay property from the kick action.

* fix cooldown and resource cost

* casting visuals adapt

* telegraphy adapt

* slowdown adaption

* Remove Lumera and Merkas demigod spells and skills

Deleted all spell and skill prototypes related to the Lumera and Merkas demigods, including their actions, effects, and skill trees. Updated athletic sprint and second wind spells, and refactored portal_to_city spell to use modular effects. Also added a debug category to the admin skill reset verb.

* fuck...

* done

* some refactor hell

* light + lurker process

* meta process

* mobs process

* vampire

* finish

* no clientside

* Update water_creation.yml

* fixes

* Update ice_ghost.yml

* а

* viator review

* fix lurker

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-17 22:13:10 +03:00
SenorJaba
a370bc19b0 Guild berets and signs (#1786)
* Guild berets and signs

* Naming fix

* Small fix

* Russ
2025-09-17 17:51:51 +03:00
TheKittehJesus
c99dee4928 Fix staff wideswing direction (#1788) 2025-09-17 09:45:46 +03:00
Viator-MV
565d8eb0fe passive heal (#1769) 2025-09-16 18:11:46 +03:00
Red
5377dd6926 fix skin coloring (#1781) 2025-09-16 14:39:46 +03:00
Nim
3630ac156a Bone hound (#1718)
* bone hound

* fix

* fix2

* fix3

* fix4
2025-09-15 19:01:13 +03:00
Kit
d0322972ad Merge pull request #1777 from KittyCat432/Deconstruction
Various changes again
2025-09-15 17:45:42 +03:00
Ed
9bd4fee694 Update tools.yml 2025-09-15 17:26:14 +03:00
Ed
8ddfba60a7 Update tools.yml 2025-09-15 17:11:37 +03:00
Ed
d3716300f8 Update tools.yml 2025-09-15 17:02:43 +03:00
Ed
d807c83a9c fix injectors 2025-09-15 16:51:58 +03:00
Ed
9425908ef2 adapt codebase 2025-09-15 14:49:58 +03:00
Ed
3409e0f752 Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Overlays/StencilOverlay.cs
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/SkinColor.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
2025-09-15 13:50:49 +03:00
ScarKy0
9e204c3023 Vulpkanin Color Clamping (#40348) 2025-09-14 20:55:26 +02:00
slarticodefast
a38c6c1aca Revert "Add heat distortion shader for hot gases" (#40352) 2025-09-14 20:48:24 +02:00
Vasilis The Pikachu
b9ddcc9e9f Revert "Can't crawl over counters (#40099)"
This reverts commit 01a7fc66f0.

@Princess-Cheeseballs

This is being reverted per maintainer vote for the release cycle, check out the meeting video here https://youtu.be/N5-UYCLha2I?t=872
2025-09-14 20:42:51 +02:00
pathetic meowmeow
d9c24b3d10 De-enumify humanoid species skin colours (#39175)
* De-enumify humanoid species skin colours

* Change index to resolve

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-13 22:30:17 -07:00
Nim
fbef31dfa6 return simple armour (#1770) 2025-09-13 15:22:02 +03:00
Nim
62a9ca1cfc nerf fire trap (#1768) 2025-09-12 17:24:18 +03:00