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

Merge remote-tracking branch 'space-station-14/master' into ed-02-06-2024-upstream

Browse Source
This commit is contained in:
Ed
2024-06-02 11:01:34 +03:00
parent b032c38917 ba04f94e48
commit 6a5fae3403
518 changed files with 20010 additions and 13172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Atmos/EntitySystems/FlammableSystem.cs
View File

@@ -156,7 +156,7 @@ namespace Content.Server.Atmos.EntitySystems
private void OnExtinguishActivateInWorld(EntityUid uid, ExtinguishOnInteractComponent component, ActivateInWorldEvent args)
{
if (args.Handled)
if (args.Handled || !args.Complex)
return;
if (!TryComp(uid, out FlammableComponent? flammable))