Commit Graph

35137 Commits

Author SHA1 Message Date
Viator-MV
4a5bc15bd8 Good fire skele (#1680)
* Revert "fire magic bad skele (#1679)"

This reverts commit b130d8aeec.

* skelehehehe

* kit conversation
2025-08-21 16:03:57 +03:00
Copilot
5182c59fc5 Fix inconsistent cotton clothing names in Russian localization (#1689)
* Initial plan

* Fix inconsistent cotton clothing names in Russian localization

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

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: TheShuEd <96445749+TheShuEd@users.noreply.github.com>
2025-08-21 00:55:28 +03:00
Nim
0d976a80b3 damageModifierSet (#1688) 2025-08-20 20:51:07 +03:00
Deserty0
046847b6e5 Fix translation (#1682)
* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit dc7e25e8f7.

* Update modifiers.ftl

* FUCK.
2025-08-19 01:07:46 +03:00
Kit
c598d25bdb i forgor translation of cackle (#1681) 2025-08-18 23:31:28 +10:00
CrystallEdge Server
24d21fad8d Automatic changelog update 2025-08-18 11:42:39 +03:00
Kit
7d29519922 Cackle: EVIL PLANT THAT WANTS TO STEAL YOUR BLOOD (#1602)
* bleeding toxin

* cackle itself

* sprites

* spike

* Cackle now spawn

* lower danger points

* color change

* new demis

* more cackle changes to new system

* hope fix conflict

* try 2

* try 3

* try 4

* try 5

* try 6

* try 6

* undo try 6

* clumsy cackle

* changes

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-08-18 11:41:34 +03:00
Kit
b130d8aeec fire magic bad skele (#1679)
* fire magic bad

* same with you demiplane skele wiz
2025-08-18 03:00:08 +03:00
CrystallEdge Server
7a71163f7c Automatic changelog update 2025-08-18 01:20:07 +03:00
Viator-MV
26202ed324 Skeleton inteligence (#1447)
* help me ed

* skills

* god defence

* lantern gaze

* mask nerf

* tomer

* move lamp

* oops

* i hate new night vision

* like this?

* meh

* wizard

* atheism

* memory of health
2025-08-18 01:19:02 +03:00
CrystallEdge Server
db07ae15fe Automatic changelog update 2025-08-18 01:11:23 +03:00
Nim
9e4f3fbfb2 The lor book of religion (#1673)
* book religion

* Imitators of the Gods

* fix bold
2025-08-18 01:10:17 +03:00
Nim
838092b497 price of artefacts (#1674) 2025-08-18 01:09:29 +03:00
github-actions[bot]
4ba66a5427 @gogenych has signed the CLA in crystallpunk-14/crystall-punk-14#1676 2025-08-17 19:49:19 +00:00
CrystallEdge Server
583c26a55b Automatic changelog update 2025-08-16 19:45:41 +03:00
Kit
22ac60a5d3 More spell balance (#1671)
* NERFS!!!!!

* BUFFS!!!!

* hell ballade rebalance

* Pacifist block

* fix
2025-08-17 02:44:33 +10:00
CrystallEdge Server
e87e021f1b Automatic changelog update 2025-08-11 23:47:33 +03:00
Red
e6f5ed2450 Spell pre-examine (#1661)
* examine spells

* fux

* fix
2025-08-11 23:46:28 +03:00
CrystallEdge Server
aa5fe8d4d7 Automatic changelog update 2025-08-11 22:20:37 +03:00
nukkuminen
cef72a3512 Cookbook (#1644)
* starting to add recipe book

* Guidebook for cooking

* added cookbook to the game, and the closet

* fix dishes

* typo fix

* another one

* even more typo fix

* fixing my shit from past

* final fixes to the guidebook

* fixing my mess
2025-08-11 22:19:32 +03:00
Viator-MV
25df43cea4 fixes (#1658) 2025-08-11 22:18:59 +03:00
CrystallEdge Server
1b2dc757e0 Automatic changelog update 2025-08-10 17:28:17 +03:00
creamybag
77c5d96ea3 New wild plant sprites. (#1654)
* 1

* 2
2025-08-10 17:27:12 +03:00
Alexsey Bezyuk
25df067d3f Backpacks description and categories (#1647)
* backpacks translation

* leather categories

* linter fix

* Linter please

* Описания

* priority in craft

* priorotize

* eng comment

* Update Content.Client/_CP14/Workbench/CP14WorkbenchWindow.xaml.cs
2025-08-10 17:25:34 +03:00
Morb
44beba9ca6 Convert flem sounds from stereo to mono (#1649) 2025-08-10 17:23:41 +03:00
nukkuminen
4c9f31ef13 Carcat guidebook tweak (#1652)
* English carkat guidebook tweak

* Russian carkat guidebook tweak
2025-08-10 17:23:25 +03:00
Kit
662e509369 no more magic type mana armor (#1650) 2025-08-09 20:53:25 +03:00
Red
c089e844dc Minor cleanup (#1645)
* bue

* some code
2025-08-09 13:47:21 +03:00
CrystallEdge Server
bfd1db72d8 Automatic changelog update 2025-08-09 13:22:31 +03:00
Alexsey Bezyuk
bdd7e5ea65 Leather rework (#1638)
* remove salt

* crafting rework

* Stacks

* corrected count

* linter fix

* Bellt crafts

* delete leather

* resize

* Hide in belt

* Sprites fix

* linter fix

* remove static price from backpacks base

* explosive resistance

* belt cost

* Lets fix cost warnings

* satchels static price for balance with backpacks

* ScrapHideRecipe cost

* lets try increase leather units in hide

* return scrap recipe back

* Lets FINISH that costs!

* hide suffix

* trying to fix stack warning

* placeholder suffix

* Hide => Leather

* Lets try again!!!!

* name and description

* another

* Update Resources/Prototypes/_CP14/Entities/Objects/Ingredients/ingredients.yml

* Update Resources/Prototypes/_CP14/Materials/simple.yml

* Update Resources/Prototypes/_CP14/Entities/Objects/Ingredients/ingredients.yml
2025-08-09 13:21:26 +03:00
Nim
96f28489c6 Перевод на RU (#1596)
* 1

* 2

* 3

* 4

* health-examinable

* .

* carpet fix

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-08-09 13:12:47 +03:00
github-actions[bot]
31167f97e4 @oldschoolotaku has signed the CLA in crystallpunk-14/crystall-punk-14#1644 2025-08-08 23:57:57 +00:00
CrystallEdge Server
e826bbe4ed Automatic changelog update 2025-08-09 00:28:28 +03:00
Red
02286f492a material aspect support (#1643) 2025-08-09 00:27:23 +03:00
CrystallEdge Server
8015892add Automatic changelog update 2025-08-08 22:43:13 +03:00
Red
a808bf521c Resurrection spell returns (#1642)
* resurrection

* resurrection

* loadout

* city portal spell scroll

* Update thaumaturgy.yml
2025-08-08 22:42:08 +03:00
Ed
9ad759b56d Update CP14DemiplaneSystem.cs 2025-08-08 20:32:25 +03:00
CrystallEdge Server
f4dad593a9 Automatic changelog update 2025-08-08 17:38:21 +03:00
Red
fa22152b42 Demiplane redesign again (again) (#1640)
* rooms generation fix??

* demiplane map returns

* wawa

* fix
2025-08-08 17:37:16 +03:00
CrystallEdge Server
76752414c6 Automatic changelog update 2025-08-08 12:36:26 +03:00
Morb
a4eaf8018f Fix mosquitos stamina animation threshold (#1635)
* Fix mosquitos stamina animation threshold

* Remove mosquito stamina
2025-08-08 12:35:21 +03:00
github-actions[bot]
95ae290c7b @Morb0 has signed the CLA in crystallpunk-14/crystall-punk-14#1635 2025-08-07 23:54:21 +00:00
CrystallEdge Server
841d75946d Automatic changelog update 2025-08-08 00:13:41 +03:00
Nim
ec7c84cc90 Lurker cape (#1455)
* lurker cape

* UseDelay

* del useDelay

* onUse

* fix
2025-08-08 00:12:36 +03:00
CrystallEdge Server
616de88ff8 Automatic changelog update 2025-08-07 23:59:03 +03:00
Morb
227c44561b Alert sprite size fix (#1637)
* Directly use vanilla alerts & make stamina as custom

* Fix mix size for alert of 96px

* Revert "Directly use vanilla alerts & make stamina as custom"

This reverts commit 3298202f8a.

* Update AlertsUI.xaml

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-08-07 23:57:58 +03:00
CrystallEdge Server
0d269372d7 Automatic changelog update 2025-08-07 23:37:47 +03:00
Red
ad75c2b22a City Generation bugfixes (#1639)
* fix biome

* mapping upadte

* and this

* Update comoss.yml
2025-08-07 23:36:42 +03:00
CrystallEdge Server
5eb53af75d Automatic changelog update 2025-08-07 14:51:44 +03:00
Red
a6c8779093 Bugfix portion (#1636)
* fix #1634

* fix #1575

* fix #1612
2025-08-07 14:50:39 +03:00