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

474 Commits

Author SHA1 Message Date
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
Ed
5f7600b6a2 Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/CargoTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Content.Shared/Storage/Components/EntityStorageComponent.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/game_presets.yml
 2025-09-08 13:12:50 +03:00
CawsForConcern
a8ba84ecf7 Fixes Theobromine missing from Iced Coffee (#40063) 
adding ice to coffee no longer removes its theobromine
 2025-09-05 00:46:44 +02:00
Ed
b8b17f7b8a Merge remote-tracking branch 'upstream/stable' into ed-25-08-2025-upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Explosion/EntitySystems/TriggerSystem.cs
#	Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/Nutrition/Components/FoodComponent.cs
#	Content.Shared/Speech/ListenEvent.cs
#	Resources/Prototypes/Entities/Effects/admin_triggers.yml
 2025-08-25 16:22:32 +03:00
Winkarst-cpu
be2eeb3cb1 Cleanup: Un-hardcode reagents standout (#39752) 2025-08-19 10:40:21 -04:00
Princess Cheeseballs
6b73d320b9 [NEW STATUS SYSTEM] Drunkenness, Stuttering, Slurred Speech, and Bloodloss (#38678) 
* The only commit that matters

* I had to stop playing with my cat to push this change

* Yaml removal

* Proper drunk status effect and remove shitcode

* Review changes

* whoops

* Whoops x2

* Update master fix merge conflicts

* Fix merge conflicts

* Dunk Component kill

* MORE RELAYS

* Holy fucking breaking changes

* Ough

* 46 file diff

* Fix bad commits

* Erm what the test fail?

* Fix those last two

* Merge conflicts

* Me when I fix the merge conflicts

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-08-18 16:26:29 -04:00
EnrichedCaramel
05aad3bfd2 Expand soap making, but better (#39303) 
* Add lye reagent and its recipes

* Move and add soap recipes

* Add temperature to soap recipes

* Silly comments

* Remove NaHO based lye recipe due to sigynate recipe conflict.

* Typo

* Typo, again

* Change lye color and description
 2025-08-15 23:59:58 -07:00
SlamBamActionman
114d00d1af Rebalance advanced Brute chems, and more (#39472) 
* Initial commit

* Update based on feedback

* Minor fix

* Update to match playtest

* Update reaction behavior and test to work; max temp is no longer an inclusive value.

* Revert "Update reaction behavior and test to work; max temp is no longer an inclusive value."

This reverts commit 2a2c4a17a623cc7ddc15b63d91a1b8b441e95cea.

* Incorporate heal values & OD for adv. chems from 39464, revert adv. brutes recipes
 2025-08-14 19:32:22 +02:00
Ed
f2d9608a62 Merge remote-tracking branch 'upstream/stable' into ed-04-08-2025-upstream-sync 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Eye/VisibilityFlags.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Resources/Prototypes/Recipes/Reactions/chemicals.yml
#	Tools/actions_changelogs_since_last_run.py
 2025-08-04 12:44:29 +03:00
Admiral-Obvious-001
0606ed5851 Retry of Advanced Chem Tweaks (#38811) 
* Changed Head Branch Due To Broken Merge

* Changed Head Branch Due To Broken Merge

* Readds the removal of bic/advanced mix.

* TFW Breaking changes break changes

* TFW Breaking changes break changes
 2025-07-29 14:52:42 -04:00
Ed
f59de85047 Merge remote-tracking branch 'upstream/stable' into ed-21-07-2025-upstream-sync 
# Conflicts:
#	Content.Client/Overlays/StencilOverlay.Weather.cs
#	Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
#	Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/GameTicking/SharedGameTicker.cs
 2025-07-21 11:27:53 +03:00
Princess Cheeseballs
dec2d42a1d Crawling Part 1: The Knockdownening (#36881) 
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-07-20 01:54:42 +02:00
kosticia
f8afaa0dc9 Artifact glue reagent (#38670) 
* a

* Revert "a"

This reverts commit 2b9ba4ea67a9395d30b7ab37c8065f627f1a961a.

* f

* dev it

* a?

* ad

* forgor

* Revert "f"

This reverts commit 39228c7cbe4d28ba43b73580b55e01c3979eb869.

* derandomisation!

* reviv

* flavor

* fixe

* dwwasdwasdwa

* dwasdwasdwas

* fuck you
 2025-07-07 18:45:46 -07:00
Ed
7a8326d41e Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream 
# Conflicts:
#	Content.Server/Audio/ContentAudioSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Shuttles/Systems/ShuttleSystem.cs
#	Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
 2025-07-08 00:40:30 +03:00
Red
bb116e3219 Refactor SeeingRainbows to new status effect system (#38620) 2025-06-27 21:19:04 +03:00
Alexsey Bezyuk
9c393ff8b5 [TRADE] Reagent and Food price rework and 4 new contracts: Butchers, Diary, Gardeners and Tailors (#1453) 
* contracts

* meat prices

* cheese and egg

* blue and aged cheese

* aged and blue parts and slices

* cheese json

* contracts

* cheese and egg

* blue and aged cheese

* aged and blue parts and slices

* cheese json

* revert meat prices

* Cheese prices

* egg price remove

* revert meat prices

* factions

* contracts

* meta.json

* remove monster part price

* sickle, hoe

* up price per unit

* Trade ref, cheese fix, plate PhysCompos

* Update coins.yml

* prices reagents rework, raw nutrient decrease, food container rework

* prices

* materials, remove bars

* tailors faction

* factions

* sprite fixes

* enyity fix

* Physical compositions

* tailord dye and loot in crate

* comment

* Ore buy to bar

* move to buy positions

* factions and contracts in main page

* move flint position

* Квартц вместо стекла

* quartz price up

* glass sheet sell position

* price precurser. Again

* essences prices

* english comment

* ooops missed

* price up

* sell requests and small flowers variations

* yaml fix

* test fix?

* flowers => to vials

* 2 => 1 count

* flowers icons

* remove small variations

* clear

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-06-26 18:18:19 +03:00
Red
78a94730be New status effect system (#37238) 
* spectra

* documentation

* added into liquid anomaly

* Update TemporaryStealthComponent.cs

* Update TemporaryStealthComponent.cs

* integrated

* new system

* mark old status effect system as obsolete

* ForcedSleeping new status effect

* work with reagents

* networking???

* Revert "integrated"

This reverts commit bca02b82bae18ae131af593d7eb86e6de2745157.

* Revert "Update TemporaryStealthComponent.cs"

This reverts commit 4a5be8c4b704a0d1ff9544b2e245d8b2701ec580.

* Revert "Update TemporaryStealthComponent.cs"

This reverts commit a4875bcb41347638854bd723d96a51c3e6d38034.

* Revert "added into liquid anomaly"

This reverts commit df5086b14bb35f1467158a36807c0f2163a16d99.

* Revert "documentation"

This reverts commit 3629b9466758cbdfa4dd5e67ece122fa2f181138.

* Revert "spectra"

This reverts commit 2d03d88c16d16ad6831c19a7921b84600daeb284.

* drowsiness status effect remove

* reagents work

* polish, remove test changes

* first Fildrance review part

* Update misc.yml

* more fildrance review

* final part

* fix trailing spaces

* sleeping status effect

* drowsiness status effect

* Create ModifyStatusEffect.cs

* some tweak

* Yay!!! Manual networking

* minor nitpick

* oopsie

* refactor: xml-docs, notnullwhen attributes, whitespaces

* fildrance and emo review

* refactor: simplify check in SharedStatusEffectsSystem by using pattern matching, TryEffectsWithComp now returns set of Entity<T, StatusEffectComponent>

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
 2025-06-25 07:41:35 -04:00
Ed
b581f5d132 Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync 
# Conflicts:
#	.github/workflows/check-trailing-whitespace.yml
#	Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
#	Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Shared/Light/Components/SunShadowCycleComponent.cs
#	Resources/Prototypes/Damage/modifier_sets.yml
#	Resources/Prototypes/Maps/Pools/default.yml
 2025-06-23 16:37:22 +03:00
Sparlight
67c8d1db87 Add corgium (#37951) 
* Add corgi essence

* Adjust spacing concerns

* Renamed 'corgi essence' to 'corgium' based on maintainer discussion
 2025-06-14 11:07:48 +02:00
Nikovnik
685e7028d2 Transparent tear gas (#36440) 
* tweaked tear gas

* changed color of tear gas

* sped up metabolism rate of tear gas

* sped up tear gas passing more

* reduced tear gas content in grenades

* added threshold for better effect end timing

* removed clickable component from foams

* Suggestion changes

* Hide in spawn menu

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
 2025-06-13 09:53:44 -04: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
Perry Fraser
7ce2d241dd fix: allow ejecting diamonds from lathes/silos (#38132) 2025-06-07 13:36:58 -04:00
jkwookee
57567a92c6 Reduce Liquid Frezon Duration (#38100) 
testing
 2025-06-06 18:41:21 -04:00
Cojoke
2721d8fd5d Lube Evaporates Slowly (#37998) 2025-06-02 12:41:34 +02:00
Red
f6dd89ea7a d (#1351) 2025-06-01 21:55:20 +03:00
Alpaccalypse
0df4a2e243 Absinthe makes you mildly hallucinate (#34371) 
* Absinthe make you mildly hallucinate. Smaller glass volume, doesn't make you sick.

* Reordered glass fill sprites to look more equal
 2025-05-30 18:03:49 +02:00
Red
7642f49b00 Merge branch 'master' into ed-27-05-2025-upstream-sync 2025-05-29 00:50:36 +03:00
Red
cde388f5dd Another Merchant gameplay attempt (#1308) 
* setup UI

* setup debug data

* graph control setup

* reputation trade component

* unlocking logic

* smoe real reputation costing

* remove sponsors part, add trading specific UI nodes

* port to default pricing system

* buy cooldown

* fuck off trading cabinets

* real good cooldown UI

* Cool unlock sound

* reputation earning

* cool purchare sound

* coin & sprite work

* delete old guidebooks

* cool purcharing VFX

* better ui

* victoria gardens

* Update migration.yml

* Update migration.yml

* cooldown removed

* contracts

* Update migration.yml

* remove CP14Material

* materials appraise

* food appraise

* auto economy pricing system

* alchemy reagents appraise

* coins resprite

* alchemy appraise 2

* modular weapon appraise

* selling platform

* Update PricingSystem.cs

* Update CP14TradingPlatformSystem.cs

* merchants returns + map update

* Update CP14StationEconomySystem.Price.cs
 2025-05-29 00:22:47 +03:00
Ed
d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml
 2025-05-27 12:21:14 +03:00
Myra
df2c2adc9d Stable master merge (#37850) 2025-05-26 17:30:30 +02:00
Errant
02fe5b4ac5 HOTFIX Cryochem revert (#37844) 
* Revert "Traumoxadone (#37236)"

This reverts commit 55ec2632a8.

* Revert "Cryoxadone Tweaks (#37132)"

This reverts commit 406bfa3308.

* Revert "Stelloxadone (#37131)"

This reverts commit f415ad51c3.

* whitespace test fail evasive maneuver

* changelog 1984
 2025-05-26 16:49:34 +02:00
Hitlinemoss
6240a51932 Liquid soap is now slippery (#37747) 
* Liquid soap is now slippery

* Adjusted liquid soap friction value
 2025-05-23 23:57:06 +02:00
FrostRibbon
e114b9d9a0 Epinephrine Antihistamine effect, Histamines not radioactive (#37460) 
* Added Epinephrine antihistamine effect when at least 45u. Removed Histamines causing Radiation damage.

* Indentation fixed

* had coffee, able to see how to fix indentation now.
 2025-05-20 18:12:53 -07:00
āda
41a129e749 Pepper makes you cough (#36358) 2025-05-19 11:23:38 -07:00
Samuka-C
0d3e6986c8 Make Holy water evaporate like normal water (#37611) 
holy water evaporates
 2025-05-19 12:14:40 -04:00
qwerltaz
8fdac54c5a add: water vapor hurts slimes (#32751) 
* water vapor hurts slimes

* 3 looks good

* Update Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-05-19 00:55:40 +02:00
ScarKy0
ff8b7cf220 Aloxadone Tweaks (#37239) 
alox
 2025-05-18 19:16:13 +10:00
ScarKy0
55ec2632a8 Traumoxadone (#37236) 
* fuck salicylic acid

* small tweak based on playtest

* meh

* locale

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2025-05-18 19:11:59 +10:00
ScarKy0
406bfa3308 Cryoxadone Tweaks (#37132) 
fuck cryox
 2025-05-18 19:11:51 +10:00
ScarKy0
f415ad51c3 Stelloxadone (#37131) 
init
 2025-05-18 19:11:23 +10:00
Nemanja
866f1fb47b Adjust walking sounds (#36941) 2025-05-13 02:16:16 -07:00
Ed
59e6435fe2 Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Construction/UI/ConstructionMenuPresenter.cs
#	Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
#	Resources/Prototypes/Procedural/vgroid.yml
 2025-05-12 14:25:42 +03:00
Nemanja
38f6e6e849 Add EvenHealthChange effect (#37129) 
* Add EvenHealthChange effect

* cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-05-10 14:51:28 +02:00
ScarKy0
9e582157ac Revert "Traumoxadone (#37126)" 
This reverts commit efc8d8600d.
 2025-05-08 18:13:33 +02:00
OnyxTheBrave
e527adea92 Fixed holy water metabolism rate (#37106) 
* Fixed holy water metabolizing at 1u instead of .5u a second

* Update Resources/Prototypes/Reagents/medicine.yml

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-05-06 14:31:23 -04:00
Princess Cheeseballs
64f7fe10cc Ichor double-metabolize fix + Very minor cleanup (#37107) 
Not a yaml vacation apparently
 2025-05-06 14:16:13 -04:00
ScarKy0
efc8d8600d Traumoxadone (#37126) 
* init

* salicylic acid
 2025-05-03 00:56:47 +02:00
MissKay1994
d21906c025 Vox now can eat trash other other inedible things (#35681) 
* EAT TRASH EXHALE AMMONIA

Update to files

* Forgot to port this file

* 1D4 Guidance

* Summary (required)

Suggested changes and fixes

* Cries in conflicts

* Why do we exist? To suffer?

* 1 citation for being stupid

* THE ANTIDOTE, THE ANTIDOTE FOR THE POISON

* I was inverted sir

* vox organs cleanup

* vox reagents

* guidebook

* weh

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
 2025-05-01 20:16:51 +02:00
Ed
ef6d973301 Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync 
# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml
 2025-04-30 20:31:50 +03:00
Myra
87d097bb5d Stable merge (#37050) 2025-04-29 21:54:43 +01:00