Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Вернуть дронов

Browse Source 
This reverts commit 8c6a8c3c5c.

# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
#	Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
#	Resources/Prototypes/Entities/Objects/Materials/parts.yml
#	Resources/Prototypes/Entities/Objects/Misc/tiles.yml
#	Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
#	Resources/Prototypes/Entities/Objects/Power/solar_parts.yml
#	Resources/Prototypes/tags.yml
#	Resources/migration.yml
This commit is contained in:
Remuchi
2024-03-27 21:50:24 +07:00
parent 208cea9e7e
commit 1076530ad8
53 changed files with 391 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Zombies/ZombieSystem.cs
View File

@@ -3,6 +3,7 @@ using Content.Server.Body.Systems;
using Content.Server.Chat;
using Content.Server.Chat.Systems;
using Content.Server.Cloning;
using Content.Server.Drone.Components;
using Content.Server.Emoting.Systems;
using Content.Server.Inventory;
using Content.Server.Speech.EntitySystems;
@@ -219,7 +220,7 @@ namespace Content.Server.Zombies
if (args.User == entity)
continue;
if (!TryComp<MobStateComponent>(entity, out var mobState))
if (!TryComp<MobStateComponent>(entity, out var mobState) || HasComp<DroneComponent>(entity))
continue;
if (HasComp<ZombieComponent>(entity))