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

Aspect tweaks (#418)

Browse Source 
* Aspect tweaks

* Add DancingAspect

* Remove jump
This commit is contained in:
Aviu00
2023-09-19 19:02:08 +09:00
committed by Aviu00
parent 2cd3a4288f
commit bd58beb0ea
15 changed files with 189 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Holiday/Christmas/RandomGiftSystem.cs
View File

@@ -1,7 +1,9 @@
using Content.Server.Administration.Logs;
using Content.Server.Hands.Systems;
using Content.Server.White.Other;
using Content.Shared.Database;
using Content.Shared.Examine;
using Content.Shared.Interaction.Components;
using Content.Shared.Interaction.Events;
using Content.Shared.Item;
using Robust.Server.Audio;
@@ -90,6 +92,8 @@ public sealed class RandomGiftSystem : EntitySystem
var itemCompName = _componentFactory.GetComponentName(typeof(ItemComponent));
var mapGridCompName = _componentFactory.GetComponentName(typeof(MapGridComponent));
var physicsCompName = _componentFactory.GetComponentName(typeof(PhysicsComponent));
var giftIgnoreCompName = _componentFactory.GetComponentName(typeof(GiftIgnoreComponent)); // WD
var unremovableCompName = _componentFactory.GetComponentName(typeof(UnremoveableComponent)); // WD
foreach (var proto in _prototype.EnumeratePrototypes<EntityPrototype>())
{
@@ -98,7 +102,9 @@ public sealed class RandomGiftSystem : EntitySystem
_possibleGiftsUnsafe.Add(proto.ID);
if (!proto.Components.ContainsKey(itemCompName) || proto.SetSuffix is "DEBUG" or "Admeme") // WD EDIT
if (!proto.Components.ContainsKey(itemCompName) || proto.Components.ContainsKey(giftIgnoreCompName) ||
proto.Components.ContainsKey(unremovableCompName) || proto.SetSuffix != null &&
(proto.SetSuffix.Contains("DEBUG") || proto.SetSuffix.Contains("Admeme"))) // WD EDIT
continue;
_possibleGiftsSafe.Add(proto.ID);