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

10859 Commits

Author SHA1 Message Date
Ed
677a326376 Update touch.yml 2025-06-15 23:53:01 +03:00
Ed
57ab882fb9 Update MOB_subterranean_leap.yml 2025-06-15 23:42:08 +03:00
Ed
73de5ebcbb Update jump.yml 2025-06-15 23:37:00 +03:00
Ed
fe8967bd67 fix 2025-06-15 23:32:16 +03:00
Ed
d01b8fe32c Update ice_ghost.yml 2025-06-15 23:21:32 +03:00
Ed
93966e37d4 actions refactor apply 2025-06-15 23:20:52 +03:00
Ed
62cd6bfe9b Merge branch 'master' into ed-10-06-2025-upstream-sync 2025-06-15 21:44:16 +03:00
Red
b24ec5bc80 Bugfixes (#1432) 
* fix #1428

* CodTenAlt review

* fix map tests

* real this time

* fix #1429

* add wheat and cotton into victorian gardens trade faction

* Update PostMapInitTest.cs
 2025-06-15 21:25:58 +03:00
Red
d30b51c982 Firewave (#1430) 
* nerf spiders

* firebolt to firewave

* Update firebolt.yml

* rename file

* Update firewave.yml

* Update firewave.yml
 2025-06-15 18:03:38 +03:00
Ed
2f4d60b7af Update moon_strike.yml 2025-06-15 17:12:30 +03:00
Red
04f6627e16 Lumera patron (#1427) 
* mind upgrade works only on followers

* wrath of lumera, removing memory points

* enable lumera for players

* add lumera to maps

* job desc update

* guidebook
 2025-06-15 15:00:18 +03:00
Red
4be22326ce Gods part 6 (#1425) 
* Skill scanning + bugfixes

* memory point examining

* Update base.yml

* predict skill examining

* moon beam lumera action

* balance
 2025-06-15 01:50:16 +03:00
Red
71abce8db8 Skill scanning + bugfixes (#1424) 2025-06-14 19:04:33 +03:00
Red
7760e8f628 God part 4 (#1422) 
* projectile spell improve

* mind improve
 2025-06-14 14:21:25 +03:00
Red
fc0beb5ccf Gods part 3 (#1421) 
* apprice action, dead notice

* fix refollowing

* mist lumera action
 2025-06-14 02:11:36 +03:00
Red
b932d56f15 Gods part 2 (#1420) 
* spooky scary patreons

* Update CP14ReligionSystem.cs

* goodbye radio channel

* gods? no! Mana parasites! Muahahaha

* Update gods.yml

* Update primordial.yml
 2025-06-13 19:21:09 +03:00
Ed
41689de5aa infinity mana restriction 2025-06-13 16:35:39 +03:00
Red
422a0c5e10 Gods and religions (#1405) 
* basic religion vision

* block god interactions

* skill tree mob specify

* silvania setup??

* clustering shader optimization

* gods department & job

* random gods jobs

* Luxian god

* Update Nature.png

* Update sphere_of_light.yml

* god chat

* Update ChatSystem.cs

* OBSERVATION

* public observation and basic follower api

* shader tweaks

* improve shaders

* spawning and praying on altars

* altars ppvs override

* move pvs overridiation from altars to observers

* shader coloration

* spectral z mover

* god magic radius restricted

* guide how to believe in god

* sends messages to god when smoeone wanna become follower

* follower doAfter

* goodbye luxian, welcome lumera

* goodbye silvania, welcome merkas

* som polish and renamings

* gods fast travel

* Update altar.ftl

* some lumera sfx

* renouncing patrons!

* renounce followers

* followewr percentage calculation

* remove from player-facing

* fix

* Update sphere_of_light.yml

* Update base.yml
 2025-06-13 14:15:48 +03:00
Fr0goo
542bd2d948 Flem Creature (#1402) 
* added Flem Creature

a weird looking fish creature that will spawn in the demiplanes with open skies and herbals. that will attack you if you get too close

* fixed placement of lines

should be in the right places now

* changed location of fish outfit, ajusted the sprite, and made it not foldable

* added flem modifier and fixed some thingy

* Update attributions.yml

* Update mobs.yml

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-06-13 13:25:33 +03:00
SenorJaba
8ab0939698 Merchant's monocle and ability (#1413) 
* New trading stuff

* Crafts skill tree

* More trading fixes, baby!

* Last trading fix I hope

* Merchants' supremacy

* Gimme money

* Readonly
 2025-06-13 12:24:36 +03:00
Sefaia
1ea8291927 Added Big Crossbow Bolts to whitelist and created a new Entity spawn item for a quiver filled with iron big crossbow bolts. (#1418) 2025-06-13 10:34:32 +03:00
firebat4321
d89ef56907 Firebolt (#1354) 
* added firebolt spell yml, added to spellbook tree

* Added new sprites for Firebolt action/spellbook, in-game bolt sprite.

* Missing comma from fire .json file.

* Updated firebolt IDs to use own ID instead of Fireball's ID.

* Spell doesn't break on move now.

* Updated on soundHit effect

* Corrected Fireball IDs to Firebolt

* Updated copyright entries

* Update firebolt.yml

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-06-10 14:14:07 +03:00
gogenych
3623a25033 copper loadout fix (#1414) 
* copper loadout fix

* name fix
 2025-06-10 13:40:19 +03:00
Ed
42d39a7c67 Merge remote-tracking branch 'upstream/stable' into ed-10-06-2025-upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Lock/LockSystem.cs
 2025-06-10 11:33:34 +03:00
Nim
f0a25ddef6 Two-handed crossbow (#1315) 
* Crossbow

* bow

* size

* size crossbow

* PhysicalComposition
 2025-06-10 11:08:07 +03:00
Nim
747f76242f Rocks with moss (#1412) 
* rockmoss

* line
 2025-06-10 11:07:13 +03:00
slarticodefast
d4c4606cf4 Revert tile aligned barsigns (#38185) 
fixtures for bar signs (#37756)"
 2025-06-10 00:02:31 +02:00
Errant
99b2955c09 HOTFIX Revert #38004 : Change C-4 back to syndicate contraband (#38177) 
* Revert "Made C-4 Major contraband instead of syndicate contraband (#38004)"

This reverts commit 0a565469c7.

* remove changelog
 2025-06-09 18:59:37 +02:00
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
Spanky
9bb3140550 Evac Repair Lockers (#38075) 
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-06-04 23:08:38 -07: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
Cojoke
4b226eaad6 Remove Lube From Trash Puddle Spawns (#38048) 2025-06-04 14:16:24 +02: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
Funce
148fb5ca23 Blood-Red Magboots now correctly show if magboots are active (#38013) 
* Change JetPack Item Visuals to use GenericVisualizer instead of AppearanceChangeEvents

* Fix YAML indentation for jetpacks.yml
 2025-06-04 13:10:06 +02:00
SlamBamActionman
d81e82cef7 Add Diona rooting (#32782) 
* Initial commit

* Add sound

* Review commets

* addressing review

* I think this is what Slart meant?

* Review fixes

* More fixes

* tiny formatting

* Review fixes

* Review fixes

* Fix small timing error

* Follow new action system

* review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-06-04 12:52:59 +02: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
Moomoobeef
2184d38460 Stylized the nanotask printouts to be *pretty* (#37805) 2025-06-04 01:16:14 -07:00
Nim
dedd3a8b33 New carpets (#1375) 
* new carpets

* Flammable
 2025-06-04 09:57:09 +03:00