Commit Graph

43 Commits

Author SHA1 Message Date
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
comasqw
b592842a66 fix localization helper & protos descriptions in ftl (#282)
* fix localization helper & protos descriptions in ftl

* Update main.py

* Update objects.ftl

* добавил ярлык напрямую к файлу локализации

* megasuperduperpuperTWEAK

* Update yml_parser.py

* Update yml_parser.py

* Update yml_parser.py

* Update yml_parser.py

* Update main.py

* tweak

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
2024-06-27 22:07:25 +03:00
Nim
3492a7892a Mannequin (#253)
* mannequin

* fix

* fix2

* Update mannequin.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-06-21 23:17:49 +03:00
Ed
36da152d73 Clothing update (#231)
* added cotton shirts

* pants update

* add new cloaks

* Update misc_startinggear.yml

* glasses update

* Update migration.yml

* remove yellow hoodie helmet
2024-06-11 13:48:01 +03:00
Ed
f0fa3af1ab clean up and local patch (#185)
* locales pack

* more fix and tweaks and locales

* more locale

* fix 0.5

* Update biological.yml
2024-05-29 01:32:48 +03:00
Nim
f411126191 rifle (#134) 2024-05-05 00:43:56 +03:00
Agoichi
ba009f34fa Crystal/ punk-update (#129)
* Crystalpunk-update

* Crystalpunk-update

* Update Resources/Prototypes/_CP14/SoundCollections/hit_impacts.yml

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Update Resources/Prototypes/_CP14/Entities/Structures/crystal.yml

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Update Resources/Prototypes/_CP14/Entities/Structures/crystal.yml

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* clean up

* Update crystal.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
2024-05-04 13:39:32 +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
6cb97502aa KBAS5 clothing + Jaraten Structures (#120)
* add barbarian clothes

* add jaraten floors and wall

* locale

* add stonebrick walls and gold\silver ore cave walls

* fix brick black, update cave arena

* Update roundstart.yml

* Update cave-arena.yml
2024-04-28 22:47:01 +03:00
Agoichi
353fcd9cfe Magic Flashlight (#116)
* fucking flaslight

* flaslight

* Update objects.ftl
2024-04-28 00:56:02 +03:00
Nim
64218bfcab Coffin (#118)
* coffin

* eng
2024-04-27 22:04:52 +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
966a54fbc6 add torch 2024-04-20 16:54:03 +03:00
Ed
f271c8cff0 add aristocratic set 2024-04-20 15:59:15 +03:00
Ed
e98a6e17a3 Update structures.ftl 2024-04-20 14:18:22 +03:00
Ed
4763bffeac locale update 2 2024-04-20 14:16:11 +03:00
Ed
d74a33d46b locale update 2024-04-20 14:10:10 +03:00
Agoichi
040497805f Adding the sinner's mask (#97)
* adding sinner's mask

* changing sinner's mask

* changing sinner's mask

* changing sinner's mask

* changing sinner's mask

* changing sinner's mask
2024-04-16 17:51:11 +03:00
Ed
76afac43f9 minutiae grinding (#96)
* add floor crafting, add crafting lcoalization

* add chest construction

* add chest localization

* Update chests.yml
2024-04-14 22:02:04 +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