Commit Graph

286 Commits

Author SHA1 Message Date
creamybag
ee2846613a guildmaster's rapier (#1070) 2025-03-25 17:47:44 +03:00
Nim
b2095a01cc Trade orders (#1037)
* orders

* sprite

* fix orders

* different

* layers

* scrolls

* flora

* loot

* groups

* entity-group

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-03-24 17:15:44 +03:00
Nim
44b775b308 Request editing (#1063)
* request editing

* skeleton

* no bank

* job
2025-03-24 17:07:48 +03:00
Ed
2dbc3e7a4d Back to Ru CBT + Bugfixes (#1065)
* Update Dev.toml

* fix #1059

* fix #1061

* fix #1060

* fix #1058
2025-03-24 17:06:09 +03:00
ArZarLordOfMango
28d30571ca locale-fix (#1055) 2025-03-23 16:28:54 +03:00
Ed
29278ca98b localization (#1054) 2025-03-23 15:00:18 +03:00
Viator-MV
9c5662d7f5 Skeleton upgrade (#1053)
* skeleton upgrade

* armor upgradde

* skelute

* true, not real

* fix
2025-03-23 14:27:14 +03:00
Ed
eaf9c009c1 Slimes mob (#1049)
* import sprites

* pipia

* 3 slime types

* Delete generic_magic_effects.yml

* Update scrolls.yml

* demiplane integration

* Update fire.yml

* Update crystals.yml

* local

* Update fire.yml

* fix AI stuck

* Update base.yml

* loot

* Update mobs.yml
2025-03-23 14:14:08 +03:00
Nim
08bc5289cd Перевод на RU (#1034)
* translated 3

* fix

* fixxxx

* c

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-03-18 09:15:33 +03:00
Nim
eef078111d bone mask and armor (#1025)
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-03-18 09:13:52 +03:00
Nim
41f33bf005 Potions pouch (#1026)
* pouch

* loadout

* fix

* fix name

* fix name duo

* loadouts2
2025-03-15 16:30:40 +02:00
Ed
f989980df3 Carcats species [Draft] (#1023)
* body parts

* proto setup

* inhand displacements

* carcat cloak

* eyes

* gloves

* pants carcat

* pants

* shirt

* markings nose + ears

* Update 5.png

* shoes + naming

* helmet adapt

* carcat sounds

* Update sewing_table.yml

* s

* Update comoss.yml

* Update factoria.yml

* s
2025-03-14 14:11:41 +03:00
Ed
93ed28d34c Trading content (#1010)
* reroll positions

* more trading content

* bugfixes

* more content

* guidebook uodate

* Update buy.yml
2025-03-12 00:51:58 +03:00
Link
0168dbabbb Separated mana modifiers (#1001)
* brainrot

* Update test_armor.yml
2025-03-11 10:23:09 +03:00
Nim
74fa1251c7 Modular armour 1 (#936)
* armor

* fix

* fix color

* migra

* + *

* balance

* caustic

* presets

* migr2

* plate

* chainmail

* fix speed

* ehh

* ehh2

* ehh3

* fix layers

* mask craft

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-03-10 16:24:10 +03:00
Nim
391cc8e7a5 Green salad (#999)
* green salad

* maxvol

* duplicate
2025-03-10 15:18:36 +03:00
Ed
10b38f04ce 129 Dinazewwr hairstyles (#717)
* first pass

* Sync new sprites

* ru loc

* chatgpt moment

* clean up

* Update human-hair.ftl
2025-03-10 13:06:18 +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
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
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
Nim
2855cc906b Мелкий фикс перевода (#966)
* fix

* a

* ehh

* yep
2025-03-03 23:17:00 +03:00
Nim
9ea547d8be Перевод на RU (#949)
* translate

* fix

* yee

* qwerty

* fix

* Signal

* Skeleton

* arrow

* fix
2025-03-03 09:38:09 +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
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
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
aed7e0994a pax bard (#943) 2025-02-26 12:01:14 +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
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
Ed
1020288d12 Epic alchemy buff (#931)
* alchemy update

* damage heat
2025-02-22 12:45:55 +03:00
KittenColony
93350c80e8 Alchemy Remaster - Foundation (T0 / T1) (#827)
* Ported from broken repo

* Missed something

* Unfucks the port

* RU locale + EN typo fixes

* Simple solvent & Dye temperature / orgnization

* cleansing salt + reactions

* Healing solution stems bleeding

* Removed biological.yml duplicate

* Guidebook updating

* Update dye_brewing.yml

* Single character typos

* missed typos

* Salt dehydrating

* Dye now needs water (catalyst) to form

* Biological > Organic, Archaic > Arcane / Alchemized,+ RU Locale

* Adjusting & patches

* Chromium in Arcane

* Removed 0.1u empty from purification

* Update chromium_slime.yml

* test commenting out

* Uncommenting InverseEffect

* Revert "Uncommenting InverseEffect"

This reverts commit 19aaaa9246.

* Potential solution

* Revert Potential solution

* This might fix it.

* Suffering

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-02-21 17:58:40 +03:00
Deserty0
b8cc4c8c20 Fix (#922) 2025-02-20 19:22:29 +03:00
Nim
88462e5a1b Modular arrows (#906)
* arrow

* sprite

* slots

* migration

* fix

* fix2

* del

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-02-19 22:36:21 +03:00
Ed
224d96bd34 Sociopath delete (#917)
* fuck sociopath and grass seel position

* Update PostMapInitTest.cs

* fix
2025-02-19 21:56:29 +03:00
Ed
ffa565484c Modular weapon inlay (#903)
* slots lists

* blade inlay

* tadam
2025-02-16 11:41:43 +03:00
Ed
a3849c8aa9 pressure plate (#902) 2025-02-16 00:39:36 +03:00
Ed
02379e37f7 Leaf maze demiplane + crayon update (#901)
* crayons update

* Update workbench.yml

* leaf maze demiplane

* Update t2_leaf_maze.yml
2025-02-15 17:49:05 +03:00
Nim
249cad63ee fix (#896) 2025-02-14 11:51:10 +03:00
Nim
460f438bb2 Various meats (#865)
* meat

* color fix

* recipe

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-02-13 11:29:19 +03:00
Ed
73b4060c65 passport (#886) 2025-02-12 17:20:50 +03:00
Арт
21592c24bc New construction recipes (#872)
* FilesSort

* NewCrafts

* Locale

* Doors&Tomb

* RemFrames&SmallFixes

* Grilles

* BarrelsBenchPalletCurtains

* EditLocale

* BarrelIconSprite

* Fix_ResDuplicates

* Res_Fix

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-02-10 22:18:22 +03:00
Ed
4f4d24ac5b Balance bugtweak (#881)
* Update CP14UniqueLootSystem.cs

* some demiplane balance

* rings undepants

* fix #870

* fix #868

* Update CP14ClientWallpaperSystem.cs
2025-02-10 22:07:25 +03:00
Арт
c678e96fbc New vests (#862)
* Sprites&Meta

* Add_Vests

* Belt

* Loadouts&Fixes

* Rem_RedVest_FromGuildmaster
2025-02-10 17:47:40 +03:00
Ed
72c9cb9014 Unstable demiplane update (#866)
* replace heat trigger to unsafe damage trigger

* end demiplane music

* timed demiplane modifier

* unhardcode some values

* demiplane crystal destruction waves

* time limit

* fixes

* Update CP14UniqueLootSystem.cs

* Update unstable_rift.yml

* tweks

* Update unstable_rift.yml
2025-02-09 17:18:24 +03:00
Nim
ec6b5b4b93 say (#864) 2025-02-09 00:06:28 +03:00
Арт
bd45567599 Small Fixes (#861)
* Rem_HairHiding_GuardsHelmet

* Rem_electrified_CrystalShardElectro

* Locale_Fix
2025-02-08 21:39:17 +03:00