Commit Graph

31834 Commits

Author SHA1 Message Date
Ed
6f665266c4 s (#1179) 2025-04-13 15:37:00 +03:00
Ed
ac541b63ef new round leave system (#1178)
* round leave

* maps update
2025-04-13 15:36:41 +03:00
Viator-MV
0f37c24df0 fix (#1177) 2025-04-13 14:48:33 +03:00
Ed
e968c7a9b8 wendigo tweak 2025-04-13 12:34:03 +03:00
Ed
26d81b684b Weather refill (#1175)
* refillable by weather

* fix
2025-04-13 01:01:22 +03:00
Ed
51b3492cea Update wendigo.yml 2025-04-12 22:01:14 +03:00
Ed
517bc5418b Wendigo demiplane antag (#1174)
* wendigo

* ritual3

* Update sky_lightning.yml
2025-04-12 17:32:53 +03:00
Viator-MV
ee30ae1341 frigid coast (#1173)
* frigid coast

* fix

* Update snow.yml

* Update default.yml

* Update Frigid_Coast.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-04-12 16:35:41 +03:00
Ed
3c27e0ed99 Revert "Another Try" (#1170)
* Revert "Another Try (#1167)"

This reverts commit 355fc410a3.

* Update EntityTest.cs

* Revert "Update EntityTest.cs"

This reverts commit 1f75981e59.
2025-04-12 12:03:18 +03:00
Ed
e64c8f3d4f Dead tree (#1172)
* farming rebalance

* Update base.yml

* Update CP14FarmingSystem.Resourse.cs

* dead tree

* Update scattering_grenades.yml
2025-04-12 11:43:45 +03:00
Ed
da5190ae60 Farming rebalance (#1171)
* farming rebalance

* Update base.yml

* Update CP14FarmingSystem.Resourse.cs
2025-04-11 23:45:03 +03:00
Ed
355fc410a3 Another Try (#1167)
* tick

* Update simple.yml

* revert deep

* revert straw

* revert surko

* revert fix

* revert beards

* Revert "revert surko"

This reverts commit 9ea597414a.

* Revert "revert fix"

This reverts commit 910da9d6e6.

* Revert "revert beards"

This reverts commit a941a41788.

* Revert "revert deep"

This reverts commit 8dd25a4b96.

* Reapply "revert deep"

This reverts commit cbde613021.
2025-04-11 19:53:00 +03:00
Ed
948d711336 Bunch of bugfixes (#1165)
* watcher fix

* fix #1162

* fix #1111

* make watcher move smoothly

* s

* Delete test_xeno.yml
2025-04-10 22:28:50 +03:00
github-actions[bot]
de5ec12791 @noverd has signed the CLA in crystallpunk-14/crystall-punk-14#1164 2025-04-10 08:40:55 +00:00
Ed
41b84f43eb Delete Factoria (#1156)
* bue

* Update PostMapInitTest.cs
2025-04-10 11:10:04 +03:00
Ed
0decd375e4 Birch tree (#1154)
* birch

* wooden birch log and planks

* birch tile crafting

* add birch to worldgen

* Update grasslands.yml

* wooden planks (any)

* universal wood crafting

* birch wall
2025-04-09 15:54:38 +03:00
creamybag
d201dc0695 Beards (#1153)
* beards

* fix

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-04-08 17:40:01 +03:00
Ed
5b3688fc89 deep Comoss ocean (#1150)
* deep Comoss ocean

* Update migration.yml
2025-04-08 17:39:23 +03:00
Ed
f7b5e40f23 fix master (#1152) 2025-04-08 17:24:56 +03:00
Viator-MV
d0a185cca0 Empties (#1151)
добавлены пустые пресеты карт 2 биомов со всеми нужными компонентами
2025-04-08 16:04:45 +03:00
Ed
f7f7feb837 Marble update (#1146)
* all marble resprite

* Update meta.json

* marble table

* marble natural wall

* marble cave floor

* marble material

* marble small floor bricks

* marble in demiplanes
2025-04-07 21:27:20 +03:00
creamybag
06863d9986 StrawHat (#1132) 2025-04-07 17:15:56 +03:00
creamybag
d5ce5d9f37 Syurko update (#1148)
* Syurko\

* Translation editsЭ

* fix
2025-04-07 17:15:21 +03:00
Ed
56299c62d6 fix 2025-04-07 01:36:55 +03:00
Ed
e77645d9d6 old tiles YES (#1144) 2025-04-07 01:34:45 +03:00
Ed
d81dbe4c20 Update tiefling.yml 2025-04-06 20:32:52 +03:00
Nim
d3be599ccb carcat tail (#1141) 2025-04-06 17:26:36 +03:00
Ed
4efbb6f307 Update sell.yml 2025-04-06 15:04:18 +03:00
Ed
b4ab1a714c Update CP14SharedFarmingSystem.Interactions.cs 2025-04-06 14:05:04 +03:00
Ed
b04b95cae4 farm buff 2025-04-06 13:59:50 +03:00
Viator-MV
32b077af63 update (#1137) 2025-04-05 14:42:51 +03:00
Ed
52c06249ea f (#1136) 2025-04-05 13:46:23 +03:00
Ed
bb2fbd1baf Update secret_weights.yml 2025-04-05 12:43:46 +03:00
Ed
e308eec703 Hoe dirt preparing (#1135)
* seedbed returns

* modular hoe!

* hoe gameplay

* remove onion seeds
2025-04-05 01:00:39 +03:00
Nim
d5e54ce744 minor edits (#1130) 2025-04-04 17:30:41 +03:00
Nim
c91a6c3f59 Adapted watchers (#1129)
* watcher

* co

* sadly
2025-04-04 17:30:26 +03:00
Ed
b66ee390a6 Dynamic demiplane weather + farming hotfix (#1131)
* dynamic demiplane weather

* add skeleton sprite

* hotfix farming

* Update wheat.yml
2025-04-04 10:35:48 +03:00
Nim
e125605f25 fix constructions (#1125) 2025-04-03 17:13:39 +03:00
creamybag
dd9aea718c The guildmaster's rapier was not given out in the round. (#1123)
* fix

* fix2
2025-04-03 15:34:35 +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
creamybag
16c4f8be53 Furcoat carcat (#1122)
* FurcoatCat

* fix
2025-04-03 10:00:27 +03:00
Nim
879792be09 Fix mana damage (#1106)
* fix mana damage

* mana potion

* fix rev

* ehh

* hmm

* nop

* Update target_effect_creation_on_water.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-04-02 16:11:48 +03:00
Ed
fa7aacc103 Update Dev.toml 2025-04-01 23:08:46 +03:00
Ed
937851a72c Update Dev.toml 2025-04-01 21:50:20 +03:00
Ed
504adb6738 Fools day end (#1115)
* Revert "April fools fix (#1113)"

This reverts commit e2dec03cbb.

* Revert "April fools fix (#1113)"

This reverts commit e2dec03cbb.

* Revert "Update secret_weights.yml"

This reverts commit 256476b576.

* Update Dev.toml
2025-04-01 21:40:43 +03:00
Nim
b9d191c7e4 Fix bandage (#1112)
* CP14Biological

* storePositionBuy
2025-04-01 11:26:17 +03:00
Ed
1573d1ee81 ru 2025-04-01 11:16:33 +03:00
Deserty0
e2dec03cbb April fools fix (#1113)
* fix

* fuck

* фы
2025-04-01 08:41:35 +03:00
Ed
6e96943df5 Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 2025-04-01 00:11:16 +03:00
Ed
256476b576 Update secret_weights.yml 2025-04-01 00:10:51 +03:00