juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,149 Commits 57 Branches 0 Tags
924897e27ddf3ef12e908a5e43e84fa07fbfc1d5
Commit Graph

33149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
924897e27d f 2025-05-23 15:08:17 +03:00
Ed
262a8a30c9 gf 2025-05-23 14:58:41 +03:00
Ed
8e7f68c062 part of fixes 2025-05-23 14:57:20 +03:00
Ed
3a9e6dc409 Update walls.yml 2025-05-23 13:52:18 +03:00
Ed
3abb4d6051 Update ContentLocalizationManager.cs 2025-05-23 13:44:02 +03:00
Red
40246e9b13 Merge branch 'master' into ed-12-05-2025-upstream 2025-05-23 12:58:11 +03:00
Cuir
14074a2ff3 Window improvements (#1292) 
* Added stone brick and marble brick windows to the crafting menu proper.
Sanitized capitalization of construction graph ids and nodes (but not entities).
Sanitized stone and marble structure descriptions.

* Windows that are built with frames now leave those frames behind when you smash them instead of disintegrating entirely.

* Syntax error because entity id

* wooden windows

* Added a base window frame as well as a wooden window frame and its broken variant.
Frames can be vaulted through, and the broken glass variant will deal slash damage and a short stun upon entering.
Wooden windows now deconstruct and shatter into both types of frames, which can also be deconstructed.
Fixed an issue with window collisions when connected across tiles.
Gave wooden windows their own prototype file and construction graph.

* stonevrick windows

* Added functionality to stone window frame types.
Fixed an issue where shattered windows weren't triggering unless they were flammable.

* some parenting work

* fix fixtures

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-05-23 12:03:36 +03:00
Nim
51277446ef Правка перевода RU (#1302) 
* traslet fix

* fix
 2025-05-23 11:03:59 +03:00
Sukilove
aadcaabf0e Rotated Keyfile (#1299) 
* Rotated the inventory sprite Keyfile by 45 degrees

* Update CP14RoundEndSystem.CBT.cs

* Rotated another 45 degrees
 2025-05-22 23:26:34 +03:00
Red
0ce4771f3d Update CP14RoundEndSystem.CBT.cs 2025-05-22 14:53:46 +03:00
github-actions[bot]
7b7e2d0d22 @Soupkilove has signed the CLA in crystallpunk-14/crystall-punk-14#1299 2025-05-22 00:41:21 +00:00
Ed
0f4decfa9b Update CP14RoundEndSystem.CBT.cs 2025-05-21 21:28:11 +03:00
Ed
ff68b9606f Update Dev.toml 2025-05-21 21:16:19 +03:00
Red
2d0d79ca41 Daily English CBT (#1286) 
* Update CP14RoundEndSystem.CBT.cs

* Update CP14RoundEndSystem.CBT.cs

* Update CP14RoundEndSystem.CBT.cs
 2025-05-21 21:06:44 +03:00
Red
352707f1d7 Remove Guildmaster & Merchant roles (#1296) 
* b

* Update round_end.yml

* Update round_end.yml
 2025-05-21 19:33:00 +03:00
Red
068b2c5576 Update README.md 2025-05-21 12:56:43 +03:00
Alexsey Bezyuk
a73f8e3113 Seed sack and craft (#1287) 
* seed_sack

* full seed sack

* seed sack sprite

* name and description
 2025-05-21 12:41:22 +03:00
Deserty0
beeea40dc7 Lochelper update (#1262) 
* comments

* Update localization_helper.py

* okay

* oops

* dsd

* adad

* as

* finally

* Revert "finally"

This reverts commit 50c6059676.

* Reapply "finally"

* fix

* fix
 2025-05-21 11:51:03 +03:00
Nim
afa522cc7c Перевод на RU (#1285) 
* translate

* fix

* rev

* slime

* fix local
 2025-05-21 11:50:42 +03:00
github-actions[bot]
b0d6bb3c0f @Cu1r has signed the CLA in crystallpunk-14/crystall-punk-14#1292 2025-05-21 07:18:04 +00: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