Red
30d7da4b2b
Ed 06 07 2025 guards trading ( #1505 )
...
* guard trading
* Refactor trading reputation special and update guard assets
Renamed CP14AddGlobalReputationSpecial to CP14AddTradingReputationSpecial and updated its logic to use a configurable set of factions. Updated job prototypes for guard, guard commander, investigator, and merchant to use the new special and specify relevant factions. Also updated guard helmet textures and metadata.
2025-07-06 17:35:49 +03:00
Nim
cb01a6b66c
Reprise of doors, vials, and labeler ( #1495 )
...
* birch door
* hand labeler
* vial
* fix door
* vials
* frame
2025-07-04 17:35:59 +03:00
Alexsey Bezyuk
9c393ff8b5
[TRADE] Reagent and Food price rework and 4 new contracts: Butchers, Diary, Gardeners and Tailors ( #1453 )
...
* contracts
* meat prices
* cheese and egg
* blue and aged cheese
* aged and blue parts and slices
* cheese json
* contracts
* cheese and egg
* blue and aged cheese
* aged and blue parts and slices
* cheese json
* revert meat prices
* Cheese prices
* egg price remove
* revert meat prices
* factions
* contracts
* meta.json
* remove monster part price
* sickle, hoe
* up price per unit
* Trade ref, cheese fix, plate PhysCompos
* Update coins.yml
* prices reagents rework, raw nutrient decrease, food container rework
* prices
* materials, remove bars
* tailors faction
* factions
* sprite fixes
* enyity fix
* Physical compositions
* tailord dye and loot in crate
* comment
* Ore buy to bar
* move to buy positions
* factions and contracts in main page
* move flint position
* Квартц вместо стекла
* quartz price up
* glass sheet sell position
* price precurser. Again
* essences prices
* english comment
* ooops missed
* price up
* sell requests and small flowers variations
* yaml fix
* test fix?
* flowers => to vials
* 2 => 1 count
* flowers icons
* remove small variations
* clear
---------
Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com >
2025-06-26 18:18:19 +03:00
Red
17be798db4
Grass bags ( #1381 )
...
* grass bugs
* move to victoria
* Update tiles_grass_bag.yml
2025-06-04 12:22:54 +03:00
Red
43913d9d11
cozy ( #1367 )
2025-06-03 00:38:19 +03:00
Red
5c5a473ec0
More merchant content ( #1349 )
...
* energy crystals
* thaumaturgy trading
2025-06-01 19:21:41 +03:00
Red
a3ae67a762
Trade reputation rework + Merchants back + Mining contract ( #1347 )
...
* refactor unlocking
* fix contract debug crashing
* Update dev_map.yml
* bugfixes and content rebalance
* ore buy contract
2025-06-01 15:10:36 +03:00
Red
cde388f5dd
Another Merchant gameplay attempt ( #1308 )
...
* setup UI
* setup debug data
* graph control setup
* reputation trade component
* unlocking logic
* smoe real reputation costing
* remove sponsors part, add trading specific UI nodes
* port to default pricing system
* buy cooldown
* fuck off trading cabinets
* real good cooldown UI
* Cool unlock sound
* reputation earning
* cool purchare sound
* coin & sprite work
* delete old guidebooks
* cool purcharing VFX
* better ui
* victoria gardens
* Update migration.yml
* Update migration.yml
* cooldown removed
* contracts
* Update migration.yml
* remove CP14Material
* materials appraise
* food appraise
* auto economy pricing system
* alchemy reagents appraise
* coins resprite
* alchemy appraise 2
* modular weapon appraise
* selling platform
* Update PricingSystem.cs
* Update CP14TradingPlatformSystem.cs
* merchants returns + map update
* Update CP14StationEconomySystem.Price.cs
2025-05-29 00:22:47 +03:00
Ed
2358bc46d6
Torches + Cotton ( #1246 )
...
* torches add, wallmount crystals deletion
* cotton
* Update buy.yml
* craftis
* delete elemental quartz
* energy crystal resprite and rewamp
* fix
* Update misc.yml
* а
* delete rituals
* riat
* Update migration.yml
* Delete CP14ClientRitualSystem.cs
* Update statues.yml
* fix
* Update wallmount_lamp.yml
* fix
2025-04-30 17:28:38 +03:00
Ed
48831380b4
Give some love to farming ( #1124 )
...
* give some love to farming
* Queryptimization
* Fuck soil!!!
* fuck soil in prototypes!
* seeds improve
* partial merge wild and farm
* some strange fix
* plant kills refactor, add compost
* fix compost
* Update migration.yml
* rain can watering plants
* sage update
* Update seeds.yml
* sage smoking update
* Update seeds.yml
2025-04-03 15:29:08 +03:00
Ed
504adb6738
Fools day end ( #1115 )
...
* Revert "April fools fix (#1113 )"
This reverts commit e2dec03cbb#1113 )"
This reverts commit e2dec03cbb256476b576
2025-04-01 21:40:43 +03:00
Ed
655cba7674
April 2025 fool ( #1109 )
...
* Новый геймплей кузнеца и алхимика (#1084 )
* anvilvat
Vat is now anvil
* deleted layers
* я даун
* тесты скажите что не так
* fuck documentation
* finally ok
* Alloys
* test not give up
* fix tests mk2 and anvil rename
* anvilgril
* FUCK TABS
* cattle
* meow
* the чистка
* armor
* fuck
* Update tags.yml
* ДА КАК ЭТО Я ВООБЩЕ БЛЯТЬ МОГ СДЕЛАТЬ НАХУЙ
* garde
* yes
* сохранить забыл
* голова потекла
* упс
* b
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
* Viator's april fools (#1091 )
* uno reverse
* comos!
* desery special
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
* [April Fools] Mob Pumpkin King!!! (#1092 )
* MobPumpkinKing
* generation
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
* asdsasdd (#1110 )
* wait what???
* some fixes
* Поправка локализации на завтра (#1108 )
* локаль
* упс
* Create TOPSECRET.xml
* Update entry.yml
* Update TOPSECRET.xml
* ч
---------
Co-authored-by: Deserty0 <86846189+Deserty0@users.noreply.github.com >
Co-authored-by: Viator-MV <egor44148@gmail.com >
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com >
2025-04-01 00:05:46 +03:00
Ed
bef78c62c0
Alchemical bomb ( #965 )
...
* smoke bomb system
* collector fixes
* bomb integration
* fix
* tweak
2025-03-03 14:06:50 +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
Nim
19c29e126d
Onion and pepper ( #889 )
...
* onion and pepper
* flavor
* crates
2025-02-13 15:21:41 +03:00
Ed
a6262a471d
Resprites + Satchels ( #834 )
...
* magic essence experiment
* demiplane key resprite
* some resprites
* guard commander cape
* vat and cauldron resprite
* flint resprite
* satchels!
2025-02-02 03:29:55 +03:00
Ed
af182db79e
Another assets relicense ( #814 )
...
* TheShuEd assets relicensing
* Max Gab mass relicensing
* omsoyk mass relicensing
* Prazat mass relicense
* Jaraten mass relicensing
* Update meta.json
* jaraten part 2
* finalize
* validation
* unrelated fixes
* Revert "jaraten part 2"
This reverts commit b39ee0cdb944febae3803d2f388f47775f21a18d
2025-01-27 16:03:13 +03:00
Ed
fb604d1e08
fix CLA licensing
2025-01-24 22:02:46 +03:00
Ed
0af7a7ec64
Alchemist content ( #718 )
...
* reinforced vials
* glass recipes
* roundstart alchemist potions
2025-01-10 16:17:32 +03:00
Nim
417668b88b
Crayon ( #634 )
...
* crayon
* add crayon into loots
---------
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2024-12-07 00:50:54 +03:00
Ed
d67f7619c4
Edgefication ( #590 )
...
* bloat
* bloat 2
* bloat 3
* final bloat
* Update icon.ico
* Create integration_test_run.bat
* Arggh
* Disable some tests
* revert roomfill clearexisting changes
2024-11-18 14:40:52 +03:00
Ed
5bcc378bbe
Clean up, increase build stability ( #583 )
...
* Update base.yml
* bandit -> sociopath
* some fixes
* syringe
* vaults
* Update ContentAudioSystem.CP14AmbientLoop.cs
2024-11-13 17:56:07 +03:00
Nim
e062d386fc
Herbal bandages and gauze ( #545 )
...
* gauze and bandage
* fix
* spawn
* dele
* doAfter buff
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2024-11-08 09:26:31 +03:00
Ed
546e1d8fa1
Tomatoes + farming trading ( #513 )
...
* farm trading
* ruond prices
* add tomatoes sprites
* TOMATOES
* Update tomatoes.yml
2024-10-27 01:26:22 +03:00
Ed
d2c5aa74b4
Ritualizm ( #474 )
...
* ritual cucumber setup
* entities requirements
* try graph???
* Revert "try graph???"
This reverts commit c90c6353cb
2024-10-06 18:04:18 +03:00
vladimir.s
8d022dd502
Wooden objects and structures resprite ( #436 )
2024-09-17 13:06:34 +03:00
Ed
ca318a1849
Cucumber! Potato! ( #430 )
...
* some ambient loops tweak
* cucumber! potato!
* seed craft
* fix CLA
* Update CP14DayCycleSystem.cs
* Update CP14DayCycleSystem.cs
* weather
2024-09-01 16:14:56 +03:00
Ed
37a4068334
CLA license update ( #429 )
...
* pupu
* Update LICENSE.TXT
* CLA
* CLA!
* Revert "CLA!"
This reverts commit f999e341a1
2024-08-29 18:23:33 +03:00
Ed
e02a9951a7
Flowers + some love for Alchemy ( #427 )
...
* red rose proto and sprite
* 242 changed files guys
* yellow dayflin
* jitter + drunk solution, also refactor alchemy recipes
* dyes entity
* dye crafting, dye using
* add flowers to generation
2024-08-29 00:31:09 +05:00
Ed
d3189b83cf
Pumpkin + Cabbage ( #417 )
...
* seeds
* import Omsoyk plant sprites
* cabbage slicing
* sliceable pumpkin
* some tweaks
* seedbed clean fix, remove shitcode systems
* seed crafting, knife fix
* utencil
* Update base.yml
* cabbage rebalance
* abstract seed
2024-08-22 17:35:00 +03:00
Ed
22bb0ae283
Energy pilons WIP ( #326 )
...
* split partial magic system
* add debug sprited pilons
* some energy pilons interactions
* Update CP14MagicEnergySystem.Relay.cs
* spupers (#322 )
* spupers
* meta
* aura nodes + aura scanners
* scanner sprites
* maid dress
* reverse pilon logic
* relay delete, code clean up
* delete content
* Update basic.yml
* Update shirt.yml
* Update crystal.yml
---------
Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com >
2024-07-29 21:01:36 +03:00
Ed
9f1b4fc51c
Melting molds ( #347 )
...
* temp tweak
* add metall bars
* melting molds
* add sawing molds table
* sawing sounds
* fix
2024-07-23 10:29:41 +03:00
Ed
8cbd26ae2f
Farming WIP ( #269 )
...
* setup planting doafter
* spawn plants after use seed
* some work
* move comps to separate folder
* public check daylight
* daylight plant energy regeneration
* some fixes
* bruh, im thinking
* added ingame soil
* added hoe
* attaching plants
* hoe system
* block plant dublicating
* some planting refactor
* shovel as pant + soil remover
* plant growing visualizer
* soil resprite
* split farming system to second partial class
* update throught event refactor
* tring sync update plant with update visuals
* finish visual sync
* plants growing
* more partial splitting, naming work, clean up
* Update FARMINGTEST.yml
* Update FARMINGTEST.yml
* fix typo
* prototype value validating
* Оно бухает воду!
* solution visualizer in soil
* forgot some fix
* part of Tornado review fix
* destroy RemovePlantComponent
* more fixes
* simple harvesting
* refactor plant component values changing
* harvest redo
* gather on destroyByTool
* sickle resprite
* plant fading
* fading per minute!
* wheat sprites
* YML restruct
* fixes
* auto root plants
* add comments
* move sprites
* split structures from object textures
* wheat farming!
* Update CP14FarmingSystem.Interactions.cs
* seedbed (#297 )
seedbed :^)
* a
* Update soil.yml
---------
Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com >
2024-07-15 23:58:03 +03:00
Ed
0211a50581
Energy crystal ( #243 )
...
* init magic container system
* charging and discharging
* add energy regenerator
* thaumaturgy glasses, scanning energy
* add energy quartz prorotypes and sprites
* light power controller
* commit special for _des
* simple normalizer crystal slot
* YEEEEEEE BOIII, examined crystalls inside things
* кристал теперь видно, когда он вставлен в стабилизатор
* TryUseCharge приборами
* hello deserty, how are you doing?
* rename regenerator to EnergyDraw, allow draw from slot
* normalizer жрет magic energy файналли
* Update normalizer.yml
* visual polishing
* Update crystal.yml
2024-06-13 22:55:20 +03:00
Ed
2cfdc4a52f
Solution normalizer ( #227 )
...
* dropper
* add stabilizer
* fuck, now
* Update CP14SolutionNormalizerComponent.cs
2024-06-08 18:46:09 +03:00
Ed
d998e6bf9a
Lumishroom ( #226 )
...
* added lumishroom art
* lumishroom
* Update migration.yml
* fix
* fix x2
* Update alchemy_test_layer2.yml
* worldgen
* Update chromium_inverse.yml
* add new barrels and vials
2024-06-08 01:03:21 +03:00
Ed
b33a094f65
change licenses ( #191 )
...
* change licenses
* Update rsi-schema.json
* change codebase license
* try make schema
* Create rsi.json
* rga fix
2024-05-31 00:01:22 +03:00
Ed
7a75835908
Wild sage alchemy reagent ( #182 )
...
* add wild sage root
* Update biological.yml
* added complex wild sage reaction
* add wild sage in worldgen
* Update basic-effects.yml
2024-05-27 23:24:08 +03:00
Ed
af114a93f6
Chromium slime ( #174 )
...
* added chromium slime
* inverse poison damage
2024-05-25 17:41:29 +03:00
Ed
f8564b3661
Agaric shroom! ( #172 )
...
* agaric shrooms!
* add agaric reagents
* add agaric into worldgen
2024-05-25 13:30:33 +03:00
Ed
9690077532
Bloodgrass gatherable entity + gatherable system cleanup + bugfix ( #154 )
...
* added 4 basic reagent effects
* entrance bugfixes
* add bloodgrass world sprites
* preuso cherry pick
* add planet bloodgrass and sickle gathering
* +1 gather sound
2024-05-18 15:16:20 +03:00
Ed
7b2328ba22
Alchemy tools: pestle and mortar ( #144 )
...
* add mortar & pestle mechanic
* setup prototypes
* Update mixing_types.yml
* add bubble sound collection, fix errors
2024-05-08 17:15:31 +03:00
Ed
4c692d7d4a
Alchemy + Guidebook initialization ( #124 )
...
* remove Guidebook
* water and blood
* localization things
* added vital extract
* some fixes
* added bloodgrass
* guidebook localization
* fixes icons and remove unnecesary fields
* added inhand cauldron
* fix wallmount board
* Update bonfire.yml
* Update bonfire.yml
* alchemy furnace + mist
* fixes
* Guidebook localization
* Update drinks.yml
* Revert "remove Guidebook"
This reverts commit 7924cf235f
2024-05-02 20:41:11 +03:00
Ed
0169cb55d8
Alchemy instruments ( #122 )
...
* add beer barrel
* add vet
* add storage to vat
* make bucket viable!
* bandage vat item fix
* Update vat.yml
* add small vial
* tiny vial
* Update SharedStorageSystem.cs
* Create biological.yml
* spilable and bonfire climbing
2024-04-30 16:48:08 +03:00
