Commit Graph

31247 Commits

Author SHA1 Message Date
Ed
9cb1f806de mimimi 2025-03-07 17:07:46 +03:00
github-actions[bot]
d97d7f6fc4 @LinkF2kkk has signed the CLA in crystallpunk-14/crystall-punk-14#987 2025-03-07 13:53:33 +00:00
Nim
228258e575 Dice (#989)
* dice

* wallet

* crate
2025-03-07 15:36:58 +03:00
Ed
6aac9d6447 Update wizard.yml 2025-03-07 14:53:58 +03:00
Ed
0b5712ce97 Vampire antag (#988)
* new blood types

* vampire systems setup

* death under sun

* vampire blood nutrition

* alerts

* autolearn skills

* base bite actions

* suck blood spell

* polish

* Update blood.yml

* unshitcode

* vampire hunger visual

* nerf speed

* hypnosis + map update

* darkness demiplane warning
2025-03-07 14:52:43 +03:00
Nim
cea7d93d12 Fixes (#975)
* fixs

* not
2025-03-06 16:33:10 +03:00
Tornado Tech
4a11cf9c53 Merge pull request #977 from crystallpunk-14/skill-remaster
Knowledge refactor
2025-03-06 22:29:36 +10:00
github-actions[bot]
19e9b3bc40 @SpyDev14 has signed the CLA in crystallpunk-14/crystall-punk-14#976 2025-03-06 10:38:37 +00:00
Tornado Tech
1ad686f42e feature: add to adghost CP14AllKnowing 2025-03-06 19:59:33 +10:00
Tornado Tech
06697abcdb fix: Books\knowledge.yml 2025-03-06 19:57:04 +10:00
Tornado Tech
1265355260 fix: CP14AddKnowledgeSpecial usings 2025-03-06 19:48:20 +10:00
github-actions[bot]
b1e985d0ad @Tornado-Technology has signed the CLA in crystallpunk-14/crystall-punk-14#977 2025-03-06 09:46:28 +00:00
Tornado Tech
ce0ec78e8d fix: CP14AddKnowledgeSpecial namespace 2025-03-06 19:43:04 +10:00
Tornado Tech
e6a28307a4 refactor: server CP14KnowledgeSystem 2025-03-06 19:42:20 +10:00
Ed
c1acf81541 NewTrade (#969)
* trading portal replace traveling storeship

* clean up content

* clean up content 2

* seel and buy realization

* fixes

* Update migration.yml

* Update migration.yml

* Update dev_map.yml

* Update dev_map.yml

* thats work correctly now

* bugfies and visual

* factions

* faction restruct + name reduce

* unnesting sell cargo positions

* unnesting cargo positions

* more cargo content

* Update buy.yml

* improve tradeportal visual

* Update migration.yml

* Bank ad Commandant removal

* merchant objectives

* finish

* clean up content

* Update migration.yml

* fix goal calculation

* Update comoss.yml

* Update dev_map.yml
2025-03-06 12:01:43 +03:00
Tornado Tech
7b5283b35b fix: Knowledge events usings (I hate Rider) 2025-03-06 18:56:06 +10:00
Tornado Tech
45a6919994 fix: KnowledgeRequired 2025-03-06 18:46:51 +10:00
Viator-MV
0d23f79eb6 Обновление скелетов (#971)
* Literally everything

Как будто я не должен был делать всё в 1 коммит

* фиксы

маленькие изменения по запросу Эда

* fix

HideSpawnMenu

* fix2

fix

* final fix

final fix
2025-03-06 11:40:30 +03:00
Tornado Tech
35e6bae5fe refactor: Add AllKnowing comp, separate paper and events 2025-03-06 18:40:17 +10:00
Tornado Tech
44f4c17266 refactor: Orthographic and obsolete in Knowledge 2025-03-06 18:22:01 +10:00
Nim
e54e8a95ee Sheep (#972)
* sheep

* demi mod
2025-03-05 17:30:06 +03:00
creamybag
d9a5869504 Merge pull request #973 from creamybag/GuildmasterHat
Guildmaster hat
2025-03-05 17:28:41 +03:00
Ed
f9ff91d74b Update default.yml 2025-03-04 13:56:12 +03:00
Ed
b7b52e664d Update Dev.toml 2025-03-03 23:59:32 +03:00
Ed
b202897c36 Merge pull request #968 from crystallpunk-14/ed-2025-03-03-upstream-stable-2
Stable upstream sync
2025-03-03 23:40:02 +03: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
Nim
2855cc906b Мелкий фикс перевода (#966)
* fix

* a

* ehh

* yep
2025-03-03 23:17:00 +03:00
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
Errant
3d9ce10f58 Revert "[HOTFIX] - Players with unknown playtimes now are tagged as new players" (#35639)
Revert "[HOTFIX] - Players with unknown playtimes now are tagged as new playe…"

This reverts commit 4dfd3e5740.
2025-03-03 07:49:13 +01:00
Nim
9ea547d8be Перевод на RU (#949)
* translate

* fix

* yee

* qwerty

* fix

* Signal

* Skeleton

* arrow

* fix
2025-03-03 09:38:09 +03:00
beck-thompson
4dfd3e5740 [HOTFIX] - Players with unknown playtimes now are tagged as new players (#35564)
* Players with unknown playtimes now are tagged as new players

* Fix

* I'm silly it was in the same file

* Cavar update
2025-03-02 20:45:54 +01:00
Errant
7bf09bfdb5 add altered silicon to rules (#35455)
* add altered silicon to rules

* skreee

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>

---------

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
2025-03-02 20:41:07 +01:00
SlamBamActionman
08cb26dbf0 Hotfix: Fix uplinks allowing buying conditionally restricted items (#35334)
* Initial commit

* I just compressed the code

* Actually address review
2025-03-02 20:40:57 +01: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
Myra
98cca7b0f8 Change Phalanximine to be more complex, increase Arithrazine damage (#32209) 2025-03-02 13:47:11 +01: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
ActiveMammmoth
cec05d697e Staff of Animation Fixes (#35491)
* staff of animation fixes and system

* requested changes

* size back to normal

* Update AnimateSpellSystem.cs

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-02-27 20:11:57 +01:00