juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,806 Commits 57 Branches 0 Tags
ed-14-04-2025-content
Commit Graph

32806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
b028f1fcff Update comoss_d.yml 2025-05-21 12:46:40 +03:00
Ed
bc88dc3c55 Merge branch 'ed-14-04-2025-content' of https://github.com/crystallpunk-14/crystall-punk-14 into ed-14-04-2025-content 2025-05-21 11:55:02 +03:00
Ed
552b996319 Update Frigid_Coast.yml 2025-05-21 11:54:46 +03:00
Red
c10a62b37b Merge branch 'master' into ed-14-04-2025-content 2025-05-21 00:59:35 +03:00
Ed
9e26d985a5 Update roles.yml 2025-05-21 00:33:20 +03:00
Ed
58edb8783b test with joinqueue 2025-05-21 00:31:04 +03:00
Red
1d093c3919 Critical bugfixes (#1291) 
* fix modifier duplication

* fix scrap melting
 2025-05-21 00:30:16 +03:00
TheKittehJesus
726a078b95 added hideCaution to BaseSmokingPipe (#1290) 2025-05-21 00:02:44 +03:00
Red
7b7a837cf8 City Gate fix + Comoss update (#1289) 
* city gate fix

* Update comoss.yml

* fix

* Update migration.yml
 2025-05-20 22:36:43 +03:00
TheKittehJesus
2fc1384780 Proofreading changes [EN] (#1288) 
* First batch of text fixes

* Tweaks

* that the tavern

---------

Co-authored-by: TheKittehJesus <29379890+SamGithubAccount@users.noreply.github.com>
 2025-05-20 22:22:43 +03:00
github-actions[bot]
a92e07fc20 @TheKittehJesus has signed the CLA in crystallpunk-14/crystall-punk-14#1288 2025-05-20 18:35:33 +00:00
Ed
ab619ad840 Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 2025-05-19 21:45:33 +03:00
Red
f4caea3c6c Garbage delete (#1284) 
* fuck this

* and this

* aaand this

* content fix

* Update base.yml

* Update physical.yml

* kill bob
 2025-05-19 14:53:00 +03:00
Alexsey Bezyuk
bd2f2e14d9 Wheat gather increase (#1283) 
* wheat increase

* requirment bread count decrease

* Revert "wheat increase"

This reverts commit 9a7ecedcdc.

* Time decrease
 2025-05-19 12:32:00 +03:00
Alexsey Bezyuk
f250f2b986 Gathering Seeds (#1282) 2025-05-19 12:13:29 +03:00
Alexsey Bezyuk
3472feefea Increase WorkbenchRadius (#1281) 2025-05-19 10:38:19 +03:00
github-actions[bot]
3a89698faa @PhantornRU has signed the CLA in crystallpunk-14/crystall-punk-14#1281 2025-05-19 07:31:20 +00:00
Ed
72976a9f3a ро 2025-05-19 00:59:40 +03:00
github-actions[bot]
c0ccb2d392 @DeLTaAlarm0 has signed the CLA in crystallpunk-14/crystall-punk-14#1275 2025-05-18 18:16:01 +00:00
Ed
e70e64011f Update CP14BloodMoonCurseRule.cs 2025-05-18 16:59:39 +03:00
Ed
fd6965efe0 skimimimi 2025-05-18 15:36:28 +03:00
Ed
db222c01c2 Update Dev.toml 2025-05-18 15:35:03 +03:00
Ed
1cd20edecf Workshop resprite pack (#1279) 
* Jaraten resprite pack

* stamina TTomattT

* shrooms jaraten

* cloak fix

* passport resprite
 2025-05-18 01:24:07 +03:00
Ed
0274826e32 Species free innate skill (#1277) 
* innate free job skills

* returns species magic buff + unlock all skill

* Update tiefling.yml

* fix
 2025-05-18 00:37:04 +03:00
Ed
5cd70ae1e9 fix achemist 2025-05-17 16:57:15 +03:00
Ed
5629a916a0 Update Dev.toml 2025-05-17 16:52:53 +03:00
Ed
23c9e11019 Blood moon part 2 (#1272) 
* som tweaks

* fixing all

* bloodlust spell

* atatat
 2025-05-17 14:12:49 +03:00
Viator-MV
74707a98c3 emiplane ghostrole fix (#1271) 
* fine

* fix

* Update Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs

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

* Update Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml

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

* Update Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml

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

* Update Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml

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

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-16 15:26:02 +03:00
Ed
132d1db37b search of life spell (#1273) 2025-05-16 00:58:48 +03:00
Ed
e0a4f5592f Blood moon (#1270) 
* some setup

* fix dayccle events, add basic gamerules

* carcat guidebook update

* pfpf

* wawa

* fnish
 2025-05-15 17:32:26 +03:00
Ed
26e4088cdd Silva Photosynthes returns + Carcat guidebook page (#1269) 
* f

* restore silva feature

* carcat guidebook

* day cycle
 2025-05-15 00:37:42 +03:00
Ed
e361125549 Update blacksmith.yml 2025-05-14 22:34:49 +03:00
Ed
14d0c1f6ea Update skimitar.yml 2025-05-14 19:12:43 +03:00
Ed
8c47af421f balance pass 2025-05-14 18:22:05 +03:00
Viator-MV
80d668361c Mana trance (#1216) 
* That's it, Ed.

* skill

* CleanDisposed.

* now heal

* remake

* bruh rechek

* slowing

* Update metamagic.yml

* some ingame test and balance

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-14 14:56:27 +03:00
Ed
c2c66e77c1 Shrimp progression (#1268) 
* Ore modifier category

* roundstart adventurer weapon equip

* forgot about guard

* Update adventure.yml
 2025-05-14 14:22:33 +03:00
creamybag
edecdc3701 PackOmsoyk (#1267) 2025-05-14 13:53:56 +03:00
Ed
be495f274c Skill progression system (#1263) 
* delete skill trees

* Revert "delete skill trees"

This reverts commit 9d7fae73c4.

* learning refactor

* UI tweaks

* sword mastery skill

* telegraphy

* rapier mastery

* research table ui

* finish studing

* polish UI researching

* pyrokinetic

* more skill tree working

* heat adapt

* alchemist and metamagic update

* skill multiple effects support + metamagic bugg manapool

* impossible 😢

* skimitar gaming

* skimidi

* blacksmithing branch

* remove research restrictions

* remove species magic buff

* fix loc

* Update thaumaturgy.yml

* pip

* Delete skill_tree.yml
 2025-05-14 12:43:43 +03:00
Ed
9e409a1eaf Update Dev.toml 2025-05-11 17:05:32 +03:00
Nim
abd69892c5 Myconide (#1265) 2025-05-11 17:04:52 +03:00
Nim
3164cb5b94 Fixing issues (#1258) 
* fix

* gib frog

* zombie

* not damage
 2025-05-10 21:45:11 +03:00
Ed
a243d2f8cd Update Dev.toml 2025-05-10 14:11:32 +03:00
paige404
ebaa57133f Slime Crown (#1257) 
* Add slime crown, an admin-spawn artifact hat that makes all slimes friendly with the wearer.

* Add slime crown sprites
 2025-05-10 14:11:09 +03:00
Viator-MV
44f1c03e34 Spells extension (#1202) 
* fire

* trance_compression_distoration

* scroll loot

* fix

* myeh

* again mb?

* compression fix

* crystal fix

* disorion debuff

* delete all it

* final?

* nah

* not mine

* fix

* fix

* mmmm

* mana trance rebalance

* relocate trance

* fix

* blyat

* no compression

* delete all

* fix

* Update modifier_sets.yml

* Update heat.yml

* Update heat.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-10 13:28:33 +03:00
Nim
6e86a54a88 meat cooked (#1261) 2025-05-10 12:21:55 +03:00
Militore
aa2e080e31 Guard bell (#1242) 
* add Guard Bell

* revert vanila changes, add same functionality

* revert more vanila changes, replace .ogg, fix locale and locale usage

* Update GuardBell.yml

* Update base.yml

* add attributions.yml for alerts

* try changing to proper license

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-09 15:07:05 +03:00
github-actions[bot]
d9c2bd8e09 @paige404 has signed the CLA in crystallpunk-14/crystall-punk-14#1257 2025-05-08 08:40:48 +00:00
Ed
448cd605c4 bye frigid 2025-05-06 20:36:08 +03:00
Nim
d8e360367e Well and new bed, aristocratic cloak (#1228) 
* well and bed

* aristocratic cloak

* fix

* GuardCommander

* fix2

* nop merchant

* bed resp

* fix well visual

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-05-06 09:47:46 +03:00
Nim
89c737f37d Перевод на RU (#1231) 
* translated

* end

* review desert

* review 2

* fix
 2025-05-06 09:46:46 +03:00