juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream

Browse Source 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
This commit is contained in:
Ed
2024-10-29 11:16:56 +03:00
parent b14c75390c 0468c0f6bb
commit ae3cbd6092
388 changed files with 34535 additions and 18822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Temperature/Systems/TemperatureSystem.cs
View File

@@ -131,7 +131,7 @@ public sealed class TemperatureSystem : EntitySystem
TemperatureComponent? temperature = null)
{
//CrystallPunk may try place on heater and entity, and solutions
//if (!Resolve(uid, ref temperature))
//if (!Resolve(uid, ref temperature, false))
// return;
if (temperature == null)
return;
@@ -315,7 +315,7 @@ public sealed class TemperatureSystem : EntitySystem
private void ChangeTemperatureOnCollide(Entity<ChangeTemperatureOnCollideComponent> ent, ref ProjectileHitEvent args)
{
_temperature.ChangeHeat(args.Target, ent.Comp.Heat, ent.Comp.IgnoreHeatResistance);// adjust the temperature
_temperature.ChangeHeat(args.Target, ent.Comp.Heat, ent.Comp.IgnoreHeatResistance);// adjust the temperature
}
private void OnParentChange(EntityUid uid, TemperatureComponent component,