Commit Graph

31113 Commits

Author SHA1 Message Date
Ed
81b9cdfff7 Alchemy integration test (#967)
* Update TryAllReactionsTest.cs

* test drive

* fix traveling ship roundremove

* Update CP14RoundRemoveShuttleSystem.cs

* Dev map update
2025-03-03 23:15:40 +03:00
Ed
3fb7cc0cd7 minor balance tweak 2025-03-03 18:43:44 +03:00
Ed
a0b190fd97 Update vials.yml 2025-03-03 16:55:12 +03:00
Ed
719ee50c96 CP14AreaEffectBehavior 2025-03-03 16:07:19 +03:00
Ed
c7c2e7265b Update essence_collector.yml 2025-03-03 14:37:13 +03:00
Ed
bef78c62c0 Alchemical bomb (#965)
* smoke bomb system

* collector fixes

* bomb integration

* fix

* tweak
2025-03-03 14:06:50 +03:00
VideoKompany
bab794e68f Added 'arrow' to the names of the arrowheads (#964)
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
2025-03-03 10:37:36 +03:00
Nim
9ea547d8be Перевод на RU (#949)
* translate

* fix

* yee

* qwerty

* fix

* Signal

* Skeleton

* arrow

* fix
2025-03-03 09:38:09 +03:00
creamybag
a16dd2fd3e Shirts in pants #2 (#934)
* New shirt, all fix

* merchant,chainmail
2025-03-02 22:16:34 +03:00
creamybag
8bbb0dad84 lute (#962) 2025-03-02 17:03:40 +03:00
Ed
8652e71b39 Essence nodes (#961)
* essence nodes

* Update essence_nodes.yml
2025-03-02 15:13:21 +03:00
Ed
9a787bc7b8 Thaumaturgic alchemy refactor WIP (#955)
* essences thaumaturgy refactor

* migrate structure crystals

* shard migrate

* bruh

* fix migration

* fixes

* 1 combining

* Create essence_brewing.yml

* Update magic.yml

* stack essence support

* FUCK THIIA ALL, DELETE ALL

* redesign counter spell

* Update precurser.yml

* magic splitting solution

* precurser splitting

* Praecantatio

* Update cleaner.yml

* add potions recipe

* fuck alchemy guidebook

* guidebook update

* fixes

* energia fix

* Update migration.yml

* fixes

* Update Alchemy.xml

* fix

* medium vial

* fixes?

* Update essence_combining.yml

* Update target_effect_creation_water.yml

* alchemist Comoss update

* Update closets.yml

* mana opertion glove

* Update migration.yml

* Update vials.yml

* Update GuideReagentReaction.xaml

* try to fix

* manual migration

* Update comoss_d.yml

* fix

* manual migration 2

* precursor admixture

* Update heater.yml
2025-03-02 13:28:13 +03:00
Ed
2225de9ce4 switch to ru CBT 2025-03-01 14:13:46 +03:00
Nim
2d4ace0b10 Tip sprite (#954)
* tip sprite

* fix

* heh

* solution
2025-03-01 01:26:36 +03:00
Ed
b8c2d662b6 English OBT setup (#956)
* fix

* Update Dev.toml
2025-02-28 20:18:28 +03:00
Nim
310c711adf tweak (#953) 2025-02-28 17:03:23 +03:00
Ed
3fd47443ae Essence collector (#952)
* collector attract essence

* collector

* Update magic-essence.yml

* Update essence_collelctor.yml
2025-02-28 15:55:47 +03:00
Ed
f2c9fb6503 ballade balance 2025-02-27 17:30:39 +03:00
Ed
3d398e89ab integration whistler poison into alchemy (#950) 2025-02-27 15:12:30 +03:00
Nim
15d9657139 Invisible whistler (#941)
* invisible whistler

* Parts

* spike

* flavor

* flavor

* filter

* sprite

* demiplan
2025-02-27 14:02:30 +03:00
Ed
5524e029f4 Essence splitter (#948)
* disable rotting

* pipipi

* essence storage

* energy splitter

* Update essence_splitter.yml

* Update impact.png

* visual fixes

* sound fix

* Update twoHandedStaffs.yml

* unhardcode

* Update meta.json

* fix
2025-02-27 13:48:38 +03:00
Ed
c6cc4daa3f Magical ballade (#946)
* mana ballade

* mana gift + consume merged in 1 loadout option

* Update T0_mana_gift.yml
2025-02-26 17:23:53 +03:00
Ed
9440115087 Fire ballade (#945) 2025-02-26 14:49:32 +03:00
Ed
1542459864 Books and bookshelf (#944)
* guidebooks

* guard spawns

* books restruct

* bookshelf

* Update crates.yml
2025-02-26 14:38:22 +03:00
Ed
aed7e0994a pax bard (#943) 2025-02-26 12:01:14 +03:00
Ed
d0f1bba9d8 speed up ballade (#942) 2025-02-26 10:51:23 +03:00
Ed
ba901d5e0e Crystals Update (#925)
* portal frame

* resprited sharpening stone

* portal frame entity

* darkness -> dimension magic type

* thaumaturgy platforms, some refactor

* magic energy refactor

* Update AirlockPryingTest.cs

* transfering tweaks

* fixed magic manipulation
2025-02-25 23:37:05 +03:00
Ed
4e62a0efcc Update gob_way.webp 2025-02-25 18:14:47 +03:00
Nim
6fb28fae4f sack craft (#937) 2025-02-25 17:34:04 +03:00
Ed
a370182cb6 Spell icons folder restruct (#940)
* spell icon sprite restruct

* proto edit

* Update T1_fire_rune.yml
2025-02-25 17:33:20 +03:00
creamybag
ba6ceac7ef DismasHair (#939)
* DismasHair

* new rsi, new meta, new name
2025-02-25 17:32:45 +03:00
Ed
3e26334c53 healing bard spell (#938) 2025-02-25 15:44:22 +03:00
Nim
3a0a4c17ea Сrafting changes (#932)
* crafting

* tweak
2025-02-25 10:31:59 +03:00
Viator-MV
186a1a04bf Merge pull request #933 from Viator-MV/Comoss_update_22.02.25
Comoss update 22.02.25
2025-02-24 18:48:38 +03:00
Ed
37ff029956 return black roofs 2025-02-24 01:07:03 +03:00
Ed
a847b9be71 Merge branch 'master' into Comoss_update_22.02.25 2025-02-24 00:55:25 +03:00
Ed
7cc9eb9ab2 Merge pull request #935 from crystallpunk-14/ed-23-02-2025-upstream
Upstream room sync
2025-02-24 00:38:31 +03:00
Ed
ae5b1118d8 Update shield.yml 2025-02-24 00:17:41 +03:00
Ed
c60f65c901 Update CP14DemiplaneSystem.Echoes.cs 2025-02-24 00:09:19 +03:00
Ed
b8575aba8f roofs update 2025-02-23 23:29:45 +03:00
Ed
07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
2025-02-23 23:07:55 +03:00
PJBot
408c6ab443 Automatic changelog update 2025-02-23 19:30:21 +00:00
deltanedas
3e7450802b fix chameleon projector ripley bug (#35070)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-02-23 20:29:15 +01:00
PJBot
9f4d6abd30 Automatic changelog update 2025-02-23 19:02:23 +00:00
Errant
cc74880061 version watermark (#35284)
* version watermark

* force version watermarks on vulture
2025-02-23 20:01:17 +01:00
PJBot
40fbbe3ae4 Automatic changelog update 2025-02-23 18:49:44 +00:00
pathetic meowmeow
fdf19c6a90 Add a tertiary header parser to the guidebook document parser (#35315) 2025-02-23 19:48:38 +01:00
pathetic meowmeow
cbecc4cc4b Use new engine APIs for setting the scroll target of views (#35401) 2025-02-23 18:47:13 +01:00
keronshb
3192914fc5 Fix/Addition - Wizard Survivor Antag Status (#35226) 2025-02-23 12:24:36 -05:00
Viator-MV
8de115e7d2 Merge branch 'crystallpunk-14:master' into Comoss_update_22.02.25 2025-02-23 19:55:35 +03:00