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

21734 Commits

Author SHA1 Message Date
Ed
a2ed3154bb Update natural.yml 2025-04-22 22:05:24 +03:00
Nim
b70af8848c Modular helmet (#1206) 
* modular helmet

* fix

* del Bascinet
 2025-04-22 14:12:41 +03:00
Ed
0996413d72 Structure Durability rebalance - Part 1 (#1205) 
* walls rebalance pass

* windows and fence fix

* doors rebalance

* doors tweaks

* door construction rebalance

* Update WallWood.yml

* Update WallDirt.yml

* stone wall sfx

* ore rebalance

* Я не удержался и снес половину репы

* fix rsi

* Update windows.yml

* stonebrick constructions

* Update stonebrick.yml

* Update migration.yml

* Delete cargo_shuttle.yml

* Delete wall_marble.yml

* fix

* Update wooden.yml
 2025-04-22 13:22:28 +03:00
Ed
68f1bc408f Update Dev.toml 2025-04-21 20:24:48 +03:00
Deserty0
850111f469 Entity 0 fix (#1204) 
* fix

* Update scattering_grenades.yml

* Update EntityTest.cs
 2025-04-21 12:20:26 +03:00
Nim
5bbf0df340 Bell (#1185) 
* bell

* soundCollection

* sound

* bell sound

* bell short

* surrendering
 2025-04-21 11:46:58 +03:00
Ed
74cafc7584 Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 2025-04-20 17:38:51 +03:00
Ed
3affdaf167 Update Dev.toml 2025-04-20 17:38:32 +03:00
Ed
cd0fcb8b47 Global Fence update (#1186) 
* small wooden fence new

* birch and stonebrick fences

* big wooden fence

* birch big

* iron fence

* iron fence gate

* fence iron window

* fix

* fix
 2025-04-20 17:37:56 +03:00
Ed
f787bb5ea4 Ice bow artifact (#1200) 
* pvs

* fix tradepost

* ice bow artifact
 2025-04-19 17:24:57 +03:00
creamybag
000a064140 Modular Palette (#1199) 2025-04-19 17:22:58 +03:00
Ed
026a17be57 Raids (#1198) 
* simpliest undead raid

* map fix

* Comoss big update

* fix raids

* Update demiplane_rifts.yml

* fix

* Update mobs.yml
 2025-04-19 15:47:06 +03:00
Ed
c1e5ee6f82 Update Dev.toml 2025-04-19 11:57:14 +03:00
Ed
a87364541e Update Dev.toml 2025-04-19 11:47:32 +03:00
Ed
b437be5cf8 Random bullfix go! (#1197) 
* some fixes for AI pathfinding

* cobblestone tile

* stonebrick update

* fix #1194

* fix #1193

* Update stonebricks_square_carved.png
 2025-04-18 22:47:17 +03:00
Viator-MV
a57f613d91 all in 1 (#1192) 2025-04-18 18:00:21 +03:00
Ed
39ca6175e6 Simple sponsorship system (#1189) 
* simple sponsorship system

* priority Join

* OOC Sponsor Color

* Update CP14SponsorRolePrototype.cs

* loadout sponsorship

* bruh

* refactor to interfaces

* Update CP14ClientSponsorManager.cs

* finish loadout option

* role pass
 2025-04-17 19:55:25 +03:00
Nim
1a0136c21f a variety of fixes (#1191) 2025-04-17 16:12:04 +03:00
Nim
63993e221f skeleton ModifierSet (#1190) 2025-04-16 15:46:11 +03:00
Ed
b40cbfb5d7 Automatic Open tests (#1142) 
* auto eng obt

* Update CP14RoundEndSystem.CBT.cs

* Update CP14EdSystem.cs

* cbt cbt!

* Update CP14RoundEndSystem.CBT.cs
 2025-04-15 23:09:49 +03:00
Ed
61edcf69df Update Dev.toml 2025-04-15 01:45:15 +03:00
Ed
5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync 
# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
 2025-04-15 00:44:29 +03:00
creamybag
e7cd69e383 Carcat sprites fix (#1176) 
* CarcatSpritesFix

* fix
 2025-04-14 17:16:08 +03:00
SlamBamActionman
961d2cfdef Clarify "purple text" characters in rules & readd Space Law non-restricted item seizure (#36414) 
Initial commit
 2025-04-14 16:12:03 +02:00
Nim
b7e4fbb74a Amulets are jewellery (#1126) 
* amulets are jewellery

* transfer textures
 2025-04-14 14:50:07 +03:00
Nim
85204144fb magic modifier (#1103) 2025-04-14 14:45:36 +03:00
creamybag
f2520fd468 beards 2.0 (#1182) 2025-04-14 13:18:38 +03:00
chromiumboy
87b6eb55e5 Hotfix for water/fuel tank fixtures (#36527) 
Sharing the same fixture layer as walls causes dragged water/fuel tanks to be blocked by things that they really shouldn't be, such as lights and holopads

Being PRed as a hotfix in order to fully finalize #36341
 2025-04-13 22:02:29 -07:00
Pieter-Jan Briers
7bb35889ce Revert "Feature/shader radial menu" due to shader issue (#36470) 2025-04-13 23:55:27 +02:00
Ed
5df9a526f0 new horns 2025-04-13 23:27:24 +03:00
Myra
1741f40f8a Disable mob pushing 
Part of maint meeting
 2025-04-13 22:04:52 +02:00
Ed
4a98d86330 wastelands (#1181) 2025-04-13 22:43:47 +03:00
Ed
aef6eb155e back to ru cbt 2025-04-13 21:06:44 +03:00
Ed
78c61c3094 ssss 2025-04-13 21:02:25 +03:00
Ed
5646e419bc Update Fear.yml 2025-04-13 19:51:20 +03:00
Ed
6f665266c4 s (#1179) 2025-04-13 15:37:00 +03:00
Ed
ac541b63ef new round leave system (#1178) 
* round leave

* maps update
 2025-04-13 15:36:41 +03:00
Viator-MV
0f37c24df0 fix (#1177) 2025-04-13 14:48:33 +03:00
Ed
e968c7a9b8 wendigo tweak 2025-04-13 12:34:03 +03:00
Ed
26d81b684b Weather refill (#1175) 
* refillable by weather

* fix
 2025-04-13 01:01:22 +03:00
Ed
51b3492cea Update wendigo.yml 2025-04-12 22:01:14 +03:00
Ed
517bc5418b Wendigo demiplane antag (#1174) 
* wendigo

* ritual3

* Update sky_lightning.yml
 2025-04-12 17:32:53 +03:00
Viator-MV
ee30ae1341 frigid coast (#1173) 
* frigid coast

* fix

* Update snow.yml

* Update default.yml

* Update Frigid_Coast.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-04-12 16:35:41 +03:00
Ed
3c27e0ed99 Revert "Another Try" (#1170) 
* Revert "Another Try (#1167)"

This reverts commit 355fc410a3.

* Update EntityTest.cs

* Revert "Update EntityTest.cs"

This reverts commit 1f75981e59.
 2025-04-12 12:03:18 +03:00
Ed
e64c8f3d4f Dead tree (#1172) 
* farming rebalance

* Update base.yml

* Update CP14FarmingSystem.Resourse.cs

* dead tree

* Update scattering_grenades.yml
 2025-04-12 11:43:45 +03:00
Ed
da5190ae60 Farming rebalance (#1171) 
* farming rebalance

* Update base.yml

* Update CP14FarmingSystem.Resourse.cs
 2025-04-11 23:45:03 +03:00
Ed
355fc410a3 Another Try (#1167) 
* tick

* Update simple.yml

* revert deep

* revert straw

* revert surko

* revert fix

* revert beards

* Revert "revert surko"

This reverts commit 9ea597414a.

* Revert "revert fix"

This reverts commit 910da9d6e6.

* Revert "revert beards"

This reverts commit a941a41788.

* Revert "revert deep"

This reverts commit 8dd25a4b96.

* Reapply "revert deep"

This reverts commit cbde613021.
 2025-04-11 19:53:00 +03:00
Ed
948d711336 Bunch of bugfixes (#1165) 
* watcher fix

* fix #1162

* fix #1111

* make watcher move smoothly

* s

* Delete test_xeno.yml
 2025-04-10 22:28:50 +03:00
Emisse
418b931ab8 Job count annotation for each map yml file (#36433) 2025-04-10 11:43:52 -06:00
PJBot
32e6203a9d Automatic changelog update 2025-04-10 16:00:25 +00:00