juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,935 Commits 57 Branches 0 Tags
9425908ef2bfb7d20eca54a01a20a3e7cb96f7bd
Commit Graph

35935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
9425908ef2 adapt codebase 2025-09-15 14:49:58 +03:00
Ed
3409e0f752 Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Overlays/StencilOverlay.cs
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/SkinColor.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
 2025-09-15 13:50:49 +03:00
Princess Cheeseballs
d8e818283c [STAGING/HOTFIX] Butcher entities in containers. (#40299) 
* Kitchen spike and sharp system

* Use transform and parent

* A

* Works

* A

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-14 22:41:42 +02:00
ScarKy0
9e204c3023 Vulpkanin Color Clamping (#40348) 2025-09-14 20:55:26 +02:00
slarticodefast
a38c6c1aca Revert "Add heat distortion shader for hot gases" (#40352) 2025-09-14 20:48:24 +02:00
Vasilis The Pikachu
b9ddcc9e9f Revert "Can't crawl over counters (#40099)" 
This reverts commit 01a7fc66f0.

@Princess-Cheeseballs

This is being reverted per maintainer vote for the release cycle, check out the meeting video here https://youtu.be/N5-UYCLha2I?t=872
 2025-09-14 20:42:51 +02:00
Kit
28308cee08 NLR!!!!! (#1771) 
* NLR!!!!!

* remove from RU side
 2025-09-14 18:43:28 +03:00
pathetic meowmeow
d9c24b3d10 De-enumify humanoid species skin colours (#39175) 
* De-enumify humanoid species skin colours

* Change index to resolve

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-13 22:30:17 -07:00
CrystallEdge Server
239bd2aafd Automatic changelog update 2025-09-13 15:23:07 +03:00
Nim
fbef31dfa6 return simple armour (#1770) 2025-09-13 15:22:02 +03:00
CrystallEdge Server
f5bf4457e7 Automatic changelog update 2025-09-12 17:26:58 +03:00
nukkuminen
4d381ac923 Make the magic vision effect better (#1766) 
* Make the magic vision effect better

* whoops

* Lowered the intensity of the effect
Added support to remove the effect via settings
 2025-09-12 17:25:53 +03:00
CrystallEdge Server
4b619f5d56 Automatic changelog update 2025-09-12 17:25:23 +03:00
Nim
62a9ca1cfc nerf fire trap (#1768) 2025-09-12 17:24:18 +03:00
Red
2820882754 Stop microwaving! (#40132) 
* Create KillMicrowaveTest.cs

* Update KillMicrowaveTest.cs

* Update Content.IntegrationTests/Tests/Microwave/KillMicrowaveTest.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.IntegrationTests/Tests/Microwave/KillMicrowaveTest.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.IntegrationTests/Tests/Microwave/KillMicrowaveTest.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* documentation

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-09-12 12:17:29 +02:00
InsoPL
49fb6fdd6c Fix for can't stop pulling when cuffed (#40233) 
* fix

* fix

* spaces added
 2025-09-11 20:39:25 -07:00
ApolloVector
8cc1b29ba4 Clake frag round fix (#40294) 
make the frag work
 2025-09-11 18:36:10 -07:00
slarticodefast
321331e664 move all the radio components and system to Shared (#40293) 
* move all the radio components and system to Shared.

* duh split impl

* address reviews

* cleanup

---------

Co-authored-by: walksanatora <walkerffo22@gmail.com>
 2025-09-12 01:26:47 +02:00
PJBot
d8c55aef3c Automatic changelog update 2025-09-11 22:08:44 +00:00
UpAndLeaves
1245487c9a storage and inventory toolshed commands (#39046) 
* First commit

* CommandImplementation on singletons is die, a la moony

* Fix duplicated thingy because yes

* Prototypes, bugfixes, refactoring oh my

* Remember to actually stage your ftl changes next time, leaf
 2025-09-11 15:07:37 -07:00
PJBot
bb970970c9 Automatic changelog update 2025-09-11 20:00:29 +00:00
Lillian Industries
7396d9e54c Added SmartFridge circuitboards (#39879) 2025-09-11 22:59:20 +03:00
Perry Fraser
fbf65b7f74 Make vending machine restocks predicted (and its sound not spammable) (#38609) 
* feat: make vending machine restocks predicted

* refactor: VendingMachineRestockComponent cleanup

* refactor: minor simplification

* revert: refactor: minor simplification; load bearing IsFirstTimePredicted

lol second guessed myself

* chore: unneeded VendingMachineSystem dep

* Update Content.Shared/VendingMachines/VendingMachineComponent.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-09-11 20:27:54 +02:00
PJBot
77eca4a570 Automatic changelog update 2025-09-11 16:00:24 +00:00
SlamBamActionman
ff3f0c6997 Reorganize and refactor drinks yml (#39221) 2025-09-11 17:59:11 +02:00
SlamBamActionman
690b4d1edd Merge remote-tracking branch 'upstream-origin/master' into fork/iaada/more-trash 2025-09-11 17:08:39 +02:00
ScarKy0
1f1c71919b Remove unused BulletTennis (#40285) 
init
 2025-09-11 16:36:39 +02:00
SlamBamActionman
9519eb5f7a Fix Linter errors (#40283) 
Fix yoml
 2025-09-11 15:17:37 +02:00
SlamBamActionman
b3e06de0e5 They're milk jugs, not milk cartons! 2025-09-11 14:02:05 +02:00
PJBot
b9920cbdcb Automatic changelog update 2025-09-11 11:38:33 +00:00
SlamBamActionman
8a4a6ec7ab Food Item Size Adjustment (#39203) 2025-09-11 13:37:25 +02:00
Charlie Morley
09f17802c2 Clip the WindowTitle of FancyWindows, so close buttons don't get hidden (#40272) 
ClipText of FancyWindow title, so close buttons don't get hidden
 2025-09-11 13:23:47 +02:00
PJBot
5acc1633cb Automatic changelog update 2025-09-11 10:58:38 +00:00
IProduceWidgets
276e4df749 No take; Only throw. (#40143) 
* commit atrocities

* hail satan

* Channel Pavlovian horror

* pet kitty cat

* Taint universe forever

* Assault sensibilities

* sully existence

* tarnish morality

* The degunnening

* encratening

* Update toys.yml

* add few pixels to fix vulp inhands

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-09-11 12:57:30 +02:00
slarticodefast
8171589f56 fix chasmsystem resolve error (#40281) 2025-09-11 03:00:55 -07:00
CrystallEdge Server
02835be768 Automatic changelog update 2025-09-11 12:34:09 +03:00
Kit
ab0add0f32 Condense (#1765) 2025-09-11 12:33:03 +03:00
Absotively
164f8a2fad Fix APC breaker toggle button prediction by setting ToggleMode True (#40273) 
* Use ToggleMode for toggle button

* Actually this bit doesn't require changing apparently
 2025-09-10 21:27:17 -07:00
GeneralGaws
a7eb5dd22b Fix darts inhand sprites (#40207) 
fix

Co-authored-by: GeneralGaws <limonmessi@mail.ru>
 2025-09-10 23:50:57 -04:00
PJBot
f271790f75 Automatic changelog update 2025-09-11 02:38:17 +00:00
ToastEnjoyer
46f59300ac Laser rifle is contraband again (#40253) 
* Fixed contraband tag

* practice isnt contraband

* Added base

* Removal
 2025-09-10 19:37:10 -07:00
PJBot
6e88b66735 Automatic changelog update 2025-09-11 01:48:04 +00:00
SlamBamActionman
8f8b307460 Exo - Lighting update & more (#40199) 2025-09-10 18:46:55 -07:00
PJBot
ddc428b946 Automatic changelog update 2025-09-11 01:02:35 +00:00
IProduceWidgets
2882fd289f Add admin shuttles (#32139) 
* dis da shuttles tho

* power checking

* rerun tests

* purge invalids

* attributions

* Update shuttle save files for new serialization.

* get regexed nerd

* fix shuttle yml guh

* Kill actions
 2025-09-11 03:01:28 +02:00
PJBot
1736b9bb34 Automatic changelog update 2025-09-10 22:15:05 +00:00
Princess Cheeseballs
2601853791 Cardboard Box Weightless Fix (#40260) 
Box is no longer space faring

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-11 00:13:58 +02:00
PJBot
73499b2a0c Automatic changelog update 2025-09-10 21:50:00 +00:00
imatsoup
35bb5c633c Make Butterflies zombie immune (#40265) 
butterfly zombie no longer
 2025-09-10 23:48:53 +02:00
CrystallEdge Server
a46a17034d Automatic changelog update 2025-09-11 00:23:27 +03:00