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

33955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
c0f4098ca9 spell fixes 2025-06-10 11:49:35 +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
CrystallEdge Server
a51f579591 Automatic changelog update 2025-06-10 11:09:13 +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
Red
14efec2f47 Update actions_changelogs_since_last_run.py 2025-06-09 14:49:07 +03:00
Red
508aead876 Update actions_changelogs_since_last_run.py 2025-06-09 14:43:33 +03:00
CrystallEdge Server
50af3f1d23 Automatic changelog update 2025-06-09 14:37:01 +03:00
Viator-MV
e06e1bb7fc Druid stuff (#1396) 
* staff

* Revert "staff"

This reverts commit bb7532e0b2.

* not resprite
 2025-06-09 14:35:56 +03:00
CrystallEdge Server
4daaedb900 Automatic changelog update 2025-06-09 14:35:43 +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
CrystallEdge Server
799189d4f5 Automatic changelog update 2025-06-09 13:26:45 +03:00
Sefaia
29a88758c0 Fixed some misplaced recipes for Aventails and Greaves. (#1409) 2025-06-09 13:25:39 +03:00
CrystallEdge Server
e5abe8d48a Automatic changelog update 2025-06-09 08:57:24 +03:00
Jona-K
a67fa6f6d5 Made sure only the intent changes are present (#1408) 2025-06-09 08:56:18 +03:00
CrystallEdge Server
bf8f6dc0ef Automatic changelog update 2025-06-08 19:17:31 +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
CrystallEdge Server
612c61deae Automatic changelog update 2025-06-08 10:54:28 +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
CrystallEdge Server
8858a477fa Automatic changelog update 2025-06-08 10:53:23 +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
Viator-MV
bcbbd6e31b cooldown (#1401) 
Your personal Viator has overheated, and the cooldown will last until active PR's are approved.
 2025-06-08 10:03:53 +03:00
Ed
3532a0f945 Update default.yml 2025-06-07 16:34:39 +03:00
CrystallEdge Server
ebd01f4980 Automatic changelog update 2025-06-07 14:05:47 +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
CrystallEdge Server
f259fe37d6 Automatic changelog update 2025-06-06 18:07:14 +03:00
gogenych
6735f16e59 some price change (#1392) 2025-06-06 18:06:07 +03:00
metalgearsloth
a91154702d Update submodule to 261.2.0 (#38081) 2025-06-05 23:08:33 +10:00
PJBot
3851893953 Automatic changelog update 2025-06-05 12:53:48 +00:00
slarticodefast
7d2d05b99c Fix noir shader in compability mode (#38080) 
fix noir shader in compability mode
 2025-06-05 14:52:39 +02:00
CrystallEdge Server
354169afe8 Automatic changelog update 2025-06-05 12:47:44 +03:00
Red
a04720e2a0 fuck rings (#1389) 2025-06-05 12:46:38 +03:00
CrystallEdge Server
d08526fa39 Automatic changelog update 2025-06-05 11:47:14 +03:00
Jona-K
9e9b7f583f Removing The Scream Action From The Action Bar (#1348) 
* Removed Initilization For The Scream Action

* Commetet out code instead of Deleting it outright

* Commetet Out The Code Inititzilazing The Scream Action

* Update Content.Server/Speech/EntitySystems/VocalSystem.cs

* Update Content.Server/Speech/EntitySystems/VocalSystem.cs

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-06-05 11:46:08 +03:00
PJBot
2f5964063d Automatic changelog update 2025-06-05 06:09:45 +00: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
CrystallEdge Server
9632bc8bfc Automatic changelog update 2025-06-05 00:59:10 +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
PJBot
be6326077a Automatic changelog update 2025-06-04 21:42:47 +00:00
Spanky
694b0093c2 Fland Update (#38068) 
Add turrets to Fland
 2025-06-04 17:41:38 -04:00
PJBot
121dd6666b Automatic changelog update 2025-06-04 20:38:20 +00:00
Spanky
b2d54c510e Omega Update (#38066) 2025-06-04 13:37:11 -07:00
CrystallEdge Server
0b0d2a941f Automatic changelog update 2025-06-04 18:41:24 +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
CrystallEdge Server
5eaaaf4d3e Automatic changelog update 2025-06-04 14:35:15 +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