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

Fix Murdertron 5000 a/k/a Emagged recycler (#18892)

Browse Source 
* Fix gibbing humans

* Millions must gib

* Workplace accident

* Everything alive goes into the recycler

* Review
This commit is contained in:
Sailor
2023-08-14 02:54:52 +03:00
committed by GitHub
parent 6a4d2a7014
commit 459660ed92
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
View File

@@ -111,11 +111,13 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem
if (!CanStart(uid, component)) if (!CanStart(uid, component))
return false; return false;
if (component.Whitelist != null && !component.Whitelist.IsValid(item) || if (HasComp<MobStateComponent>(item) && !CanGib(uid, item, component)) // whitelist? We be gibbing, boy!
HasComp<MobStateComponent>(item) && !CanGib(uid, item, component)) // whitelist? We be gibbing, boy!
return false; return false;
if (component.Blacklist != null && component.Blacklist.IsValid(item)) if (component.Whitelist is {} whitelist && !whitelist.IsValid(item))
return false;
if (component.Blacklist is {} blacklist && blacklist.IsValid(item))
return false; return false;
if (!_container.TryRemoveFromContainer(item)) if (!_container.TryRemoveFromContainer(item))

1
Resources/Prototypes/Entities/Structures/Machines/recycler.yml
View File

@@ -87,6 +87,7 @@
whitelist: whitelist:
components: components:
- PhysicalComposition - PhysicalComposition
- MobState
- SpaceGarbage - SpaceGarbage
tags: tags:
- Trash - Trash