diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 62d21cce8e..6a07034f75 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -135,7 +135,7 @@ namespace Content.Client.Entry _prototypeManager.RegisterIgnore("wireLayout"); _prototypeManager.RegisterIgnore("alertLevels"); _prototypeManager.RegisterIgnore("nukeopsRole"); - _prototypeManager.RegisterIgnore("stationGoal"); // WD ENGI EXCLUSIVE + _prototypeManager.RegisterIgnore("stationGoal"); // WD _prototypeManager.RegisterIgnore("ghostRoleRaffleDecider"); //WD-EDIT diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs index 50d3adbdc3..376774cad1 100644 --- a/Content.Server/Strip/StrippableSystem.cs +++ b/Content.Server/Strip/StrippableSystem.cs @@ -136,14 +136,14 @@ namespace Content.Server.Strip } // WD EDIT END - // WD ENGI EXCLUSIVE EDIT START + // WD EDIT START if (args.Slot == "ears" && TryComp(strippable, out PreventStrippingFromEarsComponent? _)) { var message = Loc.GetString("buckethelmet-cant-strip"); _popupSystem.PopupEntity(message, user, user); return; } - // WD ENGI EXCLUSIVE EDIT END + // WD EDIT END if (args.IsHand) @@ -616,7 +616,7 @@ namespace Content.Server.Strip if (ev.Event.InventoryOrHand) { - if ( ev.Event.InsertOrRemove && !CanStripInsertInventory((entity.Owner, entity.Comp), args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName) || + if (ev.Event.InsertOrRemove && !CanStripInsertInventory((entity.Owner, entity.Comp), args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName) || !ev.Event.InsertOrRemove && !CanStripRemoveInventory(entity.Owner, args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName)) { ev.Cancel(); @@ -624,7 +624,7 @@ namespace Content.Server.Strip } else { - if ( ev.Event.InsertOrRemove && !CanStripInsertHand((entity.Owner, entity.Comp), args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName) || + if (ev.Event.InsertOrRemove && !CanStripInsertHand((entity.Owner, entity.Comp), args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName) || !ev.Event.InsertOrRemove && !CanStripRemoveHand(entity.Owner, args.Target.Value, args.Used.Value, ev.Event.SlotOrHandName)) { ev.Cancel(); @@ -645,14 +645,14 @@ namespace Content.Server.Strip if (ev.InventoryOrHand) { if (ev.InsertOrRemove) - StripInsertInventory((entity.Owner, entity.Comp), ev.Target.Value, ev.Used.Value, ev.SlotOrHandName); - else StripRemoveInventory(entity.Owner, ev.Target.Value, ev.Used.Value, ev.SlotOrHandName, ev.Args.Hidden); + StripInsertInventory((entity.Owner, entity.Comp), ev.Target.Value, ev.Used.Value, ev.SlotOrHandName); + else StripRemoveInventory(entity.Owner, ev.Target.Value, ev.Used.Value, ev.SlotOrHandName, ev.Args.Hidden); } else { if (ev.InsertOrRemove) - StripInsertHand((entity.Owner, entity.Comp), ev.Target.Value, ev.Used.Value, ev.SlotOrHandName, ev.Args.Hidden); - else StripRemoveHand((entity.Owner, entity.Comp), ev.Target.Value, ev.Used.Value, ev.SlotOrHandName, ev.Args.Hidden); + StripInsertHand((entity.Owner, entity.Comp), ev.Target.Value, ev.Used.Value, ev.SlotOrHandName, ev.Args.Hidden); + else StripRemoveHand((entity.Owner, entity.Comp), ev.Target.Value, ev.Used.Value, ev.SlotOrHandName, ev.Args.Hidden); } } } diff --git a/Content.Server/_White/_Engi/BucketHelmet/BucketHelmetSystem.cs b/Content.Server/_White/_Engi/BucketHelmet/BucketHelmetSystem.cs index 5aa91b87a6..1b3c0f4d64 100644 --- a/Content.Server/_White/_Engi/BucketHelmet/BucketHelmetSystem.cs +++ b/Content.Server/_White/_Engi/BucketHelmet/BucketHelmetSystem.cs @@ -4,8 +4,8 @@ using Content.Shared._White._Engi.BucketHelmet; namespace Content.Server._White._Engi.BucketHelmet; /// +/// WD. /// This handles placemet of PreventStrippingFromEarsComponent when bucket helmet is in use. -/// WD Engi Exclusive. /// public sealed class BucketHelmetSystem : EntitySystem { diff --git a/Content.Server/_White/_Engi/PacifiedOnChaplainAction/PacifiedOnChaplainActionComponent.cs b/Content.Server/_White/_Engi/PacifiedOnChaplainAction/PacifiedOnChaplainActionComponent.cs index 7ac2616d17..320f17e3a8 100644 --- a/Content.Server/_White/_Engi/PacifiedOnChaplainAction/PacifiedOnChaplainActionComponent.cs +++ b/Content.Server/_White/_Engi/PacifiedOnChaplainAction/PacifiedOnChaplainActionComponent.cs @@ -3,8 +3,8 @@ using Robust.Shared.Audio; namespace Content.Server._White._Engi.PacifiedOnChaplainAction { /// + /// WD. /// Adds verb for chaplain to pacify entity. - /// WD Engi Exclusive. /// [RegisterComponent] public sealed partial class PacifiedOnChaplainActionComponent : Component diff --git a/Content.Server/_White/_Engi/PacifiedOnChaplainAction/PacifiedOnChaplainActionSystem.cs b/Content.Server/_White/_Engi/PacifiedOnChaplainAction/PacifiedOnChaplainActionSystem.cs index 19ae17880c..f86ca2054f 100644 --- a/Content.Server/_White/_Engi/PacifiedOnChaplainAction/PacifiedOnChaplainActionSystem.cs +++ b/Content.Server/_White/_Engi/PacifiedOnChaplainAction/PacifiedOnChaplainActionSystem.cs @@ -12,7 +12,7 @@ using Content.Shared.Database; namespace Content.Server._White._Engi.PacifiedOnChaplainAction { /// - /// WD Engi Exclusive. + /// WD /// public sealed class PacifiedOnChaplainAction : EntitySystem { diff --git a/Content.Server/_White/_Engi/StationGoalCommand/StationGoalComponent.cs b/Content.Server/_White/_Engi/StationGoalCommand/StationGoalComponent.cs index 874aa4cb56..0252059942 100644 --- a/Content.Server/_White/_Engi/StationGoalCommand/StationGoalComponent.cs +++ b/Content.Server/_White/_Engi/StationGoalCommand/StationGoalComponent.cs @@ -3,7 +3,7 @@ using Robust.Shared.Prototypes; namespace Content.Server._White._Engi.StationGoal { /// - /// WD ENGI EXCLUSIVE. + /// WD. /// If attached to a station prototype, will send the station a random goal from the list. /// [RegisterComponent] diff --git a/Content.Server/_White/_Engi/StationGoalCommand/StationGoalPaperComponent.cs b/Content.Server/_White/_Engi/StationGoalCommand/StationGoalPaperComponent.cs index 9bc7ddea47..d90da2e7fc 100644 --- a/Content.Server/_White/_Engi/StationGoalCommand/StationGoalPaperComponent.cs +++ b/Content.Server/_White/_Engi/StationGoalCommand/StationGoalPaperComponent.cs @@ -1,7 +1,7 @@ namespace Content.Server._White._Engi.StationGoal { /// - /// WD ENGI EXCLUSIVE. + /// WD. /// Paper with a written station goal in it. /// [RegisterComponent] diff --git a/Content.Server/_White/_Engi/StationGoalCommand/StationGoalPaperSystem.cs b/Content.Server/_White/_Engi/StationGoalCommand/StationGoalPaperSystem.cs index 11cd09d2a6..c5ec51faa8 100644 --- a/Content.Server/_White/_Engi/StationGoalCommand/StationGoalPaperSystem.cs +++ b/Content.Server/_White/_Engi/StationGoalCommand/StationGoalPaperSystem.cs @@ -12,7 +12,7 @@ using Content.Server.RandomMetadata; namespace Content.Server._White._Engi.StationGoal { /// - /// WD ENGI EXCLUSIVE. + /// WD. /// System to spawn paper with station goal. /// public sealed class StationGoalPaperSystem : EntitySystem @@ -71,7 +71,6 @@ namespace Content.Server._White._Engi.StationGoal } /// - /// WD ENGI EXCLUSIVE. /// Send a station goal on selected station to all faxes which are authorized to receive it. /// /// True if at least one fax received paper diff --git a/Content.Server/_White/_Engi/StationGoalCommand/StationGoalPrototype.cs b/Content.Server/_White/_Engi/StationGoalCommand/StationGoalPrototype.cs index 2bcf442f01..04a2e0807a 100644 --- a/Content.Server/_White/_Engi/StationGoalCommand/StationGoalPrototype.cs +++ b/Content.Server/_White/_Engi/StationGoalCommand/StationGoalPrototype.cs @@ -3,7 +3,7 @@ using Robust.Shared.Prototypes; namespace Content.Server._White._Engi.StationGoal { /// - /// WD ENGI EXCLUSIVE. + /// WD /// [Serializable, Prototype("stationGoal")] public sealed class StationGoalPrototype : IPrototype diff --git a/Content.Server/_White/_Engi/Suhariki/SuharikiComponent.cs b/Content.Server/_White/_Engi/Suhariki/SuharikiComponent.cs deleted file mode 100644 index a437ed567e..0000000000 --- a/Content.Server/_White/_Engi/Suhariki/SuharikiComponent.cs +++ /dev/null @@ -1,53 +0,0 @@ -using Robust.Shared.Prototypes; -using Content.Shared.Damage; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -using Content.Shared.Chat.Prototypes; -using Robust.Shared.Audio; - -namespace Content.Server._White._Engi.Suhariki; - -/// -/// Makes you loose your tooth and have funny accent. -/// WD Engi Exclusive. -/// -[RegisterComponent, Access(typeof(SuharikiSystem))] -public sealed partial class SuharikiComponent : Component - -{ - /// - /// Amount and type of damage that will be dealt on event. - /// - [DataField(required: true)] - [ViewVariables(VVAccess.ReadWrite)] - public DamageSpecifier Damage = new(); - - /// - /// Chance of event activation. - /// - [DataField] - public float Chance = 0; - - /// - /// Amount of rolls for event. - /// - [DataField] - public int StonesInFood = 1; - - /// - /// The prototype that will be spawned on event. - /// - [DataField(customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)] - public string HoldingPrototype = "SuharikiTooth"; - - /// - /// Emote triggered on event. - /// - [DataField(customTypeSerializer: typeof(PrototypeIdSerializer))] - public string EmoteId = "Scream"; - - /// - /// Sound triggered on event. - /// - [DataField] - public SoundSpecifier UseSound { get; set; } = new SoundPathSpecifier("/Audio/White/_Engi/Object/Misc/Suhariki/tooth_break.ogg"); -} diff --git a/Content.Server/_White/_Engi/Suhariki/SuharikiSystem.cs b/Content.Server/_White/_Engi/Suhariki/SuharikiSystem.cs deleted file mode 100644 index 035e55e97e..0000000000 --- a/Content.Server/_White/_Engi/Suhariki/SuharikiSystem.cs +++ /dev/null @@ -1,152 +0,0 @@ -using Content.Server.Inventory; -using Content.Server.Nutrition.Components; -using Content.Server.Popups; -using Content.Shared.Interaction.Events; -using Content.Shared.Nutrition.EntitySystems; -using Robust.Shared.Random; -using Content.Shared.Damage; -using Content.Server.Effects; -using Robust.Shared.Player; -using Content.Server.Administration.Logs; -using Content.Shared.Database; -using Content.Server.Chat.Systems; -using Content.Server.Nutrition.EntitySystems; -using Robust.Shared.Timing; -using Robust.Shared.Audio; -using Robust.Shared.Audio.Systems; -using Content.Shared.Verbs; -using Robust.Shared.Utility; -using Content.Shared.Body.Components; -using Content.Server.Body.Systems; -using Content.Server.Body.Components; -using Content.Server.Speech.Components; - -namespace Content.Server._White._Engi.Suhariki; - -/// -/// WD Engi Exclusive. -/// -public sealed class SuharikiSystem : EntitySystem -{ - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly ColorFlashEffectSystem _color = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly FoodSystem _food = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly BodySystem _body = default!; - private EntityQuery _metaQuery; - - public override void Initialize() - { - base.Initialize(); - _metaQuery = GetEntityQuery(); - SubscribeLocalEvent(OnUseInHand, after: new[] { typeof(OpenableSystem), typeof(ServerInventorySystem) }); - SubscribeLocalEvent>(AddEatVerb); - } - - private void OnUseInHand(Entity entity, ref UseInHandEvent ev) - { - if (ev.Handled) - return; - - var result = TryUse(ev.User, ev.User, entity, entity.Comp); - ev.Handled = result.Handled; - } - - private (bool Success, bool Handled) TryUse(EntityUid user, EntityUid target, EntityUid food, SuharikiComponent scomponent) - { - var foodComponents = _metaQuery.GetComponent(food).EntityPrototype; - - if (foodComponents == null) - return (false, false); - - foodComponents.Components.TryGetComponent("Food", out var component); - - if (component == null) - return (false, false); - - // idk what I'm doing but otherwise the owner is "0" and it throws fatal error - component.Owner = food; - - var result = _food.TryFeed(user, target, food, (FoodComponent) component); - - if (result.Success) - Timer.Spawn(300, () => RollEvent(scomponent, user)); - - return (true, true); - } - - private void RollEvent(SuharikiComponent scomponent, EntityUid user) - { - if (scomponent.StonesInFood < 1) - return; - - scomponent.StonesInFood -= 1; - - // Pseudorandom shit - if (!_random.Prob(scomponent.Chance)) - return; - - // Normally slimes don't care about hard food - var whomst = _metaQuery.GetComponent(user).EntityPrototype; - var isUserSlime = whomst!.ID.Contains("slime", StringComparison.OrdinalIgnoreCase); - if (isUserSlime) - return; - - var modifiedDamage = _damageableSystem.TryChangeDamage(user, scomponent.Damage, true); - var deleted = Deleted(user); - if (modifiedDamage is null || !EntityManager.EntityExists(user)) - return; - if (!modifiedDamage.Any() || deleted) - return; - // Damaging the user with appropriate effects - var stringTopopup = Loc.GetString("suhariki-lost", ("user", user)); - _popup.PopupEntity(Name(user) + " " + stringTopopup, user, Shared.Popups.PopupType.LargeCaution); - _color.RaiseEffect(Color.Red, new List { user }, Filter.Pvs(user, entityManager: EntityManager)); - _audio.PlayPvs(scomponent.UseSound, user, AudioParams.Default.WithVolume(-1f)); - _adminLogger.Add(LogType.Damaged, - LogImpact.Medium, - $"This idiot {ToPrettyString(user):user} tried to eat Suhariki and lost tooth, received {modifiedDamage.GetTotal():damage} damage and recieved FrontalLisp accent"); - - // Spawns prototype - var coords = Transform(user).Coordinates; - Spawn(scomponent.HoldingPrototype, coords.Offset(_random.NextVector2(0.2f))); - - // Scream - Timer.Spawn(300, () => _chat.TryEmoteWithChat(user, scomponent.EmoteId)); - - // Adding FrontalLisp accent - EnsureComp(user); - - return; - - } - - private void AddEatVerb(Entity entity, ref GetVerbsEvent ev) - { - if (entity.Owner == ev.User || - !ev.CanInteract || - !ev.CanAccess || - !TryComp(ev.User, out var body) || - !_body.TryGetBodyOrganComponents(ev.User, out var stomachs)) - return; - - var user = ev.User; - AlternativeVerb verb = new() - { - Act = () => - { - TryUse(user, user, entity, entity.Comp); - }, - Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/cutlery.svg.192dpi.png")), - Text = Loc.GetString("food-system-verb-eat"), - Priority = -1 - }; - - ev.Verbs.Add(verb); - } - -} diff --git a/Content.Shared/Fax/Components/FaxMachineComponent.cs b/Content.Shared/Fax/Components/FaxMachineComponent.cs index 7743c366bb..ba6491303a 100644 --- a/Content.Shared/Fax/Components/FaxMachineComponent.cs +++ b/Content.Shared/Fax/Components/FaxMachineComponent.cs @@ -60,7 +60,7 @@ public sealed partial class FaxMachineComponent : Component public bool ReceiveNukeCodes { get; set; } = false; /// - /// WD ENGI EXCLUSIVE. + /// WD. /// Should that fax receive station goal info /// [ViewVariables(VVAccess.ReadWrite)] diff --git a/Content.Shared/_White/_Engi/BucketHelmet/BucketHelmetComponent.cs b/Content.Shared/_White/_Engi/BucketHelmet/BucketHelmetComponent.cs index 11dca20edf..dced0423a6 100644 --- a/Content.Shared/_White/_Engi/BucketHelmet/BucketHelmetComponent.cs +++ b/Content.Shared/_White/_Engi/BucketHelmet/BucketHelmetComponent.cs @@ -1,8 +1,8 @@ namespace Content.Shared._White._Engi.BucketHelmet; /// +/// WD. /// This is used for bucket helmet. -/// WD Engi Exclusive. /// [RegisterComponent] public sealed partial class BucketHelmetComponent : Component diff --git a/Content.Shared/_White/_Engi/BucketHelmet/PreventStrippingFromEarsComponent.cs b/Content.Shared/_White/_Engi/BucketHelmet/PreventStrippingFromEarsComponent.cs index 9bdb4135eb..843e7cf0cc 100644 --- a/Content.Shared/_White/_Engi/BucketHelmet/PreventStrippingFromEarsComponent.cs +++ b/Content.Shared/_White/_Engi/BucketHelmet/PreventStrippingFromEarsComponent.cs @@ -1,8 +1,8 @@ namespace Content.Shared._White._Engi.BucketHelmet; /// +/// WD. /// This is used to block stripping headsets when bucket helmet is on. -/// WD Engi Exclusive. /// [RegisterComponent] public sealed partial class PreventStrippingFromEarsComponent : Component diff --git a/Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingComponent.cs b/Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingComponent.cs index dce35c3809..72a9f95515 100644 --- a/Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingComponent.cs +++ b/Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingComponent.cs @@ -4,8 +4,8 @@ using Robust.Shared.GameStates; namespace Content.Shared._White._Engi.DamageableClothing; /// +/// WD. /// This component goes on an equippable item that should take damage while in use. -/// WD Engi Exclusive. /// [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] public sealed partial class DamageableClothingComponent : Component diff --git a/Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingUserComponent.cs b/Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingUserComponent.cs index eda9ae8daa..f4db76ddef 100644 --- a/Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingUserComponent.cs +++ b/Content.Shared/_White/_Engi/DamageableClothing/Components/DamageableClothingUserComponent.cs @@ -1,8 +1,8 @@ namespace Content.Shared._White._Engi.DamageableClothing; /// +/// WD. /// This component gets dynamically added to an Entity via the . -/// WD Engi Exclusive. /// [RegisterComponent] public sealed partial class DamageableClothingUserComponent : Component diff --git a/Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingSystem.cs b/Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingSystem.cs index 8a4ed64175..04db92c521 100644 --- a/Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingSystem.cs +++ b/Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.Inventory.Events; namespace Content.Shared._White._Engi.DamageableClothing; /// -/// WD Engi Exclusive. +/// WD /// public sealed partial class DamageableClothingSystem : EntitySystem { diff --git a/Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingUserSystem.cs b/Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingUserSystem.cs index c4269c78a7..c83154a58a 100644 --- a/Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingUserSystem.cs +++ b/Content.Shared/_White/_Engi/DamageableClothing/DamageableClothingUserSystem.cs @@ -3,7 +3,7 @@ using Content.Shared.Damage; namespace Content.Shared._White._Engi.DamageableClothing; /// -/// WD Engi Exclusive. +/// WD /// public sealed partial class DamageableClothingSystem { diff --git a/Resources/Audio/White/_Engi/Events/Impedance-Madness-Day-2024-submission.ogg b/Resources/Audio/White/_Engi/Events/Impedance-Madness-Day-2024-submission.ogg deleted file mode 100644 index 4a7b88eed0..0000000000 Binary files a/Resources/Audio/White/_Engi/Events/Impedance-Madness-Day-2024-submission.ogg and /dev/null differ diff --git a/Resources/Audio/White/_Engi/Events/Space-Station-13-_-14-Corporate-Rats-By-Bolgarich.ogg b/Resources/Audio/White/_Engi/Events/Space-Station-13-_-14-Corporate-Rats-By-Bolgarich.ogg deleted file mode 100644 index 1605269130..0000000000 Binary files a/Resources/Audio/White/_Engi/Events/Space-Station-13-_-14-Corporate-Rats-By-Bolgarich.ogg and /dev/null differ diff --git a/Resources/Audio/White/_Engi/Events/TNO-Remix-Resistance.ogg b/Resources/Audio/White/_Engi/Events/TNO-Remix-Resistance.ogg deleted file mode 100644 index 2d8c713be8..0000000000 Binary files a/Resources/Audio/White/_Engi/Events/TNO-Remix-Resistance.ogg and /dev/null differ diff --git a/Resources/Locale/ru-RU/_Engi/suhariki.ftl b/Resources/Locale/ru-RU/_Engi/suhariki.ftl deleted file mode 100644 index c6f4aaaa7a..0000000000 --- a/Resources/Locale/ru-RU/_Engi/suhariki.ftl +++ /dev/null @@ -1,7 +0,0 @@ -ent-FoodSnackSuhariki = сухарики - .desc = Старая реликвия из прошлого, на этикетке едва можно прочитать слово «Кириешки». -ent-FoodPacketSuharikiTrash = упаковка от сухариков -ent-SuharikiTooth = зуб - .desc = Может быть он твой, а может и не твой. - -suhariki-lost = сломал свой зуб! diff --git a/Resources/Locale/ru-RU/white/station-goal/station-goal-command.ftl b/Resources/Locale/ru-RU/white/station-goal/station-goal-command.ftl index bed1884700..10d87709f0 100644 --- a/Resources/Locale/ru-RU/white/station-goal/station-goal-command.ftl +++ b/Resources/Locale/ru-RU/white/station-goal/station-goal-command.ftl @@ -1,3 +1,3 @@ -send-station-goal-command-description = WD ENGI EXCLUSIVE. Отправляет выбранную цель станции на все факсы способные её принять +send-station-goal-command-description = WD. Отправляет выбранную цель станции на все факсы способные её принять send-station-goal-command-help-text = Использование: { $command } send-station-goal-command-arg-id = diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 31cdd32e27..9dd4c37ca2 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -594,8 +594,6 @@ prob: 0.10 - id: BarberScissors prob: 0.05 - - id: FoodSnackSuhariki # WD Engi Exclusive - prob: 0.10 # Syndicate loot - id: null prob: 0.95 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml index cf37bfe791..9f4b3e5983 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml @@ -45,6 +45,5 @@ - FoodFrozenSnowconeRainbow - FoodSnackPistachios - FoodSnackSemki - - FoodSnackSuhariki # WD chance: 0.8 offset: 0.0 diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml index c59388f9f5..bf94bea6a5 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml @@ -66,7 +66,7 @@ - type: PhysicalComposition materialComposition: Plastic: 50 - - type: Construction # WD Engi Exclusive + - type: Construction # WD deconstructionTarget: null graph: ClothingHeadBucketHelmet node: start diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml index 96f7ef2dd7..cbefa86808 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml @@ -82,7 +82,7 @@ - type: FaxMachine name: "Central Command" notifyAdmins: true - receiveStationGoal: true # WD ENGI EXCLUSIVE + receiveStationGoal: true # WD - type: entity parent: FaxMachineBase @@ -110,6 +110,6 @@ - type: FaxMachine name: "Captain's Office" receiveNukeCodes: true - receiveStationGoal: true # WD ENGI EXCLUSIVE + receiveStationGoal: true # WD - type: StealTarget stealGroup: FaxMachineCaptain diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml index fd32490b82..da9dfef6ae 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml @@ -263,8 +263,7 @@ sprite: White/Objects/Weapons/Chaplain/scythe-inhands.rsi - type: Sharp -# Может пиздеть -# WD Engi Exclusive - и может давать пизды +# Может пиздеть и может давать пизды - type: entity parent: HolyKatana id: PossessedBlade @@ -282,11 +281,9 @@ - suitStorage - type: GhostRole allowSpeech: true - # WD Engi Exclusive edit start name: ghost-role-information-possessed-blade-name description: ghost-role-information-possessed-blade-description rules: ghost-role-information-possessed-blade-rules - # WD Engi Exclusive edit end - type: GhostTakeoverAvailable - type: Examiner - type: Item @@ -295,7 +292,6 @@ shape: - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/possessed.rsi - # WD Engi Exclusive start - type: DamageOtherOnHit damage: types: @@ -304,7 +300,6 @@ - type: UseDelay delay: 2.0 - type: PacifiedOnChaplainAction - # WD Engi Exclusive end # Приклеен к руке, быстро и громко бьет - type: entity @@ -507,11 +502,9 @@ soundSwing: collection: HammerMiss - type: DisarmMalus - # WD Engi Exclusive start - type: KnockDownOnHit knockDownBehavior: NoDrop knockdownTime: 0.4 - # WD Engi Exclusive end # Имеет все инструменты в себе, но работает медленно и почти не наносит урона - type: entity diff --git a/Resources/Prototypes/_White/_Engi/Entities/Clothing/Head/bucketHelmet.yml b/Resources/Prototypes/_White/_Engi/Entities/Clothing/Head/bucketHelmet.yml index be64280c24..524c6e95af 100644 --- a/Resources/Prototypes/_White/_Engi/Entities/Clothing/Head/bucketHelmet.yml +++ b/Resources/Prototypes/_White/_Engi/Entities/Clothing/Head/bucketHelmet.yml @@ -1,4 +1,3 @@ -# WD Engi Exclusive - type: entity parent: ClothingHeadBase id: ClothingHeadBucketHelmet diff --git a/Resources/Prototypes/_White/_Engi/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml b/Resources/Prototypes/_White/_Engi/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml index 7512186177..92184cf628 100644 --- a/Resources/Prototypes/_White/_Engi/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml +++ b/Resources/Prototypes/_White/_Engi/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml @@ -1,4 +1,3 @@ -# WD Engi Exclusive - type: entity parent: ClothingOuterArmorBasic id: ClothingOuterArmorReflectiveGhetto diff --git a/Resources/Prototypes/_White/_Engi/Entities/Objects/Consumable/Food/suhariki.yml b/Resources/Prototypes/_White/_Engi/Entities/Objects/Consumable/Food/suhariki.yml deleted file mode 100644 index 1ad6277d38..0000000000 --- a/Resources/Prototypes/_White/_Engi/Entities/Objects/Consumable/Food/suhariki.yml +++ /dev/null @@ -1,78 +0,0 @@ -# WD Engi Exclusive -- type: entity - parent: BaseItem - id: FoodSnackSuhariki - name: suhariki - description: Old relic of the past, you can barely read the label "Kirieshki". - components: - - type: Food - trash: FoodPacketSuharikiTrash - - type: FlavorProfile - flavors: - - cheap - - bread - - type: Sprite - sprite: White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi - state: suhariki - - type: Tag - tags: - - FoodSnack - - type: BadFood - - type: Suhariki - chance: 0.25 - damage: - types: - Blunt: 10 - - type: Item - size: Tiny - sprite: White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi - heldPrefix: suhariki - - type: SolutionContainerManager - solutions: - food: - maxVol: 5 # No extra room for condiments - reagents: - - ReagentId: Nutriment - Quantity: 1 - - ReagentId: Omnizine - Quantity: 4 - - type: SpaceGarbage - - type: StaticPrice - price: 500 - -- type: entity - noSpawn: true - parent: FoodPacketTrash - id: FoodPacketSuharikiTrash - name: suhariki bag - components: - - type: Sprite - sprite: White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi - state: suhariki-trash - - type: Item - size: Tiny - sprite: White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi - heldPrefix: suhariki - -- type: entity - noSpawn: true - name: Зуб - parent: BaseItem - id: SuharikiTooth - description: Может быть он твой, а может и не твой. - components: - - type: Sprite - sprite: White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi - state: icon - - type: Item - size: Tiny - - type: EmitSoundOnLand - sound: - path: /Audio/White/_Engi/Object/Misc/Suhariki/tooth_drop_1.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/White/_Engi/Object/Misc/Suhariki/tooth_drop_2.ogg - - type: SpaceGarbage - - type: StaticPrice - price: 100 - diff --git a/Resources/Prototypes/_White/_Engi/Entities/Objects/Shields/MirrorShieldGhetto.yml b/Resources/Prototypes/_White/_Engi/Entities/Objects/Shields/MirrorShieldGhetto.yml index ca14a41179..c0873496c1 100644 --- a/Resources/Prototypes/_White/_Engi/Entities/Objects/Shields/MirrorShieldGhetto.yml +++ b/Resources/Prototypes/_White/_Engi/Entities/Objects/Shields/MirrorShieldGhetto.yml @@ -1,4 +1,3 @@ -# WD Engi Exclusive - type: entity name: makeshift mirror shield parent: BaseItem diff --git a/Resources/Prototypes/_White/_Engi/Fluff/fluff.yml b/Resources/Prototypes/_White/_Engi/Fluff/fluff.yml deleted file mode 100644 index 9ebb3456a7..0000000000 --- a/Resources/Prototypes/_White/_Engi/Fluff/fluff.yml +++ /dev/null @@ -1,24 +0,0 @@ -# WD Engi Exclusive - -#BIG_Zi_348 -- type: customGhost - id: big_zi_348-ghost - ckey: BIG_Zi_348 - sprite: White/_Engi/Fluff/BIG_Zi_348/big_zi_348-ghost.rsi - alpha: 0.9 - ghostName: BIG_Zi_348 - ghostDescription: Как хорошо быть кем-то в этой жизни. - -#Rikka -- type: entity - parent: BasePlushie - id: PlushieRikkaFluff - name: плюшевая Аврора - description: Теперь бесит компактнее. - suffix: fluff - components: - - type: Sprite - sprite: White/_Engi/Fluff/Rikka/rikka-plushie.rsi - state: icon - - type: Item - size: Normal diff --git a/Resources/Prototypes/_White/_Engi/Recipes/Graphs/bucketHelmet.yml b/Resources/Prototypes/_White/_Engi/Recipes/Graphs/bucketHelmet.yml index 6129a2624b..cefb0023e3 100644 --- a/Resources/Prototypes/_White/_Engi/Recipes/Graphs/bucketHelmet.yml +++ b/Resources/Prototypes/_White/_Engi/Recipes/Graphs/bucketHelmet.yml @@ -1,5 +1,4 @@ -# WD Engi Exclusive -- type: constructionGraph +- type: constructionGraph id: ClothingHeadBucketHelmet start: start graph: diff --git a/Resources/Prototypes/_White/_Engi/Recipes/Graphs/ghettoMirrorShield.yml b/Resources/Prototypes/_White/_Engi/Recipes/Graphs/ghettoMirrorShield.yml index c15ac8bafb..d31994341c 100644 --- a/Resources/Prototypes/_White/_Engi/Recipes/Graphs/ghettoMirrorShield.yml +++ b/Resources/Prototypes/_White/_Engi/Recipes/Graphs/ghettoMirrorShield.yml @@ -1,5 +1,4 @@ -# WD Engi Exclusive -- type: constructionGraph +- type: constructionGraph id: MirrorShieldGhetto start: start graph: diff --git a/Resources/Prototypes/_White/_Engi/Recipes/ghettoMirrorShield.yml b/Resources/Prototypes/_White/_Engi/Recipes/ghettoMirrorShield.yml index 3c8faa88ec..8b42cc331a 100644 --- a/Resources/Prototypes/_White/_Engi/Recipes/ghettoMirrorShield.yml +++ b/Resources/Prototypes/_White/_Engi/Recipes/ghettoMirrorShield.yml @@ -1,5 +1,4 @@ -# WD Engi Exclusive -- type: construction +- type: construction name: самодельный зеркальный щит id: MirrorShieldGhetto graph: MirrorShieldGhetto diff --git a/Resources/Prototypes/_White/_Engi/StationGoal/stationGoals.yml b/Resources/Prototypes/_White/_Engi/StationGoal/stationGoals.yml index 0478e9b42b..4877fb1cbf 100644 --- a/Resources/Prototypes/_White/_Engi/StationGoal/stationGoals.yml +++ b/Resources/Prototypes/_White/_Engi/StationGoal/stationGoals.yml @@ -1,4 +1,3 @@ -# WD ENGI EXCLUSIVE - type: stationGoal id: Singularity text: engi-station-goal-singularity diff --git a/Resources/Prototypes/_White/_Engi/tags.yml b/Resources/Prototypes/_White/_Engi/tags.yml deleted file mode 100644 index 6d867976e4..0000000000 --- a/Resources/Prototypes/_White/_Engi/tags.yml +++ /dev/null @@ -1,3 +0,0 @@ -# WD Engi Exclusive -- type: Tag - id: MirrorShieldGhetto diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/_White/tags.yml index 40e48a923a..7e71fc6b52 100644 --- a/Resources/Prototypes/_White/tags.yml +++ b/Resources/Prototypes/_White/tags.yml @@ -121,6 +121,5 @@ - type: Tag id: VoiceActivatedBombImplant -# WD Engi Exclusive - type: Tag id: MirrorShieldGhetto diff --git a/Resources/Textures/White/_Engi/Fluff/BIG_Zi_348/big_zi_348-ghost.rsi/animated.png b/Resources/Textures/White/_Engi/Fluff/BIG_Zi_348/big_zi_348-ghost.rsi/animated.png deleted file mode 100644 index 307cdcdfd0..0000000000 Binary files a/Resources/Textures/White/_Engi/Fluff/BIG_Zi_348/big_zi_348-ghost.rsi/animated.png and /dev/null differ diff --git a/Resources/Textures/White/_Engi/Fluff/BIG_Zi_348/big_zi_348-ghost.rsi/meta.json b/Resources/Textures/White/_Engi/Fluff/BIG_Zi_348/big_zi_348-ghost.rsi/meta.json deleted file mode 100644 index 1a633023c5..0000000000 --- a/Resources/Textures/White/_Engi/Fluff/BIG_Zi_348/big_zi_348-ghost.rsi/meta.json +++ /dev/null @@ -1,141 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Modified by BIG_Zi_348 from - https://github.com/tgstation/tgstation/blob/f80e7ba62d27c77cfeac709dd71033744d0015c4/icons/mob/mob.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "animated", - "directions": 4, - "delays": [ - [ - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05 - ], - [ - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05 - ], - [ - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05 - ], - [ - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05 - ] - ] - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/White/_Engi/Fluff/Rikka/rikka-plushie.rsi/icon.png b/Resources/Textures/White/_Engi/Fluff/Rikka/rikka-plushie.rsi/icon.png deleted file mode 100644 index b03857f3bf..0000000000 Binary files a/Resources/Textures/White/_Engi/Fluff/Rikka/rikka-plushie.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/White/_Engi/Fluff/Rikka/rikka-plushie.rsi/meta.json b/Resources/Textures/White/_Engi/Fluff/Rikka/rikka-plushie.rsi/meta.json deleted file mode 100644 index 52771d3ac2..0000000000 --- a/Resources/Textures/White/_Engi/Fluff/Rikka/rikka-plushie.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "rikka", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/meta.json b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/meta.json deleted file mode 100644 index 49ba5139da..0000000000 --- a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/meta.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "deadisko and BIG_Zi_348", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "suhariki" - }, - { - "name": "suhariki-trash" - }, - { - "name": "suhariki-inhand-right", - "directions": 4 - }, - { - "name": "suhariki-inhand-left", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-inhand-left.png b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-inhand-left.png deleted file mode 100644 index 5a37a5debe..0000000000 Binary files a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-inhand-right.png b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-inhand-right.png deleted file mode 100644 index 95c620f2eb..0000000000 Binary files a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-trash.png b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-trash.png deleted file mode 100644 index f528d725b2..0000000000 Binary files a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki-trash.png and /dev/null differ diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki.png b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki.png deleted file mode 100644 index 5e46236261..0000000000 Binary files a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/suhariki.rsi/suhariki.png and /dev/null differ diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi/icon.png b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi/icon.png deleted file mode 100644 index 43d576fdae..0000000000 Binary files a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi/meta.json b/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi/meta.json deleted file mode 100644 index 87bfd9d670..0000000000 --- a/Resources/Textures/White/_Engi/Objects/Consumable/Food/Suhariki/tooth.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "xd", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -}