juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,981 Commits 57 Branches 0 Tags
f70e3051ed3e7202ff2ccd545dfd7e77f396ff3a
Commit Graph

46 Commits

Author SHA1 Message Date
Ed
37e0ffa173 Workshop update (#392) 
* kreks spell icons

* vladimirs walls update

* add flora material
 2024-08-05 22:46:22 +03:00
Ed
1f4b7f68bf Playtest polishing (#383) 
* fix predicting sharpening

* finish shadow step

* tweak ice dagger

* shadow grab test

* fireball spell

* ice shards spell

* battle royale crates

* loot tables

* remove expedition ship

* dev update

* br map update

* spells tweak

* tips update

* some fixes

* biome forest spawner

* give keys to orgs

* mobs and aura spawners

* expedition update: goal, new ship, new map

* fix doors layers

* add new map proto

* translate keys

* Update crates.yml

* Update PostMapInitTest.cs

* fix spawning on expedition ship

* Fuck you, Randy. Remove nails

* fix lock systems

* localize tips

* some tweaks

* update ship, remove shrooms.

* fixes

* Update StationSystem.cs

* Revert "Update StationSystem.cs"

This reverts commit f632241324.

* Update expedition_test.yml
 2024-08-05 15:22:14 +03:00
GrandApothecary19
72cbed696f More sprites for tavern (#357) 
* - add sprites

* - fixo for .ftl

* - fix because no whiskey in Eberron((

* - fixo
 2024-08-03 15:51:29 +03:00
Ed
31c9485e3b Magic rings (#378) 
* flame creation spell backend

* flame creation visuals

* flame creation spell visual

* tweak

* some tweaks

* ice dagger spell

* move spells to rings

* Update ring.yml

* fix server crash
 2024-08-02 00:48:36 +03:00
Jaraten
5072800d4a wood furniture resprite (#360) 
* wood table + workbench

* cupboard + dresser

* wooden bucket

* wooden crates

* Update Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml

* barrel

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-30 17:07:43 +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
GrandApothecary19
fee5cc25ce Deleting all CP14 guns proto (#346) 
* Deleting all CP14 guns proto

* sprites deleting to
 2024-07-22 19:11:07 +03:00
Ed
a81465f0d9 Rock and stone mini update (#344) 
* ore resprite

* tools restruct, ore repath, add pickaxr

* fixes

* localizattion sync

* fixes

* Update migration.yml
 2024-07-22 18:46:26 +03:00
Ed
2bf17fdc35 Content pack (#337) 
* added rope

* black shirt replace

* Update migration.yml

* more berets

* loadout update

* captain role and jacket

* bruhh captain cap

* add one-handed sword

* shield!

* Update entities.ftl
 2024-07-19 00:03:08 +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
20d6ccffdb Scythe (#311) 
* Scythe

* Update entities.ftl
 2024-07-07 12:55:03 +03:00
Ed
1dbe308527 Entity ru localization sync (#285) 
* first use

* LOCALIZAAATION

* and again

* Update fire.yml

* Update entities.ftl

* Update main.py

* Update main.py

* delete wrong locales

* battle staff locale

* Update main.py

* more remove

* Update wielded-inhand-right.png
 2024-06-28 12:25:20 +03:00
Ed
54ecb1b23e added battle staff (#286) 2024-06-27 23:29:27 +03:00
Ed
e4678dc66e Nails, Hammer tool and construction recipe update (#249) 
* foundation resprite

* stone material, stack

* nails!

* mini hammer resprite

* hammer tool

* wall building update

* table crafting update

* bonfire craft update

* add wooden wall craft

* chest craft update

* Update attributions.yml

* Update tables.yml

* Update simple.yml
 2024-06-16 18:31:47 +03:00
Jaraten
f0c3d99706 repsite hammer (#248) 2024-06-16 14:40:58 +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
Jaraten
a623704416 add&resprite furnitures (#196) 
* add&resprite furnitures

* license and sprite fix

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-06-05 20:15:51 +03:00
Ed
16bc737d9a Battle hammer (#206) 
* add hammer

* Update battleHammer.yml

* remove 32
 2024-06-04 15:28:52 +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
505a12606a add wallet (#169) 2024-05-24 18:59:10 +03:00
Ed
18e4e86b21 Ed 19 05 2024 building2 (#161) 
* added wooden planks from wooden logs

* update construction crafts from new wood planks

* Update simple.yml

* add wall frame and wall construction graph

* noSpawn old planks, fix wooden frame layering

* update Jaraten sprites

* add wooden window and restruct files

* fix

* Update wall.yml

* add new walls!

* restruct wallmounts, fix bugs

* door fix

* Update walls.yml

* Update simple.yml
 2024-05-21 00:07:51 +03:00
Ed
1ce32bd1c7 Logs + fireplace fix + Trees (#158) 
* add wooden log stacks

* setup wood material

* update trees

* fix fireplaces

* stack now properly works in fireplace system

* bonfire fix

* Update materials.yml

* Update base.yml
 2024-05-19 15:40:28 +03:00
Ed
b66ce952af Minecraft update (#157) 
* add shovel and digging tool quality

* dirt digging effect

* variantize deconstructed tile

* added dirt tile borders

* revert variantize tiles, add dirt blocks entity

* add dirt stack

* Update simple.yml
 2024-05-19 00:26:52 +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
Nim
f411126191 rifle (#134) 2024-05-05 00:43:56 +03:00
Ed
ba05b56d51 Fence fix + Navy revolver (#130) 
* Update fence_wood.yml

* added revolver navy

* Update guns.yml

* Update wooden_fence.yml
 2024-05-04 13:20:21 +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.

* fix filtering guidebook

* test fix

* Update heater.yml
 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
Agoichi
353fcd9cfe Magic Flashlight (#116) 
* fucking flaslight

* flaslight

* Update objects.ftl
 2024-04-28 00:56:02 +03:00
Ed
1f9f88883c Content (#110) 
* Add many test walls

* minor bug fix

* fix torch

* add wallmount variation

* final wood wall!

* great sprite clearing + locales

* fixes

* Update bonfire.yml

* Update wallmount_torch.yml

* Update cave-arena.yml
 2024-04-26 11:09:38 +03:00
Ed
8ba56847bb add crossBOLT 2024-04-22 22:01:47 +03:00
Ed
39f64dea73 added light crossbow 2024-04-22 21:46:11 +03:00
Ed
0b4c5bb988 +2 ores 2024-04-18 23:34:45 +03:00
Ed
59b8757f14 add iron and ore fragments items 2024-04-18 14:16:09 +03:00
Ed
aeb4772c14 Пачка несвязанных обновлений (#88) 
* add coins, start ftl

* localization patch

* fixes

* localization patch

* tiefling

* Update structures.ftl

* add tag

* Update LICENSE.TXT

* Update README.md

* move dagger and sickle to belt slot

* fix license

* Update equipped-CLOAK.png
 2024-04-13 19:13:16 +03:00
Ed
f6a28d4afc Добавлены деньги. Добавлена локализация на англ для всех прототипов. (#86) 
* add coins, start ftl

* localization patch

* fixes

* localization patch

* tiefling

* Update structures.ftl
 2024-04-13 18:00:14 +03:00
Ed
485873839b Работа для кузнеца (#80) 
* add content

* Update CPSharpenedComponent.cs

* Update twoHandedSword.yml

* update
 2024-04-12 21:09:54 +03:00
Ed
9720dcffc5 spears and mace (#66) 2024-04-06 22:58:08 +03:00
Ed
80958e4d71 Hairs init + move textures to _CP14 folder (#43) 
* move textures to _CP14 folder

* hairs

* maps update
 2024-04-06 10:01:45 +03:00