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
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
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
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
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
deltanedas
3488e577d9
Electric grill ( #20661 )
...
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-01 19:17:50 -05:00
