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

78 Commits

Author SHA1 Message Date
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
Tayrtahn
c565b44965 Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814) 
* The easy ones

* For certain values of easy

* Easy test

* Hair

* Fix sandbox violations

* Sort usings
 2025-07-07 21:57:05 +02: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
ScarKy0
af0e0598e8 TemperatureProtection now works directly on entities (#37544) 
* init

* review

* review
 2025-05-17 16:38:49 +02: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
Tayrtahn
c8fe3651e5 Add prediction to electric grills (#36241) 
* Prediction for EntityHeaterSystem

* Switch to Entity<T>

* meh

* Move popup inside ChangeSetting

* Fix grill visually turning on when changing setting while power is off

* Add note about my failed quest

* Why isn't this an IDE warning?

* Move comment above switch expression in SettingPower
 2025-04-01 09:43:19 -07:00
Ed
312f2ae14c Великая жарка мяса (#788) 
* temperature transform

* Update CP14TemperatureSystem.cs

* fix heating entities

* cooking!

* fix cooking

* aaa

* foodsequence remove

* fix

* fix
 2025-01-21 23:03:50 +03:00
Ed
d67f7619c4 Edgefication (#590) 
* bloat

* bloat 2

* bloat 3

* final bloat

* Update icon.ico

* Create integration_test_run.bat

* Arggh

* Disable some tests

* revert roomfill clearexisting changes
 2024-11-18 14:40:52 +03:00
Ed
ae3cbd6092 Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
 2024-10-29 11:16:56 +03:00
slarticodefast
d6d8c55d57 Don't error on missing component in ChangeHeat (#32451) 2024-10-12 11:52:05 -07:00
Ed
5b2020d708 Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
 2024-09-08 21:20:54 +03:00
Nemanja
a197baac17 split temperature protection into heating and cooling (#30662) 
* split temperature protection into heating and cooling

* fugg

* weh
 2024-09-07 15:37:17 +10:00
Ed
ca656b3c10 Merge remote-tracking branch 'upstream/master' into ed-29-08-2024 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Maps/reach.yml
 2024-08-29 14:32:09 +03:00
metalgearsloth
a89d4c750b Power stuff (#31314) 
* Power stuff

- Add shared IsPowered
- Add shared ResolveApc
- Move PowerChangedEvent to shared for now
- Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it.

* big update

* boing
 2024-08-25 22:18:42 +10:00
Ed
c82b17a65e Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Traits/speech.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml
 2024-08-19 19:06:38 +03:00
Boaz1111
ed3e10741f New Projectile Effect:Temperature Change (#31004) 
* bah

* all done, thanks slarti

* makes the watcher do the thing

* Update TemperatureSystem.cs

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* changes something

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-08-18 21:11:17 -06:00
themias
79ae2cceb4 Add sound for turning on grill (#31099) 
* Add sound for turning on grill

* remove view variable
 2024-08-16 20:41:55 -04:00
Ed
dd580c68c9 Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Resources/Prototypes/Accents/word_replacements.yml
 2024-08-05 15:28:42 +03:00
Nemanja
b3a64d4bcd Add slowdown to low temperatures (#29692) 
* TemperatureSpeed component

* temperature slowdown prediction (done right)

* remove unnecessary changes

* that too

* get in line

* make it readonly

* auto pause
 2024-08-05 18:07:02 +10:00
TemporalOroboros
bea8c1a0b8 Relocate TemperatureProtectionComponent (#30437) 
Moves it from the atmos module to the temperature module where it is actually used.
 2024-07-30 12:31:55 -07:00
Ed
9f1b4fc51c Melting molds (#347) 
* temp tweak

* add metall bars

* melting molds

* add sawing molds table

* sawing sounds

* fix
 2024-07-23 10:29:41 +03:00
Ed
e216eeae20 Merge remote-tracking branch 'space-station-14/master' into ed-25-05-2024-upstream 
# Conflicts:
#	Content.Server/Atmos/Components/FlammableComponent.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
 2024-05-25 18:49:49 +03:00
Nemanja
8a95cb186c Remove AlertType and AlertCategory (#27933) 2024-05-23 22:43:04 -04:00
Ed
4c692d7d4a Alchemy + Guidebook initialization (#124) 
* remove Guidebook

* water and blood

* localization things

* added vital extract

* some fixes

* added bloodgrass

* guidebook localization

* fixes icons and remove unnecesary fields

* added inhand cauldron

* fix wallmount board

* Update bonfire.yml

* Update bonfire.yml

* alchemy furnace + mist

* fixes

* Guidebook localization

* Update drinks.yml

* Revert "remove Guidebook"

This reverts commit 7924cf235f.

* fix filtering guidebook

* test fix

* Update heater.yml
 2024-05-02 20:41:11 +03:00
Ed
2c34befbcb Fireplace (#123) 
* bonfire!

* fix

* update torch

* docs

* add audio, fix errors

* loc string + fix errors
 2024-05-01 19:55:48 +03:00
Ed
af734dc5c2 fixes 2024-04-20 12:45:25 +03:00
Ed
0bc1c31193 КОСТЁР (#22) 
* респрайт костра, новый костёр

* fix itemheating

* этот костер потребовал слишком много работы

* перекрас травы
 2024-04-03 00:48:08 +03:00
Jake Huxell
59e46aab93 Reduced Warning Count By 130 For Full Rebuilds (#26518) 
* remove deprecated entity coordinate extension functions. Reduces warning count by approximately 50

* final toCoords Removed

* Remove all unused variables and dead code paths

* remove always true variable, should be a cvar or something instead

* remove superfluous variables from tests
 2024-03-29 16:28:16 +11:00
Nemanja
8ed32a1e42 Add events for TemperatureProtection and PressureProtection (#25165) 2024-02-13 23:44:47 -08:00
Leon Friedrich
9a3342d972 Remove uses of TransformComponent.ChildEntities (#22442) 
* Make output of ChildEnumerator non-nullable

* Remove uses of ChildEntities

* poke tests

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-12-17 03:09:50 +11:00
Leon Friedrich
477327f952 Atmos scaling cvar changes (#22501) 2023-12-15 14:02:21 -08:00
Leon Friedrich
918d8c2b34 Adds a new AtmosphereSystem.GetTileMixture() override (#21804) 2023-11-29 10:03:44 +11:00
deltanedas
68aa295a38 Add internal temperatures for cooking meats (#20659) 2023-10-20 12:21:49 -08:00
DrSmugleaf
f560f88eb5 Remove 700 usages of Component.Owner (#21100) 2023-10-19 12:34:31 -07:00
Errant
064cb8797e Accurate temperature alerts (#19913) 2023-10-18 10:05:15 -08:00
deltanedas
c988f21d25 Temperature refactor (#20662) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-10-02 07:44:05 -07:00
deltanedas
3488e577d9 Electric grill (#20661) 
---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-10-01 19:17:50 -05:00
Nemanja
c34913b227 Try and fix mob prototypes (#19859) 
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2023-09-14 20:10:30 -07:00
DrSmugleaf
a88e747a0b Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
deltanedas
1edd6e53fb temperature reset on rejuvenate (#19142) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-08-14 15:28:52 -07:00
Slava0135
12d3b4a326 ignore resistances in temperature system (#17301) 2023-06-13 07:59:07 -05:00
Kevin Zheng
4498cfe452 Add missing DataField for currentTemperature (#14179) 2023-02-19 06:57:09 -08:00
metalgearsloth
bf79d76666 Content update for ECS physics (#13291) 2023-01-15 15:38:59 +11:00
metalgearsloth
ab07944af8 Remove IPhysBody (#13297) 2023-01-03 17:45:18 +11:00
Francesco
d47e001b18 feat: Medbay cryo pods (#11349) 
Fixes https://github.com/space-wizards/space-station-14/issues/11245
 2022-12-25 22:35:51 +11:00
Leon Friedrich
92e92dceb0 Unrevert #10934 2022-10-25 11:06:00 +11:00
Kara
258ec0cac1 Clothing/item ECS & cleanup (#9706) 2022-07-27 03:53:47 -07:00
Vera Aguilera Puerto
aa9281d667 Refactors the AtmosphereSystem public-facing API to allow for multiple atmos backends. (#8134) 
* Refactors the entirety of the AtmosphereSystem public-facing API to allow for multiple atmos backends.

* actually compiles

* Remove commented out code

* funny bracket

* Move archived moles, temperature from GasMixture to TileAtmosphere.

* WIP customizable map default mixture
still VERY buggy

* broken mess
aaaaaaaaaaaaa

* Fix lattice, etc not being considered space

* visualization for "IsSpace"

* help

* Update Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* Holy SHIT it compiles AGAIN

* Fix AtmosDeviceSystem crash at shutdown

* Fix immutable tiles on map blueprints not being fixed by fixgridatmos/revalidate.

* Use space instead of gasmixture immutable for heat capacity calculations

* Remove all LINDA-specific code from GasMixture, move it to TileAtmosphere/AtmosphereSystem instead.

* Fix roundstart tiles not processing

* Update Content.Server/Atmos/Commands/SetTemperatureCommand.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs

Changed Files tab is so large I can't commit both suggestions at once mfw

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-07-04 09:51:34 -05:00
metalgearsloth
8905996cfc Make raiselocalevent not broadcast by default (#8998) 2022-06-22 09:53:41 +10:00
wrexbe
c134d78920 Make HeatCapacity use FixturesMass (#8661) 2022-06-12 16:02:46 +10:00