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

10760 Commits

Author SHA1 Message Date
Viator-MV
e06e1bb7fc Druid stuff (#1396) 
* staff

* Revert "staff"

This reverts commit bb7532e0b2.

* not resprite
 2025-06-09 14:35:56 +03:00
Alchebun
8d55affc34 Buildable Wooden Fences (#1370) 
* Start of New PR

* still figuring it out

* This is confusing...

* AHA! Progress!

* Big Fences complete

* smaller fence test

* fixed smaller gates

---------

Co-authored-by: Alchebun <jimmy.12.or#gmail.com>
 2025-06-09 14:34:38 +03:00
Sefaia
29a88758c0 Fixed some misplaced recipes for Aventails and Greaves. (#1409) 2025-06-09 13:25:39 +03:00
gogenych
c7151a7f56 Copper time! (#1403) 
* blyad ya na mastere sdelal

* returned readability

* new presets for copper weapons

* fix
 2025-06-08 19:16:25 +03:00
Peck3
c4cae9ce0c Innkeeper guidebook entry (#1318) 
* Innkeeping guidebook text

Contains the text for the innkeeping guidebook page

* Update jobs.yml

Adds innkeeper to jobs.yml

* Update jobs.yml

* Update jobs.yml

* Update jobs.yml

* RU jobs.yml

* Innkeeper guidebook text RU

* Grammar update

* Ru

* Adds PhantornRU's suggestions

* Small grammar updates to new text

* Another update to the suggested text

* Update RU page, translation needed

* Testing out images

* Fixed embeds, added more

* Fucked up the boxes

* maybe this time it will work

* This time for sure

* it didnt work

* It worked, updated RU page

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-06-08 10:54:11 +03:00
Nim
024d22dc05 Slippers and hat (#1398) 
* Slippers and hat

* sound

* fix
 2025-06-08 10:53:19 +03:00
Viator-MV
f7622a2123 New skeleton fixes (#1394) 
* thats all

* T1too
 2025-06-08 10:52:14 +03:00
Ed
3532a0f945 Update default.yml 2025-06-07 16:34:39 +03:00
Red
3e78962d91 Venicialis new map (#1397) 
* venec map

* venec udate

* venicialis fort

* Update PostMapInitTest.cs
 2025-06-07 14:04:41 +03:00
gogenych
6735f16e59 some price change (#1392) 2025-06-06 18:06:07 +03:00
Red
a04720e2a0 fuck rings (#1389) 2025-06-05 12:46:38 +03:00
Red
d16b9c8de7 Kill guards with sharpened blade (#1386) 
* disable guard

* sharpening

* remove mithril from trading

* merchants remap

* Update guard_commander.yml
 2025-06-05 00:58:04 +03:00
Red
538585d9cb Beer bug (#1384) 
* magic beer

* disable personal objectives
 2025-06-04 18:40:18 +03:00
Red
e6188a3fbf Golden balance touch (#1382) 
* gold refactor

* Update ore_veins.yml

* remove gold and mithril from maps
 2025-06-04 14:34:08 +03:00
Red
17be798db4 Grass bags (#1381) 
* grass bugs

* move to victoria

* Update tiles_grass_bag.yml
 2025-06-04 12:22:54 +03:00
Red
6c47cb8c77 f (#1380) 2025-06-04 11:43:15 +03:00
Nim
dedd3a8b33 New carpets (#1375) 
* new carpets

* Flammable
 2025-06-04 09:57:09 +03:00
Red
c41f20706e +rep (#1376) 2025-06-03 18:12:44 +03:00
Kit
367c53986c change healing to use EvenHealthChange (#1340) 2025-06-03 17:10:33 +03:00
Nim
dd6f5a7e6f lockpick artifact (#1374) 2025-06-03 15:37:25 +03:00
Mandranir
ca87391672 fix(objects): dropper size to tiny (#1373) 2025-06-03 14:48:24 +03:00
TheKittehJesus
4c7b035c9c New belt controls (#1298) 
* Work for a madman

* God, that's a lot of hardcoding

* Fixed belt2 smartequip and cleaned up

* Continued clean up

* No scope creep!

* Replaced belt1 for upstream default belt

* Moved CP14OpenSkillMenu to CP14ContentContexts

* Changed naming of belt1 textures to just belt

* Updated new belt1 refrences

* I forgot to edit the RSI meta

* fix all BELT1 Texture instance

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-06-03 14:39:39 +03:00
DeLTaAlarm0
261441dd67 Open/closed table sign (#1275) 
* Added open/closed sign

* Added open/closed sign

* Update openclosed_sign.yml

* Update openclosed_sign.yml

* Update workbench recipes

* Update openclosed_sign.yml

* Update openclosed_sign.yml

* Update misc.yml
 2025-06-03 14:22:24 +03:00
Red
581ca2f5ef OP Ballades (#1372) 2025-06-03 12:43:21 +03:00
TheKittehJesus
a070db91be Changed cashconverter to be anchorable on tables (#1371) 2025-06-03 09:41:17 +03:00
ArZarLordOfMango
72735a627d fix moral (#1368) 2025-06-03 01:04:33 +03:00
paige404
881a504334 Reorganize slime ymls, adjust damage resistances and vulnerabilities for slimes (#1300) 2025-06-03 00:59:07 +03:00
Red
43913d9d11 cozy (#1367) 2025-06-03 00:38:19 +03:00
Red
d80ab67391 Update fire.yml (#1365) 2025-06-02 23:00:16 +03:00
Red
2b1cef9d72 Update fire.yml (#1357) 2025-06-02 21:16:07 +03:00
Red
acc8093f9a More economy fixes (#1356) 
* fic

* Update base_instruments.yml

* fix

* Update chests.yml
 2025-06-02 18:06:56 +03:00
Viator-MV
c939761737 skelemake (#1276) 
* skelemake

* sharded

* mastery

* Not so slow cast

* ok no demi deipletion

* skillstorage and Species

* ressurection dead

* fixed

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-06-02 14:20:45 +03:00
Nim
5a2ccc3e08 Resprite (#1328) 
* well resprite

* broken well

* Campfire

* meta

* Quantity
 2025-06-02 14:16:42 +03:00
Ed
483a82fdd4 Update grasshighbush.yml 2025-06-02 11:34:01 +03:00
Ed
e953410205 Update peace_ballade.yml 2025-06-02 11:32:01 +03:00
Kit
c35052b9fa STOP POSTING ABOUT THE THING ALL MY FRIENDS ON TIK TOK SENT ME "THE THING" (#1353) 2025-06-02 10:21:51 +03:00
Red
f6dd89ea7a d (#1351) 2025-06-01 21:55:20 +03:00
Red
5c5a473ec0 More merchant content (#1349) 
* energy crystals

* thaumaturgy trading
 2025-06-01 19:21:41 +03:00
Ed
6fce9dcdaa Update trade_platform.yml 2025-06-01 16:14:08 +03:00
Ed
da45b9bba8 fixes 2025-06-01 15:56:38 +03:00
Red
a3ae67a762 Trade reputation rework + Merchants back + Mining contract (#1347) 
* refactor unlocking

* fix contract debug crashing

* Update dev_map.yml

* bugfixes and content rebalance

* ore buy contract
 2025-06-01 15:10:36 +03:00
Red
a99f2fcd50 Remove random reaction system (#1345) 
* wow

* d
 2025-06-01 15:01:32 +03:00
Alexsey Bezyuk
759e7c73d9 furnace radius (#1346) 2025-06-01 12:33:38 +03:00
Ed
bd783f9ec0 Update herbals.yml 2025-05-31 22:04:20 +03:00
Ed
1818f253ae chest fix 2025-05-31 18:07:14 +03:00
Red
10090292a1 Master fix (#1342) 
* Update web.yml

* cocoon loot

* Update web.yml
 2025-05-31 17:50:01 +03:00
Red
71527bb4eb Merge pull request #1341 from crystallpunk-14/ed-31-05-2025-web 
Spider content update
 2025-05-31 14:31:44 +03:00
Ed
0dd379dec3 Merge branch 'master' into ed-27-05-2025-upstream-sync 2025-05-30 23:24:23 +03:00
Nim
b28c5605b9 zombie speed (#1337) 2025-05-30 18:22:39 +03:00
Red
7d658de8a1 Merge branch 'master' into ed-27-05-2025-upstream-sync 2025-05-30 14:54:06 +03:00