diff --git a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs index eea37da177..1a71c890dc 100644 --- a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs +++ b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs @@ -1,4 +1,7 @@ -using Content.Server.Administration.Logs; +using System.Linq; +using System.Runtime.InteropServices.JavaScript; +using System.Text.RegularExpressions; +using Content.Server.Administration.Logs; using Content.Server.Hands.Systems; using Content.Server.White.Other; using Content.Shared.Database; @@ -104,7 +107,8 @@ public sealed class RandomGiftSystem : EntitySystem 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 + new[] {"Debug, Admeme, Admin"}.Any(x => + proto.SetSuffix.Contains(x, StringComparison.OrdinalIgnoreCase))) // WD EDIT continue; _possibleGiftsSafe.Add(proto.ID); diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index 9f2a02aba5..3cf2fb19af 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml @@ -64,6 +64,6 @@ sprite: Objects/Weapons/Guns/Battery/egun.rsi state: base product: CrateArmoryEgun - cost: 2500 + cost: 5500 category: Armory group: market diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml index e1b80a2771..54cc48e097 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml @@ -30,6 +30,7 @@ - type: Tag tags: - DoorBumpOpener + - type: ContentEye - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index cd63946fa3..ac7f737c0d 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -436,6 +436,8 @@ - type: Damageable damageContainer: Shield - type: Rechargeable + maxCharge: 20 + rechargeDelay: 15 - type: StaticPrice price: 350