juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,784 Commits 57 Branches 0 Tags
655cba76746584537d3937231865c5ebfc849664
Commit Graph

69 Commits

Author SHA1 Message Date
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
Nim
44b775b308 Request editing (#1063) 
* request editing

* skeleton

* no bank

* job
 2025-03-24 17:07:48 +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
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
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
Deserty0
b8cc4c8c20 Fix (#922) 2025-02-20 19:22:29 +03:00
Nim
249cad63ee fix (#896) 2025-02-14 11:51:10 +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
Арт
c678e96fbc New vests (#862) 
* Sprites&Meta

* Add_Vests

* Belt

* Loadouts&Fixes

* Rem_RedVest_FromGuildmaster
 2025-02-10 17:47:40 +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
Ed
cb583d6897 Ru localization sync (#854) 
* localization sync

* Update entities.ftl

* Update entities.ftl
 2025-02-07 17:12:54 +03:00
creamybag
11a4ed5439 creamy shyba (#839) 2025-02-04 23:35:48 +03:00
Ed
94ab0fc94b Bugfixes (#783) 
* fix force evaporation

* knowledge book in bank

* music in loadouts

* Update general.yml

* localization sync

* fix round leave and manifest

* ship sound replacement

* fix traveling ship gravity

* forgot this role knowledge
 2025-01-19 14:23:53 +03:00
Nim
2644fe26ea Ashes and Russian translation edits with a couple of minor fixes (#735) 
* ash++++

* fix

* по запросу
 2025-01-13 23:01:34 +03:00
Ed
815c031a16 localization sync 2025-01-08 15:31:17 +03:00
Ed
22b0f46890 Roundleave ship clean up (#653) 
* cryo shuttle rework

* Update entities.ftl
 2024-12-09 20:39:56 +03:00
Ed
dc5333ee18 localization update 2024-12-08 01:19:57 +03:00
Ed
52a0f44aa1 Bank progression mechanic (#633) 
* bank progression mechanic

* loc fix

* minor random fixes

* minor tweaks

* lighthouse

* Vladimirs Alerts!

* offset alerts

* lighthouse
 2024-12-07 00:39:05 +03:00
Ed
64df860b50 Salary for the guards (#631) 
* public API

* salary init

* salary finish

* Update entities.ftl

* Update salary.yml
 2024-12-06 00:59:37 +03:00
Ed
094fbc445f localization sync 2024-12-05 14:43:43 +03:00
Ed
f6630e1ec9 Key distribution system (#625) 
* data restruct

* yay

* Update arenas.yml

* fixes

* auto labeling

* shuffle
 2024-12-03 12:34:07 +03:00
Ed
897a9cf683 localization sync (#597) 
* localization sync

* init

* Update entities.ftl

* внезапный респрайт лома
 2024-11-24 14:33:02 +03:00
Ed
6147740f3e Try fix master constantly fails (#567) 
* try to fix

* Update entities.ftl

* Update entities.ftl

* Update entities.ftl

* Update entities.ftl

* Update entities.ftl

* Update entities.ftl
 2024-11-09 13:07:12 +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
4e3c70a9d1 Iron doors (#505) 
* iron doors

* shirt desc partial fix

* fix
 2024-10-24 12:38:12 +03:00
Ed
8c06677ff4 Ru localization update (#500) 
* Update entities.ftl

* fix

* Update entities.ftl
 2024-10-20 23:27:33 +03:00
Ed
c2704165d3 Loadout update (#461) 
* some full species sprite

* floral wreath

* alchemist cloak, loadout restruct

* giant head clothing refactor

* Update entities.ftl

* backpacks loadout! yay

* trinkets

* Update general.yml

* oopsie

* Update general.yml

* fixes

* Delete test-ship.yml
 2024-09-27 00:36:09 +03:00
comasqw
8e27ef22ed Local helper update (#420) 
* local helper update

* Delete entities.ftl

* Helper Refactor

* Revert "Helper Refactor"

This reverts commit 4aca315593.

* Helper Refactor

* Жееесть, я не знал про setdefault у словарей

* Update localization_helper.py

* Ревёрт "Жееесть, я не знал про setdefault у словарей"

Лучше бы я продолжал не знать о них

* чтооооо

* Update yml_parser.py

* Update entities.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-09-23 15:43:02 +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
Skilets
e938b2f9ed Icon (#426) 
* Fix Hud

* skulls wall

---------

Co-authored-by: SkiletsKir <113713080+Skilets@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-08-28 15:32:22 +03:00
Ed
3850317a37 Update entities.ftl (#418) 2024-08-22 19:00:29 +03:00
Nim
bf256b25e9 Two new spells of light (#404) 
* light spell

* fix
 2024-08-10 13:08:14 +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
599c599a4e Some shit (#380) 
* telegraphy effects

* shadow step spell backend

* add component spell

* predict sharpening

* Update ring.yml

* locale sync

* Update entities.ftl

* icon shadow step
 2024-08-02 13:51:54 +03:00
Nim
19365c0314 Statue of Gob (#376) 
* statue of Gob

* fix
 2024-08-01 09:15:44 +03:00
KommissarRed
7478e6b445 Remove "bruh" (#367) 2024-07-30 20:43:13 +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
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
dec6a1c2ca Ru localization update (#335) 
* Update entities.ftl

* Update ContentLocalizationManager.cs

* Update ContentLocalizationManager.cs

* Update entities.ftl
 2024-07-18 23:40:06 +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
Jaraten
82f1ed1493 upd cliffs (#320) 
* upd cliffs

* localize

* Update marker_base.yml

* Update entities.ftl

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-09 21:31:36 +03:00
Ed
20d6ccffdb Scythe (#311) 
* Scythe

* Update entities.ftl
 2024-07-07 12:55:03 +03:00
Ed
cc9e5f68da Update entities.ftl (#307) 2024-07-05 14:00:56 +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