diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index b06ec8f8e3c..79ddacea519 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -2,7 +2,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Client.DisplacementMap; using Content.Client.Inventory; -using Content.Shared._DV.Silicon.IPC; // DeltaV - IPC Snouts using Content.Shared.Clothing; using Content.Shared.Clothing.Components; using Content.Shared.Clothing.EntitySystems; @@ -103,12 +102,8 @@ public sealed class ClientClothingSystem : ClothingSystem List? layers = null; - // Begin DeltaV Additions - IPC snouts var speciesId = inventory.SpeciesId; - if (TryComp(args.Equipee, out SnoutHelmetComponent? helmetComponent) && helmetComponent.EnableAlternateHelmet) - speciesId = helmetComponent.ReplacementRace; - // first attempt to get species specific data. if (speciesId != null) item.ClothingVisuals.TryGetValue($"{args.Slot}-{speciesId}", out layers); @@ -120,7 +115,6 @@ public sealed class ClientClothingSystem : ClothingSystem if (!TryGetDefaultVisuals(uid, item, args.Slot, speciesId, out layers)) return; } - // End DeltaV Additions // add each layer to the visuals var i = 0; diff --git a/Content.Client/_DV/Silicon/IPC/SnoutHelmetSystem.cs b/Content.Client/_DV/Silicon/IPC/SnoutHelmetSystem.cs deleted file mode 100644 index a9da0b9cbfc..00000000000 --- a/Content.Client/_DV/Silicon/IPC/SnoutHelmetSystem.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Content.Shared._DV.Silicon.IPC; -using Content.Shared.Humanoid; -using Content.Shared.Humanoid.Markings; - -namespace Content.Client._DV.Silicon.IPC; - -public sealed class SnoutHelmetSystem : EntitySystem -{ - private const MarkingCategories MarkingToQuery = MarkingCategories.Snout; - private const int MaximumMarkingCount = 0; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnComponentStartup); - } - - private void OnComponentStartup(EntityUid uid, SnoutHelmetComponent component, ComponentStartup args) - { - if (TryComp(uid, out HumanoidAppearanceComponent? humanoidAppearanceComponent) && - humanoidAppearanceComponent.ClientOldMarkings.Markings.TryGetValue(MarkingToQuery, out var markings) && - markings.Count > MaximumMarkingCount) - { - component.EnableAlternateHelmet = true; - } - } -} diff --git a/Content.Client/_DV/Silicons/Charge/SiliconChargeSystem.cs b/Content.Client/_DV/Silicons/Charge/SiliconChargeSystem.cs deleted file mode 100644 index 4d0c4b58069..00000000000 --- a/Content.Client/_DV/Silicons/Charge/SiliconChargeSystem.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Content.Client.Alerts; -using Content.Shared._EE.Silicon.Components; -using Content.Shared._EE.Silicon.Systems; - -namespace Content.Client._DV.Silicon.Charge; - -public sealed class SiliconChargeSystem : SharedSiliconChargeSystem -{ - [Dependency] private readonly ClientAlertsSystem _alerts = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnSiliconInit); - SubscribeLocalEvent(OnSiliconChargeStateUpdate); - } - - private void OnSiliconInit(EntityUid uid, SiliconComponent component, ComponentInit args) - { - if (!component.BatteryPowered) - return; - - _alerts.ShowAlert(uid, component.BatteryAlert, component.ChargeState); - } - - private void OnSiliconChargeStateUpdate(EntityUid uid, SiliconComponent component, SiliconChargeStateUpdateEvent ev) - { - _alerts.ShowAlert(uid, component.BatteryAlert, ev.ChargePercent); - } -} diff --git a/Content.Client/_DV/Silicons/Charge/SiliconDrainSystem.cs b/Content.Client/_DV/Silicons/Charge/SiliconDrainSystem.cs deleted file mode 100644 index 89b34518ae9..00000000000 --- a/Content.Client/_DV/Silicons/Charge/SiliconDrainSystem.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Content.Client.Alerts; -using Content.Shared._EE.Silicon.Components; -using Content.Shared._DV.Silicons.Charge; - -namespace Content.Client._DV.Silicon.Charge; - -public sealed class SiliconDrainSystem : SharedSiliconDrainSystem -{ - [Dependency] private readonly ClientAlertsSystem _alerts = default!; - - protected override void UpdateChargeIcon(Entity ent, short chargePercent) - { - // If you can't find a battery, set the indicator and skip it. - if (!TryGetSiliconBattery(ent, out _)) - { - if (_alerts.IsShowingAlert(ent.Owner, ent.Comp.BatteryAlert)) - { - _alerts.ClearAlert(ent.Owner, ent.Comp.BatteryAlert); - _alerts.ShowAlert(ent.Owner, ent.Comp.NoBatteryAlert); - } - } - // If the battery was replaced and the no battery indicator is showing, replace the indicator - else if (_alerts.IsShowingAlert(ent.Owner, ent.Comp.NoBatteryAlert)) - { - _alerts.ClearAlert(ent.Owner, ent.Comp.NoBatteryAlert); - _alerts.ShowAlert(ent.Owner, ent.Comp.BatteryAlert, chargePercent); - } - } -} diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs index 8e4c22cf89e..6c103bf6aef 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs @@ -87,12 +87,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs Assert.That(clientAlertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(3)); var alertControls = clientAlertsUI.AlertContainer.Children.Select(c => (AlertControl) c); var alertIDs = alertControls.Select(ac => ac.Alert.ID).ToArray(); - // Goobstation - IPC have BorgHealth instead of HumanHealth - var expectedDebugIDs = new[] { "Debug1", "Debug2" }; - var expectedHealthIDs = new[] { "BorgHealth", "HumanHealth" }; - - Assert.That(alertIDs, Is.SupersetOf(expectedDebugIDs)); - Assert.That(alertIDs, Has.Some.Matches(item => expectedHealthIDs.Contains(item))); + var expectedIDs = new[] { "HumanHealth", "Debug1", "Debug2" }; + Assert.That(alertIDs, Is.SupersetOf(expectedIDs)); }); await server.WaitAssertion(() => @@ -108,12 +104,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs Assert.That(clientAlertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(2)); var alertControls = clientAlertsUI.AlertContainer.Children.Select(c => (AlertControl) c); var alertIDs = alertControls.Select(ac => ac.Alert.ID).ToArray(); - // Goobstation - IPC have BorgHealth instead of HumanHealth - var expectedDebugIDs = new[] { "Debug2" }; - var expectedHealthIDs = new[] { "BorgHealth", "HumanHealth" }; - - Assert.That(alertIDs, Is.SupersetOf(expectedDebugIDs)); - Assert.That(alertIDs, Has.Some.Matches(item => expectedHealthIDs.Contains(item))); + var expectedIDs = new[] { "HumanHealth", "Debug2" }; + Assert.That(alertIDs, Is.SupersetOf(expectedIDs)); }); await pair.CleanReturnAsync(); diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs index e4e1e6558cc..246a7701902 100644 --- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs @@ -24,7 +24,6 @@ using Content.Shared.Station.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Map.Components; -using Content.Shared._EE.Silicon.Components; // Goobstation using Robust.Shared.Prototypes; namespace Content.IntegrationTests.Tests.GameRules; @@ -230,15 +229,12 @@ public sealed class NukeOpsTest var totalSeconds = 30; var totalTicks = (int) Math.Ceiling(totalSeconds / server.Timing.TickPeriod.TotalSeconds); var increment = 5; + var resp = entMan.GetComponent(player); var damage = entMan.GetComponent(player); for (var tick = 0; tick < totalTicks; tick += increment) { await pair.RunTicksSync(increment); - if (!entMan.HasComponent(player)) // Goobstation - IPC - { - var resp = entMan.GetComponent(player); - Assert.That(resp.SuffocationCycles, Is.LessThanOrEqualTo(resp.SuffocationCycleThreshold)); - } + Assert.That(resp.SuffocationCycles, Is.LessThanOrEqualTo(resp.SuffocationCycleThreshold)); Assert.That(damage.TotalDamage, Is.EqualTo(FixedPoint2.Zero)); } diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs index d523e057abf..d9024caa486 100644 --- a/Content.Server/Chat/SuicideSystem.cs +++ b/Content.Server/Chat/SuicideSystem.cs @@ -1,5 +1,4 @@ using Content.Server.Ghost; -using Content.Shared._EE.Silicon.Components; // EE using Content.Server.Hands.Systems; using Content.Shared.Administration.Logs; using Content.Shared.Chat; @@ -173,10 +172,7 @@ public sealed class SuicideSystem : EntitySystem return; } - if (HasComp(victim)) // Goobstation - args.DamageType ??= "Shock"; - else - args.DamageType ??= "Bloodloss"; + args.DamageType ??= "Bloodloss"; _suicide.ApplyLethalDamage(victim, args.DamageType); args.Handled = true; } diff --git a/Content.Server/Cloning/CloningPodSystem.cs b/Content.Server/Cloning/CloningPodSystem.cs index 1b7f6ae4574..5faa2962ca7 100644 --- a/Content.Server/Cloning/CloningPodSystem.cs +++ b/Content.Server/Cloning/CloningPodSystem.cs @@ -8,7 +8,6 @@ using Content.Server.Materials; using Content.Server.Popups; using Content.Server.Power.EntitySystems; using Content.Shared._DV.Psionics.Components; // DeltaV -using Content.Shared._EE.Silicon.Components; // Goobstation using Content.Shared.Atmos; using Content.Shared.CCVar; using Content.Shared.Chemistry.Components; @@ -163,9 +162,6 @@ public sealed class CloningPodSystem : EntitySystem if (!TryComp(bodyToClone, out var physics)) return false; - if (HasComp(bodyToClone)) - return false; // Goobstation: Don't clone IPCs. - var cloningCost = (int)Math.Round(physics.FixturesMass); if (_configManager.GetCVar(CCVars.BiomassEasyMode)) diff --git a/Content.Server/Clothing/Systems/OutfitSystem.cs b/Content.Server/Clothing/Systems/OutfitSystem.cs index 723ba93c4b4..c02a4f1a3bf 100644 --- a/Content.Server/Clothing/Systems/OutfitSystem.cs +++ b/Content.Server/Clothing/Systems/OutfitSystem.cs @@ -13,8 +13,6 @@ using Content.Shared.Roles; using Content.Shared.Station; using Robust.Shared.Player; using Robust.Shared.Prototypes; -using Content.Shared._DV.Silicon.IPC; // DeltaV -using Content.Shared.Radio.Components; // Goobstation namespace Content.Server.Clothing.Systems; @@ -109,14 +107,6 @@ public sealed class OutfitSystem : EntitySystem _spawningSystem.EquipRoleLoadout(target, roleLoadout, jobProto); } - // Begin DeltaV/Goob Additions - if (EntityManager.HasComponent(target)) - { - var encryption = EntityManager.System(); - encryption.TryInsertEncryptionKey(target, startingGear); - } - // End DeltaV/Goob Additions - return true; } } diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs index 6e49f249960..0836f2cb328 100644 --- a/Content.Server/Electrocution/ElectrocutionSystem.cs +++ b/Content.Server/Electrocution/ElectrocutionSystem.cs @@ -299,7 +299,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem || !DoCommonElectrocution(uid, sourceUid, shockDamage, time, refresh, siemensCoefficient, statusEffects)) return false; - RaiseLocalEvent(uid, new ElectrocutedEvent(uid, sourceUid, siemensCoefficient, shockDamage), true); // Goobstation + RaiseLocalEvent(uid, new ElectrocutedEvent(uid, sourceUid, siemensCoefficient), true); return true; } @@ -349,7 +349,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem electrocutionComponent.Electrocuting = uid; electrocutionComponent.Source = sourceUid; - RaiseLocalEvent(uid, new ElectrocutedEvent(uid, sourceUid, siemensCoefficient, shockDamage), true); // Goobstation + RaiseLocalEvent(uid, new ElectrocutedEvent(uid, sourceUid, siemensCoefficient), true); return true; } diff --git a/Content.Server/Mobs/DeathgaspComponent.cs b/Content.Server/Mobs/DeathgaspComponent.cs index 8c459f14ae2..5ac925c3dd2 100644 --- a/Content.Server/Mobs/DeathgaspComponent.cs +++ b/Content.Server/Mobs/DeathgaspComponent.cs @@ -15,7 +15,7 @@ public sealed partial class DeathgaspComponent : Component /// [DataField("prototype", customTypeSerializer:typeof(PrototypeIdSerializer))] public string Prototype = "DefaultDeathgasp"; - + /// /// Goobstation: Makes sure that the deathgasp is only displayed if the entity went critical before dying /// diff --git a/Content.Server/Mobs/DeathgaspSystem.cs b/Content.Server/Mobs/DeathgaspSystem.cs index f15238f4189..c531784ea69 100644 --- a/Content.Server/Mobs/DeathgaspSystem.cs +++ b/Content.Server/Mobs/DeathgaspSystem.cs @@ -21,9 +21,7 @@ public sealed class DeathgaspSystem: EntitySystem private void OnMobStateChanged(EntityUid uid, DeathgaspComponent component, MobStateChangedEvent args) { // don't deathgasp if they arent going straight from crit to dead - if (component.NeedsCritical // Goobstation - && args.OldMobState != MobState.Critical - || args.NewMobState != MobState.Dead) + if (args.NewMobState != MobState.Dead || args.OldMobState != MobState.Critical) return; Deathgasp(uid, component); diff --git a/Content.Server/_DV/CosmicCult/Abilities/CosmicGlareSystem.cs b/Content.Server/_DV/CosmicCult/Abilities/CosmicGlareSystem.cs index a66c35499b8..803fee89986 100644 --- a/Content.Server/_DV/CosmicCult/Abilities/CosmicGlareSystem.cs +++ b/Content.Server/_DV/CosmicCult/Abilities/CosmicGlareSystem.cs @@ -5,7 +5,6 @@ using Content.Server.Light.EntitySystems; using Content.Server.Stunnable; using Content.Shared._DV.CosmicCult; using Content.Shared._DV.CosmicCult.Components; -using Content.Shared._EE.Silicon.Components; using Content.Shared.Effects; using Content.Shared.Interaction; using Content.Shared.Light.Components; @@ -70,7 +69,7 @@ public sealed class CosmicGlareSystem : EntitySystem _flash.Flash(targetEnt, uid, args.Action, uid.Comp.CosmicGlareDuration, uid.Comp.CosmicGlarePenalty, false, false, uid.Comp.CosmicGlareStun, ignoreProtection: uid.Comp.CosmicEmpowered); - if (HasComp(targetEnt) || HasComp(targetEnt)) //For paralyzing borgs and IPCs specifically. + if (HasComp(targetEnt)) //For paralyzing borgs and IPCs specifically. { _stun.TryUpdateParalyzeDuration(targetEnt, uid.Comp.CosmicGlareDuration / 2); } diff --git a/Content.Server/_DV/CosmicCult/CosmicCultSystem.cs b/Content.Server/_DV/CosmicCult/CosmicCultSystem.cs index d5fc84a290b..7b13b779301 100644 --- a/Content.Server/_DV/CosmicCult/CosmicCultSystem.cs +++ b/Content.Server/_DV/CosmicCult/CosmicCultSystem.cs @@ -12,7 +12,6 @@ using Content.Server.Radio; using Content.Server.Station.Systems; using Content.Shared._DV.CosmicCult.Components; using Content.Shared._DV.CosmicCult; -using Content.Server._EE.Radio; using Content.Shared.Alert; using Content.Shared.DoAfter; using Content.Shared.Eye; @@ -94,8 +93,6 @@ public sealed partial class CosmicCultSystem : SharedCosmicCultSystem SubscribeLocalEvent(OnEndImposition); SubscribeLocalEvent(OnImpositionMoveSpeed); - SubscribeLocalEvent(OnTransmitterChannelsChangedCult, after: new[] { typeof(IntrinsicRadioKeySystem) }); - SubscribeLocalEvent(OnRadioSendAttempt); SubscribeLocalEvent(OnJammerAnchorStateChange); @@ -250,23 +247,6 @@ public sealed partial class CosmicCultSystem : SharedCosmicCultSystem #endregion #region Edge cases - /// - /// Edge Case to handle IPCs losing astral murmur after panel operations. - /// - private void OnTransmitterChannelsChangedCult(EntityUid uid, CosmicCultComponent component, EncryptionChannelsChangedEvent args) - { - if (!TryComp(uid, out IntrinsicRadioTransmitterComponent? transmitter) || !TryComp(uid, out ActiveRadioComponent? activeRadio)) - return; - - if (transmitter.Channels.Contains(CosmicRadio) && activeRadio.Channels.Contains(CosmicRadio)) - return; - - transmitter.Channels.Add(CosmicRadio); - activeRadio.Channels.Add(CosmicRadio); - - - } - /// /// When a cultist gets polymorphed, ensure that the resulting entity has all the necessary components. Mostly there for kitsune my behated. /// diff --git a/Content.Server/_DV/Silicons/Charge/SiliconChargeSystem.cs b/Content.Server/_DV/Silicons/Charge/SiliconChargeSystem.cs deleted file mode 100644 index 36ca1a5af43..00000000000 --- a/Content.Server/_DV/Silicons/Charge/SiliconChargeSystem.cs +++ /dev/null @@ -1,5 +0,0 @@ -using Content.Shared._EE.Silicon.Systems; - -namespace Content.Server._DV.Silicon.Charge; - -public sealed class SiliconChargeSystem : SharedSiliconChargeSystem; diff --git a/Content.Server/_DV/Silicons/Charge/SiliconDrainSystem.cs b/Content.Server/_DV/Silicons/Charge/SiliconDrainSystem.cs deleted file mode 100644 index 7273375f732..00000000000 --- a/Content.Server/_DV/Silicons/Charge/SiliconDrainSystem.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Content.Shared._DV.Silicons.Charge; -using Content.Shared._EE.Silicon.Components; - -namespace Content.Server._DV.Silicons.Charge; - -public sealed class SiliconDrainSystem : SharedSiliconDrainSystem -{ - protected override void UpdateChargeIcon(Entity ent, short chargePercent) - { - // No-op on Server - } -} diff --git a/Content.Server/_EE/Power/Components/BatteryDrinkerComponent.cs b/Content.Server/_EE/Power/Components/BatteryDrinkerComponent.cs deleted file mode 100644 index eccb79444ef..00000000000 --- a/Content.Server/_EE/Power/Components/BatteryDrinkerComponent.cs +++ /dev/null @@ -1,31 +0,0 @@ -namespace Content.Server._EE.Power.Components; - -[RegisterComponent] -public sealed partial class BatteryDrinkerComponent : Component -{ - /// - /// Is this drinker allowed to drink batteries not tagged as ? - /// - [DataField] - public bool DrinkAll; - - /// - /// How long it takes to drink from a battery, in seconds. - /// Is multiplied by the source. - /// - [DataField] - public float DrinkSpeed = 1.5f; - - /// - /// The multiplier for the amount of power to attempt to drink. - /// Default amount is 1000 - /// - [DataField] - public float DrinkMultiplier = 5f; - - /// - /// The multiplier for how long it takes to drink a non-source battery, if is true. - /// - [DataField] - public float DrinkAllMultiplier = 2.5f; -} \ No newline at end of file diff --git a/Content.Server/_EE/Power/Components/RandomBatteryChargeComponent.cs b/Content.Server/_EE/Power/Components/RandomBatteryChargeComponent.cs deleted file mode 100644 index 30c25b61d41..00000000000 --- a/Content.Server/_EE/Power/Components/RandomBatteryChargeComponent.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Numerics; - -namespace Content.Server._EE.Power.Components; - -[RegisterComponent] -public sealed partial class RandomBatteryChargeComponent : Component -{ - /// - /// The minimum and maximum max charge the battery can have. - /// - [DataField] - public Vector2 BatteryMaxMinMax = new(0.85f, 1.15f); - - /// - /// The minimum and maximum current charge the battery can have. - /// - [DataField] - public Vector2 BatteryChargeMinMax = new(1f, 1f); - - /// - /// False if the randomized charge of the battery should be a multiple of the preexisting current charge of the battery. - /// True if the randomized charge of the battery should be a multiple of the max charge of the battery post max charge randomization. - /// - [DataField] - public bool BasedOnMaxCharge = true; -} \ No newline at end of file diff --git a/Content.Server/_EE/Power/Systems/BatteryDrinkerSystem.cs b/Content.Server/_EE/Power/Systems/BatteryDrinkerSystem.cs deleted file mode 100644 index fe90f15af5d..00000000000 --- a/Content.Server/_EE/Power/Systems/BatteryDrinkerSystem.cs +++ /dev/null @@ -1,136 +0,0 @@ -using System.Linq; -using Content.Shared.Power.Components; -using Content.Shared.Containers.ItemSlots; -using Content.Shared.DoAfter; -using Content.Shared.PowerCell.Components; -using Content.Shared._EE.Silicon; -using Content.Shared.Verbs; -using Robust.Shared.Utility; -using Content.Server._EE.Silicon.Charge; -using Content.Server.Power.EntitySystems; -using Content.Server.Popups; -using Content.Shared.Popups; -using Robust.Shared.Audio.Systems; -using Robust.Shared.Containers; -using Content.Server._EE.Power.Components; -using Content.Server._EE.Silicon; -using Content.Shared.Power.EntitySystems; -using Content.Shared.PowerCell; - -namespace Content.Server._EE.Power; - -public sealed class BatteryDrinkerSystem : EntitySystem -{ - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; // DeltaV - people with augment power cells can drink batteries - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent>(AddAltVerb); - - SubscribeLocalEvent(OnDoAfter); - } - - private void AddAltVerb(EntityUid uid, BatteryComponent batteryComponent, GetVerbsEvent args) - { - if (!args.CanAccess || !args.CanInteract) - return; - - if (!TryComp(args.User, out var drinkerComp) || - !TestDrinkableBattery(uid, drinkerComp) || - // DeltaV - people with augment power cells can drink batteries - !_powerCell.TryGetBatteryFromEntityOrSlot(args.User, out _)) - return; - - AlternativeVerb verb = new() - { - Act = () => DrinkBattery(uid, args.User, drinkerComp), - Text = Loc.GetString("battery-drinker-verb-drink"), - Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/smite.svg.192dpi.png")), - }; - - args.Verbs.Add(verb); - } - - private bool TestDrinkableBattery(EntityUid target, BatteryDrinkerComponent drinkerComp) - { - if (!drinkerComp.DrinkAll && !HasComp(target)) - return false; - - return true; - } - - private void DrinkBattery(EntityUid target, EntityUid user, BatteryDrinkerComponent drinkerComp) - { - var doAfterTime = drinkerComp.DrinkSpeed; - - if (TryComp(target, out var sourceComp)) - doAfterTime *= sourceComp.DrinkSpeedMulti; - else - doAfterTime *= drinkerComp.DrinkAllMultiplier; - - var args = new DoAfterArgs(EntityManager, user, doAfterTime, new BatteryDrinkerDoAfterEvent(), user, target) // TODO: Make this doafter loop, once we merge Upstream. - { - BreakOnDamage = true, - BreakOnMove = true, - Broadcast = false, - DistanceThreshold = 1.35f, - RequireCanInteract = true, - CancelDuplicate = false - }; - - _doAfter.TryStartDoAfter(args); - } - - private void OnDoAfter(EntityUid uid, BatteryDrinkerComponent drinkerComp, DoAfterEvent args) - { - if (args.Cancelled || args.Target == null) - return; - - var source = args.Target.Value; - var drinker = uid; - var sourceBattery = Comp(source); - - // Begin DeltaV - people with augment power cells can drink batteries - if (!_powerCell.TryGetBatteryFromEntityOrSlot(drinker, out var augmentBattery)) - return; - - TryComp(source, out var sourceComp); - var augmentCharge = _battery.GetCharge(augmentBattery.Value.Owner); - // End DeltaV - people with augment power cells can drink batteries - - var sourceCharge = _battery.GetCharge((source, sourceBattery)); - var amountToDrink = drinkerComp.DrinkMultiplier * 1000; - - amountToDrink = MathF.Min(amountToDrink, sourceCharge); - amountToDrink = MathF.Min(amountToDrink, augmentBattery.Value.Comp!.MaxCharge - augmentCharge); // DeltaV - people with augment power cells can drink batteries - - if (sourceComp != null && sourceComp.MaxAmount > 0) - amountToDrink = MathF.Min(amountToDrink, (float) sourceComp.MaxAmount); - - if (amountToDrink <= 0) - { - _popup.PopupEntity(Loc.GetString("battery-drinker-empty", ("target", source)), drinker, drinker); - return; - } - - if (_battery.TryUseCharge(source, amountToDrink)) - _battery.SetCharge(augmentBattery.Value.AsNullable(), augmentCharge + amountToDrink); // DeltaV - people with augment power cells can drink batteries - else - { - _battery.SetCharge(augmentBattery.Value.AsNullable(), sourceCharge + augmentCharge); // DeltaV - people with augment power cells can drink batteries - _battery.SetCharge(source, 0); - } - - if (sourceComp != null && sourceComp.DrinkSound != null){ - _popup.PopupEntity(Loc.GetString("ipc-recharge-tip"), drinker, drinker, PopupType.SmallCaution); - _audio.PlayPvs(sourceComp.DrinkSound, source); - Spawn("EffectSparks", Transform(source).Coordinates); - } - } -} diff --git a/Content.Server/_EE/Power/Systems/BatteryElectrocuteChargeSystem.cs b/Content.Server/_EE/Power/Systems/BatteryElectrocuteChargeSystem.cs deleted file mode 100644 index 2c19d6a76dd..00000000000 --- a/Content.Server/_EE/Power/Systems/BatteryElectrocuteChargeSystem.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Content.Server.Electrocution; -using Content.Server.Popups; -using Content.Shared.Power.Components; -using Content.Server.Power.EntitySystems; -using Content.Shared.Electrocution; -using Robust.Shared.Random; -using Robust.Shared.Timing; -using Content.Server._EE.Power.Components; - -namespace Content.Server._EE.Power.Systems; - -public sealed class BatteryElectrocuteChargeSystem : EntitySystem -{ - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly BatterySystem _battery = default!; - - // Yes, this is absurdly small for a reason. - public const float ElectrifiedDamagePerWatt = 0.0015f; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnElectrocuted); - } - - private void OnElectrocuted(EntityUid uid, BatteryComponent battery, ElectrocutedEvent args) - { - if (args.ShockDamage == null || args.ShockDamage <= 0) - return; - - var charge = Math.Min(args.ShockDamage.Value * args.SiemensCoefficient - / ElectrifiedDamagePerWatt * 2, - battery.MaxCharge * 0.25f) - * _random.NextFloat(0.75f, 1.25f); - - _battery.SetCharge(uid, _battery.GetCharge((uid, battery)) + charge); - - _popup.PopupEntity(Loc.GetString("battery-electrocute-charge"), uid, uid); - } -} diff --git a/Content.Server/_EE/Radio/IntrinsicRadioKeySystem.cs b/Content.Server/_EE/Radio/IntrinsicRadioKeySystem.cs deleted file mode 100644 index aa2a622ee50..00000000000 --- a/Content.Server/_EE/Radio/IntrinsicRadioKeySystem.cs +++ /dev/null @@ -1,51 +0,0 @@ -using Content.Shared._DV.CosmicCult.Components; -using Content.Shared.Implants.Components; // DeltaV -using Content.Shared.Radio; -using Content.Shared.Radio.Components; -using Robust.Shared.Prototypes; - -namespace Content.Server._EE.Radio; - -public sealed class IntrinsicRadioKeySystem : EntitySystem -{ - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnTransmitterChannelsChanged); - SubscribeLocalEvent(OnReceiverChannelsChanged); - } - - private void OnTransmitterChannelsChanged(EntityUid uid, IntrinsicRadioTransmitterComponent component, EncryptionChannelsChangedEvent args) - { - UpdateChannels(uid, args.Component, ref component.Channels); - } - - private void OnReceiverChannelsChanged(EntityUid uid, ActiveRadioComponent component, EncryptionChannelsChangedEvent args) - { - UpdateChannels(uid, args.Component, ref component.Channels); - } - - private void UpdateChannels(EntityUid uid, EncryptionKeyHolderComponent keyHolderComp, ref HashSet> channels) // DeltaV - passthrough uid - { - channels.Clear(); - channels.UnionWith(keyHolderComp.Channels); - - // Begin DeltaV Additions - Ensure radio implants continue to function - if (TryComp(uid, out var implantedComp)) - { - foreach (var implant in implantedComp.ImplantContainer.ContainedEntities) - { - if (!TryComp(implant, out var radio)) - continue; - - /* - Active added channels should already contain everything this implant - has added, so we can simply just add them back. - */ - channels.UnionWith(radio.ActiveAddedChannels); - } - } - // End DeltaV Additions - } -} diff --git a/Content.Server/_EE/Silicon/BatteryLocking/BatterySlotRequiresLockComponent.cs b/Content.Server/_EE/Silicon/BatteryLocking/BatterySlotRequiresLockComponent.cs deleted file mode 100644 index eb64ac99064..00000000000 --- a/Content.Server/_EE/Silicon/BatteryLocking/BatterySlotRequiresLockComponent.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Content.Server._EE.Silicons.BatteryLocking; - -[RegisterComponent] -public sealed partial class BatterySlotRequiresLockComponent : Component -{ - [DataField] - public string ItemSlot = string.Empty; -} \ No newline at end of file diff --git a/Content.Server/_EE/Silicon/BatteryLocking/BatterySlotRequiresLockSystem.cs b/Content.Server/_EE/Silicon/BatteryLocking/BatterySlotRequiresLockSystem.cs deleted file mode 100644 index e2dd7e1eb02..00000000000 --- a/Content.Server/_EE/Silicon/BatteryLocking/BatterySlotRequiresLockSystem.cs +++ /dev/null @@ -1,48 +0,0 @@ -using Content.Shared.Containers.ItemSlots; -using Content.Shared.Ghost; -using Content.Shared.Lock; -using Content.Shared.Popups; -using Content.Shared._EE.Silicon.Components; -using Content.Shared.IdentityManagement; - -namespace Content.Server._EE.Silicons.BatteryLocking; - -public sealed class BatterySlotRequiresLockSystem : EntitySystem - -{ - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - - /// - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(LockToggled); - SubscribeLocalEvent(LockToggleAttempted); - - } - private void LockToggled(EntityUid uid, BatterySlotRequiresLockComponent component, LockToggledEvent args) - { - if (!TryComp(uid, out var lockComp) - || !TryComp(uid, out var itemslots) - || !_itemSlotsSystem.TryGetSlot(uid, component.ItemSlot, out var slot, itemslots)) - return; - - _itemSlotsSystem.SetLock(uid, slot, lockComp.Locked, itemslots); - } - - private void LockToggleAttempted(EntityUid uid, BatterySlotRequiresLockComponent component, LockToggleAttemptEvent args) - { - if (args.Cancelled) - return; - - if (args.User == uid || !HasComp(uid)) - return; - - if (HasComp(args.User)) // Prevent admin ghosts from triggering popup - return; - - _popupSystem.PopupEntity(Loc.GetString("batteryslotrequireslock-component-alert-owner", ("user", Identity.Entity(args.User, EntityManager))), uid, uid, PopupType.Large); - } - -} diff --git a/Content.Server/_EE/Silicon/BlindHealing/BlindHealingComponent.cs b/Content.Server/_EE/Silicon/BlindHealing/BlindHealingComponent.cs deleted file mode 100644 index 1637ad6ec8c..00000000000 --- a/Content.Server/_EE/Silicon/BlindHealing/BlindHealingComponent.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace Content.Server._EE.Silicon.BlindHealing; - -[RegisterComponent] -public sealed partial class BlindHealingComponent : Component -{ - [DataField] - public int DoAfterDelay = 3; - - /// - /// A multiplier that will be applied to the above if an entity is repairing themselves. - /// - [DataField] - public float SelfHealPenalty = 4f; - - /// - /// Whether or not an entity is allowed to repair itself. - /// - [DataField] - public bool AllowSelfHeal = true; - - [DataField(required: true)] - public List DamageContainers; -} diff --git a/Content.Server/_EE/Silicon/BlindHealing/BlindHealingSystem.cs b/Content.Server/_EE/Silicon/BlindHealing/BlindHealingSystem.cs deleted file mode 100644 index f84a2e19eab..00000000000 --- a/Content.Server/_EE/Silicon/BlindHealing/BlindHealingSystem.cs +++ /dev/null @@ -1,102 +0,0 @@ -using Content.Server.Administration.Logs; -using Content.Server.Cargo.Components; -using Content.Server.Stack; -using Content.Shared._EE.Silicon.BlindHealing; -using Content.Shared.Damage; -using Content.Shared.Damage.Components; -using Content.Shared.Database; -using Content.Shared.DoAfter; -using Content.Shared.Eye.Blinding.Components; -using Content.Shared.Eye.Blinding.Systems; -using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; -using Content.Shared.Popups; -using Content.Shared.Stacks; - -namespace Content.Server._EE.Silicon.BlindHealing; - -public sealed class BlindHealingSystem : SharedBlindHealingSystem -{ - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly BlindableSystem _blindableSystem = default!; - [Dependency] private readonly StackSystem _stackSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - - public override void Initialize() - { - SubscribeLocalEvent(OnUse); - SubscribeLocalEvent(OnInteract); - SubscribeLocalEvent(OnHealingFinished); - } - - private void OnHealingFinished(EntityUid uid, BlindHealingComponent component, HealingDoAfterEvent args) - { - if (args.Cancelled || args.Target == null - || !TryComp(args.Target, out var blindComp) - || blindComp is { EyeDamage: 0 }) - return; - - if (TryComp(uid, out var stackComponent) - && TryComp(uid, out var stackPrice)) - { - var count = _stackSystem.GetCount((uid, stackComponent)); - _stackSystem.SetCount((uid, stackComponent), (int)(count - stackPrice.Price)); - } - - _blindableSystem.AdjustEyeDamage((args.Target.Value, blindComp), -blindComp.EyeDamage); - - _adminLogger.Add(LogType.Healed, $"{ToPrettyString(args.User):user} repaired {ToPrettyString(uid):target}'s vision"); - - var str = Loc.GetString("comp-repairable-repair", - ("target", uid), - ("tool", args.Used!)); - _popup.PopupEntity(str, uid, args.User); - - } - - private bool TryHealBlindness(EntityUid uid, EntityUid user, EntityUid target, float delay) - { - var doAfterEventArgs = - new DoAfterArgs(EntityManager, user, delay, new HealingDoAfterEvent(), uid, target: target, used: uid) - { - NeedHand = true, - BreakOnMove = true, - BreakOnWeightlessMove = false, - }; - - _doAfter.TryStartDoAfter(doAfterEventArgs); - return true; - } - - private void OnInteract(EntityUid uid, BlindHealingComponent component, ref AfterInteractEvent args) - { - - if (args.Handled - || !TryComp(args.User, out var damageable) - || damageable.DamageContainerID != null && !component.DamageContainers.Contains(damageable.DamageContainerID) - || !TryComp(args.User, out var blindcomp) - || blindcomp.EyeDamage == 0 - || args.User == args.Target && !component.AllowSelfHeal) - return; - - TryHealBlindness(uid, args.User, args.User, - args.User == args.Target - ? component.DoAfterDelay * component.SelfHealPenalty - : component.DoAfterDelay); - } - - private void OnUse(EntityUid uid, BlindHealingComponent component, ref UseInHandEvent args) - { - if (args.Handled - || !TryComp(args.User, out var damageable) - || damageable.DamageContainerID != null && !component.DamageContainers.Contains(damageable.DamageContainerID) - || !TryComp(args.User, out var blindcomp) - || blindcomp.EyeDamage == 0 - || !component.AllowSelfHeal) - return; - - TryHealBlindness(uid, args.User, args.User, - component.DoAfterDelay * component.SelfHealPenalty); - } -} \ No newline at end of file diff --git a/Content.Server/_EE/Silicon/Charge/Components/BatteryDrinkerSourceComponent.cs b/Content.Server/_EE/Silicon/Charge/Components/BatteryDrinkerSourceComponent.cs deleted file mode 100644 index e5fa6cda66f..00000000000 --- a/Content.Server/_EE/Silicon/Charge/Components/BatteryDrinkerSourceComponent.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Robust.Shared.Audio; - -namespace Content.Server._EE.Silicon.Charge; - -[RegisterComponent] -public sealed partial class BatteryDrinkerSourceComponent : Component -{ - /// - /// The max amount of power this source can provide in one sip. - /// No limit if null. - /// - [DataField] - public int? MaxAmount = null; - - /// - /// The multiplier for the drink speed. - /// - [DataField] - public float DrinkSpeedMulti = 1f; - - /// - /// The sound to play when the battery gets drunk from. - /// - [DataField] - public SoundSpecifier? DrinkSound = new SoundCollectionSpecifier("sparks"); -} \ No newline at end of file diff --git a/Content.Server/_EE/Silicon/DeadStartupButton/DeadStartupButtonSystem.cs b/Content.Server/_EE/Silicon/DeadStartupButton/DeadStartupButtonSystem.cs deleted file mode 100644 index 5c00451bbd2..00000000000 --- a/Content.Server/_EE/Silicon/DeadStartupButton/DeadStartupButtonSystem.cs +++ /dev/null @@ -1,88 +0,0 @@ -using Content.Server.Chat.Systems; -using Content.Server.Lightning; -using Content.Server.Popups; -using Content.Server._DV.Silicons.Charge; // DeltaV - Moved IPC charge to shared and split into server/client -using Content.Shared._EE.Silicon.DeadStartupButton; -using Content.Shared.Audio; -using Content.Shared.Damage; -using Content.Shared.Electrocution; -using Content.Shared.Mobs; -using Content.Shared.Mobs.Components; -using Content.Shared.Mobs.Systems; -using Robust.Shared.Audio; -using Robust.Shared.Audio.Systems; -using Robust.Shared.Random; -using Content.Shared.Damage.Components; -using Content.Shared.PowerCell; -using Content.Shared.Power.EntitySystems; - -namespace Content.Server._EE.Silicon.DeadStartupButton; - -public sealed class DeadStartupButtonSystem : SharedDeadStartupButtonSystem -{ - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly LightningSystem _lightning = default!; - [Dependency] private readonly SiliconDrainSystem _siliconChargeSystem = default!; // DeltaV - Renamed type from "Charge" to "Drain" to disambiguate - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - - /// - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnDoAfter); - SubscribeLocalEvent(OnElectrocuted); - SubscribeLocalEvent(OnMobStateChanged); - - } - - private void OnDoAfter(EntityUid uid, DeadStartupButtonComponent comp, OnDoAfterButtonPressedEvent args) - { - if (args.Handled || args.Cancelled - || !TryComp(uid, out var mobStateComponent) - || !_mobState.IsDead(uid, mobStateComponent) - || !TryComp(uid, out var mobThresholdsComponent) - || !TryComp(uid, out var damageable) - || !_mobThreshold.TryGetThresholdForState(uid, MobState.Critical, out var criticalThreshold, mobThresholdsComponent)) - return; - - if (damageable.TotalDamage < criticalThreshold) - _mobState.ChangeMobState(uid, MobState.Alive, mobStateComponent); - else - { - _audio.PlayPvs(comp.BuzzSound, uid, AudioParams.Default.WithVariation(0.05f)); - _popup.PopupEntity(Loc.GetString("dead-startup-system-reboot-failed", ("target", MetaData(uid).EntityName)), uid); - Spawn("EffectSparks", Transform(uid).Coordinates); - } - } - - private void OnElectrocuted(EntityUid uid, DeadStartupButtonComponent comp, ElectrocutedEvent args) - { - if (!TryComp(uid, out var mobStateComponent) - || !_mobState.IsDead(uid, mobStateComponent) - || !_siliconChargeSystem.TryGetSiliconBattery(uid, out var bateria)) - return; - - var charge = _battery.GetCharge(bateria.Value.AsNullable()); - if (charge <= 0) - return; - - _lightning.ShootRandomLightnings(uid, 2, 4); - _powerCell.TryUseCharge(uid, charge); - - } - - private void OnMobStateChanged(EntityUid uid, DeadStartupButtonComponent comp, MobStateChangedEvent args) - { - if (args.NewMobState != MobState.Alive) - return; - - _popup.PopupEntity(Loc.GetString("dead-startup-system-reboot-success", ("target", MetaData(uid).EntityName)), uid); - _audio.PlayPvs(comp.Sound, uid); - } - -} diff --git a/Content.Server/_EE/Silicon/Death/Components/SiliconDownOnDeadComponent.cs b/Content.Server/_EE/Silicon/Death/Components/SiliconDownOnDeadComponent.cs deleted file mode 100644 index c635fe05dda..00000000000 --- a/Content.Server/_EE/Silicon/Death/Components/SiliconDownOnDeadComponent.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Content.Server._EE.Silicon.Death; - -/// -/// Marks a Silicon as becoming incapacitated when they run out of battery charge. -/// -/// -/// Uses the Silicon System's charge states to do so, so make sure they're a battery powered Silicon. -/// -[RegisterComponent] -public sealed partial class SiliconDownOnDeadComponent : Component -{ - /// - /// Is this Silicon currently dead? - /// - [ViewVariables(VVAccess.ReadOnly)] - public bool Dead; -} \ No newline at end of file diff --git a/Content.Server/_EE/Silicon/Death/Systems/SiliconChargeDeathSystem.cs b/Content.Server/_EE/Silicon/Death/Systems/SiliconChargeDeathSystem.cs deleted file mode 100644 index 92cfcc8fd0d..00000000000 --- a/Content.Server/_EE/Silicon/Death/Systems/SiliconChargeDeathSystem.cs +++ /dev/null @@ -1,126 +0,0 @@ -using Content.Shared.Power.Components; -using Content.Shared._EE.Silicon.Systems; -using Content.Shared.Bed.Sleep; -using Content.Server._DV.Silicons.Charge; // DeltaV - Moved IPC charge to shared and split into server/client -using Content.Server.Humanoid; -using Content.Shared.Humanoid; - -namespace Content.Server._EE.Silicon.Death; - -public sealed class SiliconDeathSystem : EntitySystem -{ - [Dependency] private readonly SleepingSystem _sleep = default!; - [Dependency] private readonly SiliconDrainSystem _silicon = default!; // DeltaV - Renamed type from "Charge" to "Drain" to disambiguate - [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearanceSystem = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnSiliconChargeStateUpdate); - } - - private void OnSiliconChargeStateUpdate(EntityUid uid, SiliconDownOnDeadComponent siliconDeadComp, SiliconChargeStateUpdateEvent args) - { - if (!_silicon.TryGetSiliconBattery(uid, out var batteryComp)) - { - SiliconDead(uid, siliconDeadComp, batteryComp, uid); - return; - } - - if (args.ChargePercent == 0 && siliconDeadComp.Dead) - return; - - if (args.ChargePercent == 0 && !siliconDeadComp.Dead) - SiliconDead(uid, siliconDeadComp, batteryComp, uid); - else if (args.ChargePercent != 0 && siliconDeadComp.Dead) - SiliconUnDead(uid, siliconDeadComp, batteryComp, uid); - } - - private void SiliconDead(EntityUid uid, SiliconDownOnDeadComponent siliconDeadComp, BatteryComponent? batteryComp, EntityUid batteryUid) - { - var deadEvent = new SiliconChargeDyingEvent(uid, batteryComp, batteryUid); - RaiseLocalEvent(uid, deadEvent); - - if (deadEvent.Cancelled) - return; - - EntityManager.EnsureComponent(uid); - EntityManager.EnsureComponent(uid); - - if (TryComp(uid, out HumanoidAppearanceComponent? humanoidAppearanceComponent)) - { - var layers = HumanoidVisualLayersExtension.Sublayers(HumanoidVisualLayers.HeadSide); - _humanoidAppearanceSystem.SetLayersVisibility((uid, humanoidAppearanceComponent), layers, visible: false); - } - - siliconDeadComp.Dead = true; - - RaiseLocalEvent(uid, new SiliconChargeDeathEvent(uid, batteryComp, batteryUid)); - } - - private void SiliconUnDead(EntityUid uid, SiliconDownOnDeadComponent siliconDeadComp, BatteryComponent? batteryComp, EntityUid batteryUid) - { - RemComp(uid); - _sleep.TryWaking(uid, true, null); - - siliconDeadComp.Dead = false; - - RaiseLocalEvent(uid, new SiliconChargeAliveEvent(uid, batteryComp, batteryUid)); - } -} - -/// -/// A cancellable event raised when a Silicon is about to go down due to charge. -/// -/// -/// This probably shouldn't be modified unless you intend to fill the Silicon's battery, -/// as otherwise it'll just be triggered again next frame. -/// -public sealed class SiliconChargeDyingEvent : CancellableEntityEventArgs -{ - public EntityUid SiliconUid { get; } - public BatteryComponent? BatteryComp { get; } - public EntityUid BatteryUid { get; } - - public SiliconChargeDyingEvent(EntityUid siliconUid, BatteryComponent? batteryComp, EntityUid batteryUid) - { - SiliconUid = siliconUid; - BatteryComp = batteryComp; - BatteryUid = batteryUid; - } -} - -/// -/// An event raised after a Silicon has gone down due to charge. -/// -public sealed class SiliconChargeDeathEvent : EntityEventArgs -{ - public EntityUid SiliconUid { get; } - public BatteryComponent? BatteryComp { get; } - public EntityUid BatteryUid { get; } - - public SiliconChargeDeathEvent(EntityUid siliconUid, BatteryComponent? batteryComp, EntityUid batteryUid) - { - SiliconUid = siliconUid; - BatteryComp = batteryComp; - BatteryUid = batteryUid; - } -} - -/// -/// An event raised after a Silicon has reawoken due to an increase in charge. -/// -public sealed class SiliconChargeAliveEvent : EntityEventArgs -{ - public EntityUid SiliconUid { get; } - public BatteryComponent? BatteryComp { get; } - public EntityUid BatteryUid { get; } - - public SiliconChargeAliveEvent(EntityUid siliconUid, BatteryComponent? batteryComp, EntityUid batteryUid) - { - SiliconUid = siliconUid; - BatteryComp = batteryComp; - BatteryUid = batteryUid; - } -} diff --git a/Content.Server/_EE/Silicon/EmitBuzzOnCrit/EmitBuzzWhileDamagedSystem.cs b/Content.Server/_EE/Silicon/EmitBuzzOnCrit/EmitBuzzWhileDamagedSystem.cs deleted file mode 100644 index f5274ef343e..00000000000 --- a/Content.Server/_EE/Silicon/EmitBuzzOnCrit/EmitBuzzWhileDamagedSystem.cs +++ /dev/null @@ -1,59 +0,0 @@ -using Content.Server.Popups; -using Content.Shared._EE.Silicon.EmitBuzzWhileDamaged; -using Content.Shared.Audio; -using Content.Shared.Damage; -using Content.Shared.Mobs; -using Content.Shared.Mobs.Systems; -using Robust.Shared.Audio.Systems; -using Robust.Shared.Random; -using Robust.Shared.Timing; -using Content.Shared.Mobs.Components; -using Content.Shared.Damage.Components; - -namespace Content.Server._EE.Silicon.EmitBuzzOnCrit; - -/// -/// This handles the buzzing popup and sound of a silicon based race when it is pretty damaged. -/// -public sealed class EmitBuzzWhileDamagedSystem : EntitySystem -{ - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - - public override void Update(float frameTime) - { - base.Update(frameTime); - - var query = EntityQueryEnumerator(); - - while (query.MoveNext(out var uid, out var emitBuzzOnCritComponent, out var mobStateComponent, out var thresholdsComponent, out var damageableComponent)) - { - - if (_mobState.IsDead(uid, mobStateComponent) - || !_mobThreshold.TryGetThresholdForState(uid, MobState.Critical, out var threshold, thresholdsComponent) - || damageableComponent.TotalDamage < threshold / 2) - continue; - - emitBuzzOnCritComponent.AccumulatedFrametime += frameTime; - - if (emitBuzzOnCritComponent.AccumulatedFrametime < emitBuzzOnCritComponent.CycleDelay) - continue; - - emitBuzzOnCritComponent.AccumulatedFrametime -= emitBuzzOnCritComponent.CycleDelay; - - if (_gameTiming.CurTime <= emitBuzzOnCritComponent.LastBuzzPopupTime + emitBuzzOnCritComponent.BuzzPopupCooldown) - continue; - - // Start buzzing - emitBuzzOnCritComponent.LastBuzzPopupTime = _gameTiming.CurTime; - _popupSystem.PopupEntity(Loc.GetString("silicon-behavior-buzz"), uid); - Spawn("EffectSparks", Transform(uid).Coordinates); - _audio.PlayPvs(emitBuzzOnCritComponent.Sound, uid, AudioHelpers.WithVariation(0.05f, _robustRandom)); - } - } - -} \ No newline at end of file diff --git a/Content.Server/_EE/Silicon/EncryptionHolderRequiresLock/EncryptionHolderRequiresLockComponent.cs b/Content.Server/_EE/Silicon/EncryptionHolderRequiresLock/EncryptionHolderRequiresLockComponent.cs deleted file mode 100644 index a018ff81855..00000000000 --- a/Content.Server/_EE/Silicon/EncryptionHolderRequiresLock/EncryptionHolderRequiresLockComponent.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Content.Server._EE.Silicon.EncryptionHolderRequiresLock; - -[RegisterComponent] -public sealed partial class EncryptionHolderRequiresLockComponent : Component -{ -} \ No newline at end of file diff --git a/Content.Server/_EE/Silicon/EncryptionHolderRequiresLock/EncryptionHolderRequiresLockSystem.cs b/Content.Server/_EE/Silicon/EncryptionHolderRequiresLock/EncryptionHolderRequiresLockSystem.cs deleted file mode 100644 index 516fd49663d..00000000000 --- a/Content.Server/_EE/Silicon/EncryptionHolderRequiresLock/EncryptionHolderRequiresLockSystem.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Content.Shared.Lock; -using Content.Shared.Radio.Components; -using Content.Shared.Radio.EntitySystems; - -namespace Content.Server._EE.Silicon.EncryptionHolderRequiresLock; - -public sealed class EncryptionHolderRequiresLockSystem : EntitySystem - -{ - [Dependency] private readonly EncryptionKeySystem _encryptionKeySystem = default!; - - /// - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(LockToggled); - - } - private void LockToggled(EntityUid uid, EncryptionHolderRequiresLockComponent component, LockToggledEvent args) - { - if (!TryComp(uid, out var lockComp) - || !TryComp(uid, out var keyHolder)) - return; - - keyHolder.KeysUnlocked = !lockComp.Locked; - Dirty(uid, keyHolder); // DeltaV - _encryptionKeySystem.UpdateChannels(uid, keyHolder); - } -} diff --git a/Content.Server/_EE/Silicon/SiliconEmitSoundOnDrainedComponent.cs b/Content.Server/_EE/Silicon/SiliconEmitSoundOnDrainedComponent.cs deleted file mode 100644 index 0eba69bf54e..00000000000 --- a/Content.Server/_EE/Silicon/SiliconEmitSoundOnDrainedComponent.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Robust.Shared.Audio; - -namespace Content.Server._EE.Silicon; - -/// -/// Applies a to a Silicon when its battery is drained, and removes it when it's not. -/// -[RegisterComponent] -public sealed partial class SiliconEmitSoundOnDrainedComponent : Component -{ - [DataField] - public SoundSpecifier Sound = default!; - - [DataField] - public TimeSpan MinInterval = TimeSpan.FromSeconds(8); - - [DataField] - public TimeSpan MaxInterval = TimeSpan.FromSeconds(15); - - [DataField] - public float PlayChance = 1f; - - [DataField] - public string? PopUp; -} \ No newline at end of file diff --git a/Content.Server/_EE/Silicon/SiliconEmitSoundOnDrainedSystem.cs b/Content.Server/_EE/Silicon/SiliconEmitSoundOnDrainedSystem.cs deleted file mode 100644 index 0829636ac7b..00000000000 --- a/Content.Server/_EE/Silicon/SiliconEmitSoundOnDrainedSystem.cs +++ /dev/null @@ -1,43 +0,0 @@ -using Content.Server._EE.Silicon.Death; -using Content.Shared.Sound.Components; -using Content.Server.Sound; -using Content.Shared.Mobs; -using Content.Shared._EE.Silicon.Systems; - -namespace Content.Server._EE.Silicon; - -public sealed class EmitSoundOnCritSystem : EntitySystem -{ - [Dependency] private readonly EmitSoundSystem _emitSound = default!; - public override void Initialize() - { - SubscribeLocalEvent(OnDeath); - SubscribeLocalEvent(OnAlive); - SubscribeLocalEvent(OnStateChange); - } - - private void OnDeath(EntityUid uid, SiliconEmitSoundOnDrainedComponent component, SiliconChargeDeathEvent args) - { - var spamComp = EnsureComp(uid); - - spamComp.MinInterval = component.MinInterval; - spamComp.MaxInterval = component.MaxInterval; - spamComp.PopUp = component.PopUp; - spamComp.Sound = component.Sound; - _emitSound.SetEnabled((uid, spamComp), true); - } - - private void OnAlive(EntityUid uid, SiliconEmitSoundOnDrainedComponent component, SiliconChargeAliveEvent args) - { - RemComp(uid); // This component is bad and I don't feel like making a janky work around because of it. - // If you give something the SiliconEmitSoundOnDrainedComponent, know that it can't have the SpamEmitSoundComponent, and any other systems that play with it will just be broken. - } - - public void OnStateChange(EntityUid uid, SiliconEmitSoundOnDrainedComponent component, MobStateChangedEvent args) - { - if (args.NewMobState != MobState.Dead) - return; - - RemComp(uid); - } -} \ No newline at end of file diff --git a/Content.Server/_EE/Silicon/WeldingHealable/WeldingHealableComponent.cs b/Content.Server/_EE/Silicon/WeldingHealable/WeldingHealableComponent.cs deleted file mode 100644 index 45935ef88ac..00000000000 --- a/Content.Server/_EE/Silicon/WeldingHealable/WeldingHealableComponent.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Content.Shared.Damage; -using Content.Shared.Tools; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server._EE.Silicon.WeldingHealable -{ - [RegisterComponent] - public sealed partial class WeldingHealableComponent : Component - { - /// - /// DeltaV: Disables self-healing with any type of WeldingHealing item. - /// - [DataField] - public bool AllowSelfHeal = true; - } -} diff --git a/Content.Server/_EE/Silicon/WeldingHealable/WeldingHealableSystem.cs b/Content.Server/_EE/Silicon/WeldingHealable/WeldingHealableSystem.cs deleted file mode 100644 index 41e73f1dd38..00000000000 --- a/Content.Server/_EE/Silicon/WeldingHealable/WeldingHealableSystem.cs +++ /dev/null @@ -1,125 +0,0 @@ -using Content.Server._EE.Silicon.WeldingHealing; -using Content.Server.Body.Systems; // DeltaV -using Content.Shared.Tools.Components; -using Content.Shared._EE.Silicon.WeldingHealing; -using Content.Shared.Chemistry.Components.SolutionManager; -using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.Damage.Components; -using Content.Shared.Damage.Systems; -using Content.Shared.Interaction; -using Content.Shared.Popups; -using Content.Shared.Tools; -using Content.Shared._Shitmed.Targeting; -using Content.Shared.Body.Systems; -using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem; - -namespace Content.Server._EE.Silicon.WeldingHealable; - -public sealed class WeldingHealableSystem : SharedWeldingHealableSystem -{ - [Dependency] private readonly SharedToolSystem _toolSystem = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly BloodstreamSystem _bloodstream = default!; // DeltaV - - [Dependency] private readonly SharedBodySystem _bodySystem = default!; - public override void Initialize() - { - SubscribeLocalEvent(Repair); - SubscribeLocalEvent(OnRepairFinished); - } - - private void OnRepairFinished(EntityUid uid, WeldingHealableComponent healableComponent, SiliconRepairFinishedEvent args) - { - if (args.Cancelled || args.Used == null - || !TryComp(args.Target, out var damageable) - || !TryComp(args.Used, out var component) - || damageable.DamageContainerID is null - || !component.DamageContainers.Contains(damageable.DamageContainerID) - || !HasDamage((args.Target.Value, damageable), component, args.User) - || !TryComp(args.Used, out var welder) - || !TryComp(args.Used, out var solutionContainer) - || !_solutionContainer.TryGetSolution(((EntityUid) args.Used, solutionContainer), welder.FuelSolutionName, out var solution)) - return; - - _damageableSystem.TryChangeDamage(uid, component.Damage, true, false, origin: args.User); - - _solutionContainer.RemoveReagent(solution.Value, welder.FuelReagent, component.FuelCost); - - // Begin DeltaV Additions - stop bleeding on weld - if (component.bleedingModifier != 0) - { - _bloodstream.TryModifyBleedAmount(uid, component.bleedingModifier); - } - // End DeltaV Additions - - var str = Loc.GetString("comp-repairable-repair", - ("target", uid), - ("tool", args.Used!)); - _popup.PopupEntity(str, uid, args.User); - - if (!args.Used.HasValue) - return; - - args.Handled = _toolSystem.UseTool - (args.Used.Value, - args.User, - uid, - args.Delay, - component.QualityNeeded, - new SiliconRepairFinishedEvent - { - Delay = args.Delay - }); - } - private async void Repair(EntityUid uid, WeldingHealableComponent healableComponent, InteractUsingEvent args) - { - if (args.Handled - || !EntityManager.TryGetComponent(args.Used, out WeldingHealingComponent? component) - || !EntityManager.TryGetComponent(args.Target, out DamageableComponent? damageable) - || damageable.DamageContainerID is null - || !component.DamageContainers.Contains(damageable.DamageContainerID) - || !HasDamage((args.Target, damageable), component, args.User) - || !_toolSystem.HasQuality(args.Used, component.QualityNeeded) - || args.User == args.Target && !(component.AllowSelfHeal && healableComponent.AllowSelfHeal)) // DeltaV - self heal disabled by WeldingHealable - return; - - float delay = args.User == args.Target - ? component.DoAfterDelay * component.SelfHealPenalty - : component.DoAfterDelay; - - args.Handled = _toolSystem.UseTool - (args.Used, - args.User, - args.Target, - delay, - component.QualityNeeded, - new SiliconRepairFinishedEvent - { - Delay = delay, - }); - } - - private bool HasDamage(Entity damageable, WeldingHealingComponent healable, EntityUid user) - { - if (healable.Damage.DamageDict is null) - return false; - - foreach (var type in healable.Damage.DamageDict) - if (damageable.Comp.Damage.DamageDict[type.Key].Value > 0) - return true; - - // In case the healer is a humanoid entity with targeting, we run the check on the targeted parts. - if (!TryComp(user, out TargetingComponent? targeting)) - return false; - var (targetType, targetSymmetry) = _bodySystem.ConvertTargetBodyPart(targeting.Target); - foreach (var part in _bodySystem.GetBodyChildrenOfType(damageable, targetType, symmetry: targetSymmetry)) - if (TryComp(part.Id, out var damageablePart)) - foreach (var type in healable.Damage.DamageDict) - if (damageablePart.Damage.DamageDict[type.Key].Value > 0) - return true; - - return false; - } -} diff --git a/Content.Server/_EE/Silicon/WeldingHealable/WeldingHealingComponent.cs b/Content.Server/_EE/Silicon/WeldingHealable/WeldingHealingComponent.cs deleted file mode 100644 index d3e7c92c631..00000000000 --- a/Content.Server/_EE/Silicon/WeldingHealable/WeldingHealingComponent.cs +++ /dev/null @@ -1,55 +0,0 @@ -using Content.Shared.Damage; -using Content.Shared.Tools; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server._EE.Silicon.WeldingHealing -{ - [RegisterComponent] - public sealed partial class WeldingHealingComponent : Component - { - /// - /// All the damage to change information is stored in this . - /// - /// - /// If this data-field is specified, it will change damage by this amount instead of setting all damage to 0. - /// in order to heal/repair the damage values have to be negative. - /// - - [DataField(required: true)] - public DamageSpecifier Damage; - - /// - /// DeltaV: Modifies bleeding stacks by this after welding. - /// This should generally be negative. - /// - [DataField] - public float bleedingModifier = 0.0f; - - [DataField(customTypeSerializer:typeof(PrototypeIdSerializer))] - public string QualityNeeded = "Welding"; - - /// - /// The fuel amount needed to repair physical related damage - /// - [DataField] - public int FuelCost = 15; - - [DataField] - public int DoAfterDelay = 3; - - /// - /// A multiplier that will be applied to the above if an entity is repairing themselves. - /// - [DataField] - public float SelfHealPenalty = 4f; - - /// - /// Whether or not an entity is allowed to repair itself. - /// - [DataField] - public bool AllowSelfHeal = true; - - [DataField(required: true)] - public List DamageContainers; - } -} diff --git a/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs b/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs index 305d5ff8649..1f294956192 100644 --- a/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs +++ b/Content.Server/_Goobstation/Devil/Contract/DevilContractSystem.cs @@ -34,7 +34,6 @@ using Robust.Shared.Audio.Systems; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Utility; -using Content.Shared._EE.Silicon.Components; using Content.Shared.StatusEffectNew; // DeltaV - Clause status effects namespace Content.Server._Goobstation.Devil.Contract; @@ -238,7 +237,6 @@ public sealed partial class DevilContractSystem : EntitySystem public bool IsUserValid(EntityUid user, out string failReason) { if (HasComp(user) - || HasComp(user) || HasComp(user)) { failReason = Loc.GetString("devil-contract-no-soul-sign-failed"); diff --git a/Content.Server/_Goobstation/Devil/DevilSystem.cs b/Content.Server/_Goobstation/Devil/DevilSystem.cs index 7b2ba9ec93c..35756458262 100644 --- a/Content.Server/_Goobstation/Devil/DevilSystem.cs +++ b/Content.Server/_Goobstation/Devil/DevilSystem.cs @@ -54,7 +54,6 @@ using Robust.Shared.Random; using Robust.Shared.Timing; using Content.Shared.Body.Part; using Content.Server.Bible.Components; -using Content.Shared._EE.Silicon.Components; namespace Content.Server._Goobstation.Devil; @@ -215,7 +214,6 @@ public sealed partial class DevilSystem : EntitySystem // Other Devils and entities without souls have no authority over you. if (HasComp(args.Source) || HasComp(args.Source) - || HasComp(args.Source) || args.Source == devil.Owner) return; diff --git a/Content.Server/_Goobstation/Temperature/KillOnOverheatComponent.cs b/Content.Server/_Goobstation/Temperature/KillOnOverheatComponent.cs deleted file mode 100644 index fc4e6155395..00000000000 --- a/Content.Server/_Goobstation/Temperature/KillOnOverheatComponent.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Content.Shared.Atmos; - -namespace Content.Server._Goobstation.Temperature; - -/// -/// Kills an entity when its temperature goes over a threshold. -/// -[RegisterComponent, Access(typeof(KillOnOverheatSystem))] -public sealed partial class KillOnOverheatComponent : Component -{ - [DataField] - public float OverheatThreshold = Atmospherics.T0C + 110f; - - [DataField] - public LocId OverheatPopup = "ipc-overheat-popup"; -} diff --git a/Content.Server/_Goobstation/Temperature/KillOnOverheatSystem.cs b/Content.Server/_Goobstation/Temperature/KillOnOverheatSystem.cs deleted file mode 100644 index 06dc4b3ac8a..00000000000 --- a/Content.Server/_Goobstation/Temperature/KillOnOverheatSystem.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Content.Shared.Temperature.Components; -using Content.Shared.IdentityManagement; -using Content.Shared.Mobs; -using Content.Shared.Mobs.Components; -using Content.Shared.Mobs.Systems; -using Content.Shared.Popups; - -namespace Content.Server._Goobstation.Temperature; - -public sealed class KillOnOverheatSystem : EntitySystem -{ - [Dependency] private readonly MobStateSystem _mob = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - - public override void Update(float frameTime) - { - base.Update(frameTime); - - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var uid, out var comp, out var temp, out var mob)) - { - if (mob.CurrentState == MobState.Dead || temp.CurrentTemperature < comp.OverheatThreshold) - continue; - - var msg = Loc.GetString(comp.OverheatPopup, ("name", Identity.Name(uid, EntityManager))); - _popup.PopupEntity(msg, uid, PopupType.LargeCaution); - _mob.ChangeMobState(uid, MobState.Dead, mob); - } - } -} diff --git a/Content.Shared/Bed/BedSystem.cs b/Content.Shared/Bed/BedSystem.cs index c1b149c218b..229c3a9bed6 100644 --- a/Content.Shared/Bed/BedSystem.cs +++ b/Content.Shared/Bed/BedSystem.cs @@ -1,4 +1,3 @@ -using Content.Shared._EE.Silicon.Components; // Goobstation using Content.Shared.Actions; using Content.Shared.Bed.Components; using Content.Shared.Bed.Sleep; @@ -151,8 +150,7 @@ public sealed class BedSystem : EntitySystem foreach (var healedEntity in strapComponent.BuckledEntities) { - if (_mobStateSystem.IsDead(healedEntity) - || HasComp(healedEntity)) // Goobstation) + if (_mobStateSystem.IsDead(healedEntity)) continue; var damage = bedComponent.Damage; diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs index 9179ebdfb70..481d4bbd47e 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs @@ -187,7 +187,7 @@ public partial class SharedBodySystem cameFromEntities[connection] = childPart; var childPartComponent = Comp(childPart); - TryCreatePartSlot(parentEntity, connection, childPartComponent.PartType, out var partSlot, parentPartComponent); + var partSlot = CreatePartSlot(parentEntity, connection, childPartComponent.PartType, parentPartComponent); // Shitmed Change Start childPartComponent.ParentSlot = partSlot; Dirty(childPart, childPartComponent); @@ -214,7 +214,7 @@ public partial class SharedBodySystem { foreach (var (organSlotId, organProto) in organs) { - TryCreateOrganSlot(ent, organSlotId, out var slot); // Shitmed Change + var slot = CreateOrganSlot((ent, ent), organSlotId); SpawnInContainerOrDrop(organProto, ent, GetOrganContainerId(organSlotId)); if (slot is null) diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs index ee31c4b10ad..a57146cb054 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs @@ -115,13 +115,7 @@ public partial class SharedBodySystem Containers.EnsureContainer(parent.Value, GetOrganContainerId(slotId)); slot = new OrganSlot(slotId); - // Shitmed Change Start - if (!part.Organs.ContainsKey(slotId) - && !part.Organs.TryAdd(slotId, slot.Value)) - return false; - - return true; - // Shitmed Change End + return part.Organs.TryAdd(slotId, slot.Value); } /// diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs index 4486691027e..ee49399e882 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs @@ -530,8 +530,7 @@ public partial class SharedBodySystem Containers.EnsureContainer(partId.Value, GetPartSlotContainerId(slotId)); slot = new BodyPartSlot(slotId, partType); - if (!part.Children.ContainsKey(slotId) // Shitmed Change - && !part.Children.TryAdd(slotId, slot.Value)) + if (!part.Children.TryAdd(slotId, slot.Value)) return false; Dirty(partId.Value, part); diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 1d3df94d729..87b2da129aa 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -37,11 +37,4 @@ public sealed partial class CCVars : CVars /// public static readonly CVarDef DebugPow3rDisableParallel = CVarDef.Create("debug.pow3r_disable_parallel", false, CVar.SERVERONLY); - - /// - /// Goobstation: The amount of time between NPC Silicons draining their battery in seconds. - /// TODO: Move this to the proper file. I dunno which, just not the main one. - /// - public static readonly CVarDef SiliconNpcUpdateTime = - CVarDef.Create("silicon.npcupdatetime", 1.5f, CVar.SERVER | CVar.REPLICATED); // DeltaV - Move IPC charge to shared } diff --git a/Content.Shared/Electrocution/ElectrocutionEvents.cs b/Content.Shared/Electrocution/ElectrocutionEvents.cs index 3492ce535cb..fe5753c7fb3 100644 --- a/Content.Shared/Electrocution/ElectrocutionEvents.cs +++ b/Content.Shared/Electrocution/ElectrocutionEvents.cs @@ -24,14 +24,12 @@ namespace Content.Shared.Electrocution public readonly EntityUid TargetUid; public readonly EntityUid? SourceUid; public readonly float SiemensCoefficient; - public readonly float? ShockDamage = null; // Goobstation - public ElectrocutedEvent(EntityUid targetUid, EntityUid? sourceUid, float siemensCoefficient, float shockDamage) // Goobstation + public ElectrocutedEvent(EntityUid targetUid, EntityUid? sourceUid, float siemensCoefficient) { TargetUid = targetUid; SourceUid = sourceUid; SiemensCoefficient = siemensCoefficient; - ShockDamage = shockDamage; // Goobstation } } } diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs index 9fa670e8547..91ff8a20050 100644 --- a/Content.Shared/Humanoid/NamingSystem.cs +++ b/Content.Shared/Humanoid/NamingSystem.cs @@ -43,9 +43,6 @@ namespace Content.Shared.Humanoid case SpeciesNaming.FirstDashFirst: return Loc.GetString("namepreset-firstdashfirst", ("first1", GetFirstName(speciesProto, gender)), ("first2", GetFirstName(speciesProto, gender))); - case SpeciesNaming.FirstDashLast: // Goobstation - return Loc.GetString("namepreset-firstdashlast", - ("first", GetFirstName(speciesProto, gender)), ("last", GetLastName(speciesProto))); case SpeciesNaming.LastFirst: // DeltaV: Rodentia name scheme return Loc.GetString("namepreset-lastfirst", ("last", GetLastName(speciesProto)), ("first", GetFirstName(speciesProto, gender))); diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs index da4eac0010f..63714431f44 100644 --- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs +++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs @@ -180,5 +180,4 @@ public enum SpeciesNaming : byte //End of Nyano - Summary: for Oni naming TheFirstofLast, LastFirst, // DeltaV - FirstDashLast, // Goobstation } diff --git a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs index 073afd33428..5e6b6a8c54f 100644 --- a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs +++ b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs @@ -22,16 +22,6 @@ using Robust.Shared.Network; using Robust.Shared.Serialization; using Robust.Shared.Timing; -// Goobstation Change -using Content.Shared.CCVar; -using Content.Shared._Goobstation.CCVar; -using Content.Shared.Weapons.Ranged.Events; -using Content.Shared.Hands.Components; -using Content.Shared.Hands.EntitySystems; -using Content.Shared.Inventory.VirtualItem; -using Robust.Shared.Configuration; -using Content.Shared.Implants.Components; - namespace Content.Shared.Mech.EntitySystems; /// @@ -50,12 +40,6 @@ public abstract partial class SharedMechSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; // Goobstation Change - [Dependency] private readonly SharedVirtualItemSystem _virtualItem = default!; // Goobstation Change - [Dependency] private readonly IConfigurationManager _config = default!; // Goobstation Change - - // Goobstation: Local variable for checking if mech guns can be used out of them. - private bool _canUseMechGunOutside; /// public override void Initialize() @@ -74,8 +58,6 @@ public abstract partial class SharedMechSystem : EntitySystem SubscribeLocalEvent(OnCanAttackFromContainer); SubscribeLocalEvent(OnAttackAttempt); SubscribeLocalEvent(OnEntGotRemovedFromContainer); - SubscribeLocalEvent(OnShotAttempted); // Goobstation - Subs.CVar(_config, GoobCVars.MechGunOutsideMech, value => _canUseMechGunOutside = value, true); // Goobstation InitializeRelay(); } @@ -410,10 +392,10 @@ public abstract partial class SharedMechSystem : EntitySystem SetupUser(uid, toInsert.Value); _container.Insert(toInsert.Value, component.PilotSlot); UpdateAppearance(uid, component); - UpdateHands(toInsert.Value, uid, true); // Goobstation return true; } + /// /// Attempts to eject the current pilot from the mech /// @@ -435,49 +417,9 @@ public abstract partial class SharedMechSystem : EntitySystem RemoveUser(uid, pilot.Value); _container.RemoveEntity(uid, pilot.Value); UpdateAppearance(uid, component); - UpdateHands(pilot.Value, uid, false); // Goobstation return true; } - // Goobstation Change Start - private void UpdateHands(EntityUid uid, EntityUid mech, bool active) - { - if (!TryComp(uid, out var handsComponent)) - return; - if (active) - BlockHands(uid, mech, handsComponent); - else - FreeHands(uid, mech); - } - private void BlockHands(EntityUid uid, EntityUid mech, HandsComponent handsComponent) - { - var freeHands = 0; - foreach (var hand in _hands.EnumerateHands((uid, handsComponent))) - { - var heldEnt = _hands.GetHeldItem((uid, handsComponent), hand); // DV - hand refactor fixes - if (heldEnt == null) - { - freeHands++; - continue; - } - // Is this entity removable? (they might have handcuffs on) - if (HasComp(heldEnt) && heldEnt != mech) - continue; - _hands.DoDrop((uid, handsComponent), hand, true); // DV - hand refactor fixes - freeHands++; - if (freeHands == 2) - break; - } - if (_virtualItem.TrySpawnVirtualItemInHand(mech, uid, out var virtItem1)) - EnsureComp(virtItem1.Value); - if (_virtualItem.TrySpawnVirtualItemInHand(mech, uid, out var virtItem2)) - EnsureComp(virtItem2.Value); - } - private void FreeHands(EntityUid uid, EntityUid mech) - { - _virtualItem.DeleteInHandsMatching(uid, mech); - } - // Goobstation Change End private void OnGetMeleeWeapon(EntityUid uid, MechPilotComponent component, GetMeleeWeaponEvent args) { if (args.Handled) @@ -502,20 +444,6 @@ public abstract partial class SharedMechSystem : EntitySystem args.Cancel(); } - // Goobstation: Prevent guns being used out of mechs if CCVAR is set. - private void OnShotAttempted(EntityUid uid, MechEquipmentComponent component, ref ShotAttemptedEvent args) - { - if (!component.EquipmentOwner.HasValue - || !HasComp(component.EquipmentOwner.Value)) - { - if (!_canUseMechGunOutside) - args.Cancel(); - return; - } - var ev = new HandleMechEquipmentBatteryEvent(); - RaiseLocalEvent(uid, ev); - } - private void UpdateAppearance(EntityUid uid, MechComponent? component = null, AppearanceComponent? appearance = null) { @@ -575,12 +503,3 @@ public sealed partial class MechExitEvent : SimpleDoAfterEvent public sealed partial class MechEntryEvent : SimpleDoAfterEvent { } - - -/// -/// Event raised when an user attempts to fire a mech weapon to check if its battery is drained -/// -[Serializable, NetSerializable] -public sealed partial class HandleMechEquipmentBatteryEvent : EntityEventArgs -{ -} diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs index e9ef9eba88e..f2d0d77177f 100644 --- a/Content.Shared/Mind/SharedMindSystem.cs +++ b/Content.Shared/Mind/SharedMindSystem.cs @@ -1,7 +1,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared._DV.Mind; // DeltaV -using Content.Shared._EE.Silicon.Components; // Goobstation using Content.Shared.Administration.Logs; using Content.Shared.Database; using Content.Shared.Emoting; @@ -612,7 +611,7 @@ public abstract partial class SharedMindSystem : EntitySystem /// Returns a list of every living humanoid player's minds, except for a single one which is exluded. /// A new hashset is allocated for every call, consider using instead. /// - public HashSet> GetAliveHumans(EntityUid? exclude = null, bool excludeSilicon = false) // Goobstation - Add excludeSilicon + public HashSet> GetAliveHumans(EntityUid? exclude = null) { var allHumans = new HashSet>(); AddAliveHumans(allHumans, exclude); @@ -633,11 +632,6 @@ public abstract partial class SharedMindSystem : EntitySystem if (!TryGetMind(uid, out var mind, out var mindComp) || mind == exclude || !_mobState.IsAlive(uid, mobState)) continue; - // Goobstation: Skip IPCs from selections - if (excludeSilicon && HasComp(uid)) - continue; - // END Goobstation - allHumans.Add((mind, mindComp)); } } diff --git a/Content.Shared/Radio/Components/EncryptionKeyHolderComponent.cs b/Content.Shared/Radio/Components/EncryptionKeyHolderComponent.cs index 7aae664ef15..5067fe8c0c0 100644 --- a/Content.Shared/Radio/Components/EncryptionKeyHolderComponent.cs +++ b/Content.Shared/Radio/Components/EncryptionKeyHolderComponent.cs @@ -49,11 +49,4 @@ public sealed partial class EncryptionKeyHolderComponent : Component /// [ViewVariables] public string? DefaultChannel; - - /// - /// Goobstation: Whether or not the headset can be examined to see the encryption keys while the keys aren't accessible. - /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("examineWhileLocked")] - public bool ExamineWhileLocked = true; } diff --git a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs index ac6174e7fde..0b12bbc53f3 100644 --- a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs +++ b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs @@ -166,9 +166,7 @@ public sealed partial class EncryptionKeySystem : EntitySystem private void OnHolderExamined(EntityUid uid, EncryptionKeyHolderComponent component, ExaminedEvent args) { - if (!args.IsInDetailsRange - || !component.ExamineWhileLocked && !component.KeysUnlocked // Goobstation - || !component.ExamineWhileLocked && TryComp(uid, out var panel) && !panel.Open) // Goobstation + if (!args.IsInDetailsRange) return; if (component.KeyContainer.ContainedEntities.Count == 0) diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs index 719f9fbf2aa..4ed0da5b9e5 100644 --- a/Content.Shared/Station/SharedStationSpawningSystem.cs +++ b/Content.Shared/Station/SharedStationSpawningSystem.cs @@ -1,5 +1,4 @@ using System.Linq; -using Content.Shared._DV.Silicon.IPC; // DeltaV using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; using Content.Shared.Inventory; @@ -24,7 +23,6 @@ public abstract class SharedStationSpawningSystem : EntitySystem [Dependency] private readonly MetaDataSystem _metadata = default!; [Dependency] private readonly SharedStorageSystem _storage = default!; [Dependency] private readonly SharedTransformSystem _xformSystem = default!; - [Dependency] private readonly InternalEncryptionKeySpawner _internalEncryption = default!; // DeltaV private EntityQuery _handsQuery; private EntityQuery _inventoryQuery; @@ -106,12 +104,6 @@ public abstract class SharedStationSpawningSystem : EntitySystem /// public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingGear, bool raiseEvent = true) { - // Begin DeltaV Additions: Fix nukie IPCs not having comms - if (startingGear is not {} proto) - return; - - _internalEncryption.TryInsertEncryptionKey(entity, proto); - // End DeltaV Additions EquipStartingGear(entity, (IEquipmentLoadout?) startingGear, raiseEvent); } diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs index 8a4dea37dc5..84ef17d7ded 100644 --- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs +++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs @@ -70,7 +70,7 @@ public sealed partial class MeleeWeaponComponent : Component /// [DataField, AutoNetworkedField] public bool ResistanceBypass = false; - + /// /// Base damage for this weapon. Can be modified via heavy damage or other means. /// @@ -183,10 +183,6 @@ public sealed partial class MeleeWeaponComponent : Component public float HeavyPartDamageMultiplier = 0.5f; // Shitmed Change End - - // Goobstation - [DataField, AutoNetworkedField] - public bool CanWideSwing = true; } /// diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index d82ae974dca..41de21071e8 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -227,8 +227,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem return; if (!TryGetWeapon(user, out var weaponUid, out var weapon) || - weaponUid != GetEntity(msg.Weapon) || - !weapon.CanWideSwing) // Goobstation Change + weaponUid != GetEntity(msg.Weapon)) { return; } diff --git a/Content.Shared/_DV/Silicon/IPC/InternalEncryptionKeySpawner.cs b/Content.Shared/_DV/Silicon/IPC/InternalEncryptionKeySpawner.cs deleted file mode 100644 index b496bef2c09..00000000000 --- a/Content.Shared/_DV/Silicon/IPC/InternalEncryptionKeySpawner.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Content.Shared.Containers; -using Content.Shared.Radio.Components; -using Content.Shared.Roles; -using Robust.Shared.Containers; - -namespace Content.Shared._DV.Silicon.IPC; - -public sealed class InternalEncryptionKeySpawner : EntitySystem -{ - [Dependency] private readonly SharedContainerSystem _container = default!; - - /// - /// Inserts an IPC's encryption key from starting gear headset. - /// - /// - /// Doesn't support a profile's loadouts, have fun. - /// - public void TryInsertEncryptionKey(EntityUid target, StartingGearPrototype startingGear) - { - if (!TryComp(target, out var keyHolder) - || !startingGear.Equipment.TryGetValue("ears", out var headsetId) - || string.IsNullOrEmpty(headsetId)) - return; - - var headset = Spawn(headsetId, Transform(target).Coordinates); - if (!HasComp(headset) - || !TryComp(headset, out var fillComp) - || !fillComp.Containers.TryGetValue(EncryptionKeyHolderComponent.KeyContainerName, out var defaultKeys)) - return; - - _container.CleanContainer(keyHolder.KeyContainer); - - foreach (var key in defaultKeys) - { - SpawnInContainerOrDrop(key, target, keyHolder.KeyContainer.ID); - } - - Del(headset); - } -} diff --git a/Content.Shared/_DV/Silicon/IPC/SnoutHelmetComponent.cs b/Content.Shared/_DV/Silicon/IPC/SnoutHelmetComponent.cs deleted file mode 100644 index 0376d4adb9a..00000000000 --- a/Content.Shared/_DV/Silicon/IPC/SnoutHelmetComponent.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Content.Shared._DV.Silicon.IPC; - -[RegisterComponent] -public sealed partial class SnoutHelmetComponent : Component -{ - [DataField] - public bool EnableAlternateHelmet; - - [DataField(readOnly: true)] - public string? ReplacementRace; -} diff --git a/Content.Shared/_DV/Silicons/Charge/SharedSiliconDrainSystem.cs b/Content.Shared/_DV/Silicons/Charge/SharedSiliconDrainSystem.cs deleted file mode 100644 index c015758e3fc..00000000000 --- a/Content.Shared/_DV/Silicons/Charge/SharedSiliconDrainSystem.cs +++ /dev/null @@ -1,182 +0,0 @@ -using Robust.Shared.Random; -using Content.Shared._EE.Silicon.Components; -using Content.Shared.Power.Components; -using Content.Shared.Mobs.Systems; -using Content.Shared.Popups; -using Content.Shared._EE.Silicon.Systems; -using Content.Shared.Movement.Systems; -using Content.Shared.Mind.Components; -using System.Diagnostics.CodeAnalysis; -using Robust.Shared.Timing; -using Robust.Shared.Configuration; -using Robust.Shared.Utility; -using SharedCVars = Content.Shared.CCVar.CCVars; -using Content.Shared.PowerCell.Components; -using Content.Shared.Alert; -using Content.Shared.PowerCell; -using Content.Shared.Power.EntitySystems; -// Begin TheDen - IPC Dynamic Power draw -using Content.Shared.Movement.Components; -using Robust.Shared.Physics.Components; -// End TheDen - -namespace Content.Shared._DV.Silicons.Charge; - -public abstract class SharedSiliconDrainSystem : EntitySystem -{ - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly MovementSpeedModifierSystem _moveMod = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly SharedJetpackSystem _jetpack = default!; // TheDen - IPC Dynamic Power draw - [Dependency] private readonly SharedBatterySystem _battery = default!; - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnSiliconStartup); - } - - public bool TryGetSiliconBattery(EntityUid silicon, [NotNullWhen(true)] out Entity? batteryComp) - { - batteryComp = null; - if (!HasComp(silicon)) - return false; - - - // try get a battery directly on the inserted entity - if (TryComp(silicon, out var comp)) - { - batteryComp = (silicon, comp); - return true; - } - - if (_powerCell.TryGetBatteryFromSlot(silicon, out batteryComp)) - return true; - - - //DebugTools.Assert("SiliconComponent does not contain Battery"); - return false; - } - - private void OnSiliconStartup(EntityUid uid, SiliconComponent component, ComponentStartup args) - { - if (!HasComp(uid)) - return; - - if (component.EntityType.GetType() != typeof(SiliconType)) - DebugTools.Assert("SiliconComponent.EntityType is not a SiliconType enum."); - } - - public override void Update(float frameTime) - { - base.Update(frameTime); - - // For each siliconComp entity with a battery component, drain their charge. - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var silicon, out var siliconComp)) - { - if (_mobState.IsDead(silicon) - || !siliconComp.BatteryPowered) - continue; - - // Check if the Silicon is an NPC, and if so, follow the delay as specified in the CVAR. - if (siliconComp.EntityType.Equals(SiliconType.Npc)) - { - var updateTime = _config.GetCVar(SharedCVars.SiliconNpcUpdateTime); - if (_timing.CurTime - siliconComp.LastDrainTime < TimeSpan.FromSeconds(updateTime)) - continue; - - siliconComp.LastDrainTime = _timing.CurTime; - } - - // If you can't find a battery, set the indicator and skip it. - if (!TryGetSiliconBattery(silicon, out var batteryComp)) - { - UpdateChargeState(silicon, 0, siliconComp); - continue; - } - - // If the silicon ghosted or is SSD while still being powered, skip it. - if (TryComp(silicon, out var mindContComp) - && !mindContComp.HasMind) - continue; - - var drainRate = siliconComp.DrainPerSecond; - - // All multipliers will be subtracted by 1, and then added together, and then multiplied by the drain rate. This is then added to the base drain rate. - // This is to stop exponential increases, while still allowing for less-than-one multipliers. - var drainRateFinalAddi = 0f; - - // TODO: Devise a method of adding multis where other systems can alter the drain rate. - // Maybe use something similar to refreshmovespeedmodifiers, where it's stored in the component. - // Maybe it doesn't matter, and stuff should just use static drain? - if (!siliconComp.EntityType.Equals(SiliconType.Npc)) // Don't bother checking heat if it's an NPC. It's a waste of time, and it'd be delayed due to the update time. - { - drainRateFinalAddi += SiliconMovementEffects(silicon, siliconComp); // TheDen - IPC Dynamic Power draw // Removes between 90% and 0% of the total power draw. - } - - // DeltaV - Sanity check - if (float.IsNaN(drainRateFinalAddi)) - drainRateFinalAddi = 0f; - - // Ensures that the drain rate is at least 10% of normal, - // and would allow at least 4 minutes of life with a max charge, to prevent cheese. - drainRate += Math.Clamp(drainRateFinalAddi, drainRate * -0.9f, batteryComp.Value.Comp.MaxCharge / 240); - - // Drain the battery. - _powerCell.TryUseCharge(silicon, frameTime * drainRate); - - // Figure out the current state of the Silicon. - var chargePercent = (short)MathF.Round(_battery.GetCharge(batteryComp.Value.AsNullable()) / batteryComp.Value.Comp.MaxCharge * 10f); - - UpdateChargeState(silicon, chargePercent, siliconComp); - } - } - - /// - ///Makes sure the entity is showing the right charge alert - /// - /// The silicon whose charge to check - /// Charge level, normalized to range 0-100 - protected abstract void UpdateChargeIcon(Entity ent, short chargePercent); - - /// - /// Checks if anything needs to be updated, and updates it. - /// - public void UpdateChargeState(EntityUid uid, short chargePercent, SiliconComponent component) - { - component.ChargeState = chargePercent; - - RaiseLocalEvent(uid, new SiliconChargeStateUpdateEvent(chargePercent)); - - _moveMod.RefreshMovementSpeedModifiers(uid); - UpdateChargeIcon((uid, component), chargePercent); - } - - // TheDen - IPC Dynamic Power draw - private float SiliconMovementEffects(EntityUid silicon, SiliconComponent siliconComp) - { - // Calculate dynamic power draw. - if (!TryComp(silicon, out MovementSpeedModifierComponent? movement) || - !TryComp(silicon, out PhysicsComponent? physics) || - !TryComp(silicon, out InputMoverComponent? input)) - return 0; - - if (input.HeldMoveButtons == MoveButtons.None || _jetpack.IsUserFlying(silicon)) // If nothing is being held or jet packing - { - return siliconComp.DrainPerSecond * siliconComp.IdleDrainReduction * (-1); // Reduces draw by idle drain reduction - } - - // DeltaV - Prevent divide by zero errors, smh - if (movement.CurrentSprintSpeed == 0) - return 0; - - // LinearVelocity is relative to the parent - return Math.Clamp( - siliconComp.DrainPerSecond * ((physics.LinearVelocity.Length() / movement.CurrentSprintSpeed) - 1), // Power draw changes as a negative percentage of the movement - siliconComp.DrainPerSecond * siliconComp.IdleDrainReduction * (-1), // Should be a maximum of the idle drain reduction (negative) - 0f); // Minimum reduction is no change to power draw - } -} diff --git a/Content.Shared/_EE/Silicon/BatteryDrinkerEvent.cs b/Content.Shared/_EE/Silicon/BatteryDrinkerEvent.cs deleted file mode 100644 index 25ce74ba1ce..00000000000 --- a/Content.Shared/_EE/Silicon/BatteryDrinkerEvent.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Content.Shared.DoAfter; -using Robust.Shared.Serialization; - -namespace Content.Shared._EE.Silicon; - -[Serializable, NetSerializable] -public sealed partial class BatteryDrinkerDoAfterEvent : SimpleDoAfterEvent -{ - public BatteryDrinkerDoAfterEvent() - { - } -} \ No newline at end of file diff --git a/Content.Shared/_EE/Silicon/BlindHealing/SharedBlindHealingSystem.cs b/Content.Shared/_EE/Silicon/BlindHealing/SharedBlindHealingSystem.cs deleted file mode 100644 index 3534db7fb63..00000000000 --- a/Content.Shared/_EE/Silicon/BlindHealing/SharedBlindHealingSystem.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Content.Shared.DoAfter; -using Robust.Shared.Serialization; - -namespace Content.Shared._EE.Silicon.BlindHealing; - -public abstract partial class SharedBlindHealingSystem : EntitySystem -{ - [Serializable, NetSerializable] - protected sealed partial class HealingDoAfterEvent : SimpleDoAfterEvent - { - } -} \ No newline at end of file diff --git a/Content.Shared/_EE/Silicon/Components/SiliconComponent.cs b/Content.Shared/_EE/Silicon/Components/SiliconComponent.cs deleted file mode 100644 index b58f0769c6d..00000000000 --- a/Content.Shared/_EE/Silicon/Components/SiliconComponent.cs +++ /dev/null @@ -1,125 +0,0 @@ -using Robust.Shared.GameStates; -using Content.Shared._EE.Silicon.Systems; -using Robust.Shared.Serialization.TypeSerializers.Implementations; -using Robust.Shared.Prototypes; -using Content.Shared.Alert; - -namespace Content.Shared._EE.Silicon.Components; - -/// -/// Component for defining a mob as a robot. -/// -[RegisterComponent, NetworkedComponent] -public sealed partial class SiliconComponent : Component -{ - [ViewVariables(VVAccess.ReadOnly)] - public short ChargeState = 10; - - [ViewVariables(VVAccess.ReadOnly)] - public float OverheatAccumulator = 0.0f; - - /// - /// The last time the Silicon was drained. - /// Used for NPC Silicons to avoid over updating. - /// - /// - /// Time between drains can be specified in - /// - /// - public TimeSpan LastDrainTime = TimeSpan.Zero; - - /// - /// The Silicon's battery slot, if it has one. - /// - - /// - /// Is the Silicon currently dead? - /// - public bool Dead = false; - - // BatterySystem took issue with how this was used, so I'm coming back to it at a later date, when more foundational Silicon stuff is implemented. - // /// - // /// The entity to get the battery from. - // /// - // public EntityUid BatteryOverride? = EntityUid.Invalid; - - - /// - /// The type of silicon this is. - /// - /// - /// Any new types of Silicons should be added to the enum. - /// Setting this to Npc will delay charge state updates by LastDrainTime and skip battery heat calculations - /// - [DataField(customTypeSerializer: typeof(EnumSerializer))] - public Enum EntityType = SiliconType.Npc; - - /// - /// Is this silicon battery powered? - /// - /// - /// If true, should go along with a battery component. One will not be added automatically. - /// - [DataField] - public bool BatteryPowered = false; - - /// - /// How much power is drained by this Silicon every second by default. - /// - [DataField] - public float DrainPerSecond = 50f; - - // TheDen - Dynamic IPC Power Draw - /// - /// How much less power is used while being idle. - /// - /// - /// Relative to the DrainPerSecond. - /// 0 is no reduction. 1 is 100% reduction. 0.5 is 50% reduction. - /// Currently, 90% reduction is as high as we can go without changing code in C# - /// - [DataField] - public float IdleDrainReduction = 0.6f; - - /// - /// The percentages at which the silicon will enter each state. - /// - /// - /// The Silicon will always be Full at 100%. - /// Setting a value to null will disable that state. - /// Setting Critical to 0 will cause the Silicon to never enter the dead state. - /// - [DataField] - public float? ChargeThresholdMid = 0.5f; - - /// - [DataField] - public float? ChargeThresholdLow = 0.25f; - - /// - [DataField] - public float? ChargeThresholdCritical = 0.1f; - - [DataField] - public ProtoId BatteryAlert = "BorgBattery"; - - [DataField] - public ProtoId NoBatteryAlert = "BorgBatteryNone"; - - - /// - /// The amount the Silicon will be slowed at each charge state. - /// - [DataField(required: true)] - public Dictionary SpeedModifierThresholds = default!; - - [DataField] - public float FireStackMultiplier = 1f; - - /// - /// Whether or not a Silicon will cancel all sleep events. - /// Maybe you want an android that can sleep as well as drink APCs? I'm not going to judge. - /// - [DataField] - public bool DoSiliconsDreamOfElectricSheep; -} diff --git a/Content.Shared/_EE/Silicon/DeadStartupButton/DeadStartupButtonComponent.cs b/Content.Shared/_EE/Silicon/DeadStartupButton/DeadStartupButtonComponent.cs deleted file mode 100644 index 1e2fc2d768d..00000000000 --- a/Content.Shared/_EE/Silicon/DeadStartupButton/DeadStartupButtonComponent.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Robust.Shared.Audio; - -namespace Content.Shared._EE.Silicon.DeadStartupButton; - -/// -/// This is used for... -/// -[RegisterComponent] -public sealed partial class DeadStartupButtonComponent : Component -{ - [DataField("verbText")] - public string VerbText = "dead-startup-button-verb"; - - [DataField("sound")] - public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/Arcade/newgame.ogg"); - - [DataField("buttonSound")] - public SoundSpecifier ButtonSound = new SoundPathSpecifier("/Audio/Machines/button.ogg"); - - [DataField("doAfterInterval"), ViewVariables(VVAccess.ReadWrite)] - public float DoAfterInterval = 1f; - - [DataField("buzzSound")] - public SoundSpecifier BuzzSound = new SoundCollectionSpecifier("buzzes"); - - [DataField("verbPriority"), ViewVariables(VVAccess.ReadWrite)] - public int VerbPriority = 1; -} \ No newline at end of file diff --git a/Content.Shared/_EE/Silicon/DeadStartupButton/SharedDeadStartupButtonSystem.cs b/Content.Shared/_EE/Silicon/DeadStartupButton/SharedDeadStartupButtonSystem.cs deleted file mode 100644 index bc8b8e8bb85..00000000000 --- a/Content.Shared/_EE/Silicon/DeadStartupButton/SharedDeadStartupButtonSystem.cs +++ /dev/null @@ -1,66 +0,0 @@ -using Content.Shared.DoAfter; -using Content.Shared.Mobs.Components; -using Content.Shared.Mobs.Systems; -using Content.Shared.Verbs; -using Robust.Shared.Audio.Systems; -using Robust.Shared.Network; -using Robust.Shared.Serialization; -using Robust.Shared.Utility; - -namespace Content.Shared._EE.Silicon.DeadStartupButton; - -/// -/// This creates a Button that can be activated after an entity, usually a silicon or an IPC, died. -/// This will activate a doAfter and then revive the entity, playing a custom afterward sound. -/// -public abstract partial class SharedDeadStartupButtonSystem : EntitySystem -{ - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly INetManager _net = default!; - - /// - public override void Initialize() - { - SubscribeLocalEvent>(AddTurnOnVerb); - } - - private void AddTurnOnVerb(EntityUid uid, DeadStartupButtonComponent component, GetVerbsEvent args) - { - if (!_mobState.IsDead(uid) - || !args.CanAccess || !args.CanInteract || args.Hands == null) - return; - - if (!TryComp(uid, out MobStateComponent? mobStateComponent) || !_mobState.IsDead(uid, mobStateComponent)) - return; - - args.Verbs.Add(new AlternativeVerb() - { - Act = () => TryStartup(args.User, uid, component), - Text = Loc.GetString(component.VerbText), - Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/Spare/poweronoff.svg.192dpi.png")), - Priority = component.VerbPriority - }); - } - - private void TryStartup(EntityUid user, EntityUid target, DeadStartupButtonComponent comp) - { - if (!_net.IsServer) - return; - _audio.PlayPvs(comp.ButtonSound, target); - var args = new DoAfterArgs(EntityManager, user, comp.DoAfterInterval, new OnDoAfterButtonPressedEvent(), target, target:target) - { - BreakOnDamage = true, - BreakOnMove = true, - }; - _doAfterSystem.TryStartDoAfter(args); - } - - [Serializable, NetSerializable] - public sealed partial class OnDoAfterButtonPressedEvent : SimpleDoAfterEvent - { - } - - -} \ No newline at end of file diff --git a/Content.Shared/_EE/Silicon/EmitBuzzWhileDamaged/EmitBuzzWhileDamagedSystem.cs b/Content.Shared/_EE/Silicon/EmitBuzzWhileDamaged/EmitBuzzWhileDamagedSystem.cs deleted file mode 100644 index e13b77f8bd4..00000000000 --- a/Content.Shared/_EE/Silicon/EmitBuzzWhileDamaged/EmitBuzzWhileDamagedSystem.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using Robust.Shared.Audio; - -namespace Content.Shared._EE.Silicon.EmitBuzzWhileDamaged; - -/// -/// This is used for controlling the cadence of the buzzing emitted by EmitBuzzOnCritSystem. -/// This component is used by mechanical species that can get to critical health. -/// -[RegisterComponent] -public sealed partial class EmitBuzzWhileDamagedComponent : Component -{ - [DataField("buzzPopupCooldown")] - public TimeSpan BuzzPopupCooldown { get; private set; } = TimeSpan.FromSeconds(8); - - [ViewVariables] - public TimeSpan LastBuzzPopupTime; - - [DataField("cycleDelay")] - public float CycleDelay = 2.0f; - - public float AccumulatedFrametime; - - [DataField("sound")] - public SoundSpecifier Sound = new SoundCollectionSpecifier("buzzes"); -} \ No newline at end of file diff --git a/Content.Shared/_EE/Silicon/SharedSiliconSystem.cs b/Content.Shared/_EE/Silicon/SharedSiliconSystem.cs deleted file mode 100644 index dcd20ea06fa..00000000000 --- a/Content.Shared/_EE/Silicon/SharedSiliconSystem.cs +++ /dev/null @@ -1,113 +0,0 @@ -using Content.Shared._EE.Silicon.Components; -using Content.Shared.Alert; -using Content.Shared.Bed.Sleep; -using Robust.Shared.Serialization; -using Content.Shared.Movement.Systems; -using Content.Shared.Containers.ItemSlots; -using Content.Shared.PowerCell.Components; - -namespace Content.Shared._EE.Silicon.Systems; - - -public abstract class SharedSiliconChargeSystem : EntitySystem // DeltaV - Make class abstract to split into Client/Server -{ - // [Dependency] private readonly AlertsSystem _alertsSystem = default!; // DeltaV - Moved alert handling to Client - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - - public override void Initialize() - { - base.Initialize(); - - // Begin DeltaV - Moved alert handling to Client - // SubscribeLocalEvent(OnSiliconInit); - // SubscribeLocalEvent(OnSiliconChargeStateUpdate); - // End DeltaV - Moved alert handling to Client - SubscribeLocalEvent(OnRefreshMovespeed); - SubscribeLocalEvent(OnItemSlotInsertAttempt); - SubscribeLocalEvent(OnItemSlotEjectAttempt); - SubscribeLocalEvent(OnTryingToSleep); - } - - private void OnItemSlotInsertAttempt(EntityUid uid, SiliconComponent component, ref ItemSlotInsertAttemptEvent args) - { - if (args.Cancelled - || !TryComp(uid, out var cellSlotComp) - || !_itemSlots.TryGetSlot(uid, cellSlotComp.CellSlotId, out var cellSlot) - || cellSlot != args.Slot || args.User != uid) - return; - - args.Cancelled = true; - } - - private void OnItemSlotEjectAttempt(EntityUid uid, SiliconComponent component, ref ItemSlotEjectAttemptEvent args) - { - if (args.Cancelled - || !TryComp(uid, out var cellSlotComp) - || !_itemSlots.TryGetSlot(uid, cellSlotComp.CellSlotId, out var cellSlot) - || cellSlot != args.Slot || args.User != uid) - return; - - args.Cancelled = true; - } - - // Begin DeltaV - Moved alert handling to Client - // private void OnSiliconInit(EntityUid uid, SiliconComponent component, ComponentInit args) - // { - // if (!component.BatteryPowered) - // return; - - // _alertsSystem.ShowAlert(uid, component.BatteryAlert, component.ChargeState); - // } - - // private void OnSiliconChargeStateUpdate(EntityUid uid, SiliconComponent component, SiliconChargeStateUpdateEvent ev) - // { - // _alertsSystem.ShowAlert(uid, component.BatteryAlert, ev.ChargePercent); - // } - // End DeltaV - Moved alert handling to Client - - private void OnRefreshMovespeed(EntityUid uid, SiliconComponent component, RefreshMovementSpeedModifiersEvent args) - { - if (!component.BatteryPowered) - return; - - var closest = 0; - - foreach (var state in component.SpeedModifierThresholds) - if (component.ChargeState >= state.Key && state.Key > closest) - closest = state.Key; - - var speedMod = component.SpeedModifierThresholds[closest]; - - args.ModifySpeed(speedMod, speedMod); - } - - /// - /// Silicon entities can now also be Living player entities. We may want to prevent them from sleeping if they can't sleep. - /// - private void OnTryingToSleep(EntityUid uid, SiliconComponent component, ref TryingToSleepEvent args) - { - args.Cancelled = !component.DoSiliconsDreamOfElectricSheep; - } -} - - -public enum SiliconType -{ - Player, - GhostRole, - Npc, -} - -/// -/// Event raised when a Silicon's charge state needs to be updated. -/// -[Serializable, NetSerializable] -public sealed class SiliconChargeStateUpdateEvent : EntityEventArgs -{ - public short ChargePercent { get; } - - public SiliconChargeStateUpdateEvent(short chargePercent) - { - ChargePercent = chargePercent; - } -} \ No newline at end of file diff --git a/Content.Shared/_EE/Silicon/SiliconRepairable/SharedWeldingHealableSystem.cs b/Content.Shared/_EE/Silicon/SiliconRepairable/SharedWeldingHealableSystem.cs deleted file mode 100644 index c8e1921e403..00000000000 --- a/Content.Shared/_EE/Silicon/SiliconRepairable/SharedWeldingHealableSystem.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Content.Shared.DoAfter; -using Robust.Shared.Serialization; - -namespace Content.Shared._EE.Silicon.WeldingHealing; - -public abstract partial class SharedWeldingHealableSystem : EntitySystem -{ - [Serializable, NetSerializable] - protected sealed partial class SiliconRepairFinishedEvent : SimpleDoAfterEvent - { - public float Delay; - } -} \ No newline at end of file diff --git a/Resources/Audio/_EE/Effects/Buzzes/buzz1.ogg b/Resources/Audio/_EE/Effects/Buzzes/buzz1.ogg deleted file mode 100644 index aa21acee3ca..00000000000 Binary files a/Resources/Audio/_EE/Effects/Buzzes/buzz1.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Effects/Buzzes/buzz2.ogg b/Resources/Audio/_EE/Effects/Buzzes/buzz2.ogg deleted file mode 100644 index 652d331abc5..00000000000 Binary files a/Resources/Audio/_EE/Effects/Buzzes/buzz2.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Effects/Buzzes/buzz3.ogg b/Resources/Audio/_EE/Effects/Buzzes/buzz3.ogg deleted file mode 100644 index e7721fa6664..00000000000 Binary files a/Resources/Audio/_EE/Effects/Buzzes/buzz3.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Effects/Buzzes/buzz4.ogg b/Resources/Audio/_EE/Effects/Buzzes/buzz4.ogg deleted file mode 100644 index 8c400abe858..00000000000 Binary files a/Resources/Audio/_EE/Effects/Buzzes/buzz4.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Effects/Buzzes/buzz5.ogg b/Resources/Audio/_EE/Effects/Buzzes/buzz5.ogg deleted file mode 100644 index b24a684e43e..00000000000 Binary files a/Resources/Audio/_EE/Effects/Buzzes/buzz5.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Effects/Buzzes/buzz6.ogg b/Resources/Audio/_EE/Effects/Buzzes/buzz6.ogg deleted file mode 100644 index 81b206c6ed6..00000000000 Binary files a/Resources/Audio/_EE/Effects/Buzzes/buzz6.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Effects/Buzzes/buzz7.ogg b/Resources/Audio/_EE/Effects/Buzzes/buzz7.ogg deleted file mode 100644 index f58bfaa2eaa..00000000000 Binary files a/Resources/Audio/_EE/Effects/Buzzes/buzz7.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Effects/Buzzes/buzz8.ogg b/Resources/Audio/_EE/Effects/Buzzes/buzz8.ogg deleted file mode 100644 index 75ad0c4fee2..00000000000 Binary files a/Resources/Audio/_EE/Effects/Buzzes/buzz8.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Effects/Buzzes/buzz9.ogg b/Resources/Audio/_EE/Effects/Buzzes/buzz9.ogg deleted file mode 100644 index 1e3a743f73c..00000000000 Binary files a/Resources/Audio/_EE/Effects/Buzzes/buzz9.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Effects/Silicon/startup.ogg b/Resources/Audio/_EE/Effects/Silicon/startup.ogg deleted file mode 100644 index 33d90e78454..00000000000 Binary files a/Resources/Audio/_EE/Effects/Silicon/startup.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/IPC/attributions.yml b/Resources/Audio/_EE/Voice/IPC/attributions.yml deleted file mode 100644 index d2bcb8d8941..00000000000 --- a/Resources/Audio/_EE/Voice/IPC/attributions.yml +++ /dev/null @@ -1,14 +0,0 @@ -- files: ["beep_500.ogg", "beep_2000.ogg"] - license: "CC0-1.0" - copyright: "Synthesized in Audacity by BasedUser." - source: "https://github.com/ekrixi-14/ekrixi" - -- files: ["pai_whistle.ogg"] - license: "CC-BY-4.0" - copyright: "Source sound by hubismal@GitHub, modified in Audacity by BasedUser." - source: "https://github.com/space-wizards/space-station-14/commit/3421e4f4de2613df1e92a4169a778335bc9faac4" - -- files: ["whirr1.ogg", "whirr2.ogg", "whirr3.ogg"] - license: "CC0-1.0" - copyright: "Taken from source, spectrally modified and clipped" - source: "https://freesound.org/people/sad3d/sounds/500168/" diff --git a/Resources/Audio/_EE/Voice/IPC/beep_2000.ogg b/Resources/Audio/_EE/Voice/IPC/beep_2000.ogg deleted file mode 100644 index 1caa98ff9a9..00000000000 Binary files a/Resources/Audio/_EE/Voice/IPC/beep_2000.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/IPC/beep_500.ogg b/Resources/Audio/_EE/Voice/IPC/beep_500.ogg deleted file mode 100644 index 5435eefb472..00000000000 Binary files a/Resources/Audio/_EE/Voice/IPC/beep_500.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/IPC/cry_robot_1.ogg b/Resources/Audio/_EE/Voice/IPC/cry_robot_1.ogg deleted file mode 100644 index 78a27496a59..00000000000 Binary files a/Resources/Audio/_EE/Voice/IPC/cry_robot_1.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/IPC/pai_whistle.ogg b/Resources/Audio/_EE/Voice/IPC/pai_whistle.ogg deleted file mode 100644 index 42aebd11972..00000000000 Binary files a/Resources/Audio/_EE/Voice/IPC/pai_whistle.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/IPC/robot-laugh_3.ogg b/Resources/Audio/_EE/Voice/IPC/robot-laugh_3.ogg deleted file mode 100644 index 331151f6b57..00000000000 Binary files a/Resources/Audio/_EE/Voice/IPC/robot-laugh_3.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/IPC/robot-scream.ogg b/Resources/Audio/_EE/Voice/IPC/robot-scream.ogg deleted file mode 100644 index 6420a4009db..00000000000 Binary files a/Resources/Audio/_EE/Voice/IPC/robot-scream.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/IPC/whirr1.ogg b/Resources/Audio/_EE/Voice/IPC/whirr1.ogg deleted file mode 100644 index 2679d794f06..00000000000 Binary files a/Resources/Audio/_EE/Voice/IPC/whirr1.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/IPC/whirr2.ogg b/Resources/Audio/_EE/Voice/IPC/whirr2.ogg deleted file mode 100644 index 6f74bebed84..00000000000 Binary files a/Resources/Audio/_EE/Voice/IPC/whirr2.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/IPC/whirr3.ogg b/Resources/Audio/_EE/Voice/IPC/whirr3.ogg deleted file mode 100644 index 45ececee626..00000000000 Binary files a/Resources/Audio/_EE/Voice/IPC/whirr3.ogg and /dev/null differ diff --git a/Resources/Audio/_EE/Voice/IPC/wilhelm.ogg b/Resources/Audio/_EE/Voice/IPC/wilhelm.ogg deleted file mode 100644 index b8ad9d97d4f..00000000000 Binary files a/Resources/Audio/_EE/Voice/IPC/wilhelm.ogg and /dev/null differ diff --git a/Resources/Locale/en-US/_DV/accent/anglish.ftl b/Resources/Locale/en-US/_DV/accent/anglish.ftl index 0b926be66bb..4f9ce8e89eb 100644 --- a/Resources/Locale/en-US/_DV/accent/anglish.ftl +++ b/Resources/Locale/en-US/_DV/accent/anglish.ftl @@ -3001,12 +3001,6 @@ accent-anglish-replacement-1002 = foxfolk accent-anglish-words-1003 = diona accent-anglish-replacement-1003 = woodwight -accent-anglish-words-1004 = IPC -accent-anglish-replacement-1004 = wileman - -accent-anglish-words-1005 = IPCs -accent-anglish-replacement-1005 = wilemen - accent-anglish-words-1006 = reptile accent-anglish-replacement-1006 = slinkend diff --git a/Resources/Locale/en-US/_DV/forensics/fibers.ftl b/Resources/Locale/en-US/_DV/forensics/fibers.ftl index 3da59a14c75..84ac6ac6f33 100644 --- a/Resources/Locale/en-US/_DV/forensics/fibers.ftl +++ b/Resources/Locale/en-US/_DV/forensics/fibers.ftl @@ -1,5 +1,3 @@ -# IPC -fibers-steel = steel # Borg, coloured with the chassis colour for non-generic borgs fibers-plasteel = plasteel fibers-degraded-plasteel = degraded plasteel diff --git a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl index ad55fd029cf..736bf268c8a 100644 --- a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl @@ -171,6 +171,3 @@ loadout-group-gladiator-outerclothing = Gladiator outer clothing loadout-group-boxer-jumpsuit = Boxer jumpsuit loadout-group-boxer-gloves = Boxer gloves loadout-group-boxer-mask = Wrestling mask - -# Species -loadout-group-humanoid-silicon = Silicon-friendly survival box diff --git a/Resources/Locale/en-US/_DV/store/uplink/chemicals.ftl b/Resources/Locale/en-US/_DV/store/uplink/chemicals.ftl index 334bc423a37..0bd0b7104f0 100644 --- a/Resources/Locale/en-US/_DV/store/uplink/chemicals.ftl +++ b/Resources/Locale/en-US/_DV/store/uplink/chemicals.ftl @@ -1,6 +1,3 @@ -uplink-omnipatch-kit-name = OmniPatch Kit -uplink-omnipatch-kit-desc = A collection of microbots specifically curated to repair machine entities, crucial for any long term operation. - uplink-firebugs-friend-name = Firebug's Friend uplink-firebugs-friend-desc = A bottle containing a flammable chemical cocktail, perfect for throwing at your foes. diff --git a/Resources/Locale/en-US/_EE/body/behavior/behavior.ftl b/Resources/Locale/en-US/_EE/body/behavior/behavior.ftl deleted file mode 100644 index d952341b4ea..00000000000 --- a/Resources/Locale/en-US/_EE/body/behavior/behavior.ftl +++ /dev/null @@ -1 +0,0 @@ -silicon-behavior-buzz = Bzzzzt... diff --git a/Resources/Locale/en-US/_EE/datasets/ipc-names.ftl b/Resources/Locale/en-US/_EE/datasets/ipc-names.ftl deleted file mode 100644 index 34b2621a938..00000000000 --- a/Resources/Locale/en-US/_EE/datasets/ipc-names.ftl +++ /dev/null @@ -1,1104 +0,0 @@ -## First - -names-ipc-first-dataset-1 = ABEX -names-ipc-first-dataset-2 = ANCL -names-ipc-first-dataset-3 = ANTR -names-ipc-first-dataset-4 = ARMA -names-ipc-first-dataset-5 = AURA -names-ipc-first-dataset-6 = BGB -names-ipc-first-dataset-7 = CBOS -names-ipc-first-dataset-8 = CDB -names-ipc-first-dataset-9 = CHOC -names-ipc-first-dataset-10 = CHRI -names-ipc-first-dataset-11 = COI -names-ipc-first-dataset-12 = CRUX -names-ipc-first-dataset-13 = CYBR -names-ipc-first-dataset-14 = DRSD -names-ipc-first-dataset-15 = DUNC -names-ipc-first-dataset-16 = EBIX -names-ipc-first-dataset-17 = EXOS -names-ipc-first-dataset-18 = FIRC -names-ipc-first-dataset-19 = FIZZ -names-ipc-first-dataset-20 = FRE -names-ipc-first-dataset-21 = FXMC -names-ipc-first-dataset-22 = GIGA -names-ipc-first-dataset-23 = GOOF -names-ipc-first-dataset-24 = GRIN -names-ipc-first-dataset-25 = GUN -names-ipc-first-dataset-26 = HBL -names-ipc-first-dataset-27 = HG -names-ipc-first-dataset-28 = HIU -names-ipc-first-dataset-29 = HOG -names-ipc-first-dataset-30 = INC -names-ipc-first-dataset-31 = JADE -names-ipc-first-dataset-32 = JJR -names-ipc-first-dataset-33 = JLLO -names-ipc-first-dataset-34 = JNLG -names-ipc-first-dataset-35 = JRD -names-ipc-first-dataset-36 = JUNO -names-ipc-first-dataset-37 = KALE -names-ipc-first-dataset-38 = KANO -names-ipc-first-dataset-39 = KAZA -names-ipc-first-dataset-40 = KENT -names-ipc-first-dataset-41 = KIV -names-ipc-first-dataset-42 = KOR -names-ipc-first-dataset-43 = KORA -names-ipc-first-dataset-44 = KOS -names-ipc-first-dataset-45 = LUMA -names-ipc-first-dataset-46 = LUNA -names-ipc-first-dataset-47 = LYNX -names-ipc-first-dataset-48 = MET -names-ipc-first-dataset-49 = MIW -names-ipc-first-dataset-50 = MNOS -names-ipc-first-dataset-51 = MRPR -names-ipc-first-dataset-52 = MSO -names-ipc-first-dataset-53 = NANO -names-ipc-first-dataset-54 = NEST -names-ipc-first-dataset-55 = NEXO -names-ipc-first-dataset-56 = NOVA -names-ipc-first-dataset-57 = ORNG -names-ipc-first-dataset-58 = OSI -names-ipc-first-dataset-59 = PBU -names-ipc-first-dataset-60 = PHL -names-ipc-first-dataset-61 = PKP -names-ipc-first-dataset-62 = PKR -names-ipc-first-dataset-63 = PLEX -names-ipc-first-dataset-64 = PLEXO -names-ipc-first-dataset-65 = PLIX -names-ipc-first-dataset-66 = QUES -names-ipc-first-dataset-67 = QUIN -names-ipc-first-dataset-68 = QWER -names-ipc-first-dataset-69 = RIFT -names-ipc-first-dataset-70 = RR -names-ipc-first-dataset-71 = RYNO -names-ipc-first-dataset-72 = RZH -names-ipc-first-dataset-73 = SINA -names-ipc-first-dataset-74 = SLI -names-ipc-first-dataset-75 = STLP -names-ipc-first-dataset-76 = TKRG -names-ipc-first-dataset-77 = TRIX -names-ipc-first-dataset-78 = VERA -names-ipc-first-dataset-79 = VEXA -names-ipc-first-dataset-80 = VITA -names-ipc-first-dataset-81 = VIVE -names-ipc-first-dataset-82 = VOLT -names-ipc-first-dataset-83 = WAVE -names-ipc-first-dataset-84 = WISP -names-ipc-first-dataset-85 = WJ -names-ipc-first-dataset-86 = WREN -names-ipc-first-dataset-87 = XAL -names-ipc-first-dataset-88 = XENA -names-ipc-first-dataset-89 = XIS -names-ipc-first-dataset-90 = XSI -names-ipc-first-dataset-91 = XYLO -names-ipc-first-dataset-92 = YAGO -names-ipc-first-dataset-93 = YPT -names-ipc-first-dataset-94 = ZACK -names-ipc-first-dataset-95 = ZARG -names-ipc-first-dataset-96 = ZEON -names-ipc-first-dataset-97 = ZOLT -names-ipc-first-dataset-98 = ZUMA -names-ipc-first-dataset-99 = ZYLO -names-ipc-first-dataset-100 = ZYVA - -## Pain and suffering -names-ipc-last-dataset-1 = 000 -names-ipc-last-dataset-2 = 001 -names-ipc-last-dataset-3 = 002 -names-ipc-last-dataset-4 = 003 -names-ipc-last-dataset-5 = 004 -names-ipc-last-dataset-6 = 005 -names-ipc-last-dataset-7 = 006 -names-ipc-last-dataset-8 = 007 -names-ipc-last-dataset-9 = 008 -names-ipc-last-dataset-10 = 009 -names-ipc-last-dataset-11 = 010 -names-ipc-last-dataset-12 = 011 -names-ipc-last-dataset-13 = 012 -names-ipc-last-dataset-14 = 013 -names-ipc-last-dataset-15 = 014 -names-ipc-last-dataset-16 = 015 -names-ipc-last-dataset-17 = 016 -names-ipc-last-dataset-18 = 017 -names-ipc-last-dataset-19 = 018 -names-ipc-last-dataset-20 = 019 -names-ipc-last-dataset-21 = 020 -names-ipc-last-dataset-22 = 021 -names-ipc-last-dataset-23 = 022 -names-ipc-last-dataset-24 = 023 -names-ipc-last-dataset-25 = 024 -names-ipc-last-dataset-26 = 025 -names-ipc-last-dataset-27 = 026 -names-ipc-last-dataset-28 = 027 -names-ipc-last-dataset-29 = 028 -names-ipc-last-dataset-30 = 029 -names-ipc-last-dataset-31 = 030 -names-ipc-last-dataset-32 = 031 -names-ipc-last-dataset-33 = 032 -names-ipc-last-dataset-34 = 033 -names-ipc-last-dataset-35 = 034 -names-ipc-last-dataset-36 = 035 -names-ipc-last-dataset-37 = 036 -names-ipc-last-dataset-38 = 037 -names-ipc-last-dataset-39 = 038 -names-ipc-last-dataset-40 = 039 -names-ipc-last-dataset-41 = 040 -names-ipc-last-dataset-42 = 041 -names-ipc-last-dataset-43 = 042 -names-ipc-last-dataset-44 = 043 -names-ipc-last-dataset-45 = 044 -names-ipc-last-dataset-46 = 045 -names-ipc-last-dataset-47 = 046 -names-ipc-last-dataset-48 = 047 -names-ipc-last-dataset-49 = 048 -names-ipc-last-dataset-50 = 049 -names-ipc-last-dataset-51 = 050 -names-ipc-last-dataset-52 = 051 -names-ipc-last-dataset-53 = 052 -names-ipc-last-dataset-54 = 053 -names-ipc-last-dataset-55 = 054 -names-ipc-last-dataset-56 = 055 -names-ipc-last-dataset-57 = 056 -names-ipc-last-dataset-58 = 057 -names-ipc-last-dataset-59 = 058 -names-ipc-last-dataset-60 = 059 -names-ipc-last-dataset-61 = 060 -names-ipc-last-dataset-62 = 061 -names-ipc-last-dataset-63 = 062 -names-ipc-last-dataset-64 = 063 -names-ipc-last-dataset-65 = 064 -names-ipc-last-dataset-66 = 065 -names-ipc-last-dataset-67 = 066 -names-ipc-last-dataset-68 = 067 -names-ipc-last-dataset-69 = 068 -names-ipc-last-dataset-70 = 069 -names-ipc-last-dataset-71 = 070 -names-ipc-last-dataset-72 = 071 -names-ipc-last-dataset-73 = 072 -names-ipc-last-dataset-74 = 073 -names-ipc-last-dataset-75 = 074 -names-ipc-last-dataset-76 = 075 -names-ipc-last-dataset-77 = 076 -names-ipc-last-dataset-78 = 077 -names-ipc-last-dataset-79 = 078 -names-ipc-last-dataset-80 = 079 -names-ipc-last-dataset-81 = 080 -names-ipc-last-dataset-82 = 081 -names-ipc-last-dataset-83 = 082 -names-ipc-last-dataset-84 = 083 -names-ipc-last-dataset-85 = 084 -names-ipc-last-dataset-86 = 085 -names-ipc-last-dataset-87 = 086 -names-ipc-last-dataset-88 = 087 -names-ipc-last-dataset-89 = 088 -names-ipc-last-dataset-90 = 089 -names-ipc-last-dataset-91 = 090 -names-ipc-last-dataset-92 = 091 -names-ipc-last-dataset-93 = 092 -names-ipc-last-dataset-94 = 093 -names-ipc-last-dataset-95 = 094 -names-ipc-last-dataset-96 = 095 -names-ipc-last-dataset-97 = 096 -names-ipc-last-dataset-98 = 097 -names-ipc-last-dataset-99 = 098 -names-ipc-last-dataset-100 = 099 -names-ipc-last-dataset-101 = 100 -names-ipc-last-dataset-102 = 101 -names-ipc-last-dataset-103 = 102 -names-ipc-last-dataset-104 = 103 -names-ipc-last-dataset-105 = 104 -names-ipc-last-dataset-106 = 105 -names-ipc-last-dataset-107 = 106 -names-ipc-last-dataset-108 = 107 -names-ipc-last-dataset-109 = 108 -names-ipc-last-dataset-110 = 109 -names-ipc-last-dataset-111 = 110 -names-ipc-last-dataset-112 = 111 -names-ipc-last-dataset-113 = 112 -names-ipc-last-dataset-114 = 113 -names-ipc-last-dataset-115 = 114 -names-ipc-last-dataset-116 = 115 -names-ipc-last-dataset-117 = 116 -names-ipc-last-dataset-118 = 117 -names-ipc-last-dataset-119 = 118 -names-ipc-last-dataset-120 = 119 -names-ipc-last-dataset-121 = 120 -names-ipc-last-dataset-122 = 121 -names-ipc-last-dataset-123 = 122 -names-ipc-last-dataset-124 = 123 -names-ipc-last-dataset-125 = 124 -names-ipc-last-dataset-126 = 125 -names-ipc-last-dataset-127 = 126 -names-ipc-last-dataset-128 = 127 -names-ipc-last-dataset-129 = 128 -names-ipc-last-dataset-130 = 129 -names-ipc-last-dataset-131 = 130 -names-ipc-last-dataset-132 = 131 -names-ipc-last-dataset-133 = 132 -names-ipc-last-dataset-134 = 133 -names-ipc-last-dataset-135 = 134 -names-ipc-last-dataset-136 = 135 -names-ipc-last-dataset-137 = 136 -names-ipc-last-dataset-138 = 137 -names-ipc-last-dataset-139 = 138 -names-ipc-last-dataset-140 = 139 -names-ipc-last-dataset-141 = 140 -names-ipc-last-dataset-142 = 141 -names-ipc-last-dataset-143 = 142 -names-ipc-last-dataset-144 = 143 -names-ipc-last-dataset-145 = 144 -names-ipc-last-dataset-146 = 145 -names-ipc-last-dataset-147 = 146 -names-ipc-last-dataset-148 = 147 -names-ipc-last-dataset-149 = 148 -names-ipc-last-dataset-150 = 149 -names-ipc-last-dataset-151 = 150 -names-ipc-last-dataset-152 = 151 -names-ipc-last-dataset-153 = 152 -names-ipc-last-dataset-154 = 153 -names-ipc-last-dataset-155 = 154 -names-ipc-last-dataset-156 = 155 -names-ipc-last-dataset-157 = 156 -names-ipc-last-dataset-158 = 157 -names-ipc-last-dataset-159 = 158 -names-ipc-last-dataset-160 = 159 -names-ipc-last-dataset-161 = 160 -names-ipc-last-dataset-162 = 161 -names-ipc-last-dataset-163 = 162 -names-ipc-last-dataset-164 = 163 -names-ipc-last-dataset-165 = 164 -names-ipc-last-dataset-166 = 165 -names-ipc-last-dataset-167 = 166 -names-ipc-last-dataset-168 = 167 -names-ipc-last-dataset-169 = 168 -names-ipc-last-dataset-170 = 169 -names-ipc-last-dataset-171 = 170 -names-ipc-last-dataset-172 = 171 -names-ipc-last-dataset-173 = 172 -names-ipc-last-dataset-174 = 173 -names-ipc-last-dataset-175 = 174 -names-ipc-last-dataset-176 = 175 -names-ipc-last-dataset-177 = 176 -names-ipc-last-dataset-178 = 177 -names-ipc-last-dataset-179 = 178 -names-ipc-last-dataset-180 = 179 -names-ipc-last-dataset-181 = 180 -names-ipc-last-dataset-182 = 181 -names-ipc-last-dataset-183 = 182 -names-ipc-last-dataset-184 = 183 -names-ipc-last-dataset-185 = 184 -names-ipc-last-dataset-186 = 185 -names-ipc-last-dataset-187 = 186 -names-ipc-last-dataset-188 = 187 -names-ipc-last-dataset-189 = 188 -names-ipc-last-dataset-190 = 189 -names-ipc-last-dataset-191 = 190 -names-ipc-last-dataset-192 = 191 -names-ipc-last-dataset-193 = 192 -names-ipc-last-dataset-194 = 193 -names-ipc-last-dataset-195 = 194 -names-ipc-last-dataset-196 = 195 -names-ipc-last-dataset-197 = 196 -names-ipc-last-dataset-198 = 197 -names-ipc-last-dataset-199 = 198 -names-ipc-last-dataset-200 = 199 -names-ipc-last-dataset-201 = 200 -names-ipc-last-dataset-202 = 201 -names-ipc-last-dataset-203 = 202 -names-ipc-last-dataset-204 = 203 -names-ipc-last-dataset-205 = 204 -names-ipc-last-dataset-206 = 205 -names-ipc-last-dataset-207 = 206 -names-ipc-last-dataset-208 = 207 -names-ipc-last-dataset-209 = 208 -names-ipc-last-dataset-210 = 209 -names-ipc-last-dataset-211 = 210 -names-ipc-last-dataset-212 = 211 -names-ipc-last-dataset-213 = 212 -names-ipc-last-dataset-214 = 213 -names-ipc-last-dataset-215 = 214 -names-ipc-last-dataset-216 = 215 -names-ipc-last-dataset-217 = 216 -names-ipc-last-dataset-218 = 217 -names-ipc-last-dataset-219 = 218 -names-ipc-last-dataset-220 = 219 -names-ipc-last-dataset-221 = 220 -names-ipc-last-dataset-222 = 221 -names-ipc-last-dataset-223 = 222 -names-ipc-last-dataset-224 = 223 -names-ipc-last-dataset-225 = 224 -names-ipc-last-dataset-226 = 225 -names-ipc-last-dataset-227 = 226 -names-ipc-last-dataset-228 = 227 -names-ipc-last-dataset-229 = 228 -names-ipc-last-dataset-230 = 229 -names-ipc-last-dataset-231 = 230 -names-ipc-last-dataset-232 = 231 -names-ipc-last-dataset-233 = 232 -names-ipc-last-dataset-234 = 233 -names-ipc-last-dataset-235 = 234 -names-ipc-last-dataset-236 = 235 -names-ipc-last-dataset-237 = 236 -names-ipc-last-dataset-238 = 237 -names-ipc-last-dataset-239 = 238 -names-ipc-last-dataset-240 = 239 -names-ipc-last-dataset-241 = 240 -names-ipc-last-dataset-242 = 241 -names-ipc-last-dataset-243 = 242 -names-ipc-last-dataset-244 = 243 -names-ipc-last-dataset-245 = 244 -names-ipc-last-dataset-246 = 245 -names-ipc-last-dataset-247 = 246 -names-ipc-last-dataset-248 = 247 -names-ipc-last-dataset-249 = 248 -names-ipc-last-dataset-250 = 249 -names-ipc-last-dataset-251 = 250 -names-ipc-last-dataset-252 = 251 -names-ipc-last-dataset-253 = 252 -names-ipc-last-dataset-254 = 253 -names-ipc-last-dataset-255 = 254 -names-ipc-last-dataset-256 = 255 -names-ipc-last-dataset-257 = 256 -names-ipc-last-dataset-258 = 257 -names-ipc-last-dataset-259 = 258 -names-ipc-last-dataset-260 = 259 -names-ipc-last-dataset-261 = 260 -names-ipc-last-dataset-262 = 261 -names-ipc-last-dataset-263 = 262 -names-ipc-last-dataset-264 = 263 -names-ipc-last-dataset-265 = 264 -names-ipc-last-dataset-266 = 265 -names-ipc-last-dataset-267 = 266 -names-ipc-last-dataset-268 = 267 -names-ipc-last-dataset-269 = 268 -names-ipc-last-dataset-270 = 269 -names-ipc-last-dataset-271 = 270 -names-ipc-last-dataset-272 = 271 -names-ipc-last-dataset-273 = 272 -names-ipc-last-dataset-274 = 273 -names-ipc-last-dataset-275 = 274 -names-ipc-last-dataset-276 = 275 -names-ipc-last-dataset-277 = 276 -names-ipc-last-dataset-278 = 277 -names-ipc-last-dataset-279 = 278 -names-ipc-last-dataset-280 = 279 -names-ipc-last-dataset-281 = 280 -names-ipc-last-dataset-282 = 281 -names-ipc-last-dataset-283 = 282 -names-ipc-last-dataset-284 = 283 -names-ipc-last-dataset-285 = 284 -names-ipc-last-dataset-286 = 285 -names-ipc-last-dataset-287 = 286 -names-ipc-last-dataset-288 = 287 -names-ipc-last-dataset-289 = 288 -names-ipc-last-dataset-290 = 289 -names-ipc-last-dataset-291 = 290 -names-ipc-last-dataset-292 = 291 -names-ipc-last-dataset-293 = 292 -names-ipc-last-dataset-294 = 293 -names-ipc-last-dataset-295 = 294 -names-ipc-last-dataset-296 = 295 -names-ipc-last-dataset-297 = 296 -names-ipc-last-dataset-298 = 297 -names-ipc-last-dataset-299 = 298 -names-ipc-last-dataset-300 = 299 -names-ipc-last-dataset-301 = 300 -names-ipc-last-dataset-302 = 301 -names-ipc-last-dataset-303 = 302 -names-ipc-last-dataset-304 = 303 -names-ipc-last-dataset-305 = 304 -names-ipc-last-dataset-306 = 305 -names-ipc-last-dataset-307 = 306 -names-ipc-last-dataset-308 = 307 -names-ipc-last-dataset-309 = 308 -names-ipc-last-dataset-310 = 309 -names-ipc-last-dataset-311 = 310 -names-ipc-last-dataset-312 = 311 -names-ipc-last-dataset-313 = 312 -names-ipc-last-dataset-314 = 313 -names-ipc-last-dataset-315 = 314 -names-ipc-last-dataset-316 = 315 -names-ipc-last-dataset-317 = 316 -names-ipc-last-dataset-318 = 317 -names-ipc-last-dataset-319 = 318 -names-ipc-last-dataset-320 = 319 -names-ipc-last-dataset-321 = 320 -names-ipc-last-dataset-322 = 321 -names-ipc-last-dataset-323 = 322 -names-ipc-last-dataset-324 = 323 -names-ipc-last-dataset-325 = 324 -names-ipc-last-dataset-326 = 325 -names-ipc-last-dataset-327 = 326 -names-ipc-last-dataset-328 = 327 -names-ipc-last-dataset-329 = 328 -names-ipc-last-dataset-330 = 329 -names-ipc-last-dataset-331 = 330 -names-ipc-last-dataset-332 = 331 -names-ipc-last-dataset-333 = 332 -names-ipc-last-dataset-334 = 333 -names-ipc-last-dataset-335 = 334 -names-ipc-last-dataset-336 = 335 -names-ipc-last-dataset-337 = 336 -names-ipc-last-dataset-338 = 337 -names-ipc-last-dataset-339 = 338 -names-ipc-last-dataset-340 = 339 -names-ipc-last-dataset-341 = 340 -names-ipc-last-dataset-342 = 341 -names-ipc-last-dataset-343 = 342 -names-ipc-last-dataset-344 = 343 -names-ipc-last-dataset-345 = 344 -names-ipc-last-dataset-346 = 345 -names-ipc-last-dataset-347 = 346 -names-ipc-last-dataset-348 = 347 -names-ipc-last-dataset-349 = 348 -names-ipc-last-dataset-350 = 349 -names-ipc-last-dataset-351 = 350 -names-ipc-last-dataset-352 = 351 -names-ipc-last-dataset-353 = 352 -names-ipc-last-dataset-354 = 353 -names-ipc-last-dataset-355 = 354 -names-ipc-last-dataset-356 = 355 -names-ipc-last-dataset-357 = 356 -names-ipc-last-dataset-358 = 357 -names-ipc-last-dataset-359 = 358 -names-ipc-last-dataset-360 = 359 -names-ipc-last-dataset-361 = 360 -names-ipc-last-dataset-362 = 361 -names-ipc-last-dataset-363 = 362 -names-ipc-last-dataset-364 = 363 -names-ipc-last-dataset-365 = 364 -names-ipc-last-dataset-366 = 365 -names-ipc-last-dataset-367 = 366 -names-ipc-last-dataset-368 = 367 -names-ipc-last-dataset-369 = 368 -names-ipc-last-dataset-370 = 369 -names-ipc-last-dataset-371 = 370 -names-ipc-last-dataset-372 = 371 -names-ipc-last-dataset-373 = 372 -names-ipc-last-dataset-374 = 373 -names-ipc-last-dataset-375 = 374 -names-ipc-last-dataset-376 = 375 -names-ipc-last-dataset-377 = 376 -names-ipc-last-dataset-378 = 377 -names-ipc-last-dataset-379 = 378 -names-ipc-last-dataset-380 = 379 -names-ipc-last-dataset-381 = 380 -names-ipc-last-dataset-382 = 381 -names-ipc-last-dataset-383 = 382 -names-ipc-last-dataset-384 = 383 -names-ipc-last-dataset-385 = 384 -names-ipc-last-dataset-386 = 385 -names-ipc-last-dataset-387 = 386 -names-ipc-last-dataset-388 = 387 -names-ipc-last-dataset-389 = 388 -names-ipc-last-dataset-390 = 389 -names-ipc-last-dataset-391 = 390 -names-ipc-last-dataset-392 = 391 -names-ipc-last-dataset-393 = 392 -names-ipc-last-dataset-394 = 393 -names-ipc-last-dataset-395 = 394 -names-ipc-last-dataset-396 = 395 -names-ipc-last-dataset-397 = 396 -names-ipc-last-dataset-398 = 397 -names-ipc-last-dataset-399 = 398 -names-ipc-last-dataset-400 = 399 -names-ipc-last-dataset-401 = 400 -names-ipc-last-dataset-402 = 401 -names-ipc-last-dataset-403 = 402 -names-ipc-last-dataset-404 = 403 -names-ipc-last-dataset-405 = 404 -names-ipc-last-dataset-406 = 405 -names-ipc-last-dataset-407 = 406 -names-ipc-last-dataset-408 = 407 -names-ipc-last-dataset-409 = 408 -names-ipc-last-dataset-410 = 409 -names-ipc-last-dataset-411 = 410 -names-ipc-last-dataset-412 = 411 -names-ipc-last-dataset-413 = 412 -names-ipc-last-dataset-414 = 413 -names-ipc-last-dataset-415 = 414 -names-ipc-last-dataset-416 = 415 -names-ipc-last-dataset-417 = 416 -names-ipc-last-dataset-418 = 417 -names-ipc-last-dataset-419 = 418 -names-ipc-last-dataset-420 = 419 -names-ipc-last-dataset-421 = 420 -names-ipc-last-dataset-422 = 421 -names-ipc-last-dataset-423 = 422 -names-ipc-last-dataset-424 = 423 -names-ipc-last-dataset-425 = 424 -names-ipc-last-dataset-426 = 425 -names-ipc-last-dataset-427 = 426 -names-ipc-last-dataset-428 = 427 -names-ipc-last-dataset-429 = 428 -names-ipc-last-dataset-430 = 429 -names-ipc-last-dataset-431 = 430 -names-ipc-last-dataset-432 = 431 -names-ipc-last-dataset-433 = 432 -names-ipc-last-dataset-434 = 433 -names-ipc-last-dataset-435 = 434 -names-ipc-last-dataset-436 = 435 -names-ipc-last-dataset-437 = 436 -names-ipc-last-dataset-438 = 437 -names-ipc-last-dataset-439 = 438 -names-ipc-last-dataset-440 = 439 -names-ipc-last-dataset-441 = 440 -names-ipc-last-dataset-442 = 441 -names-ipc-last-dataset-443 = 442 -names-ipc-last-dataset-444 = 443 -names-ipc-last-dataset-445 = 444 -names-ipc-last-dataset-446 = 445 -names-ipc-last-dataset-447 = 446 -names-ipc-last-dataset-448 = 447 -names-ipc-last-dataset-449 = 448 -names-ipc-last-dataset-450 = 449 -names-ipc-last-dataset-451 = 450 -names-ipc-last-dataset-452 = 451 -names-ipc-last-dataset-453 = 452 -names-ipc-last-dataset-454 = 453 -names-ipc-last-dataset-455 = 454 -names-ipc-last-dataset-456 = 455 -names-ipc-last-dataset-457 = 456 -names-ipc-last-dataset-458 = 457 -names-ipc-last-dataset-459 = 458 -names-ipc-last-dataset-460 = 459 -names-ipc-last-dataset-461 = 460 -names-ipc-last-dataset-462 = 461 -names-ipc-last-dataset-463 = 462 -names-ipc-last-dataset-464 = 463 -names-ipc-last-dataset-465 = 464 -names-ipc-last-dataset-466 = 465 -names-ipc-last-dataset-467 = 466 -names-ipc-last-dataset-468 = 467 -names-ipc-last-dataset-469 = 468 -names-ipc-last-dataset-470 = 469 -names-ipc-last-dataset-471 = 470 -names-ipc-last-dataset-472 = 471 -names-ipc-last-dataset-473 = 472 -names-ipc-last-dataset-474 = 473 -names-ipc-last-dataset-475 = 474 -names-ipc-last-dataset-476 = 475 -names-ipc-last-dataset-477 = 476 -names-ipc-last-dataset-478 = 477 -names-ipc-last-dataset-479 = 478 -names-ipc-last-dataset-480 = 479 -names-ipc-last-dataset-481 = 480 -names-ipc-last-dataset-482 = 481 -names-ipc-last-dataset-483 = 482 -names-ipc-last-dataset-484 = 483 -names-ipc-last-dataset-485 = 484 -names-ipc-last-dataset-486 = 485 -names-ipc-last-dataset-487 = 486 -names-ipc-last-dataset-488 = 487 -names-ipc-last-dataset-489 = 488 -names-ipc-last-dataset-490 = 489 -names-ipc-last-dataset-491 = 490 -names-ipc-last-dataset-492 = 491 -names-ipc-last-dataset-493 = 492 -names-ipc-last-dataset-494 = 493 -names-ipc-last-dataset-495 = 494 -names-ipc-last-dataset-496 = 495 -names-ipc-last-dataset-497 = 496 -names-ipc-last-dataset-498 = 497 -names-ipc-last-dataset-499 = 498 -names-ipc-last-dataset-500 = 499 -names-ipc-last-dataset-501 = 500 -names-ipc-last-dataset-502 = 501 -names-ipc-last-dataset-503 = 502 -names-ipc-last-dataset-504 = 503 -names-ipc-last-dataset-505 = 504 -names-ipc-last-dataset-506 = 505 -names-ipc-last-dataset-507 = 506 -names-ipc-last-dataset-508 = 507 -names-ipc-last-dataset-509 = 508 -names-ipc-last-dataset-510 = 509 -names-ipc-last-dataset-511 = 510 -names-ipc-last-dataset-512 = 511 -names-ipc-last-dataset-513 = 512 -names-ipc-last-dataset-514 = 513 -names-ipc-last-dataset-515 = 514 -names-ipc-last-dataset-516 = 515 -names-ipc-last-dataset-517 = 516 -names-ipc-last-dataset-518 = 517 -names-ipc-last-dataset-519 = 518 -names-ipc-last-dataset-520 = 519 -names-ipc-last-dataset-521 = 520 -names-ipc-last-dataset-522 = 521 -names-ipc-last-dataset-523 = 522 -names-ipc-last-dataset-524 = 523 -names-ipc-last-dataset-525 = 524 -names-ipc-last-dataset-526 = 525 -names-ipc-last-dataset-527 = 526 -names-ipc-last-dataset-528 = 527 -names-ipc-last-dataset-529 = 528 -names-ipc-last-dataset-530 = 529 -names-ipc-last-dataset-531 = 530 -names-ipc-last-dataset-532 = 531 -names-ipc-last-dataset-533 = 532 -names-ipc-last-dataset-534 = 533 -names-ipc-last-dataset-535 = 534 -names-ipc-last-dataset-536 = 535 -names-ipc-last-dataset-537 = 536 -names-ipc-last-dataset-538 = 537 -names-ipc-last-dataset-539 = 538 -names-ipc-last-dataset-540 = 539 -names-ipc-last-dataset-541 = 540 -names-ipc-last-dataset-542 = 541 -names-ipc-last-dataset-543 = 542 -names-ipc-last-dataset-544 = 543 -names-ipc-last-dataset-545 = 544 -names-ipc-last-dataset-546 = 545 -names-ipc-last-dataset-547 = 546 -names-ipc-last-dataset-548 = 547 -names-ipc-last-dataset-549 = 548 -names-ipc-last-dataset-550 = 549 -names-ipc-last-dataset-551 = 550 -names-ipc-last-dataset-552 = 551 -names-ipc-last-dataset-553 = 552 -names-ipc-last-dataset-554 = 553 -names-ipc-last-dataset-555 = 554 -names-ipc-last-dataset-556 = 555 -names-ipc-last-dataset-557 = 556 -names-ipc-last-dataset-558 = 557 -names-ipc-last-dataset-559 = 558 -names-ipc-last-dataset-560 = 559 -names-ipc-last-dataset-561 = 560 -names-ipc-last-dataset-562 = 561 -names-ipc-last-dataset-563 = 562 -names-ipc-last-dataset-564 = 563 -names-ipc-last-dataset-565 = 564 -names-ipc-last-dataset-566 = 565 -names-ipc-last-dataset-567 = 566 -names-ipc-last-dataset-568 = 567 -names-ipc-last-dataset-569 = 568 -names-ipc-last-dataset-570 = 569 -names-ipc-last-dataset-571 = 570 -names-ipc-last-dataset-572 = 571 -names-ipc-last-dataset-573 = 572 -names-ipc-last-dataset-574 = 573 -names-ipc-last-dataset-575 = 574 -names-ipc-last-dataset-576 = 575 -names-ipc-last-dataset-577 = 576 -names-ipc-last-dataset-578 = 577 -names-ipc-last-dataset-579 = 578 -names-ipc-last-dataset-580 = 579 -names-ipc-last-dataset-581 = 580 -names-ipc-last-dataset-582 = 581 -names-ipc-last-dataset-583 = 582 -names-ipc-last-dataset-584 = 583 -names-ipc-last-dataset-585 = 584 -names-ipc-last-dataset-586 = 585 -names-ipc-last-dataset-587 = 586 -names-ipc-last-dataset-588 = 587 -names-ipc-last-dataset-589 = 588 -names-ipc-last-dataset-590 = 589 -names-ipc-last-dataset-591 = 590 -names-ipc-last-dataset-592 = 591 -names-ipc-last-dataset-593 = 592 -names-ipc-last-dataset-594 = 593 -names-ipc-last-dataset-595 = 594 -names-ipc-last-dataset-596 = 595 -names-ipc-last-dataset-597 = 596 -names-ipc-last-dataset-598 = 597 -names-ipc-last-dataset-599 = 598 -names-ipc-last-dataset-600 = 599 -names-ipc-last-dataset-601 = 600 -names-ipc-last-dataset-602 = 601 -names-ipc-last-dataset-603 = 602 -names-ipc-last-dataset-604 = 603 -names-ipc-last-dataset-605 = 604 -names-ipc-last-dataset-606 = 605 -names-ipc-last-dataset-607 = 606 -names-ipc-last-dataset-608 = 607 -names-ipc-last-dataset-609 = 608 -names-ipc-last-dataset-610 = 609 -names-ipc-last-dataset-611 = 610 -names-ipc-last-dataset-612 = 611 -names-ipc-last-dataset-613 = 612 -names-ipc-last-dataset-614 = 613 -names-ipc-last-dataset-615 = 614 -names-ipc-last-dataset-616 = 615 -names-ipc-last-dataset-617 = 616 -names-ipc-last-dataset-618 = 617 -names-ipc-last-dataset-619 = 618 -names-ipc-last-dataset-620 = 619 -names-ipc-last-dataset-621 = 620 -names-ipc-last-dataset-622 = 621 -names-ipc-last-dataset-623 = 622 -names-ipc-last-dataset-624 = 623 -names-ipc-last-dataset-625 = 624 -names-ipc-last-dataset-626 = 625 -names-ipc-last-dataset-627 = 626 -names-ipc-last-dataset-628 = 627 -names-ipc-last-dataset-629 = 628 -names-ipc-last-dataset-630 = 629 -names-ipc-last-dataset-631 = 630 -names-ipc-last-dataset-632 = 631 -names-ipc-last-dataset-633 = 632 -names-ipc-last-dataset-634 = 633 -names-ipc-last-dataset-635 = 634 -names-ipc-last-dataset-636 = 635 -names-ipc-last-dataset-637 = 636 -names-ipc-last-dataset-638 = 637 -names-ipc-last-dataset-639 = 638 -names-ipc-last-dataset-640 = 639 -names-ipc-last-dataset-641 = 640 -names-ipc-last-dataset-642 = 641 -names-ipc-last-dataset-643 = 642 -names-ipc-last-dataset-644 = 643 -names-ipc-last-dataset-645 = 644 -names-ipc-last-dataset-646 = 645 -names-ipc-last-dataset-647 = 646 -names-ipc-last-dataset-648 = 647 -names-ipc-last-dataset-649 = 648 -names-ipc-last-dataset-650 = 649 -names-ipc-last-dataset-651 = 650 -names-ipc-last-dataset-652 = 651 -names-ipc-last-dataset-653 = 652 -names-ipc-last-dataset-654 = 653 -names-ipc-last-dataset-655 = 654 -names-ipc-last-dataset-656 = 655 -names-ipc-last-dataset-657 = 656 -names-ipc-last-dataset-658 = 657 -names-ipc-last-dataset-659 = 658 -names-ipc-last-dataset-660 = 659 -names-ipc-last-dataset-661 = 660 -names-ipc-last-dataset-662 = 661 -names-ipc-last-dataset-663 = 662 -names-ipc-last-dataset-664 = 663 -names-ipc-last-dataset-665 = 664 -names-ipc-last-dataset-666 = 665 -names-ipc-last-dataset-667 = 666 -names-ipc-last-dataset-668 = 667 -names-ipc-last-dataset-669 = 668 -names-ipc-last-dataset-670 = 669 -names-ipc-last-dataset-671 = 670 -names-ipc-last-dataset-672 = 671 -names-ipc-last-dataset-673 = 672 -names-ipc-last-dataset-674 = 673 -names-ipc-last-dataset-675 = 674 -names-ipc-last-dataset-676 = 675 -names-ipc-last-dataset-677 = 676 -names-ipc-last-dataset-678 = 677 -names-ipc-last-dataset-679 = 678 -names-ipc-last-dataset-680 = 679 -names-ipc-last-dataset-681 = 680 -names-ipc-last-dataset-682 = 681 -names-ipc-last-dataset-683 = 682 -names-ipc-last-dataset-684 = 683 -names-ipc-last-dataset-685 = 684 -names-ipc-last-dataset-686 = 685 -names-ipc-last-dataset-687 = 686 -names-ipc-last-dataset-688 = 687 -names-ipc-last-dataset-689 = 688 -names-ipc-last-dataset-690 = 689 -names-ipc-last-dataset-691 = 690 -names-ipc-last-dataset-692 = 691 -names-ipc-last-dataset-693 = 692 -names-ipc-last-dataset-694 = 693 -names-ipc-last-dataset-695 = 694 -names-ipc-last-dataset-696 = 695 -names-ipc-last-dataset-697 = 696 -names-ipc-last-dataset-698 = 697 -names-ipc-last-dataset-699 = 698 -names-ipc-last-dataset-700 = 699 -names-ipc-last-dataset-701 = 700 -names-ipc-last-dataset-702 = 701 -names-ipc-last-dataset-703 = 702 -names-ipc-last-dataset-704 = 703 -names-ipc-last-dataset-705 = 704 -names-ipc-last-dataset-706 = 705 -names-ipc-last-dataset-707 = 706 -names-ipc-last-dataset-708 = 707 -names-ipc-last-dataset-709 = 708 -names-ipc-last-dataset-710 = 709 -names-ipc-last-dataset-711 = 710 -names-ipc-last-dataset-712 = 711 -names-ipc-last-dataset-713 = 712 -names-ipc-last-dataset-714 = 713 -names-ipc-last-dataset-715 = 714 -names-ipc-last-dataset-716 = 715 -names-ipc-last-dataset-717 = 716 -names-ipc-last-dataset-718 = 717 -names-ipc-last-dataset-719 = 718 -names-ipc-last-dataset-720 = 719 -names-ipc-last-dataset-721 = 720 -names-ipc-last-dataset-722 = 721 -names-ipc-last-dataset-723 = 722 -names-ipc-last-dataset-724 = 723 -names-ipc-last-dataset-725 = 724 -names-ipc-last-dataset-726 = 725 -names-ipc-last-dataset-727 = 726 -names-ipc-last-dataset-728 = 727 -names-ipc-last-dataset-729 = 728 -names-ipc-last-dataset-730 = 729 -names-ipc-last-dataset-731 = 730 -names-ipc-last-dataset-732 = 731 -names-ipc-last-dataset-733 = 732 -names-ipc-last-dataset-734 = 733 -names-ipc-last-dataset-735 = 734 -names-ipc-last-dataset-736 = 735 -names-ipc-last-dataset-737 = 736 -names-ipc-last-dataset-738 = 737 -names-ipc-last-dataset-739 = 738 -names-ipc-last-dataset-740 = 739 -names-ipc-last-dataset-741 = 740 -names-ipc-last-dataset-742 = 741 -names-ipc-last-dataset-743 = 742 -names-ipc-last-dataset-744 = 743 -names-ipc-last-dataset-745 = 744 -names-ipc-last-dataset-746 = 745 -names-ipc-last-dataset-747 = 746 -names-ipc-last-dataset-748 = 747 -names-ipc-last-dataset-749 = 748 -names-ipc-last-dataset-750 = 749 -names-ipc-last-dataset-751 = 750 -names-ipc-last-dataset-752 = 751 -names-ipc-last-dataset-753 = 752 -names-ipc-last-dataset-754 = 753 -names-ipc-last-dataset-755 = 754 -names-ipc-last-dataset-756 = 755 -names-ipc-last-dataset-757 = 756 -names-ipc-last-dataset-758 = 757 -names-ipc-last-dataset-759 = 758 -names-ipc-last-dataset-760 = 759 -names-ipc-last-dataset-761 = 760 -names-ipc-last-dataset-762 = 761 -names-ipc-last-dataset-763 = 762 -names-ipc-last-dataset-764 = 763 -names-ipc-last-dataset-765 = 764 -names-ipc-last-dataset-766 = 765 -names-ipc-last-dataset-767 = 766 -names-ipc-last-dataset-768 = 767 -names-ipc-last-dataset-769 = 768 -names-ipc-last-dataset-770 = 769 -names-ipc-last-dataset-771 = 770 -names-ipc-last-dataset-772 = 771 -names-ipc-last-dataset-773 = 772 -names-ipc-last-dataset-774 = 773 -names-ipc-last-dataset-775 = 774 -names-ipc-last-dataset-776 = 775 -names-ipc-last-dataset-777 = 776 -names-ipc-last-dataset-778 = 777 -names-ipc-last-dataset-779 = 778 -names-ipc-last-dataset-780 = 779 -names-ipc-last-dataset-781 = 780 -names-ipc-last-dataset-782 = 781 -names-ipc-last-dataset-783 = 782 -names-ipc-last-dataset-784 = 783 -names-ipc-last-dataset-785 = 784 -names-ipc-last-dataset-786 = 785 -names-ipc-last-dataset-787 = 786 -names-ipc-last-dataset-788 = 787 -names-ipc-last-dataset-789 = 788 -names-ipc-last-dataset-790 = 789 -names-ipc-last-dataset-791 = 790 -names-ipc-last-dataset-792 = 791 -names-ipc-last-dataset-793 = 792 -names-ipc-last-dataset-794 = 793 -names-ipc-last-dataset-795 = 794 -names-ipc-last-dataset-796 = 795 -names-ipc-last-dataset-797 = 796 -names-ipc-last-dataset-798 = 797 -names-ipc-last-dataset-799 = 798 -names-ipc-last-dataset-800 = 799 -names-ipc-last-dataset-801 = 800 -names-ipc-last-dataset-802 = 801 -names-ipc-last-dataset-803 = 802 -names-ipc-last-dataset-804 = 803 -names-ipc-last-dataset-805 = 804 -names-ipc-last-dataset-806 = 805 -names-ipc-last-dataset-807 = 806 -names-ipc-last-dataset-808 = 807 -names-ipc-last-dataset-809 = 808 -names-ipc-last-dataset-810 = 809 -names-ipc-last-dataset-811 = 810 -names-ipc-last-dataset-812 = 811 -names-ipc-last-dataset-813 = 812 -names-ipc-last-dataset-814 = 813 -names-ipc-last-dataset-815 = 814 -names-ipc-last-dataset-816 = 815 -names-ipc-last-dataset-817 = 816 -names-ipc-last-dataset-818 = 817 -names-ipc-last-dataset-819 = 818 -names-ipc-last-dataset-820 = 819 -names-ipc-last-dataset-821 = 820 -names-ipc-last-dataset-822 = 821 -names-ipc-last-dataset-823 = 822 -names-ipc-last-dataset-824 = 823 -names-ipc-last-dataset-825 = 824 -names-ipc-last-dataset-826 = 825 -names-ipc-last-dataset-827 = 826 -names-ipc-last-dataset-828 = 827 -names-ipc-last-dataset-829 = 828 -names-ipc-last-dataset-830 = 829 -names-ipc-last-dataset-831 = 830 -names-ipc-last-dataset-832 = 831 -names-ipc-last-dataset-833 = 832 -names-ipc-last-dataset-834 = 833 -names-ipc-last-dataset-835 = 834 -names-ipc-last-dataset-836 = 835 -names-ipc-last-dataset-837 = 836 -names-ipc-last-dataset-838 = 837 -names-ipc-last-dataset-839 = 838 -names-ipc-last-dataset-840 = 839 -names-ipc-last-dataset-841 = 840 -names-ipc-last-dataset-842 = 841 -names-ipc-last-dataset-843 = 842 -names-ipc-last-dataset-844 = 843 -names-ipc-last-dataset-845 = 844 -names-ipc-last-dataset-846 = 845 -names-ipc-last-dataset-847 = 846 -names-ipc-last-dataset-848 = 847 -names-ipc-last-dataset-849 = 848 -names-ipc-last-dataset-850 = 849 -names-ipc-last-dataset-851 = 850 -names-ipc-last-dataset-852 = 851 -names-ipc-last-dataset-853 = 852 -names-ipc-last-dataset-854 = 853 -names-ipc-last-dataset-855 = 854 -names-ipc-last-dataset-856 = 855 -names-ipc-last-dataset-857 = 856 -names-ipc-last-dataset-858 = 857 -names-ipc-last-dataset-859 = 858 -names-ipc-last-dataset-860 = 859 -names-ipc-last-dataset-861 = 860 -names-ipc-last-dataset-862 = 861 -names-ipc-last-dataset-863 = 862 -names-ipc-last-dataset-864 = 863 -names-ipc-last-dataset-865 = 864 -names-ipc-last-dataset-866 = 865 -names-ipc-last-dataset-867 = 866 -names-ipc-last-dataset-868 = 867 -names-ipc-last-dataset-869 = 868 -names-ipc-last-dataset-870 = 869 -names-ipc-last-dataset-871 = 870 -names-ipc-last-dataset-872 = 871 -names-ipc-last-dataset-873 = 872 -names-ipc-last-dataset-874 = 873 -names-ipc-last-dataset-875 = 874 -names-ipc-last-dataset-876 = 875 -names-ipc-last-dataset-877 = 876 -names-ipc-last-dataset-878 = 877 -names-ipc-last-dataset-879 = 878 -names-ipc-last-dataset-880 = 879 -names-ipc-last-dataset-881 = 880 -names-ipc-last-dataset-882 = 881 -names-ipc-last-dataset-883 = 882 -names-ipc-last-dataset-884 = 883 -names-ipc-last-dataset-885 = 884 -names-ipc-last-dataset-886 = 885 -names-ipc-last-dataset-887 = 886 -names-ipc-last-dataset-888 = 887 -names-ipc-last-dataset-889 = 888 -names-ipc-last-dataset-890 = 889 -names-ipc-last-dataset-891 = 890 -names-ipc-last-dataset-892 = 891 -names-ipc-last-dataset-893 = 892 -names-ipc-last-dataset-894 = 893 -names-ipc-last-dataset-895 = 894 -names-ipc-last-dataset-896 = 895 -names-ipc-last-dataset-897 = 896 -names-ipc-last-dataset-898 = 897 -names-ipc-last-dataset-899 = 898 -names-ipc-last-dataset-900 = 899 -names-ipc-last-dataset-901 = 900 -names-ipc-last-dataset-902 = 901 -names-ipc-last-dataset-903 = 902 -names-ipc-last-dataset-904 = 903 -names-ipc-last-dataset-905 = 904 -names-ipc-last-dataset-906 = 905 -names-ipc-last-dataset-907 = 906 -names-ipc-last-dataset-908 = 907 -names-ipc-last-dataset-909 = 908 -names-ipc-last-dataset-910 = 909 -names-ipc-last-dataset-911 = 910 -names-ipc-last-dataset-912 = 911 -names-ipc-last-dataset-913 = 912 -names-ipc-last-dataset-914 = 913 -names-ipc-last-dataset-915 = 914 -names-ipc-last-dataset-916 = 915 -names-ipc-last-dataset-917 = 916 -names-ipc-last-dataset-918 = 917 -names-ipc-last-dataset-919 = 918 -names-ipc-last-dataset-920 = 919 -names-ipc-last-dataset-921 = 920 -names-ipc-last-dataset-922 = 921 -names-ipc-last-dataset-923 = 922 -names-ipc-last-dataset-924 = 923 -names-ipc-last-dataset-925 = 924 -names-ipc-last-dataset-926 = 925 -names-ipc-last-dataset-927 = 926 -names-ipc-last-dataset-928 = 927 -names-ipc-last-dataset-929 = 928 -names-ipc-last-dataset-930 = 929 -names-ipc-last-dataset-931 = 930 -names-ipc-last-dataset-932 = 931 -names-ipc-last-dataset-933 = 932 -names-ipc-last-dataset-934 = 933 -names-ipc-last-dataset-935 = 934 -names-ipc-last-dataset-936 = 935 -names-ipc-last-dataset-937 = 936 -names-ipc-last-dataset-938 = 937 -names-ipc-last-dataset-939 = 938 -names-ipc-last-dataset-940 = 939 -names-ipc-last-dataset-941 = 940 -names-ipc-last-dataset-942 = 941 -names-ipc-last-dataset-943 = 942 -names-ipc-last-dataset-944 = 943 -names-ipc-last-dataset-945 = 944 -names-ipc-last-dataset-946 = 945 -names-ipc-last-dataset-947 = 946 -names-ipc-last-dataset-948 = 947 -names-ipc-last-dataset-949 = 948 -names-ipc-last-dataset-950 = 949 -names-ipc-last-dataset-951 = 950 -names-ipc-last-dataset-952 = 951 -names-ipc-last-dataset-953 = 952 -names-ipc-last-dataset-954 = 953 -names-ipc-last-dataset-955 = 954 -names-ipc-last-dataset-956 = 955 -names-ipc-last-dataset-957 = 956 -names-ipc-last-dataset-958 = 957 -names-ipc-last-dataset-959 = 958 -names-ipc-last-dataset-960 = 959 -names-ipc-last-dataset-961 = 960 -names-ipc-last-dataset-962 = 961 -names-ipc-last-dataset-963 = 962 -names-ipc-last-dataset-964 = 963 -names-ipc-last-dataset-965 = 964 -names-ipc-last-dataset-966 = 965 -names-ipc-last-dataset-967 = 966 -names-ipc-last-dataset-968 = 967 -names-ipc-last-dataset-969 = 968 -names-ipc-last-dataset-970 = 969 -names-ipc-last-dataset-971 = 970 -names-ipc-last-dataset-972 = 971 -names-ipc-last-dataset-973 = 972 -names-ipc-last-dataset-974 = 973 -names-ipc-last-dataset-975 = 974 -names-ipc-last-dataset-976 = 975 -names-ipc-last-dataset-977 = 976 -names-ipc-last-dataset-978 = 977 -names-ipc-last-dataset-979 = 978 -names-ipc-last-dataset-980 = 979 -names-ipc-last-dataset-981 = 980 -names-ipc-last-dataset-982 = 981 -names-ipc-last-dataset-983 = 982 -names-ipc-last-dataset-984 = 983 -names-ipc-last-dataset-985 = 984 -names-ipc-last-dataset-986 = 985 -names-ipc-last-dataset-987 = 986 -names-ipc-last-dataset-988 = 987 -names-ipc-last-dataset-989 = 988 -names-ipc-last-dataset-990 = 989 -names-ipc-last-dataset-991 = 990 -names-ipc-last-dataset-992 = 991 -names-ipc-last-dataset-993 = 992 -names-ipc-last-dataset-994 = 993 -names-ipc-last-dataset-995 = 994 -names-ipc-last-dataset-996 = 995 -names-ipc-last-dataset-997 = 996 -names-ipc-last-dataset-998 = 997 -names-ipc-last-dataset-999 = 998 -names-ipc-last-dataset-1000 = 999 diff --git a/Resources/Locale/en-US/_EE/emotes/emotes.ftl b/Resources/Locale/en-US/_EE/emotes/emotes.ftl deleted file mode 100644 index d7f5381601f..00000000000 --- a/Resources/Locale/en-US/_EE/emotes/emotes.ftl +++ /dev/null @@ -1,6 +0,0 @@ -silicon-emote-deathgasp = seizes up and falls limp, {POSS-ADJ($entity)} lights sputtering into darkness... -chat-emote-msg-deathgasp-silicon = suddenly goes silent, with a hiss of grinding servos and a screech of dying myomers. -# DeltaV -chat-emote-name-whirr = Whirr -# DeltaV -chat-emote-name-boop = Boop diff --git a/Resources/Locale/en-US/_EE/lock/batterySlotRequiresLock.ftl b/Resources/Locale/en-US/_EE/lock/batterySlotRequiresLock.ftl deleted file mode 100644 index 25a7f0723eb..00000000000 --- a/Resources/Locale/en-US/_EE/lock/batterySlotRequiresLock.ftl +++ /dev/null @@ -1 +0,0 @@ -batteryslotrequireslock-component-alert-owner = {$user} is messing with your maintenance panel! diff --git a/Resources/Locale/en-US/_EE/power/batteries.ftl b/Resources/Locale/en-US/_EE/power/batteries.ftl deleted file mode 100644 index 15ebafae77b..00000000000 --- a/Resources/Locale/en-US/_EE/power/batteries.ftl +++ /dev/null @@ -1 +0,0 @@ -battery-electrocute-charge = The battery surges with energy! diff --git a/Resources/Locale/en-US/_EE/power/batteryDrinker.ftl b/Resources/Locale/en-US/_EE/power/batteryDrinker.ftl deleted file mode 100644 index 5b580a41849..00000000000 --- a/Resources/Locale/en-US/_EE/power/batteryDrinker.ftl +++ /dev/null @@ -1,2 +0,0 @@ -battery-drinker-verb-drink = Drain -battery-drinker-empty = {CAPITALIZE(THE($target))} is already empty! diff --git a/Resources/Locale/en-US/_EE/power/silicons.ftl b/Resources/Locale/en-US/_EE/power/silicons.ftl deleted file mode 100644 index 4e047d36539..00000000000 --- a/Resources/Locale/en-US/_EE/power/silicons.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ipc-recharge-tip = You charged a litte of your battery. -dead-startup-button-verb = Reboot -dead-startup-system-reboot-success = {$target}'s system was rebooted. -dead-startup-system-reboot-failed = {$target}'s chassis is way too damaged. diff --git a/Resources/Locale/en-US/_EE/prototypes/entities/mobs/customization/ipcAntenna.ftl b/Resources/Locale/en-US/_EE/prototypes/entities/mobs/customization/ipcAntenna.ftl deleted file mode 100644 index 07fe8ab6d51..00000000000 --- a/Resources/Locale/en-US/_EE/prototypes/entities/mobs/customization/ipcAntenna.ftl +++ /dev/null @@ -1,17 +0,0 @@ -marking-RobotAntennaTv = Tv -marking-RobotAntennaTv-ipc_antenna_tv = TV -marking-RobotAntennaTesla = Tesla -marking-RobotAntennaTesla-ipc_antenna_tesla = Tesla -marking-RobotAntennaLightb = Light (alt) -marking-RobotAntennaLight = Light -marking-RobotAntennaCyberhead = Cyberhead -marking-RobotAntennaCyberhead-ipc_antenna_cyberhead = Cyberhead -marking-RobotAntennaSidelights = Sidelights -marking-RobotAntennaAntlers = Antlers -marking-RobotAntennaAntlers-ipc_antenna_antlers = Antlers -marking-RobotAntennaDroneeyes = Drone Eyes -marking-RobotAntennaDroneeyes-ipc_antenna_droneeyes = Drone Eyes -marking-RobotAntennaCrowned = Crowned -marking-RobotAntennaCrowned-ipc_antenna_crowned = Crown -marking-RobotAntennaTowers = Towers -marking-RobotAntennaTowers-ipc_antenna_towers = Towers diff --git a/Resources/Locale/en-US/_EE/prototypes/entities/mobs/customization/ipcScreens.ftl b/Resources/Locale/en-US/_EE/prototypes/entities/mobs/customization/ipcScreens.ftl deleted file mode 100644 index a684433ad65..00000000000 --- a/Resources/Locale/en-US/_EE/prototypes/entities/mobs/customization/ipcScreens.ftl +++ /dev/null @@ -1,78 +0,0 @@ -marking-ScreenStatic = Static -marking-ScreenStatic-ipc_screen_static = Static -marking-ScreenBlue = Blue -marking-ScreenBlue-ipc_screen_blue = Blue -marking-ScreenBreakout = Breakout -marking-ScreenBreakout-ipc_screen_breakout = Breakout -marking-ScreenEight = Eight -marking-ScreenEight-ipc_screen_eight = Eight -marking-ScreenGoggles = Goggles -marking-ScreenGoggles-ipc_screen_goggles = Goggles -marking-ScreenExclaim = Exclaim -marking-ScreenExclaim-ipc_screen_exclaim = Exclaim -marking-ScreenHeart = Heart -marking-ScreenHeart-ipc_screen_heart = Heart -marking-ScreenMonoeye = Cyclops -marking-ScreenMonoeye-ipc_screen_monoeye = Cyclops -marking-ScreenNature = Naturalist -marking-ScreenNature-ipc_screen_nature = Naturalist -marking-ScreenOrange = Orange -marking-ScreenOrange-ipc_screen_orange = Orange -marking-ScreenPink = Pink -marking-ScreenPink-ipc_screen_pink = Pink -marking-ScreenQuestion = Question -marking-ScreenQuestion-ipc_screen_question = Question -marking-ScreenShower = Shower -marking-ScreenShower-ipc_screen_shower = Shower -marking-ScreenYellow = Yellow -marking-ScreenYellow-ipc_screen_yellow = Yellow -marking-ScreenScroll = Scroll -marking-ScreenScroll-ipc_screen_scroll = Scroll -marking-ScreenConsole = Console -marking-ScreenConsole-ipc_screen_console = Console -marking-ScreenRgb = RGB -marking-ScreenRgb-ipc_screen_rgb = RGB -marking-ScreenGlider = Glider -marking-ScreenGlider-ipc_screen_glider = Glider -marking-ScreenRainbowhoriz = Horizontal Rainbow -marking-ScreenRainbowhoriz-ipc_screen_rainbowhoriz = Horizontal Rainbow -marking-ScreenBsod = BSOD -marking-ScreenBsod-ipc_screen_bsod = BSOD -marking-ScreenRedtext = Red Text -marking-ScreenRedtext-ipc_screen_redtext = Red Text -marking-ScreenSinewave = Sinewave -marking-ScreenSinewave-ipc_screen_sinewave = Sinewave -marking-ScreenSquarewave = Squarewave -marking-ScreenSquarewave-ipc_screen_squarewave = Squarewave -marking-ScreenEcgwave = ECG wave -marking-ScreenEcgwave-ipc_screen_ecgwave = ECG wave -marking-ScreenEyes = Eyes -marking-ScreenEyes-ipc_screen_eyes = Eyes -marking-ScreenEyestall = Tall Eyes -marking-ScreenEyestall-ipc_screen_eyestall = Tall Eyes -marking-ScreenEyesangry = Angry Eyes -marking-ScreenEyesangry-ipc_screen_eyesangry = Angry Eyes -marking-ScreenLoading = Loading... -marking-ScreenLoading-ipc_screen_loading = Loading -marking-ScreenWindowsxp = Experience -marking-ScreenWindowsxp-ipc_screen_windowsxp = Experience -marking-ScreenTetris = NT Block Game -marking-ScreenTetris-ipc_screen_tetris = NT Block Game -marking-ScreenTv = Tv -marking-ScreenTv-ipc_screen_tv = Tv -marking-ScreenTextdrop = Textdrop -marking-ScreenTextdrop-ipc_screen_textdrop = Textdrop -marking-ScreenStars = Stars -marking-ScreenStars-ipc_screen_stars = Stars -marking-ScreenRainbowdiag = Diagonal Rainbow -marking-ScreenRainbowdiag-ipc_screen_rainbowdiag= Diagonal Rainbow -marking-ScreenBlank = Dead Pixel -marking-ScreenBlank-ipc_screen_blank = Dead Pixel -marking-ScreenSmile = Smiley -marking-ScreenSmile-ipc_screen_smile = Smiley -marking-ScreenFrown = Frowny -marking-ScreenFrown-ipc_screen_frown = Frowny -marking-ScreenRing = Ring -marking-ScreenRing-ipc_screen_ring = Ring -marking-ScreenL = L -marking-ScreenL-ipc_screen_l = L diff --git a/Resources/Locale/en-US/_EE/silicons/cyberlimbs.ftl b/Resources/Locale/en-US/_EE/silicons/cyberlimbs.ftl deleted file mode 100644 index 2c4da305b3e..00000000000 --- a/Resources/Locale/en-US/_EE/silicons/cyberlimbs.ftl +++ /dev/null @@ -1,96 +0,0 @@ -marking-MobIPCHeadDefault = Standard Operational Monitor -marking-MobIPCTorsoDefault = Standard Robotic Chassis -marking-MobIPCTorsoFemaleDefault = Standard Robotic Chassis -marking-MobIPCLArmDefault = Standard Left Robotic Arm -marking-MobIPCLHandDefault = Standard Left Robotic Hand -marking-MobIPCLLegDefault = Standard Left Robotic Leg -marking-MobIPCLFootDefault = Standard Left Robotic Foot -marking-MobIPCRArmDefault = Standard Right Robotic Arm -marking-MobIPCRHandDefault = Standard Right Robotic Hand -marking-MobIPCRLegDefault = Standard Right Robotic Leg -marking-MobIPCRFootDefault = Standard Right Robotic Foot - -marking-CyberLimbsMarkingBishopHead = Operational Monitor from Bishop Cybernetics -marking-CyberLimbsMarkingBishopHeadAlt = Head from Bishop Cybernetics -marking-CyberLimbsMarkingBishopHeadAlt1 = Alternate Head from Bishop Cybernetics -marking-CyberLimbsMarkingBishopChest = Robotic Chassis from Bishop Cybernetics -marking-CyberLimbsMarkingBishopLArm = Left Robotic Arm from Bishop Cybernetics -marking-CyberLimbsMarkingBishopLHand = Left Robotic Hand from Bishop Cybernetics -marking-CyberLimbsMarkingBishopLLeg = Left Robotic Leg from Bishop Cybernetics -marking-CyberLimbsMarkingBishopLFoot = Left Robotic Foot from Bishop Cybernetics -marking-CyberLimbsMarkingBishopRArm = Right Robotic Arm from Bishop Cybernetics -marking-CyberLimbsMarkingBishopRHand = Right Robotic Hand from Bishop Cybernetics -marking-CyberLimbsMarkingBishopRLeg = Right Robotic Leg from Bishop Cybernetics -marking-CyberLimbsMarkingBishopRFoot = Right Robotic Foot from Bishop Cybernetics - -marking-CyberLimbsMarkingHesphiastosHead = Operational Monitor from Hesphiastos Industries -marking-CyberLimbsMarkingHesphiastosHeadAlt = Head from Hesphiastos Industries -marking-CyberLimbsMarkingHesphiastosChest = Robotic Chassis from Hesphiastos Industries -marking-CyberLimbsMarkingHesphiastosLArm = Left Robotic Arm from Hesphiastos Industries -marking-CyberLimbsMarkingHesphiastosLHand = Left Robotic Hand from Hesphiastos Industries -marking-CyberLimbsMarkingHesphiastosLLeg = Left Robotic Leg from Hesphiastos Industries -marking-CyberLimbsMarkingHesphiastosLFoot = Left Robotic Foot from Hesphiastos Industries -marking-CyberLimbsMarkingHesphiastosRArm = Right Robotic Arm from Hesphiastos Industries -marking-CyberLimbsMarkingHesphiastosRHand = Right Robotic Hand from Hesphiastos Industries -marking-CyberLimbsMarkingHesphiastosRLeg = Right Robotic Leg from Hesphiastos Industries -marking-CyberLimbsMarkingHesphiastosRFoot = Right Robotic Foot from Hesphiastos Industries - -marking-CyberLimbsMarkingWardtakahashiHead = Operational Monitor from Ward-Takahashi -marking-CyberLimbsMarkingWardtakahashiHeadAlt = Head from Ward-Takahashi -marking-CyberLimbsMarkingWardtakahashiHeadAlt1 = Alternate Head from Ward-Takahashi -marking-CyberLimbsMarkingWardtakahashiChest = Robotic Chassis from Ward-Takahashi -marking-CyberLimbsMarkingWardtakahashiLArm = Left Robotic Arm from Ward-Takahashi -marking-CyberLimbsMarkingWardtakahashiLHand = Left Robotic Hand from Ward-Takahashi -marking-CyberLimbsMarkingWardtakahashiLLeg = Left Robotic Leg from Ward-Takahashi -marking-CyberLimbsMarkingWardtakahashiLFoot = Left Robotic Foot from Ward-Takahashi -marking-CyberLimbsMarkingWardtakahashiRArm = Right Robotic Arm from Ward-Takahashi -marking-CyberLimbsMarkingWardtakahashiRHand = Right Robotic Hand from Ward-Takahashi -marking-CyberLimbsMarkingWardtakahashiRLeg = Right Robotic Leg from Ward-Takahashi -marking-CyberLimbsMarkingWardtakahashiRFoot = Right Robotic Foot from Ward-Takahashi - -marking-CyberLimbsMarkingXionHead = Operational Monitor from Xion Manufacturing Group -marking-CyberLimbsMarkingXionHeadAlt = Head from Xion Manufacturing Group -marking-CyberLimbsMarkingXionChest = Robotic Chassis from Xion Manufacturing Group -marking-CyberLimbsMarkingXionLArm = Left Robotic Arm from Xion Manufacturing Group -marking-CyberLimbsMarkingXionLHand = Left Robotic Hand from Xion Manufacturing Group -marking-CyberLimbsMarkingXionLLeg = Left Robotic Leg from Xion Manufacturing Group -marking-CyberLimbsMarkingXionLFoot = Left Robotic Foot from Xion Manufacturing Group -marking-CyberLimbsMarkingXionRArm = Right Robotic Arm from Xion Manufacturing Group -marking-CyberLimbsMarkingXionRHand = Right Robotic Hand from Xion Manufacturing Group -marking-CyberLimbsMarkingXionRLeg = Right Robotic Leg from Xion Manufacturing Group -marking-CyberLimbsMarkingXionRFoot = Right Robotic Foot from Xion Manufacturing Group - -marking-CyberLimbsMarkingShellguardHead = Operational Monitor from Shellguard Munitions -marking-CyberLimbsMarkingShellguardHeadAlt = Head from Shellguard Munitions -marking-CyberLimbsMarkingShellguardChest = Robotic Chassis from Shellguard Munitions -marking-CyberLimbsMarkingShellguardLArm = Left Robotic Arm from Shellguard Munitions -marking-CyberLimbsMarkingShellguardLHand = Left Robotic Hand from Shellguard Munitions -marking-CyberLimbsMarkingShellguardLLeg = Left Robotic Leg from Shellguard Munitions -marking-CyberLimbsMarkingShellguardLFoot = Left Robotic Foot from Shellguard Munitions -marking-CyberLimbsMarkingShellguardRArm = Right Robotic Arm from Shellguard Munitions -marking-CyberLimbsMarkingShellguardRHand = Right Robotic Hand from Shellguard Munitions -marking-CyberLimbsMarkingShellguardRLeg = Right Robotic Leg from Shellguard Munitions -marking-CyberLimbsMarkingShellguardRFoot = Right Robotic Foot from Shellguard Munitions - -marking-CyberLimbsMarkingMorpheusHead = Operational Monitor from Morpheus Cyberkinetics -marking-CyberLimbsMarkingMorpheusHeadAlt = Head from Morpheus Cyberkinetics -marking-CyberLimbsMarkingMorpheusChest = Robotic Chassis from Morpheus Cyberkinetics -marking-CyberLimbsMarkingMorpheusLArm = Left Robotic Arm from Morpheus Cyberkinetics -marking-CyberLimbsMarkingMorpheusLHand = Left Robotic Hand from Morpheus Cyberkinetics -marking-CyberLimbsMarkingMorpheusLLeg = Left Robotic Leg from Morpheus Cyberkinetics -marking-CyberLimbsMarkingMorpheusLFoot = Left Robotic Foot from Morpheus Cyberkinetics -marking-CyberLimbsMarkingMorpheusRArm = Right Robotic Arm from Morpheus Cyberkinetics -marking-CyberLimbsMarkingMorpheusRHand = Right Robotic Hand from Morpheus Cyberkinetics -marking-CyberLimbsMarkingMorpheusRLeg = Right Robotic Leg from Morpheus Cyberkinetics -marking-CyberLimbsMarkingMorpheusRFoot = Right Robotic Foot from Morpheus Cyberkinetics - -marking-CyberLimbsMarkingZenghuHead = Head from Zenghu Pharmaceuticals -marking-CyberLimbsMarkingZenghuChest = Robotic Chassis from Zenghu Pharmaceuticals -marking-CyberLimbsMarkingZenghuRHand = Right Robotic Hand from Zenghu Pharmaceuticals -marking-CyberLimbsMarkingZenghuRArm = Right Robotic Arm from Zenghu Pharmaceuticals -marking-CyberLimbsMarkingZenghuLHand = Left Robotic Hand from Zenghu Pharmaceuticals -marking-CyberLimbsMarkingZenghuLArm = Left Robotic Arm from Zenghu Pharmaceuticals -marking-CyberLimbsMarkingZenghuRLeg = Right Robotic Leg from Zenghu Pharmaceuticals -marking-CyberLimbsMarkingZenghuRFoot = Right Robotic Foot from Zenghu Pharmaceuticals -marking-CyberLimbsMarkingZenghuLLeg = Left Robotic Leg from Zenghu Pharmaceuticals -marking-CyberLimbsMarkingZenghuLFoot = Left Robotic Foot from Zenghu Pharmaceuticals diff --git a/Resources/Locale/en-US/_EE/silicons/siliconChargers.ftl b/Resources/Locale/en-US/_EE/silicons/siliconChargers.ftl deleted file mode 100644 index 4d143b6337e..00000000000 --- a/Resources/Locale/en-US/_EE/silicons/siliconChargers.ftl +++ /dev/null @@ -1,4 +0,0 @@ -silicon-charger-overheatwarning = You feel like you're in a microwave! -silicon-charger-chargerate-string = Charge rate -silicon-charger-efficiency-string = Efficiency -silicon-charger-list-full = {CAPITALIZE(THE($charger))} can only accommodate so many targets! diff --git a/Resources/Locale/en-US/_EE/silicons/silicons.ftl b/Resources/Locale/en-US/_EE/silicons/silicons.ftl deleted file mode 100644 index f7a9650fff3..00000000000 --- a/Resources/Locale/en-US/_EE/silicons/silicons.ftl +++ /dev/null @@ -1,3 +0,0 @@ -silicon-overheating = You feel your circuits overheating! -silicon-crit = Structural integrity critical! -silicon-power-low = Power low! diff --git a/Resources/Locale/en-US/_EE/species/namePreset.ftl b/Resources/Locale/en-US/_EE/species/namePreset.ftl deleted file mode 100644 index be280a7ba20..00000000000 --- a/Resources/Locale/en-US/_EE/species/namePreset.ftl +++ /dev/null @@ -1 +0,0 @@ -namepreset-firstdashlast = {$first}-{$last} diff --git a/Resources/Locale/en-US/_EE/species/species.ftl b/Resources/Locale/en-US/_EE/species/species.ftl deleted file mode 100644 index faec6dde93a..00000000000 --- a/Resources/Locale/en-US/_EE/species/species.ftl +++ /dev/null @@ -1 +0,0 @@ -species-name-ipc = IPC diff --git a/Resources/Locale/en-US/_Goobstation/power/silicons.ftl b/Resources/Locale/en-US/_Goobstation/power/silicons.ftl deleted file mode 100644 index 9d52b2210d1..00000000000 --- a/Resources/Locale/en-US/_Goobstation/power/silicons.ftl +++ /dev/null @@ -1 +0,0 @@ -ipc-overheat-popup = {$name}'s circuits shut down from overheating! diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index 149b5453f5e..c8e94cb6fc8 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -722,3 +722,10 @@ HandheldHealthAnalyzerEmpty: HandheldHealthAnalyzer #2026-01-09 BorgModuleAdvancedChemical: BorgModuleAdvancedTopical + +# 2026-05-19 +OrganIPCEars: null +OrganIPCSpacePump: null +OrganIPCTongue: null +PlushieIPC: null +LeftLegIPC: null diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 813407e6131..fae8bb207f0 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -54,7 +54,6 @@ damageContainers: - Inorganic - Silicon - - HumanoidSilicon # DeltaV - IPCs - type: ShowAccessReaderSettings - type: entity @@ -271,7 +270,6 @@ - BiologicalMetaphysical # DeltaV - Kitsune - Inorganic # DeltaV - Silicon # DeltaV - Borgs - - HumanoidSilicon # DeltaV - IPCs - type: Tag tags: - PetWearable diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 72398e4bd65..dc5edc13df5 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -206,7 +206,6 @@ tags: - ClownMask - WhitelistChameleon - - IPCMaskWearable # EE - IPCs - type: HideLayerClothing slots: - Snout @@ -301,9 +300,6 @@ - type: HideLayerClothing slots: - Snout - - type: Tag - tags: - - IPCMaskWearable # EE - IPCs - type: entity parent: ClothingMaskBase @@ -321,7 +317,6 @@ tags: - HamsterWearable - WhitelistChameleon - - IPCMaskWearable # EE - IPCs - type: HideLayerClothing slots: - Snout @@ -516,7 +511,6 @@ tags: - HamsterWearable - WhitelistChameleon - - IPCMaskWearable # EE - IPCs - type: HideLayerClothing slots: - Snout @@ -537,9 +531,6 @@ - type: HideLayerClothing slots: - Snout - - type: Tag - tags: - - IPCMaskWearable # EE - IPCs - type: entity parent: ClothingMaskBase @@ -556,9 +547,6 @@ - type: HideLayerClothing slots: - Snout - - type: Tag - tags: - - IPCMaskWearable # EE - IPCs - type: entity parent: ClothingMaskBase @@ -575,9 +563,6 @@ - type: HideLayerClothing slots: - Snout - - type: Tag - tags: - - IPCMaskWearable # EE - IPCs - type: entity parent: ClothingMaskBase @@ -594,9 +579,6 @@ - type: HideLayerClothing slots: - Snout - - type: Tag - tags: - - IPCMaskWearable # EE - IPCs - type: entity parent: ClothingMaskBase @@ -613,9 +595,6 @@ - type: HideLayerClothing slots: - Snout - - type: Tag - tags: - - IPCMaskWearable # EE - IPCs - type: entity parent: ClothingMaskBase @@ -632,9 +611,6 @@ - type: HideLayerClothing slots: - Snout - - type: Tag - tags: - - IPCMaskWearable # EE - IPCs - type: entity parent: ClothingMaskBase @@ -651,7 +627,6 @@ - type: Tag tags: - WhitelistChameleon - - IPCMaskWearable # EE - IPCs - type: entity parent: ClothingMaskNeckGaiter @@ -756,9 +731,6 @@ - type: EyeProtection - type: BreathMask - type: IdentityBlocker - - type: Tag - tags: - - IPCMaskWearable # EE - IPCs - type: entity parent: ClothingMaskGas @@ -782,4 +754,3 @@ - type: Tag tags: - WhitelistChameleon - - IPCMaskWearable # EE - IPCs diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml index 5c70ec96be2..33f0ec3ad60 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml @@ -41,9 +41,6 @@ type: ChameleonBoundUserInterface enum.VoiceMaskUIKey.Key: type: VoiceMaskBoundUserInterface - - type: Tag - tags: - - IPCMaskWearable # EE - IPCs - type: entity parent: ClothingMaskBase diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index a23f1dea3ff..831010f8f48 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -42,7 +42,6 @@ # Begin DeltaV - see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml - id: PlushieMothRandom # Nyano - random moth plushies - id: PlushieMort - - id: PlushieIPC - id: PlushieFelinid - id: PlushieOni - id: PlushieHarpy diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index ebc81b4d1e0..dd68670a9fa 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -164,7 +164,6 @@ speechVerb: Robotic speechSounds: Borg - type: Vocal - wilhelm: "/Audio/_EE/Voice/IPC/wilhelm.ogg" # DeltaV sounds: Unsexed: UnisexSilicon wilhelmProbability: 0.001 # DeltaV @@ -257,7 +256,6 @@ - FootstepSound - CanPilot - SiliconEmotes - - SiliconOrIPCEmotes # DeltaV - Honker # DeltaV - Can honk - Unimplantable - type: Emoting @@ -528,7 +526,6 @@ allowedEmotes: - Laugh - type: Vocal - wilhelm: "/Audio/_EE/Voice/IPC/wilhelm.ogg" # DeltaV sounds: Unsexed: UnisexSiliconXenoborg wilhelmProbability: 0.001 # DeltaV diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 592fedba480..210394d82c9 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -24,7 +24,6 @@ tags: - DoorBumpOpener - SiliconEmotes - - SiliconOrIPCEmotes # DeltaV - Honker # DeltaV - Can honk - Unimplantable - type: MobState @@ -105,7 +104,6 @@ tags: - DoorBumpOpener - SiliconEmotes - - SiliconOrIPCEmotes # DeltaV - Honker # DeltaV - Can honk - Bot - Unimplantable @@ -478,7 +476,6 @@ - DoorBumpOpener - FootstepSound - SiliconEmotes - - SiliconOrIPCEmotes # DeltaV - Honker # DeltaV - Can honk - Bot - Unimplantable diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 231d217d531..f9ae69fa829 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -495,7 +495,6 @@ damageContainers: - Inorganic - Silicon - - HumanoidSilicon # End DeltaV additions - type: ToggleableGhostRole roleName: station-ai-ghost-role-name diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 7ab6396de28..9f269c26fca 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -389,8 +389,6 @@ orGroup: GiftPool - id: ToySiobhan orGroup: GiftPool - - id: PlushieIPC - orGroup: GiftPool - id: PlushieFelinid orGroup: GiftPool - id: PlushieOni diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml index 4930db22543..532d0b9cca3 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml @@ -49,13 +49,6 @@ solutions: glass: canReact: false - # EE - IPC Healing - - type: BlindHealing - damageContainers: - - Silicon - - HumanoidSilicon # DeltaV - IPCs need to see - - type: StackPrice - price: 2 - type: entity parent: SheetGlassBase diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml index 528afd03d7b..52cb0ec6953 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml @@ -45,14 +45,6 @@ - type: PhysicalComposition materialComposition: Steel: 100 - - type: Healing # DeltaV - steel heals caustic damage for IPCs - delay: 1 - damageContainers: - - Silicon - - HumanoidSilicon - damage: - types: - Caustic: -5 - type: Stack stackType: Steel baseLayer: base diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index b0295068a53..628d0bf76dc 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -84,13 +84,6 @@ - type: PhysicalComposition materialComposition: Plasma: 100 - - type: Healing # DeltaV - Plasma heals IPC radiation - delay: 2.0 - damageContainers: - - HumanoidSilicon - damage: - types: - Radiation: -5.0 - type: Stack stackType: Plasma baseLayer: base @@ -152,14 +145,6 @@ - type: PhysicalComposition materialComposition: Plastic: 100 - - type: Healing # DeltaV - plastic repairs stop bleeding - delay: 3.0 - damageContainers: - - HumanoidSilicon - damage: - groups: - Brute: 0 # funny - bloodlossModifier: -20 - type: Stack stackType: Plastic baseLayer: base diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index c99f3ef4634..16607922dd8 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -64,7 +64,6 @@ price: 100 # Begin DeltaV additions - type: MeleeWeapon - canWideSwing: false damage: types: Blunt: 3 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 42be24195bf..bda59013787 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -42,7 +42,6 @@ enum.MechUiKey.Key: type: MechBoundUserInterface - type: MeleeWeapon - canWideSwing: false hidden: true attackRate: 0.75 damage: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml index 16cb05f2bb6..61124d6599d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml @@ -103,9 +103,6 @@ stopSearchVerbText: positronic-brain-stop-searching-verb-text stopSearchVerbPopup: positronic-brain-stopped-searching job: Borg - - type: Organ - slotId: posbrain - - type: Brain - type: BlockMovement - type: Examiner - type: BorgBrain diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml index 818874e35c7..59337e8676f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml @@ -29,21 +29,6 @@ - type: PhysicalComposition materialComposition: Steel: 15 - # EE Change Start - #Same as Ointment but divided by 5 and 3 because StackPrice needs to be 1 - Estacao Pirata IPCs - #1 Ointment = -50 damage of those types - #1 Cable ~= -50 (-49.8) damage of those types - - type: Healing - delay: 0.6 - damageContainers: - - Silicon - - HumanoidSilicon # DeltaV - damage: - types: # these are all split across multiple types - Heat: -3.22 # DeltaV was -1.66 - Shock: -3.22 # DeltaV was -1.66 - Cold: -3.22 # DeltaV - # EE Change End - type: GuideHelp guides: - VoltageNetworks diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index fb492bad3cf..2b7ffc780a7 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -105,17 +105,6 @@ price: 40 - type: IgnitionSource temperature: 700 - - type: WeldingHealing # Same as Brutepack - EE IPCs - damageContainers: - - Silicon - - HumanoidSilicon # DeltaV - fuelCost: 15 - damage: - types: - Blunt: -15 - Piercing: -15 - Slash: -15 - bleedingModifier: -20 # DeltaV - IPCs bleed - type: Cautery # Shitmed speed: 0.7 - type: SurgeryTool # Shitmed diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index 4513fdebd59..ff453335d19 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -128,7 +128,6 @@ - PlushieXeno # Begin DeltaV - see Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml - PlushieMort - - PlushieIPC - PlushieFelinid - PlushieOni - PlushieHarpy diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2faafc04caa..20714a58837 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -341,28 +341,22 @@ - RoboticsStatic - BorgModulesStatic - BorgLimbsStatic - # Begin DeltaV Additions - - RoboticsStaticDeltaV - - PowerAugments - - ToolAugments - - BorgDVModulesStatic + - PowerAugments # DeltaV - augments + - ToolAugments # DeltaV - augments + - BorgDVModulesStatic # DeltaV - modules - BorgModulesStaticShitmed # Shitmed - - BorgIdentificationStaticDeltaV # Borg IDs - - BorgModulesServiceStaticDV # Service Borg Rework - # End DeltaV Additions + - BorgIdentificationStaticDeltaV # DeltaV - Borg IDs dynamicPacks: - Robotics - BorgModules - MechParts - MechEquipment - # Begin DeltaV Additions - - RoboticsDeltaV - - BorgModulesDeltaV - - Surgery # Share Surgery Parts between Epi and Med. - - CyberneticsRobotics # Share Surgery Parts between Epi and Med. - - PsionicProsthetics - - BorgModulesServiceDynamicDV # Service Borg Rework - # End DeltaV Additions + - RoboticsDeltaV # DeltaV + - BorgModulesDeltaV # DeltaV + - Surgery # DeltaV - Share Surgery Parts between Epi and Med. + - CyberneticsRobotics # DeltaV - Share Surgery Parts between Epi and Med. + - PsionicProsthetics # DeltaV + - BorgModulesServiceDynamicDV # DeltaV - type: EmagLatheRecipes # DeltaV emagStaticPacks: - RoboticsEmagStatic @@ -584,7 +578,6 @@ - ReportingStatic - EVASuit - PowerCellsStatic - - IPCLimbsStatic - PowerAugments - ToolAugments - SimpleToolsStaticDeltaV diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml index a5c5be6f669..6797215ce08 100644 --- a/Resources/Prototypes/Entities/Structures/Power/apc.yml +++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml @@ -151,8 +151,6 @@ priority: 1 - type: StaticPrice price: 500 - - type: BatteryDrinkerSource # EE IPCs - maxAmount: 10000 - type: GuideHelp guides: - VoltageNetworks @@ -216,8 +214,6 @@ - type: Battery maxCharge: 50000 startingCharge: 50000 - - type: BatteryDrinkerSource # EE IPCs - maxAmount: 5000 - type: entity parent: BaseAPC @@ -227,8 +223,6 @@ - type: Battery maxCharge: 100000 startingCharge: 100000 - - type: BatteryDrinkerSource # EE IPCs - maxAmount: 12000 - type: entity parent: BaseAPC @@ -238,8 +232,6 @@ - type: Battery maxCharge: 150000 startingCharge: 150000 - - type: BatteryDrinkerSource # EE IPCs - maxAmount: 18000 - type: entity parent: BaseAPC @@ -249,8 +241,6 @@ - type: Battery maxCharge: 200000 startingCharge: 200000 - - type: BatteryDrinkerSource # EE IPCs - maxAmount: 26000 - type: entity parent: BaseAPC diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml index d2b314614e2..312358c732f 100644 --- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml +++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml @@ -278,8 +278,6 @@ whitelist: components: - BorgChassis - - Silicon # EE IPCs - - AugmentStationRecharge # DeltaV augment power cells - type: Construction containers: - machine_parts @@ -323,7 +321,6 @@ whitelist: components: - BorgChassis - - Silicon # EE IPCs - AugmentStationRecharge # DeltaV augment power cells - type: ContainerContainer containers: diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml index 336fa252cf3..2c0cc518f0e 100644 --- a/Resources/Prototypes/Guidebook/species.yml +++ b/Resources/Prototypes/Guidebook/species.yml @@ -18,7 +18,6 @@ - Oni - Rodentia - Chitinid - - IPC - Feroxi - Kitsune - Avali @@ -66,8 +65,3 @@ id: Vox name: species-name-vox text: "/ServerInfo/Guidebook/Mobs/Vox.xml" - -- type: guideEntry - id: IPC - name: species-name-ipc - text: "/ServerInfo/Guidebook/Mobs/IPCs.xml" diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 9325a3f1e9f..f4cc94bcef5 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -106,7 +106,6 @@ - EmergencyNitrogen - EmergencyOxygen - LoadoutSpeciesVoxNitrogen - - EmergencyIPCBox # DeltaV - EmergencyWaterVapor # DeltaV # nitrogen or oxygen tank, depending on what your species needs @@ -769,7 +768,6 @@ - EmergencyNitrogenClown - EmergencyOxygenClown - LoadoutSpeciesVoxNitrogen - - EmergencyIPCBox # DeltaV - EmergencyWaterVaporClown # DeltaV - type: loadoutGroup @@ -839,7 +837,6 @@ - EmergencyOxygenMime - EmergencySpeciesMothMime - LoadoutSpeciesVoxNitrogen - - EmergencyIPCBox # DeltaV - EmergencyWaterVaporMime # DeltaV - type: loadoutGroup @@ -1238,7 +1235,6 @@ - EmergencyNitrogenExtended - EmergencyOxygenExtended - LoadoutSpeciesVoxNitrogen - - EmergencyIPCBox # DeltaV - EmergencyWaterVaporExtended # DeltaV # Science @@ -1645,7 +1641,6 @@ - EmergencyNitrogenSecurity - EmergencyOxygenSecurity - LoadoutSpeciesVoxNitrogen - - EmergencyIPCBox # DeltaV - EmergencyWaterVaporSecurity # DeltaV # Medical @@ -1951,7 +1946,6 @@ - EmergencyNitrogenMedical - EmergencyOxygenMedical - LoadoutSpeciesVoxNitrogen - - EmergencyIPCBox # DeltaV - EmergencyWaterVaporMedical # DeltaV # Wildcards @@ -2004,7 +1998,6 @@ - EmergencyNitrogenSyndicate - EmergencyOxygenSyndicate - LoadoutSpeciesVoxNitrogen - - EmergencyIPCBox # DeltaV - EmergencyWaterVaporSyndicate # DeltaV - type: loadoutGroup diff --git a/Resources/Prototypes/Roles/Antags/zombie.yml b/Resources/Prototypes/Roles/Antags/zombie.yml index a7d7bbe1ae0..aa1a2cda818 100644 --- a/Resources/Prototypes/Roles/Antags/zombie.yml +++ b/Resources/Prototypes/Roles/Antags/zombie.yml @@ -8,10 +8,6 @@ requirements: - !type:OverallPlaytimeRequirement time: 12h # DeltaV - was 1h - - !type:SpeciesRequirement # DeltaV - inverted: true - species: - - IPC - type: antag id: Zombie @@ -19,9 +15,4 @@ antagonist: true setPreference: false objective: roles-antag-zombie-objective - requirements: - - !type:SpeciesRequirement - inverted: true - species: - - IPC guides: [ Zombies ] diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 134716721b0..d4bf219f6d0 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -494,12 +494,6 @@ path: /Audio/Items/bikehorn.ogg Ping: path: /Audio/Effects/Cargo/ping.ogg - Boop: # DeltaV (EE) - path: /Audio/_EE/Voice/IPC/beep_500.ogg - Whirr: # DeltaV (EE) - collection: IPCWhirrs - params: - variation: 0 - type: emoteSounds id: UnisexSiliconSyndicate @@ -522,12 +516,6 @@ path: /Audio/Items/bikehorn.ogg Ping: path: /Audio/Effects/Cargo/ping.ogg - Boop: # DeltaV (EE) - path: /Audio/_EE/Voice/IPC/beep_500.ogg - Whirr: # DeltaV (EE) - collection: IPCWhirrs - params: - variation: 0 - type: emoteSounds id: UnisexSiliconXenoborg @@ -550,12 +538,6 @@ collection: XenoborgBikeHorn Ping: collection: XenoborgPing - Boop: # DeltaV (EE) - path: /Audio/_EE/Voice/IPC/beep_500.ogg - Whirr: # DeltaV (EE) - collection: IPCWhirrs - params: - variation: 0 # body emotes - type: emoteSounds diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 96e5162cc7d..6a2ad235ea6 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -66,6 +66,7 @@ - Vocal tags: - Honker # DeltaV - let borgs, bots, and IPCs use it (And Motorkind) + - SiliconEmotes chatMessages: ["chat-emote-msg-honk"] chatTriggers: - honk @@ -347,7 +348,7 @@ components: - Vocal tags: - - SiliconOrIPCEmotes # DeltaV - let borgs, bots, and IPCs use it + - SiliconEmotes chatMessages: ["chat-emote-msg-buzz"] chatTriggers: - buzzing @@ -400,7 +401,7 @@ components: - Vocal tags: - - SiliconOrIPCEmotes # DeltaV - let borgs, bots, and IPCs use it + - SiliconEmotes chatMessages: ["chat-emote-msg-beep"] chatTriggers: - beep @@ -418,7 +419,7 @@ components: - Vocal tags: - - SiliconOrIPCEmotes # DeltaV - let borgs, bots, and IPCs use it + - SiliconEmotes chatMessages: ["chat-emote-msg-chime"] chatTriggers: - chime @@ -436,7 +437,7 @@ components: - Vocal tags: - - SiliconOrIPCEmotes # DeltaV - let borgs, bots, and IPCs use it + - SiliconEmotes chatMessages: ["chat-emote-msg-buzzestwo"] chatTriggers: - buzztwice @@ -460,7 +461,7 @@ components: - Vocal tags: - - SiliconOrIPCEmotes # DeltaV - let borgs, bots, and IPCs use it + - SiliconEmotes chatMessages: ["chat-emote-msg-ping"] chatTriggers: - ping diff --git a/Resources/Prototypes/_DV/Augments/power.yml b/Resources/Prototypes/_DV/Augments/power.yml index 734671d20dc..95ef6ca74a5 100644 --- a/Resources/Prototypes/_DV/Augments/power.yml +++ b/Resources/Prototypes/_DV/Augments/power.yml @@ -116,9 +116,6 @@ components: - type: Sprite state: apc - - type: Organ - onAdd: - - type: BatteryDrinker - type: Construction graph: CreatePowerCellChargerAugment node: apc diff --git a/Resources/Prototypes/_DV/Body/Organs/ipc.yml b/Resources/Prototypes/_DV/Body/Organs/ipc.yml deleted file mode 100644 index 9e8c6b5dac6..00000000000 --- a/Resources/Prototypes/_DV/Body/Organs/ipc.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - parent: OrganIPCPump - id: OrganIPCSpacePump - name: pressurized micro pump - description: "A pressure-resistant micro pump, able to work even in the depths of space." - components: - - type: Organ - onAdd: - - type: PressureImmunity diff --git a/Resources/Prototypes/_DV/Body/Prototypes/ipc.yml b/Resources/Prototypes/_DV/Body/Prototypes/ipc.yml deleted file mode 100644 index e12eb20ac56..00000000000 --- a/Resources/Prototypes/_DV/Body/Prototypes/ipc.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: body - id: IPCTorsoOnly - name: "ipc" - root: torso - slots: - torso: - part: TorsoIPC diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml index 8078a3b2a4d..8ba4551c897 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml @@ -35,19 +35,6 @@ - type: Label currentLabel: reagent-name-nitrogen -- type: entity - parent: BoxSurvival - id: BoxSurvivalHumanoidSilicon - suffix: IPC - components: - - type: EntityTableContainerFill - containers: - storagebase: !type:AllSelector - children: - - id: Flare - - id: CableApcStack10 - - id: WelderMini - # Water Vapor Breather Boxes - type: entity parent: BoxSurvivalBrigmedic diff --git a/Resources/Prototypes/_DV/Catalog/Uplink/chemicals.yml b/Resources/Prototypes/_DV/Catalog/Uplink/chemicals.yml index 8ef88e7a313..d94617b5259 100644 --- a/Resources/Prototypes/_DV/Catalog/Uplink/chemicals.yml +++ b/Resources/Prototypes/_DV/Catalog/Uplink/chemicals.yml @@ -1,21 +1,3 @@ -- type: listing - id: UplinkOmniPatchKit - name: uplink-omnipatch-kit-name - description: uplink-omnipatch-kit-desc - productEntity: OmniPatch - discountCategory: usualDiscounts - discountDownTo: - Telecrystal: 1 - cost: - Telecrystal: 2 - categories: - - UplinkChemicals - conditions: - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle - - type: listing id: UplinkFirebugsFriend name: uplink-firebugs-friend-name diff --git a/Resources/Prototypes/_DV/Damage/containers.yml b/Resources/Prototypes/_DV/Damage/containers.yml deleted file mode 100644 index c55eb47dfc0..00000000000 --- a/Resources/Prototypes/_DV/Damage/containers.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: damageContainer - id: HumanoidSilicon - supportedGroups: - - Brute - - Burn - - Electronic - supportedTypes: - - Radiation diff --git a/Resources/Prototypes/_DV/Damage/modifier_sets.yml b/Resources/Prototypes/_DV/Damage/modifier_sets.yml index 9a8c94100fe..f7f116b76f7 100644 --- a/Resources/Prototypes/_DV/Damage/modifier_sets.yml +++ b/Resources/Prototypes/_DV/Damage/modifier_sets.yml @@ -75,22 +75,6 @@ # Represents which damage types should be modified # in relation to how they cause bleed rate. -- type: damageModifierSet - id: BloodlossIPC - coefficients: - Blunt: 0.00 # no evil doublestack damage - Slash: 0.25 - Piercing: 0.2 - Shock: 0.0 - Heat: -0.5 # heat damage cauterizes wounds, but will still hurt obviously. - Cold: 0.0 - Poison: 0.0 - Radiation: 0.0 - Asphyxiation: 0.0 - Bloodloss: 0.0 - Cellular: 0.0 - Caustic: 0.0 - Ion: 0.0 - type: damageModifierSet id: Felinid diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_DV/Entities/Clothing/Eyes/glasses.yml index acc6462ba84..4e22840f9e7 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Eyes/glasses.yml @@ -118,7 +118,6 @@ damageContainers: - Inorganic - Silicon - - HumanoidSilicon # DeltaV - IPCs - type: Sprite sprite: _DV/Clothing/Eyes/Glasses/traymeson.rsi - type: Clothing diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/_DV/Entities/Clothing/Eyes/hud.yml index 6a342890550..6650289bbc6 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Eyes/hud.yml @@ -85,7 +85,6 @@ - BiologicalMetaphysical - Inorganic - Silicon - - HumanoidSilicon - type: IdentityBlocker coverage: EYES - type: Tag diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/zenghu_alt.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/zenghu_alt.yml deleted file mode 100644 index 6731ad12f05..00000000000 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/zenghu_alt.yml +++ /dev/null @@ -1,105 +0,0 @@ -- type: marking - id: CyberLimbsMarkingZenghuHeadAlt - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_head-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_head-2 - -- type: marking - id: CyberLimbsMarkingZenghuChestAlt - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_chest-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_chest-2 - -- type: marking - id: CyberLimbsMarkingZenghuLArmAlt - bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_l_arm-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_l_arm-2 - -- type: marking - id: CyberLimbsMarkingZenghuLHandAlt - bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_l_hand-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_l_hand-2 - -- type: marking - id: CyberLimbsMarkingZenghuLLegAlt - bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_l_leg-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_l_leg-2 - -- type: marking - id: CyberLimbsMarkingZenghuLFootAlt - bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_l_foot - -- type: marking - id: CyberLimbsMarkingZenghuRArmAlt - bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_r_arm-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_r_arm-2 - -- type: marking - id: CyberLimbsMarkingZenghuRHandAlt - bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_r_hand-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_r_hand-2 - -- type: marking - id: CyberLimbsMarkingZenghuRLegAlt - bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_r_leg-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_r_leg-2 - -- type: marking - id: CyberLimbsMarkingZenghuRFootAlt - bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_alt.rsi - state: zhpipc_r_foot diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/ipc.yml deleted file mode 100644 index 1e2ac9ebaf6..00000000000 --- a/Resources/Prototypes/_DV/Entities/Mobs/Player/ipc.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - parent: MobIPC - id: MobIPCTorsoOnly - name: ipc chassis - suffix: Torso Only - components: - - type: Body - prototype: IPCTorsoOnly - - type: IsDeadIC - - type: RandomHumanoidAppearance - - type: ItemSlots - slots: - cell_slot: - locked: true - name: power-cell-slot-component-slot-name-default - startingItem: null diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/motorkind.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/motorkind.yml index 133678dec04..4318cfec6eb 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Player/motorkind.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/motorkind.yml @@ -1,5 +1,5 @@ - type: entity save: false name: Urist McQueen - parent: BaseMobMotorkind + parent: BaseMobSpeciesOrganic id: MobMotorkind diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/motorkind.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/motorkind.yml index e9f014a9e37..4f25b9be552 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/motorkind.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/motorkind.yml @@ -4,7 +4,7 @@ - type: entity save: false name: Urist McQueen - parent: PlayerSiliconHumanoidBase + parent: BaseSpeciesDummy id: BaseMobMotorkind abstract: true components: @@ -20,7 +20,7 @@ prototype: Motorkind requiredLegs: 2 - type: Damageable - damageContainer: HumanoidSilicon + damageContainer: Silicon damageModifierSet: Motorkind - type: DamageVisuals thresholds: [25, 50, 75, 100] @@ -169,10 +169,8 @@ Unsexed: MaleMotorkind - type: Speech speechSounds: Alto - - type: EncryptionHolderRequiresLock - type: EncryptionKeyHolder keySlots: 4 - examineWhileLocked: false keysExtractionMethod: Cutting keysUnlocked: false - type: Lock diff --git a/Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml index ffe5a3e241d..56438d60ff2 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Fun/toys.yml @@ -86,46 +86,6 @@ sprite: _DV/Objects/Fun/Toys/mortyplush.rsi state: icon -- type: entity - parent: BasePlushie - id: PlushieIPC - name: ipc plushie - description: A massive robo-plushie. The screen might be hard plastic, but the rest of it is soft and cuddly! - components: - - type: Sprite - sprite: _DV/Objects/Fun/Toys/ipcplush.rsi - layers: - - state: icon - - state: heart - shader: unshaded - - state: screenshine - - type: MultiHandedItem - - type: Item - size: Ginormous - - type: EmitSoundOnUse - sound: - path: /Audio/_EE/Voice/IPC/pai_whistle.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/_EE/Voice/IPC/robot-scream.ogg - - type: EmitSoundOnActivate - sound: - path: /Audio/_EE/Voice/IPC/pai_whistle.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/_EE/Voice/IPC/robot-scream.ogg - - type: MeleeWeapon - soundHit: - path: /Audio/_EE/Voice/IPC/robot-scream.ogg - - type: Edible - requiresSpecialDigestion: true - useSound: - path: /Audio/_EE/Voice/IPC/pai_whistle.ogg - delay: 5 - - type: HeldSpeedModifier - walkModifier: 0.7 - sprintModifier: 0.7 - - type: entity parent: BasePlushie id: PlushieFelinid diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail.yml index 30b9e95c9fd..d9eaa91dbfb 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail.yml @@ -696,8 +696,6 @@ - id: PlushieMothBartender prob: 0.5 orGroup: Plushie - - id: PlushieIPC - orGroup: Plushie - id: PlushieFelinid orGroup: Plushie - id: PlushieOni diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml index 221da186d03..e53cdedda7f 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml @@ -285,74 +285,6 @@ storagebase: id: PillAgonolexyne amount: 5 - -- type: entity - parent: BaseHealingItem - id: Oilpack - name: oil pack - suffix: Full - description: Fit with a proprietary and disposable connector, oil can easily be injected to top off a bleeding IPC - components: - - type: Sprite - sprite: _DV/Objects/Medical/Oilpack.rsi - state: icon - - type: Item - sprite: _DV/Objects/Medical/Oilpack.rsi - heldPrefix: icon - - type: Healing - damageContainers: - - HumanoidSilicon - damage: - groups: - Burn: 0 # funny cant remove - # ModifyBloodLevel: 20 # restores a lot of blood for IPCs. TODO: Fix this lol - - type: Stack - stackType: Oilpack - count: 5 - - type: StackPrice - price: 10 - -- type: entity - parent: Oilpack - id: Oilpack1 - suffix: Single - components: - - type: Stack - count: 1 - -- type: entity - parent: Oilpack - id: OmniPatch - suffix: Full - name: omni patch - description: A topical patch of specially grown silica microbots, curated to heal machine entities. Smells of ozone. - components: - - type: Sprite - sprite: _DV/Objects/Medical/Omnipatch.rsi - - type: Item - sprite: _DV/Objects/Medical/Omnipatch.rsi - - type: Healing - damageContainers: - - HumanoidSilicon - - Silicon - damage: - groups: - Burn: -60 # 25 per type - Brute: -60 # 20 per type, mostly irrelevant cause welder gaming - types: - Radiation: -20 - - type: Stack - stackType: OmniPatch - count: 10 - -- type: entity - id: Omnipatch1 - parent: OmniPatch - suffix: Single - components: - - type: Stack - count: 1 - - type: entity parent: PurifyingSalts id: PurifyingSalts1 diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml index a5f2fe36f52..dab1481b21c 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml @@ -9,7 +9,6 @@ - type: Lathe staticPacks: - BorgModulesSyndicateStatic - - RoboticsStaticDeltaV - RoboticsStatic - BorgModulesStatic - BorgLimbsStatic diff --git a/Resources/Prototypes/_DV/Entities/Surgery/surgeries.yml b/Resources/Prototypes/_DV/Entities/Surgery/surgeries.yml index 154328b88f2..bf63831eec1 100644 --- a/Resources/Prototypes/_DV/Entities/Surgery/surgeries.yml +++ b/Resources/Prototypes/_DV/Entities/Surgery/surgeries.yml @@ -35,9 +35,6 @@ - type: SurgeryOrganSlotCondition organSlot: powerCell inverse: true - - type: SurgeryBodyCondition - accepted: [ IPC ] - inverse: true - type: entity parent: SurgeryBase @@ -93,9 +90,6 @@ - type: SurgeryOrganSlotCondition organSlot: charger inverse: true - - type: SurgeryBodyCondition - accepted: [ IPC ] - inverse: true - type: entity parent: SurgeryBase diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml index c62fc834f91..e1fe731cb98 100644 --- a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml @@ -129,22 +129,6 @@ equipment: mask: ClothingMaskBreathMedicalSecurity -- type: loadoutEffectGroup - id: HumanoidSilicon - effects: - - !type:SpeciesLoadoutEffect - species: - - IPC - -- type: loadout - id: EmergencyIPCBox - effects: - - !type:GroupLoadoutEffect - proto: HumanoidSilicon - storage: - back: - - BoxSurvivalHumanoidSilicon - # ERT - type: loadout diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index a49067dc6c3..deb3e5af26e 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -1018,15 +1018,6 @@ - ScarfBlack - ScarfZebra -# Species -- type: loadoutGroup - id: GroupHumanoidSilicon - name: loadout-group-humanoid-silicon - minLimit: 1 - hidden: true - loadouts: - - EmergencyIPCBox - # ERT - type: loadoutGroup id: GroupEVATankERT diff --git a/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml b/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml index 75fb34d320a..976537ad9c0 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml @@ -79,11 +79,6 @@ parent: BaseCrewSpeciesPhrase text: species-name-kitsune -- type: quickPhrase - id: SpeciesIPCPhrase - parent: BaseCrewSpeciesPhrase - text: species-name-ipc - - type: quickPhrase id: SpeciesKThavenPhrase parent: BaseCrewSpeciesPhrase diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml index 601a3c71863..3d1a51648f0 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml @@ -1,10 +1,5 @@ ## Static -- type: latheRecipePack - parent: - - IPCPartsStatic # Shitmed - id: RoboticsStaticDeltaV - - type: latheRecipePack id: RoboticsEmagStatic recipes: diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/robotics.yml index 7cd1986b456..33b7486ef5b 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/robotics.yml @@ -295,16 +295,6 @@ id: AugmentPaperworkPanelElectronics result: AugmentPaperworkPanelElectronics -- type: latheRecipe - parent: BaseIPCOrganRecipe - id: OrganIPCSpacePump - result: OrganIPCSpacePump - materials: - Steel: 2000 - Plasma: 1000 - Plastic: 1000 - Gold: 500 - - type: latheRecipe id: ForcewallLeftArm result: ForcewallLeftArm diff --git a/Resources/Prototypes/_DV/Species/ipc.yml b/Resources/Prototypes/_DV/Species/ipc.yml deleted file mode 100644 index 420c306aa3f..00000000000 --- a/Resources/Prototypes/_DV/Species/ipc.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: marking - id: MobIPCEyesDefault - bodyPart: Eyes - markingCategory: Eyes - speciesRestriction: [] - sprites: - - sprite: Mobs/Customization/eyes.rsi - state: no_eyes diff --git a/Resources/Prototypes/_DV/Stacks/medical_stacks.yml b/Resources/Prototypes/_DV/Stacks/medical_stacks.yml index 492e4b39c43..3146cf787a4 100644 --- a/Resources/Prototypes/_DV/Stacks/medical_stacks.yml +++ b/Resources/Prototypes/_DV/Stacks/medical_stacks.yml @@ -1,17 +1,3 @@ -- type: stack - id: Oilpack - name: stack-oil-pack - icon: { sprite: "/Textures/_DV/Objects/Medical/Oilpack.rsi", state: icon } - spawn: Oilpack - maxCount: 5 - -- type: stack - id: OmniPatch - name: stack-omni-patch - icon: { sprite: "/Textures/_DV/Objects/Medical/Omnipatch.rsi", state: icon } - spawn: OmniPatch - maxCount: 10 - - type: stack id: PurifyingSalts name: stack-purifying-salts diff --git a/Resources/Prototypes/_DV/Traits/medical.yml b/Resources/Prototypes/_DV/Traits/medical.yml index 1fe51019c8e..4376a2bb656 100644 --- a/Resources/Prototypes/_DV/Traits/medical.yml +++ b/Resources/Prototypes/_DV/Traits/medical.yml @@ -91,16 +91,10 @@ description: trait-synth-desc category: Medical conditions: - - !type:HasCompCondition - component: Silicon - invert: true - !type:HasCompCondition component: BorgChassis invert: true tooltip: trait-condition-borg-not - - !type:IsSpeciesCondition - species: IPC - invert: true effects: - !type:AddCompsEffect components: diff --git a/Resources/Prototypes/_DV/tags.yml b/Resources/Prototypes/_DV/tags.yml index 487a4afee86..6b35c836c24 100644 --- a/Resources/Prototypes/_DV/tags.yml +++ b/Resources/Prototypes/_DV/tags.yml @@ -183,9 +183,6 @@ - type: Tag id: SecDogWearable # allows Laika to wear meson goggles (and more later?) -- type: Tag - id: SiliconOrIPCEmotes # upstream's SiliconEmotes = only bots and borgs, this one includes IPCs - - type: Tag id: Skirt diff --git a/Resources/Prototypes/_EE/Body/Organs/ipc.yml b/Resources/Prototypes/_EE/Body/Organs/ipc.yml deleted file mode 100644 index b28edac76a4..00000000000 --- a/Resources/Prototypes/_EE/Body/Organs/ipc.yml +++ /dev/null @@ -1,76 +0,0 @@ -- type: entity - id: BaseIPCOrgan - parent: BaseItem - abstract: true - components: - - type: Sprite - netsync: false - sprite: _Shitmed/Mobs/Species/IPC/organs.rsi - - type: Organ - # - type: Edible - # - type: Extractable - # grindableSolutionName: organ - - type: SolutionContainerManager - solutions: - organ: - reagents: - - ReagentId: Oil - Quantity: 10 - -- type: entity - id: OrganIPCEyes - parent: BaseIPCOrgan - name: robotic eyes - description: "01001001 00100000 01110011 01100101 01100101 00100000 01111001 01101111 01110101 00100001" - components: - - type: Sprite - layers: - - state: eyeball-l - - state: eyeball-r - - type: Organ - slotId: eyes - - type: Eyes - -- type: entity - id: OrganIPCTongue - parent: BaseIPCOrgan - name: vocal modulator - description: "A vocal modulator, used to produce speech." - components: - - type: Sprite - state: tongue - - type: Organ - -- type: entity - id: OrganIPCEars - parent: BaseIPCOrgan - name: "sonic receptors" - description: "A set of highly attuned membranes, capable of sensing anything an organic ear can sense" # DeltaV - components: - - type: Sprite - state: ears - - type: Organ - -- type: entity - id: OrganIPCPump - parent: BaseIPCOrgan - name: micro pump - description: "A micro pump, used to circulate coolant." - components: - - type: Sprite - state: heart-on - - type: Organ - slotId: pump - - type: Heart - # The heart 'metabolizes' medicines and poisons that aren't filtered out by other organs. - # This is done because these chemicals need to have some effect even if they aren't being filtered out of your body. - # You're technically 'immune to poison' without a heart, but.. uhh, you'll have bigger problems on your hands. - - # This is fine? - # - type: Metabolizer - # maxReagents: 2 - # metabolizerTypes: [Human] - # groups: - # - id: Medicine - # - id: Poison - # - id: Narcotic diff --git a/Resources/Prototypes/_EE/Body/Parts/ipc.yml b/Resources/Prototypes/_EE/Body/Parts/ipc.yml deleted file mode 100644 index d8dee5a6a4d..00000000000 --- a/Resources/Prototypes/_EE/Body/Parts/ipc.yml +++ /dev/null @@ -1,263 +0,0 @@ -- type: entity - id: PartIPC - parent: BaseItem - name: "ipc body part" - abstract: true - components: - - type: Damageable - damageContainer: Inorganic # Shitmed Change - - type: BodyPart - #- type: Gibbable # Shitmed - Update for new gibbing system - - type: ContainerContainer - containers: - bodypart: !type:Container - ents: [] - - type: SurgeryTool - startSound: - path: /Audio/_Shitmed/Medical/Surgery/organ1.ogg - endSound: - path: /Audio/_Shitmed/Medical/Surgery/organ2.ogg - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 110 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 150 - behaviors: - - !type:GibPartBehavior { } - - type: StaticPrice - price: 100 - -- type: entity - id: TorsoIPC - name: "ipc torso" - parent: PartIPC - components: - - type: Sprite - netsync: false - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "torso_m" - - type: Icon - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "torso_m" - - type: BodyPart - partType: Torso - children: # I hate this so much I want to kill it AAAAAAAAAAAAAAAAAAAAAAAA - head: - id: "head" - type: Head - left arm: - id: "left arm" - type: Arm - right arm: - id: "right arm" - type: Arm - left leg: - id: "left leg" - type: Leg - right leg: - id: "right leg" - type: Leg - organs: - posbrain: - id: "posbrain" - pump: - id: "pump" - - type: ContainerContainer - containers: - torso_slot: !type:ContainerSlot {} - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 400 - behaviors: - - !type:GibPartBehavior { } - - trigger: - !type:DamageTypeTrigger - damageType: Slash - damage: 400 - behaviors: - - !type:GibPartBehavior { } - -- type: entity - id: HeadIPC - name: "ipc head" - parent: PartIPC - components: - - type: Sprite - netsync: false - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "head_m" - - type: Icon - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "head_m" - - type: BodyPart - partType: Head - organs: - eyes: - id: "eyes" - vital: true - - type: Input - context: "ghost" - - type: MovementSpeedModifier - baseWalkSpeed: 0 - baseSprintSpeed: 0 - #- type: InputMover # DeltaV - Disable InputMover on here else we get an assert - - type: GhostOnMove - - type: Tag - tags: - - Head - -- type: entity - id: LeftArmIPC - name: "left ipc arm" - parent: PartIPC - components: - - type: Sprite - netsync: false - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "l_arm" - - type: Icon - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "l_arm" - - type: BodyPart - partType: Arm - symmetry: Left - children: - left hand: - id: "left hand" - type: Hand - -- type: entity - id: RightArmIPC - name: "right ipc arm" - parent: PartIPC - components: - - type: Sprite - netsync: false - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "r_arm" - - type: Icon - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "r_arm" - - type: BodyPart - partType: Arm - symmetry: Right - children: - right hand: - id: "right hand" - type: Hand - -- type: entity - id: LeftHandIPC - name: "left ipc hand" - parent: PartIPC - components: - - type: Sprite - netsync: false - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "l_hand" - - type: Icon - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "l_hand" - - type: BodyPart - partType: Hand - symmetry: Left - -- type: entity - id: RightHandIPC - name: "right ipc hand" - parent: PartIPC - components: - - type: Sprite - netsync: false - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "r_hand" - - type: Icon - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "r_hand" - - type: BodyPart - partType: Hand - symmetry: Right - -- type: entity - id: LeftLegIPC - name: "left ipc leg" - parent: PartIPC - components: - - type: Sprite - netsync: false - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "l_leg" - - type: Icon - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "l_leg" - - type: BodyPart - partType: Leg - symmetry: Left - children: - left foot: - id: "left foot" - type: Foot - - type: MovementBodyPart - -- type: entity - id: RightLegIPC - name: "right ipc leg" - parent: PartIPC - components: - - type: Sprite - netsync: false - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "r_leg" - - type: Icon - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "r_leg" - - type: BodyPart - partType: Leg - symmetry: Right - children: - right foot: - id: "right foot" - type: Foot - - type: MovementBodyPart - -- type: entity - id: LeftFootIPC - name: "left ipc foot" - parent: PartIPC - components: - - type: Sprite - netsync: false - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "l_foot" - - type: Icon - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "l_foot" - - type: BodyPart - partType: Foot - symmetry: Left - -- type: entity - id: RightFootIPC - name: "right ipc foot" - parent: PartIPC - components: - - type: Sprite - netsync: false - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "r_foot" - - type: Icon - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "r_foot" - - type: BodyPart - partType: Foot - symmetry: Right diff --git a/Resources/Prototypes/_EE/Body/Prototypes/ipc.yml b/Resources/Prototypes/_EE/Body/Prototypes/ipc.yml deleted file mode 100644 index 12a6213d00d..00000000000 --- a/Resources/Prototypes/_EE/Body/Prototypes/ipc.yml +++ /dev/null @@ -1,45 +0,0 @@ -- type: body - id: IPC - name: "ipc" - root: torso - slots: - head: - part: HeadIPC - connections: - - torso - organs: - eyes: OrganIPCEyes - torso: - part: TorsoIPC - connections: - - right arm - - left arm - - right leg - - left leg - organs: - posbrain: PositronicBrain - pump: OrganIPCPump - right arm: - part: RightArmIPC - connections: - - right hand - left arm: - part: LeftArmIPC - connections: - - left hand - right hand: - part: RightHandIPC - left hand: - part: LeftHandIPC - right leg: - part: RightLegIPC - connections: - - right foot - left leg: - part: LeftLegIPC - connections: - - left foot - right foot: - part: RightFootIPC - left foot: - part: LeftFootIPC \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Damage/modifier_sets.yml b/Resources/Prototypes/_EE/Damage/modifier_sets.yml deleted file mode 100644 index 990dfb6c043..00000000000 --- a/Resources/Prototypes/_EE/Damage/modifier_sets.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: damageModifierSet - id: IPC - coefficients: - Poison: 0 - Cold: 0.9 # DeltaV - was 0.5 - Heat: 1.1 # DeltaV - was 1.5 - Shock: 2.0 - Radiation: 0.5 # DeltaV - was not real diff --git a/Resources/Prototypes/_EE/Datasets/ipc_names.yml b/Resources/Prototypes/_EE/Datasets/ipc_names.yml deleted file mode 100644 index 24cf8b5909e..00000000000 --- a/Resources/Prototypes/_EE/Datasets/ipc_names.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: localizedDataset - id: IpcFirst - values: - prefix: names-ipc-first-dataset- - count: 100 - -- type: localizedDataset - id: IpcLast - values: - prefix: names-ipc-last-dataset- - count: 1000 diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/antenna.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/antenna.yml deleted file mode 100644 index b90200a45db..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/antenna.yml +++ /dev/null @@ -1,89 +0,0 @@ -- type: marking - speciesRestriction: [IPC] - id: RobotAntennaTv - bodyPart: HeadTop - markingCategory: HeadTop - sprites: - - sprite: _EE/Mobs/Customization/ipc_antenna.rsi - state: ipc_antenna_tv - -- type: marking - speciesRestriction: [IPC] - id: RobotAntennaTesla - bodyPart: HeadTop - markingCategory: HeadTop - sprites: - - sprite: _EE/Mobs/Customization/ipc_antenna.rsi - state: ipc_antenna_tesla - -# - type: marking -# speciesRestriction: [IPC] -# id: RobotAntennaLightb -# bodyPart: HeadTop -# markingCategory: HeadTop -# sprites: -# - sprite: _EE/Mobs/Customization/ipc_antenna.rsi -# state: ipc_antenna_lightb - -# - type: marking -# speciesRestriction: [IPC] -# id: RobotAntennaLight -# bodyPart: HeadTop -# markingCategory: HeadTop -# sprites: -# - sprite: _EE/Mobs/Customization/ipc_antenna.rsi -# state: ipc_antenna_light - -- type: marking - speciesRestriction: [IPC] - id: RobotAntennaCyberhead - bodyPart: HeadTop - markingCategory: HeadTop - sprites: - - sprite: _EE/Mobs/Customization/ipc_antenna.rsi - state: ipc_antenna_cyberhead - -# - type: marking -# speciesRestriction: [IPC] -# id: RobotAntennaSidelights -# bodyPart: HeadTop -# markingCategory: HeadTop -# sprites: -# - sprite: _EE/Mobs/Customization/ipc_antenna.rsi -# state: ipc_antenna_sidelights - -- type: marking - speciesRestriction: [IPC] - id: RobotAntennaAntlers - bodyPart: HeadTop - markingCategory: HeadTop - sprites: - - sprite: _EE/Mobs/Customization/ipc_antenna.rsi - state: ipc_antenna_antlers - -- type: marking - speciesRestriction: [IPC] - id: RobotAntennaDroneeyes - bodyPart: HeadTop - markingCategory: HeadTop - sprites: - - sprite: _EE/Mobs/Customization/ipc_antenna.rsi - state: ipc_antenna_droneeyes - -- type: marking - speciesRestriction: [IPC] - id: RobotAntennaCrowned - bodyPart: HeadTop - markingCategory: HeadTop - sprites: - - sprite: _EE/Mobs/Customization/ipc_antenna.rsi - state: ipc_antenna_crowned - -- type: marking - speciesRestriction: [IPC] - id: RobotAntennaTowers - bodyPart: HeadTop - markingCategory: HeadTop - sprites: - - sprite: _EE/Mobs/Customization/ipc_antenna.rsi - state: ipc_antenna_towers \ No newline at end of file diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/bishop.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/bishop.yml deleted file mode 100644 index 5f7e3724498..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/bishop.yml +++ /dev/null @@ -1,128 +0,0 @@ -- type: marking - id: CyberLimbsMarkingBishopHead - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi - state: head - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_monitor.rsi - state: head-2 - -- type: marking - id: CyberLimbsMarkingBishopHeadAlt - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: head - -- type: marking - id: CyberLimbsMarkingBishopHeadAlt1 - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_alt1.rsi - state: head - -- type: marking - id: CyberLimbsMarkingBishopChest - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: torso-primary - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: torso-secondary - -- type: marking - id: CyberLimbsMarkingBishopLArm - bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: l_arm-primary - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: l_arm-secondary - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: l_arm-tertiary - -- type: marking - id: CyberLimbsMarkingBishopLHand - bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: l_hand - -- type: marking - id: CyberLimbsMarkingBishopLLeg - bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: l_leg-primary - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: l_leg-secondary - - -- type: marking - id: CyberLimbsMarkingBishopLFoot - bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: l_foot - - - -- type: marking - id: CyberLimbsMarkingBishopRArm - bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: r_arm-primary - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: r_arm-secondary - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: r_arm-tertiary - - -- type: marking - id: CyberLimbsMarkingBishopRHand - bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: r_hand - -- type: marking - id: CyberLimbsMarkingBishopRLeg - bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: r_leg-primary - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: r_leg-secondary - - -- type: marking - id: CyberLimbsMarkingBishopRFoot - bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: r_foot diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/hephiastos.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/hephiastos.yml deleted file mode 100644 index 58481694f73..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/hephiastos.yml +++ /dev/null @@ -1,128 +0,0 @@ -- type: marking - id: CyberLimbsMarkingHesphiastosHead - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi - state: head-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_monitor.rsi - state: head-2 - -- type: marking - id: CyberLimbsMarkingHesphiastosHeadAlt - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi - state: head-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi - state: head-2 - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_alt1.rsi - state: head-3 - -- type: marking - id: CyberLimbsMarkingHesphiastosChest - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: torso-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: torso-2 - -- type: marking - id: CyberLimbsMarkingHesphiastosLArm - bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: l_arm-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: l_arm-2 - -- type: marking - id: CyberLimbsMarkingHesphiastosLHand - bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: l_hand-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: l_hand-2 - -- type: marking - id: CyberLimbsMarkingHesphiastosLLeg - bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: l_leg-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: l_leg-2 - - -- type: marking - id: CyberLimbsMarkingHesphiastosLFoot - bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: l_foot-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: l_foot-2 - - - -- type: marking - id: CyberLimbsMarkingHesphiastosRArm - bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: r_arm-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: r_arm-2 - - -- type: marking - id: CyberLimbsMarkingHesphiastosRHand - bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: r_hand-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: r_hand-2 - - -- type: marking - id: CyberLimbsMarkingHesphiastosRLeg - bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: r_leg-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: r_leg-2 - - -- type: marking - id: CyberLimbsMarkingHesphiastosRFoot - bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC, Moth, Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, HumanoidFoxes, Reptilian] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: r_foot-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/hesphiastos/hesphiastos_main.rsi - state: r_foot-2 diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/morpheus.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/morpheus.yml deleted file mode 100644 index ddb18e26082..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/morpheus.yml +++ /dev/null @@ -1,158 +0,0 @@ -- type: marking - id: CyberLimbsMarkingMorpheusHead - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi - state: head - -- type: marking - id: CyberLimbsMarkingMorpheusHeadAlt - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_alt1.rsi - state: head - -- type: marking - id: CyberLimbsMarkingMorpheusChest - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [IPC] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi - state: torso - -- type: marking - id: CyberLimbsMarkingMorpheusLArm - bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi - state: l_arm - -- type: marking - id: CyberLimbsMarkingMorpheusLHand - bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi - state: l_hand - -- type: marking - id: CyberLimbsMarkingMorpheusLLeg - bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi - state: l_leg - - -- type: marking - id: CyberLimbsMarkingMorpheusLFoot - bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi - state: l_foot - - - -- type: marking - id: CyberLimbsMarkingMorpheusRArm - bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi - state: r_arm - - -- type: marking - id: CyberLimbsMarkingMorpheusRHand - bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi - state: r_hand - -- type: marking - id: CyberLimbsMarkingMorpheusRLeg - bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi - state: r_leg - - -- type: marking - id: CyberLimbsMarkingMorpheusRFoot - bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/morpheus/morpheus_main.rsi - state: r_foot diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/screens.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/screens.yml deleted file mode 100644 index 325c35c6903..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/screens.yml +++ /dev/null @@ -1,390 +0,0 @@ -## CANT SET THESE SCREENS TO "shader: unshaded" -## RobustToolbox/Robust.Shared/Utility/SpriteSpecifier.cs - -- type: marking - speciesRestriction: [IPC] - id: ScreenStatic - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_static - - -- type: marking - speciesRestriction: [IPC] - id: ScreenBlue - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_blue - - -- type: marking - speciesRestriction: [IPC] - id: ScreenBreakout - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_breakout - - -- type: marking - speciesRestriction: [IPC] - id: ScreenEight - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_eight - - -- type: marking - speciesRestriction: [IPC] - id: ScreenGoggles - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_goggles - - -- type: marking - speciesRestriction: [IPC] - id: ScreenExclaim - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_exclaim - - -- type: marking - speciesRestriction: [IPC] - id: ScreenHeart - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_heart - - -- type: marking - speciesRestriction: [IPC] - id: ScreenMonoeye - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_monoeye - - -- type: marking - speciesRestriction: [IPC] - id: ScreenNature - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_nature - - -- type: marking - speciesRestriction: [IPC] - id: ScreenOrange - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_orange - - -- type: marking - speciesRestriction: [IPC] - id: ScreenPink - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_pink - - -- type: marking - speciesRestriction: [IPC] - id: ScreenQuestion - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_question - - -- type: marking - speciesRestriction: [IPC] - id: ScreenShower - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_shower - - -- type: marking - speciesRestriction: [IPC] - id: ScreenYellow - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_yellow - - -- type: marking - speciesRestriction: [IPC] - id: ScreenScroll - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_scroll - - -- type: marking - speciesRestriction: [IPC] - id: ScreenConsole - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_console - - -- type: marking - speciesRestriction: [IPC] - id: ScreenRgb - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_rgb - - -- type: marking - speciesRestriction: [IPC] - id: ScreenGlider - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_glider - - -- type: marking - speciesRestriction: [IPC] - id: ScreenRainbowhoriz - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_rainbowhoriz - - -- type: marking - speciesRestriction: [IPC] - id: ScreenBsod - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_bsod - - -- type: marking - speciesRestriction: [IPC] - id: ScreenRedtext - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_redtext - - -- type: marking - speciesRestriction: [IPC] - id: ScreenSinewave - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_sinewave - - -- type: marking - speciesRestriction: [IPC] - id: ScreenSquarewave - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_squarewave - - -- type: marking - speciesRestriction: [IPC] - id: ScreenEcgwave - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_ecgwave - - -- type: marking - speciesRestriction: [IPC] - id: ScreenEyes - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_eyes - - -- type: marking - speciesRestriction: [IPC] - id: ScreenEyestall - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_eyestall - - -- type: marking - speciesRestriction: [IPC] - id: ScreenEyesangry - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_eyesangry - - -- type: marking - speciesRestriction: [IPC] - id: ScreenLoading - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_loading - - -- type: marking - speciesRestriction: [IPC] - id: ScreenWindowsxp - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_windowsxp - - -- type: marking - speciesRestriction: [IPC] - id: ScreenTetris - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_tetris - - -- type: marking - speciesRestriction: [IPC] - id: ScreenTv - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_tv - - -- type: marking - speciesRestriction: [IPC] - id: ScreenTextdrop - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_textdrop - - -- type: marking - speciesRestriction: [IPC] - id: ScreenStars - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_stars - - -- type: marking - speciesRestriction: [IPC] - id: ScreenRainbowdiag - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_rainbowdiag - - -- type: marking - speciesRestriction: [IPC] - id: ScreenBlank - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_blank - - -- type: marking - speciesRestriction: [IPC] - id: ScreenSmile - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_smile - -- type: marking - speciesRestriction: [IPC] - id: ScreenFrown - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_frown - - -- type: marking - speciesRestriction: [IPC] - id: ScreenRing - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_ring - - -- type: marking - speciesRestriction: [IPC] - id: ScreenL - bodyPart: Eyes # DeltaV - Moves screen to the eyes layer - markingCategory: Eyes - sprites: - - sprite: _EE/Mobs/Customization/ipc_screens.rsi - state: ipc_screen_l diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/shellguard.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/shellguard.yml deleted file mode 100644 index 26bb00052bf..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/shellguard.yml +++ /dev/null @@ -1,125 +0,0 @@ -- type: marking - id: CyberLimbsMarkingShellguardHead - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi - state: head-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_monitor.rsi - state: head-2 - -- type: marking - id: CyberLimbsMarkingShellguardHeadAlt - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi - state: head-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_alt1.rsi - state: head-2 - -- type: marking - id: CyberLimbsMarkingShellguardChest - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: torso-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: torso-2 - -- type: marking - id: CyberLimbsMarkingShellguardLArm - bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: l_arm-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: l_arm-2 - -- type: marking - id: CyberLimbsMarkingShellguardLHand - bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: l_hand-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: l_hand-2 - -- type: marking - id: CyberLimbsMarkingShellguardLLeg - bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: l_leg-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: l_leg-2 - - -- type: marking - id: CyberLimbsMarkingShellguardLFoot - bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: l_foot-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: l_foot-2 - - - -- type: marking - id: CyberLimbsMarkingShellguardRArm - bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: r_arm-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: r_arm-2 - - -- type: marking - id: CyberLimbsMarkingShellguardRHand - bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: r_hand-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: r_hand-2 - -- type: marking - id: CyberLimbsMarkingShellguardRLeg - bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: r_leg-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: r_leg-2 - - -- type: marking - id: CyberLimbsMarkingShellguardRFoot - bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: r_foot-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/shellguard/shellguard_main.rsi - state: r_foot-2 diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/wardtakahashi.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/wardtakahashi.yml deleted file mode 100644 index 85c68714ae1..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/wardtakahashi.yml +++ /dev/null @@ -1,112 +0,0 @@ -- type: marking - id: CyberLimbsMarkingWardtakahashiHead - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_monitor.rsi - state: head - -- type: marking - id: CyberLimbsMarkingWardtakahashiHeadAlt - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi - state: head - -- type: marking - id: CyberLimbsMarkingWardtakahashiHeadAlt1 - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_alt1.rsi - state: head - -- type: marking - id: CyberLimbsMarkingWardtakahashiChest - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi - state: torso - -- type: marking - id: CyberLimbsMarkingWardtakahashiLArm - bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi - state: l_arm - -- type: marking - id: CyberLimbsMarkingWardtakahashiLHand - bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi - state: l_hand - -- type: marking - id: CyberLimbsMarkingWardtakahashiLLeg - bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi - state: l_leg - - -- type: marking - id: CyberLimbsMarkingWardtakahashiLFoot - bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi - state: l_foot - - - -- type: marking - id: CyberLimbsMarkingWardtakahashiRArm - bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi - state: r_arm - - -- type: marking - id: CyberLimbsMarkingWardtakahashiRHand - bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi - state: r_hand - -- type: marking - id: CyberLimbsMarkingWardtakahashiRLeg - bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi - state: r_leg - - -- type: marking - id: CyberLimbsMarkingWardtakahashiRFoot - bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/wardtakahashi/wardtakahashi_main.rsi - state: r_foot diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/xion.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/xion.yml deleted file mode 100644 index 7b8d0394d5d..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/xion.yml +++ /dev/null @@ -1,126 +0,0 @@ -- type: marking - id: CyberLimbsMarkingXionHead - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_monitor.rsi - state: head-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_monitor.rsi - state: head-2 - -- type: marking - id: CyberLimbsMarkingXionHeadAlt - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_alt1.rsi - state: head-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_alt1.rsi - state: head-2 - -- type: marking - id: CyberLimbsMarkingXionChest - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: torso-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: torso-2 - -- type: marking - id: CyberLimbsMarkingXionLArm - bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: l_arm-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: l_arm-2 - -- type: marking - id: CyberLimbsMarkingXionLHand - bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: l_hand-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: l_hand-2 - -- type: marking - id: CyberLimbsMarkingXionLLeg - bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: l_leg-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: l_leg-2 - - -- type: marking - id: CyberLimbsMarkingXionLFoot - bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: l_foot-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: l_foot-2 - - - -- type: marking - id: CyberLimbsMarkingXionRArm - bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: r_arm-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: r_arm-2 - - - -- type: marking - id: CyberLimbsMarkingXionRHand - bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: r_hand-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: r_hand-2 - -- type: marking - id: CyberLimbsMarkingXionRLeg - bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: r_leg-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: r_leg-2 - - -- type: marking - id: CyberLimbsMarkingXionRFoot - bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: r_foot-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/xion/xion_main.rsi - state: r_foot-2 diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/zenghu.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/zenghu.yml deleted file mode 100644 index a0e0f59653c..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/zenghu.yml +++ /dev/null @@ -1,115 +0,0 @@ -- type: marking - id: CyberLimbsMarkingZenghuHead - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: head-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: head-2 - -- type: marking - id: CyberLimbsMarkingZenghuChest - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: torso-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: torso-2 - -- type: marking - id: CyberLimbsMarkingZenghuLArm - bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: l_arm-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: l_arm-2 - -- type: marking - id: CyberLimbsMarkingZenghuLHand - bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: l_hand-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: l_hand-2 - -- type: marking - id: CyberLimbsMarkingZenghuLLeg - bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: l_leg-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: l_leg-2 - - -- type: marking - id: CyberLimbsMarkingZenghuLFoot - bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: l_foot-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: l_foot-2 - - - -- type: marking - id: CyberLimbsMarkingZenghuRArm - bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: r_arm-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: r_arm-2 - - - -- type: marking - id: CyberLimbsMarkingZenghuRHand - bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: r_hand-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: r_hand-2 - -- type: marking - id: CyberLimbsMarkingZenghuRLeg - bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: r_leg-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: r_leg-2 - - -- type: marking - id: CyberLimbsMarkingZenghuRFoot - bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: r_foot-1 - - sprite: _Shitmed/Mobs/Species/Cybernetics/zenghu/zenghu_main.rsi - state: r_foot-2 diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml deleted file mode 100644 index 11c35dd129f..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Player/ipc.yml +++ /dev/null @@ -1,134 +0,0 @@ -- type: entity - id: MobIPC - parent: PlayerSiliconHumanoidBase - name: Urist McPositronic - description: A positronic brain in a metal body. - components: - - type: PowerCellSlot - cellSlotId: cell_slot - fitsInCharger: true - - type: ItemSlots - slots: - cell_slot: - locked: true - name: power-cell-slot-component-slot-name-default - startingItem: PowerCellMedium - - type: BatterySlotRequiresLock - itemSlot: cell_slot - - type: EncryptionHolderRequiresLock - - type: SiliconEmitSoundOnDrained - sound: "/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg" # SOMEONE PLEASE FIND A BETTER SOUND FOR THIS. - minInterval: 15 - maxInterval: 30 - popUp: "silicon-power-low" - - type: Lock - locked: true - lockOnClick: false - unlockOnClick: false - lockTime: 5 - unlockTime: 5 - breakOnAccessBreaker: false # DeltaV - cant be emagged - - type: InteractionPopup - successChance: 1 - interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others - - type: NpcFactionMember - factions: - - NanoTrasen - - type: StandingState - - type: Crawler - - type: MobState - allowedStates: - - Alive - - Critical - - Dead - - type: MobThresholds - thresholds: - 0: Alive - 119.999: Critical # TO make it almost impossible - 120: Dead - stateAlertDict: - Alive: BorgHealth - Critical: BorgCrit - Dead: BorgDead - - type: TypingIndicator - proto: robot - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Blunt - damage: 400 - behaviors: - - !type:GibBehavior { } - - type: Polymorphable # DeltaV - - type: SlowOnDamage - speedModifierThresholds: - 60: 0.7 - 80: 0.5 # DeltaV - was 90 - 100: 0.3 # DeltaV - was 120, which is irrelvant? - - type: SiliconDownOnDead - - type: Speech - - type: Deathgasp - prototype: SiliconDeathgasp - - type: Inventory - templateId: ipc - - type: GuideHelp - guides: - - IPC - - type: Silicon - entityType: enum.SiliconType.Player - batteryPowered: true - drainPerSecond: 1.3 # DeltaV change from 1.5 - idleDrainReduction: 0.6 # TheDen - 60% less power usage while idling, for IPC Dynamic Power Draw - chargeThresholdMid: 0.80 - chargeThresholdLow: 0.35 - chargeThresholdCritical: 0.10 - speedModifierThresholds: - 4: 1 - 3: 1 - 2: 0.80 - 1: 0.45 - 0: 0.00 - - type: BatteryDrinker - - type: EncryptionKeyHolder - keySlots: 4 - examineWhileLocked: false - keysExtractionMethod: Cutting - keysUnlocked: false - - type: ActiveRadio - - type: IntrinsicRadioReceiver - - type: IntrinsicRadioTransmitter - - type: DeadStartupButton - sound: - path: /Audio/_EE/Effects/Silicon/startup.ogg -# Erro de linter -# - type: Wires -# layoutId: IPC - - type: EmitBuzzWhileDamaged - - type: CanHostGuardian - - type: Repairable # DeltaV - Replace welding healable with upstream version - damageValue: -10 # 10 seconds to repair from crit - doAfterDelay: 1 - fuelCost: 0.5 - allowSelfRepair: true # DeltaV - was false - - type: Fiber # DeltaV - IPCs leave fibers instead of prints - fiberMaterial: fibers-steel - - type: CombatMode # DeltaV - let IPCs disarm - canDisarm: true - - type: SnoutHelmet # DeltaV - IPC Snouts - replacementRace: vulpkanin - -- type: entity - save: false - name: Urist McPositronic - parent: MobHumanDummy - id: MobIPCDummy - categories: [ HideSpawnMenu ] # Goobstation - description: A dummy IPC meant to be used in character setup. - components: - - type: HumanoidAppearance - species: IPC - - type: Inventory - templateId: ipc diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml deleted file mode 100644 index 547a1ad0547..00000000000 --- a/Resources/Prototypes/_EE/Entities/Mobs/Player/silicon_base.yml +++ /dev/null @@ -1,342 +0,0 @@ -- type: entity - save: false - id: PlayerSiliconHumanoidBase - parent: [BaseMob, MobDamageable, MobCombat, MobAtmosExposed, MobFlammable] - abstract: true - components: - - type: ContentEye - - type: CameraRecoil - - type: Reactive - groups: - Flammable: [Touch] - Extinguish: [Touch] - Acidic: [Touch] - reactions: - - reagents: [Water, SpaceCleaner] - methods: [Touch] - effects: - - !type:WashCreamPie - - type: DamageOnHighSpeedImpact - damage: - types: - Blunt: 10 - soundHit: - path: /Audio/Effects/hit_kick.ogg - - type: Damageable - damageContainer: HumanoidSilicon # DeltaV - change from Silicon - damageModifierSet: IPC - - type: InteractionOutline - - type: MovementSpeedModifier - baseWalkSpeed: 4 - baseSprintSpeed: 3 - - type: ZombieImmune - - type: DoAfter - - type: RotationVisuals - defaultRotation: 90 # DeltaV - horizontalRotation: 90 - - type: Examiner - # - type: Recyclable - # safe: false - # - type: EyeProtection # You'll want this if your robot can't wear glasses, like an IPC. - # protectionTime: 12 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 185 - restitution: 0.0 - mask: - - MobMask - layer: - - MobLayer - - type: Silicon - entityType: enum.SiliconType.Player - batteryPowered: false # Needs to also have a battery! - chargeThresholdMid: 0.60 - chargeThresholdLow: 0.30 - chargeThresholdCritical: 0 - speedModifierThresholds: - 4: 1 - 3: 1 - 2: 0.80 - 1: 0.45 - 0: 0.00 - - type: Temperature - currentTemperature: 310.15 - specificHeat: 42 - atmosTemperatureTransferEfficiency: 0.05 - - type: TemperatureDamage # DeltaV - Update for TemperatureDamage - heatDamageThreshold: 1800 # GoobStation: Roughly the melting point of mild steels - coldDamageThreshold: 100 # DeltaV - has to be very cold - coldDamage: - types: - Cold: 0.1 #per second, scales with temperature & other constants - heatDamage: - types: - Heat: 2 # DeltaV - was 3 - - type: KillOnOverheat # GoobStation - - type: Deathgasp - prototype: SiliconDeathgasp - needsCritical: false - - type: MobState - allowedStates: - - Alive - - Dead - - type: MobThresholds - thresholds: - 0: Alive - 165: Dead - - type: Destructible - thresholds: - - trigger: !type:DamageTrigger - damage: 500 - behaviors: - - !type:GibBehavior {} - - type: Icon - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: full - - type: Sprite - noRot: true - drawdepth: Mobs - layers: - - map: ["enum.HumanoidVisualLayers.Chest"] - - map: ["enum.HumanoidVisualLayers.Head"] - - map: ["enum.HumanoidVisualLayers.Snout"] - - map: ["enum.HumanoidVisualLayers.Eyes"] - - map: ["enum.HumanoidVisualLayers.RArm"] - - map: ["enum.HumanoidVisualLayers.LArm"] - - map: ["enum.HumanoidVisualLayers.RLeg"] - - map: ["enum.HumanoidVisualLayers.LLeg"] - - shader: StencilClear - sprite: Mobs/Species/Human/parts.rsi - state: l_leg - - shader: StencilMask - map: ["enum.HumanoidVisualLayers.StencilMask"] - sprite: Mobs/Customization/masking_helpers.rsi - state: female_full - visible: false - - map: ["enum.HumanoidVisualLayers.LFoot"] - - map: ["enum.HumanoidVisualLayers.RFoot"] - - map: ["socks"] - - map: ["underpants"] - - map: ["undershirt"] - - map: ["jumpsuit"] - - map: ["enum.HumanoidVisualLayers.LHand"] - - map: ["enum.HumanoidVisualLayers.RHand"] - - map: ["enum.HumanoidVisualLayers.Handcuffs"] - color: "#ffffff" - sprite: Objects/Misc/handcuffs.rsi - state: body-overlay-2 - visible: false - - map: ["id"] - - map: ["gloves"] - - map: ["shoes"] - - map: ["ears"] - - map: ["outerClothing"] - - map: ["eyes"] - - map: ["belt"] - - map: ["back"] - - map: ["neck"] # DeltaV - moved on top of back - - map: ["enum.HumanoidVisualLayers.FacialHair"] - - map: ["enum.HumanoidVisualLayers.Hair"] - - map: ["enum.HumanoidVisualLayers.HeadSide"] - - map: ["enum.HumanoidVisualLayers.HeadTop"] - - map: ["mask"] - - map: ["head"] - - map: ["pocket1"] - - map: ["pocket2"] - - map: ["enum.HumanoidVisualLayers.Tail"] - - map: ["clownedon"] # Dynamically generated - sprite: "Effects/creampie.rsi" - state: "creampie_human" - visible: false - - type: CanEnterCryostorage # Goobstation - - type: StatusIcon # Goobstation - bounds: -0.5,-0.5,0.5,0.5 - #- type: Bloodstream - # damageBleedModifiers: BloodlossIPC - # bloodReagents: - # reagents: - # - ReagentId: Oil - # Quantity: 1 - # bleedReductionAmount: 0 - # bloodMaxVolume: 100 - # chemicalMaxVolume: 0 - # bleedPuddleThreshold: 3 - # bloodRefreshAmount: 0 - # bloodlossThreshold: 0.8 - # maxBleedAmount: 2 # not a lot, but its hard to stop - # bloodlossDamage: - # types: - # Blunt: 0.1 # lubricant is running low - # bloodlossHealDamage: - # types: - # Burn: 0 - - type: Flammable - fireSpread: true - canResistFire: true - damage: - types: - Heat: 0 # GoobStation: Replaced fire damage with overheating shutdown - - type: Barotrauma # DeltaV - uncommented - damage: - types: - Blunt: 0.5 # DeltaV - was 0.28 - Heat: 0.25 # DeltaV - - type: Identity - # soundHit: - # path: /Audio/Effects/metalbreak.ogg - - type: RangedDamageSound - soundGroups: - Brute: - collection: MetalBulletImpact - soundTypes: - Heat: - collection: MetalLaserImpact - - type: Tag - tags: - - CanPilot - - FootstepSound - - DoorBumpOpener - - SiliconOrIPCEmotes # DeltaV - - Honker # DeltaV - Honk seperate from Silicon emotes - - type: Hands - - type: Inventory - templateId: human - - type: InventorySlots - - type: Appearance - - type: GenericVisualizer - visuals: - enum.CreamPiedVisuals.Creamed: - clownedon: # Not 'creampied' bc I can already see Skyrat complaining about conflicts. - True: { visible: true } - False: { visible: false } - - type: Cuffable - - type: AnimationPlayer - - type: Buckle - - type: CreamPied - - type: Stripping - - type: Strippable - - type: UserInterface - interfaces: - enum.VoiceMaskUIKey.Key: - type: VoiceMaskBoundUserInterface - enum.HumanoidMarkingModifierKey.Key: - type: HumanoidMarkingModifierBoundUserInterface - enum.StrippingUiKey.Key: - type: StrippableBoundUserInterface - enum.SurgeryUIKey.Key: # Shitmed - type: SurgeryBui - - type: Emoting - - type: Grammar - attributes: - proper: true - - type: Climbing - - type: StandingState - - type: MindContainer - - type: MindExaminable # DeltaV - Update for predicted mind examine - - type: SSDIndicator - - type: CanEscapeInventory - - type: HumanoidAppearance - species: IPC - - type: Body - prototype: IPC - requiredLegs: 2 - - type: Ensnareable - sprite: Objects/Misc/ensnare.rsi - - type: Speech - speechSounds: Pai - - type: Vocal - wilhelm: "/Audio/_EE/Voice/IPC/wilhelm.ogg" - sounds: - Male: UnisexIPC - Female: UnisexIPC - Unsexed: UnisexIPC - - type: MeleeWeapon - hidden: true - soundHit: - collection: Punch - angle: 30 - animation: WeaponArcFist - attackRate: 1 - damage: - types: - Blunt: 6 # It's tough. - - type: MobPrice - price: 1500 # Kidnapping a living person and selling them for cred is a good move. - deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less. - - type: Pullable - - type: Puller - - type: BodyEmotes - soundsId: GeneralBodyEmotes - - type: DamageVisuals - thresholds: [ 10, 20, 30, 50, 70, 100 ] - targetLayers: - - "enum.HumanoidVisualLayers.Chest" - - "enum.HumanoidVisualLayers.Head" - - "enum.HumanoidVisualLayers.LArm" - - "enum.HumanoidVisualLayers.LLeg" - - "enum.HumanoidVisualLayers.RArm" - - "enum.HumanoidVisualLayers.RLeg" - damageOverlayGroups: - Brute: - sprite: Mobs/Effects/brute_damage.rsi - color: "#DD8822" - # Organs - - type: IdExaminable - - type: HealthExaminable - examinableTypes: - - Blunt - - Slash - - Piercing - - Heat - - Shock - - type: StatusEffects - allowed: - - Stun - - KnockedDown - - SlowedDown - - Stutter - - SeeingRainbows - - Electrocution - # - Drunk - - SlurredSpeech - - PressureImmunity - - Muted - # - ForcedSleep - - TemporaryBlindness - - Pacified - # - PsionicsDisabled - # - PsionicallyInsulated - - Flashed # Goobstation - - type: Blindable - - type: FireVisuals - alternateState: Standing - - type: LightningTarget - priority: 1 - lightningExplode: false - - type: ComplexInteraction - - type: Carriable - - type: Targeting - - type: SurgeryTarget - - type: ParcelWrapOverride - parcelPrototype: WrappedParcelHumanoid - wrapDelay: 5 - - type: Fiber # DeltaV - IPCs leave fibers instead of prints - fiberMaterial: fibers-steel - - type: Anesthesia # DeltaV - IPCs can be operated on without anesthesia - - type: PassiveDamage # DeltaV - electric damage disappears over time - allowedStates: - - Alive - - Critical - - Dead - damage: - groups: - Electronic: -0.5 - - type: SiliconEmp # DeltaV - EMP damage - - type: CosmicCenserTarget # DeltaV - Cosmic Cult - - type: GrappleTarget # DeltaV - Allow targets to be grappled - - type: CanDoCPR # DeltaV - Addition of CPR - - type: RMCSetPose # DeltaV - RMC pose port diff --git a/Resources/Prototypes/_EE/InventoryTemplates/ipc_inventory_template.yml b/Resources/Prototypes/_EE/InventoryTemplates/ipc_inventory_template.yml deleted file mode 100644 index b94c2311684..00000000000 --- a/Resources/Prototypes/_EE/InventoryTemplates/ipc_inventory_template.yml +++ /dev/null @@ -1,143 +0,0 @@ -- type: inventoryTemplate - id: ipc - slots: - - name: shoes - slotTexture: shoes - slotFlags: FEET - stripTime: 3 - uiWindowPos: 1,0 - strippingWindowPos: 1,3 - displayName: Shoes - - name: jumpsuit - slotTexture: uniform - slotFlags: INNERCLOTHING - stripTime: 6 - uiWindowPos: 0,1 - strippingWindowPos: 0,2 - displayName: Jumpsuit - - name: outerClothing - slotTexture: suit - slotFlags: OUTERCLOTHING - stripTime: 6 - uiWindowPos: 1,1 - strippingWindowPos: 1,2 - displayName: Suit - # Underwear - # - name: undershirt - # slotTexture: undershirt - # slotFlags: UNDERSHIRT - # stripTime: 8 - # uiWindowPos: 4,1 - # strippingWindowPos: 3,1 - # displayName: Undershirt - # - name: underpants - # slotTexture: underpants - # slotFlags: UNDERPANTS - # stripTime: 12 - # uiWindowPos: 4,0 - # strippingWindowPos: 3,2 - # displayName: Underpants - # - name: socks - # slotTexture: socks - # slotFlags: SOCKS - # stripTime: 8 - # uiWindowPos: 4,2 - # strippingWindowPos: 3,3 - # displayName: Socks - - name: gloves - slotTexture: gloves - slotFlags: GLOVES - uiWindowPos: 2,1 - strippingWindowPos: 2,0 - displayName: Gloves - - name: neck - slotTexture: neck - slotFlags: NECK - uiWindowPos: 0,2 - strippingWindowPos: 0,1 - displayName: Neck - - name: mask - uiWindowPos: 1,2 - slotTexture: mask - slotFlags: MASK - strippingWindowPos: 1,1 - displayName: Mask - whitelist: - components: - - IdentityBlocker - tags: - - IPCMaskWearable - - name: eyes - slotTexture: glasses - slotFlags: EYES - stripTime: 3 - uiWindowPos: 0,0 - strippingWindowPos: 0,0 - displayName: Eyes - # - name: ears - # slotTexture: ears - # slotFlags: EARS - # stripTime: 3 - # uiWindowPos: 2,0 - # strippingWindowPos: 2,0 - # displayName: Ears - - name: head - slotTexture: head - slotFlags: HEAD - uiWindowPos: 1,3 - strippingWindowPos: 1,0 - displayName: Head - - name: pocket1 - slotTexture: pocket - slotFlags: POCKET - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 0,3 - strippingWindowPos: 0,4 - dependsOn: jumpsuit - displayName: Pocket 1 - stripHidden: true - - name: pocket2 - slotTexture: pocket - slotFlags: POCKET - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 2,3 - strippingWindowPos: 1,4 - dependsOn: jumpsuit - displayName: Pocket 2 - stripHidden: true - - name: suitstorage - slotTexture: suit_storage - slotFlags: SUITSTORAGE - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 2,0 - strippingWindowPos: 2,5 -# dependsOn: outerClothing # DeltaV - disable suit storage restriction - displayName: Suit Storage - - name: id - slotTexture: id - slotFlags: IDCARD - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 2,1 - strippingWindowPos: 2,4 - dependsOn: jumpsuit - displayName: ID - - name: belt - slotTexture: belt - slotFlags: BELT - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 3,1 - strippingWindowPos: 1,5 - displayName: Belt - - name: back - slotTexture: back - slotFlags: BACK - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 3,0 - strippingWindowPos: 0,5 - displayName: Back \ No newline at end of file diff --git a/Resources/Prototypes/_EE/SoundCollections/buzzes.yml b/Resources/Prototypes/_EE/SoundCollections/buzzes.yml deleted file mode 100644 index 1d66f186406..00000000000 --- a/Resources/Prototypes/_EE/SoundCollections/buzzes.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: soundCollection - id: buzzes - files: - - /Audio/_EE/Effects/Buzzes/buzz1.ogg - - /Audio/_EE/Effects/Buzzes/buzz2.ogg - - /Audio/_EE/Effects/Buzzes/buzz3.ogg - - /Audio/_EE/Effects/Buzzes/buzz4.ogg - - /Audio/_EE/Effects/Buzzes/buzz5.ogg - - /Audio/_EE/Effects/Buzzes/buzz6.ogg - - /Audio/_EE/Effects/Buzzes/buzz7.ogg - - /Audio/_EE/Effects/Buzzes/buzz8.ogg - - /Audio/_EE/Effects/Buzzes/buzz9.ogg diff --git a/Resources/Prototypes/_EE/SoundCollections/emotes.yml b/Resources/Prototypes/_EE/SoundCollections/emotes.yml deleted file mode 100644 index 1c934c2a2da..00000000000 --- a/Resources/Prototypes/_EE/SoundCollections/emotes.yml +++ /dev/null @@ -1,6 +0,0 @@ -- type: soundCollection - id: IPCWhirrs - files: - - /Audio/_EE/Voice/IPC/whirr1.ogg - - /Audio/_EE/Voice/IPC/whirr2.ogg - - /Audio/_EE/Voice/IPC/whirr3.ogg diff --git a/Resources/Prototypes/_EE/Species/ipc.yml b/Resources/Prototypes/_EE/Species/ipc.yml deleted file mode 100644 index cf5d47740db..00000000000 --- a/Resources/Prototypes/_EE/Species/ipc.yml +++ /dev/null @@ -1,257 +0,0 @@ -- type: species - id: IPC - name: species-name-ipc - roundStart: true - prototype: MobIPC - sprites: MobIPCSprites - markingLimits: MobIPCMarkingLimits - dollPrototype: MobIPCDummy - skinColoration: Hues - minAge: 1 - maxAge: 240 - oldAge: 50 - youngAge: 50 - maleFirstNames: IpcFirst - femaleFirstNames: IpcFirst - lastNames: IpcLast - naming: FirstDashLast - sexes: - - Unsexed - -# The lack of a layer means that -# this person cannot have round-start anything -# applied to that layer. It has to instead -# be defined as a 'custom base layer' -# in either the mob's starting marking prototype, -# or it has to be added in C#. -- type: speciesBaseSprites - id: MobIPCSprites - sprites: - Head: MobIPCHead - HeadTop: MobHumanoidAnyMarking - HeadSide: MobHumanoidAnyMarking - Tail: MobHumanoidAnyMarking - # Begin DeltaV Additions - Adds new layer types for markings-sake - Eyes: MobHumanoidAnyMarking - Hair: MobHumanoidAnyMarking - # End DeltaV Additions - Chest: MobIPCTorso - LArm: MobIPCLArm - RArm: MobIPCRArm - LHand: MobIPCLHand - RHand: MobIPCRHand - LLeg: MobIPCLLeg - RLeg: MobIPCRLeg - LFoot: MobIPCLFoot - RFoot: MobIPCRFoot - -- type: markingPoints - id: MobIPCMarkingLimits - points: - Hair: - points: 1 # DeltaV - Fixes hair not displaying - required: false - FacialHair: - points: 1 # DeltaV - Fixes hair not displaying - required: false - Tail: # DeltaV - Adds ability to use more marking types - points: 1 - required: false - Eyes: # DeltaV - Moves screen to the eyes layer - points: 1 - required: true - defaultMarkings: [ MobIPCEyesDefault ] - Head: - points: 1 - required: true - defaultMarkings: [ MobIPCHeadDefault ] - Chest: - points: 1 - required: true - defaultMarkings: [ MobIPCTorsoDefault ] - Legs: - points: 4 - required: true - defaultMarkings: [ MobIPCLLegDefault, MobIPCLFootDefault, MobIPCRLegDefault, MobIPCRFootDefault ] - Arms: - points: 4 - required: true - defaultMarkings: [ MobIPCLArmDefault, MobIPCLHandDefault, MobIPCRArmDefault, MobIPCRHandDefault ] - Snout: # DeltaV - Adds ability to use more marking types - points: 1 - required: false - HeadSide: - points: 1 - required: false - -- type: humanoidBaseSprite - id: MobIPCMarkingFollowSkin - markingsMatchSkin: true - layerAlpha: 0.5 - -- type: humanoidBaseSprite - id: MobIPCScreen - -# Head - -- type: humanoidBaseSprite - id: MobIPCHead - -- type: humanoidBaseSprite - id: MobIPCHeadMale - -- type: humanoidBaseSprite - id: MobIPCHeadFemale - -- type: marking - id: MobIPCHeadDefault - bodyPart: Head - markingCategory: Head - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: head_m - -# Torso - -- type: humanoidBaseSprite - id: MobIPCTorso - -- type: humanoidBaseSprite - id: MobIPCTorsoMale - -- type: humanoidBaseSprite - id: MobIPCTorsoFemale - -- type: marking - id: MobIPCTorsoDefault - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: torso_m - -- type: marking - id: MobIPCTorsoFemaleDefault - bodyPart: Chest - markingCategory: Chest - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: torso_f - -# Left Leg - -- type: humanoidBaseSprite - id: MobIPCLLeg - -- type: marking - id: MobIPCLLegDefault - bodyPart: LLeg - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: l_leg - -# Left Arm - -- type: humanoidBaseSprite - id: MobIPCLArm - -- type: marking - id: MobIPCLArmDefault - bodyPart: LArm - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: l_arm - -#LHand - -- type: humanoidBaseSprite - id: MobIPCLHand - -- type: marking - id: MobIPCLHandDefault - bodyPart: LHand - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: l_hand - -#LFoot - -- type: humanoidBaseSprite - id: MobIPCLFoot - -- type: marking - id: MobIPCLFootDefault - bodyPart: LFoot - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: l_foot - -#RLeg - -- type: humanoidBaseSprite - id: MobIPCRLeg - -- type: marking - id: MobIPCRLegDefault - bodyPart: RLeg - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: r_leg - -#RArm - -- type: humanoidBaseSprite - id: MobIPCRArm - -- type: marking - id: MobIPCRArmDefault - bodyPart: RArm - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: r_arm - -#RHand - -- type: humanoidBaseSprite - id: MobIPCRHand - -- type: marking - id: MobIPCRHandDefault - bodyPart: RHand - markingCategory: Arms - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: r_hand - -#RFoot - -- type: humanoidBaseSprite - id: MobIPCRFoot - -- type: marking - id: MobIPCRFootDefault - bodyPart: RFoot - markingCategory: Legs - speciesRestriction: [IPC] - sprites: - - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: r_foot - -- type: Tag - id: IPCMaskWearable diff --git a/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml deleted file mode 100644 index 42214f02a6a..00000000000 --- a/Resources/Prototypes/_EE/Voice/speech_emote_sounds.yml +++ /dev/null @@ -1,69 +0,0 @@ -- type: emoteSounds - id: UnisexIPC - params: - variation: 0 - sounds: - Scream: - path: /Audio/_EE/Voice/IPC/robot-scream.ogg - params: - variation: 0.125 - Laugh: - path: /Audio/_EE/Voice/IPC/robot-laugh_3.ogg - params: - variation: 0.125 - Chitter: - path: /Audio/Voice/Talk/pai.ogg - Squeak: - path: /Audio/Voice/Talk/pai.ogg - CatMeow: - collection: CatMeows - params: - variation: 0.125 - CatHisses: - collection: CatHisses - params: - variation: 0.125 - MonkeyScreeches: - collection: MonkeyScreeches - params: - variation: 0.125 - Sigh: - path: /Audio/Voice/Talk/pai.ogg - params: - variation: 0.125 - Crying: - path: /Audio/_EE/Voice/IPC/cry_robot_1.ogg - params: - variation: 0.125 - Whistle: - path: /Audio/_EE/Voice/IPC/pai_whistle.ogg - params: - variation: 0.125 - RobotBeep: # disease - path: /Audio/Effects/tesla_consume.ogg - params: - variation: 0.125 - Beep: # normal - path: /Audio/_EE/Voice/IPC/beep_2000.ogg - Boop: - path: /Audio/_EE/Voice/IPC/beep_500.ogg - Buzz: - path: /Audio/Machines/buzz-sigh.ogg - Honk: - path: /Audio/Items/bikehorn.ogg - params: - variation: 0.125 - Chime: - path: /Audio/Effects/Cargo/ping.ogg - Buzz-Two: - path: /Audio/Machines/buzz-two.ogg - Ping: - path: /Audio/Effects/beep1.ogg - params: # to prevent it from being definitively read by players as "OH SHIT A GRENADE" - variation: 0.125 - Whirr: - collection: IPCWhirrs - params: - variation: 0 - Gulp: # Goob - path: /Audio/Effects/Cargo/ping.ogg diff --git a/Resources/Prototypes/_EE/Voice/speech_emotes.yml b/Resources/Prototypes/_EE/Voice/speech_emotes.yml deleted file mode 100644 index fe19ac20e2c..00000000000 --- a/Resources/Prototypes/_EE/Voice/speech_emotes.yml +++ /dev/null @@ -1,28 +0,0 @@ -- type: emote - id: SiliconDeathgasp - name: chat-emote-name-deathgasp - icon: Interface/Emotes/deathgasp.png - chatMessages: ["chat-emote-msg-deathgasp-silicon"] - -- type: emote - id: Boop - name: chat-emote-name-boop - icon: _DV/Interface/Emotes/ecg.png # DeltaV - Added icon - category: Vocal - whitelist: - tags: # DeltaV - let borgs, bots, and IPCs use it - - SiliconOrIPCEmotes - chatMessages: [ boops. ] # DeltaV - period - chatTriggers: - - boops - -- type: emote - id: Whirr # uncategorized as it is generic - whitelist: - tags: # DeltaV - let borgs, bots, and IPCs use it - - SiliconOrIPCEmotes - name: chat-emote-name-whirr - chatMessages: [ whirrs. ] # DeltaV - period - chatTriggers: - - whirr - - whirrs diff --git a/Resources/Prototypes/_Shitmed/Body/Organs/cybernetic.yml b/Resources/Prototypes/_Shitmed/Body/Organs/cybernetic.yml index ec39ae2b665..b3616711371 100644 --- a/Resources/Prototypes/_Shitmed/Body/Organs/cybernetic.yml +++ b/Resources/Prototypes/_Shitmed/Body/Organs/cybernetic.yml @@ -5,7 +5,7 @@ components: - type: Cybernetics - type: Edible # DeltaV - can't eat it no more - requiresSpecialDigestion: true + requiresSpecialDigestion: true - type: Sprite sprite: _Shitmed/Mobs/Species/IPC/organs.rsi state: "eyes" @@ -49,7 +49,3 @@ damageContainers: - Biological - BiologicalMetaphysical # DeltaV - Kitsune - - type: ShowHealthIcons - damageContainers: - - Biological - - BiologicalMetaphysical # DeltaV - Kitsune diff --git a/Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/robotics.yml index c3a57b2687b..f275c7b837e 100644 --- a/Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/robotics.yml +++ b/Resources/Prototypes/_Shitmed/Recipes/Lathes/Packs/robotics.yml @@ -1,30 +1,5 @@ ## Static -- type: latheRecipePack - id: IPCLimbsStatic # DeltaV - Share Surgery Parts between Epi and Med. Non-Medical Parts moved to IPCPartsStatic - recipes: - # - TorsoIPC # DeltaV - Moved to IPCLimbsStatic - - LeftArmIPC - - RightArmIPC - - LeftLegIPC - - RightLegIPC - # - HeadIPC # DeltaV - Moved to IPCLimbsStatic - - LeftHandIPC - - RightHandIPC - - LeftFootIPC - - RightFootIPC - -# Begin DeltaV additions -- type: latheRecipePack - parent: IPCLimbsStatic - id: IPCPartsStatic - recipes: - - TorsoIPC - - HeadIPC -# End DeltaV additions - - OrganIPCEyes - - OrganIPCPump - - type: latheRecipePack id: BorgModulesStaticShitmed recipes: @@ -54,5 +29,4 @@ id: CyberneticsRobotics recipes: - BasicCyberneticEyes - - OrganIPCSpacePump # End DeltaV additions diff --git a/Resources/Prototypes/_Shitmed/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_Shitmed/Recipes/Lathes/robotics.yml index 5841212c340..1e568005985 100644 --- a/Resources/Prototypes/_Shitmed/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/_Shitmed/Recipes/Lathes/robotics.yml @@ -86,38 +86,6 @@ Gold: 300 Silver: 300 -- type: latheRecipe - abstract: true - parent: BaseRoboticsRecipe - id: BaseIPCLimbRecipe - materials: - Steel: 250 - Plastic: 100 - Glass: 250 - -- type: latheRecipe - abstract: true - parent: BaseRoboticsRecipe - id: BaseIPCOrganRecipe - materials: - Steel: 250 - Plasma: 100 - Plastic: 100 - -- type: latheRecipe - parent: BaseRoboticsRecipe - id: TorsoIPC - result: MobIPCTorsoOnly # DeltaV - this prints an actual body that can have stuff inserted into - completetime: 15 # DeltaV - Don't let players spam beeping IPC chasses - icon: # DeltaV - don't false marketing what the lathe will spit out - sprite: _Shitmed/Mobs/Species/IPC/parts.rsi - state: "torso_m" - materials: - Steel: 3000 - Gold: 500 - Plastic: 500 - Plasma: 500 - - type: latheRecipe id: ClothingHandsGlovesMechanicalSurgical result: ClothingHandsGlovesMechanicalSurgical @@ -128,60 +96,3 @@ Durathread: 500 Steel: 100 Gold: 50 - -# Generic - -- type: latheRecipe - parent: BaseIPCLimbRecipe - id: LeftArmIPC - result: LeftArmIPC - -- type: latheRecipe - parent: BaseIPCLimbRecipe - id: RightArmIPC - result: RightArmIPC - -- type: latheRecipe - parent: BaseIPCLimbRecipe - id: LeftHandIPC - result: LeftHandIPC - -- type: latheRecipe - parent: BaseIPCLimbRecipe - id: RightHandIPC - result: RightHandIPC - -- type: latheRecipe - parent: BaseBorgLimbRecipe - id: LeftLegIPC - result: LeftLegIPC - -- type: latheRecipe - parent: BaseBorgLimbRecipe - id: RightLegIPC - result: RightLegIPC - -- type: latheRecipe - parent: BaseIPCLimbRecipe - id: LeftFootIPC - result: LeftFootIPC - -- type: latheRecipe - parent: BaseIPCLimbRecipe - id: RightFootIPC - result: RightFootIPC - -- type: latheRecipe - parent: BaseIPCLimbRecipe - id: HeadIPC - result: HeadIPC - -- type: latheRecipe - parent: BaseIPCOrganRecipe - id: OrganIPCEyes - result: OrganIPCEyes - -- type: latheRecipe - parent: BaseIPCOrganRecipe - id: OrganIPCPump - result: OrganIPCPump diff --git a/Resources/Prototypes/_Shitmed/Research/civilianservices.yml b/Resources/Prototypes/_Shitmed/Research/civilianservices.yml index 3be93b6c1d8..cdc41cbe5bd 100644 --- a/Resources/Prototypes/_Shitmed/Research/civilianservices.yml +++ b/Resources/Prototypes/_Shitmed/Research/civilianservices.yml @@ -51,7 +51,6 @@ - BasicCyberneticEyes - SecurityCyberneticEyes - MedicalCyberneticEyes - - OrganIPCSpacePump # DeltaV - Pressurized Micro Pump - type: technology id: Autodoc diff --git a/Resources/Prototypes/_Shitmed/Species/cybernetics.yml b/Resources/Prototypes/_Shitmed/Species/cybernetics.yml index e0143a220c4..4b945e40895 100644 --- a/Resources/Prototypes/_Shitmed/Species/cybernetics.yml +++ b/Resources/Prototypes/_Shitmed/Species/cybernetics.yml @@ -44,4 +44,4 @@ id: MobCyberneticBishopRFoot baseSprite: sprite: _Shitmed/Mobs/Species/Cybernetics/bishop/bishop_main.rsi - state: "r_foot" + state: "r_foot" \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/Mobs/IPCs.xml b/Resources/ServerInfo/Guidebook/Mobs/IPCs.xml deleted file mode 100644 index d826028f43b..00000000000 --- a/Resources/ServerInfo/Guidebook/Mobs/IPCs.xml +++ /dev/null @@ -1,59 +0,0 @@ - - # I.P.C. - - An IPC (short for Integrated Positronic Chassis) is a type of sentient robot and is considered an [color=yellow]independent individual[/color], meaning [color=red]they are not guided by any laws of robotics[/color]. IPCs cannot be hacked by Emags because they do not have to follow any predefined directives in their system. [color=red]IPCs are silicon-based beings, so doctors do not have the skills to repair them.[/color] - - - - - Like borgs, IPCs have a positronic brain as their processing source. Their chassis can be printed at an exosuit fabricator, and any newly made IPCs must have a positronic brain or MMI surgically installed to function. - - ## Recharging an IPC - - - - - - IPCs can be recharged in three different ways: - - APC Terminal: IPCs can use APC terminals to recharge. Press [color=yellow]Alt + left click[/color] on a terminal to recharge. - - Borg Rechargers: IPCs can use borg rechargers to recharge. Always prioritize the ones outside of Epistemics to avoid headaches. - - Power Cell: IPCs have an internal power cell that serves as their battery. They can simply swap it out by opening the hatch and manually replacing it. - - ## Integrated Radio - - - - - IPCs do [bold]not[/bold] use external radios because they already have one built in. They only need to get an encryption key from a radio. By clicking on an IPC with a [color=yellow]wire cutter[/color], you can remove their keys. - You can find new keys around the station or remove one from a sector radio using a [color=yellow]screwdriver[/color]. - - ## Repairing - Due to their synthetic construction, [color=#1e90ff]IPCs cannot be poisoned.[/color] They also [color=#1e90ff]50% less Cold damage and 50% Radiation damage.[/color] However, they take [color=#ffa500]50% more heat damage and 100% more shock damage.[/color] - - - Welders can be used to repair [color=yellow]Brute[/color] damage and stop [color=orange]Bleeding[/color]. - - - - Cables can be used to repair [color=yellow]Burns[/color], except for caustic. - - - - Steel can be used to repair [color=yellow]Caustic[/color] damage. - - - - Glass Sheets can be used to repair [color=yellow]Blindness[/color]. - - - - Plasma Sheets can be used to repair [color=green]Radiation[/color] damage. - - In the event an IPC dies, after being fully repaired, it should be restarted using the [color=yellow]"Restart"[/color] button (located by right-clicking). - - [color=red]NEVER ELECTROCUTE AN IPC with a defibrillator or in any other way while it is dead, as this will cause the battery to discharge energy rays outward![/color] - - diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index 2c3ccc3e3eb..d54bce285d7 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -14,7 +14,6 @@ - diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml b/Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml index 6d45973a7dc..d14a8d4d72f 100644 --- a/Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml +++ b/Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml @@ -60,7 +60,7 @@ There are also disabilty traits. Familiarize yourself with the game and the game They include: - Blindness (severely limits your vision) - Lightweight drunk (you get drunk faster and you suffer more from the ill-effects of alcohol) -- Machine incompatible (MMIs no longer work for you, meaning you can not be borged or put into an IPC.) +- Machine incompatible (MMIs no longer work for you, meaning you can not be borged.) - Muted (you cannot talk or whisper, but you can still communicate via emotes and pen and paper) - Narcolepsy (you randomly fall asleep at unpredictable and often inconvenient times) - Pacifist (you cannot hit, shoot, or throw sharp objects at people) diff --git a/Resources/Textures/_DV/Objects/Fun/Toys/ipcplush.rsi/heart.png b/Resources/Textures/_DV/Objects/Fun/Toys/ipcplush.rsi/heart.png deleted file mode 100644 index 95a9d0c4b5e..00000000000 Binary files a/Resources/Textures/_DV/Objects/Fun/Toys/ipcplush.rsi/heart.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Fun/Toys/ipcplush.rsi/icon.png b/Resources/Textures/_DV/Objects/Fun/Toys/ipcplush.rsi/icon.png deleted file mode 100644 index b4308fcaea7..00000000000 Binary files a/Resources/Textures/_DV/Objects/Fun/Toys/ipcplush.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Fun/Toys/ipcplush.rsi/meta.json b/Resources/Textures/_DV/Objects/Fun/Toys/ipcplush.rsi/meta.json deleted file mode 100644 index c6f39853e41..00000000000 --- a/Resources/Textures/_DV/Objects/Fun/Toys/ipcplush.rsi/meta.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "chamomileteatime", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "heart", - "delays": [ - [ - 0.8, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 1.0, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "screenshine" - } - ] -} diff --git a/Resources/Textures/_DV/Objects/Fun/Toys/ipcplush.rsi/screenshine.png b/Resources/Textures/_DV/Objects/Fun/Toys/ipcplush.rsi/screenshine.png deleted file mode 100644 index 07dc0a052de..00000000000 Binary files a/Resources/Textures/_DV/Objects/Fun/Toys/ipcplush.rsi/screenshine.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Medical/Oilpack.rsi/icon.png b/Resources/Textures/_DV/Objects/Medical/Oilpack.rsi/icon.png deleted file mode 100644 index dfed78e2c7e..00000000000 Binary files a/Resources/Textures/_DV/Objects/Medical/Oilpack.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Medical/Oilpack.rsi/meta.json b/Resources/Textures/_DV/Objects/Medical/Oilpack.rsi/meta.json deleted file mode 100644 index b78ea00d73a..00000000000 --- a/Resources/Textures/_DV/Objects/Medical/Oilpack.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/623290915c2292b56da11048deb62d758e1e3fb4/icons/obj/bloodpack.dmi, Blood pack redone by Ubaser, then turned into Oil Pack by lyndomen", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_DV/Objects/Medical/Omnipatch.rsi/icon.png b/Resources/Textures/_DV/Objects/Medical/Omnipatch.rsi/icon.png deleted file mode 100644 index 7173ea2efcf..00000000000 Binary files a/Resources/Textures/_DV/Objects/Medical/Omnipatch.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_DV/Objects/Medical/Omnipatch.rsi/meta.json b/Resources/Textures/_DV/Objects/Medical/Omnipatch.rsi/meta.json deleted file mode 100644 index 929824db42e..00000000000 --- a/Resources/Textures/_DV/Objects/Medical/Omnipatch.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by Lyndomen (github) for Delta-V", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_antlers.png b/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_antlers.png deleted file mode 100644 index 125f9cf913e..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_antlers.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_crowned.png b/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_crowned.png deleted file mode 100644 index 2fd0cdd06d2..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_crowned.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_cyberhead.png b/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_cyberhead.png deleted file mode 100644 index c3d1111199e..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_cyberhead.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_droneeyes.png b/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_droneeyes.png deleted file mode 100644 index 5b2a67a813a..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_droneeyes.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_light.png b/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_light.png deleted file mode 100644 index 91f5fd25e78..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_light.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_lightb.png b/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_lightb.png deleted file mode 100644 index bc1133d8d3c..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_lightb.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_sidelights.png b/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_sidelights.png deleted file mode 100644 index 7a1c31e45e4..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_sidelights.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_tesla.png b/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_tesla.png deleted file mode 100644 index 98cb10d3cbc..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_tesla.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_towers.png b/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_towers.png deleted file mode 100644 index f971130b8e4..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_towers.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_tv.png b/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_tv.png deleted file mode 100644 index ae53b4762ed..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/ipc_antenna_tv.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/meta.json deleted file mode 100644 index 69316d7e57c..00000000000 --- a/Resources/Textures/_EE/Mobs/Customization/ipc_antenna.rsi/meta.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Yogstation at https://github.com/yogstation13/Yogstation/commit/9c046aa5327c71f9e93e45a34283b3a4aff58bd1", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "ipc_antenna_tv", - "directions": 4 - }, - { - "name": "ipc_antenna_tesla", - "directions": 4, - "delays": [ - [ - 4, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 4, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 4, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 4, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "ipc_antenna_lightb", - "directions": 4, - "delays": [ - [ - 4, - 0.5, - 0.1, - 0.5 - ], - [ - 4, - 0.5, - 0.1, - 0.5 - ], - [ - 4, - 0.5, - 0.1, - 0.5 - ], - [ - 4, - 0.5, - 0.1, - 0.5 - ] - ] - }, - { - "name": "ipc_antenna_light", - "directions": 4 - }, - { - "name": "ipc_antenna_cyberhead", - "directions": 4 - }, - { - "name": "ipc_antenna_sidelights", - "directions": 4 - }, - { - "name": "ipc_antenna_antlers", - "directions": 4 - }, - { - "name": "ipc_antenna_droneeyes", - "directions": 4 - }, - { - "name": "ipc_antenna_crowned", - "directions": 4 - }, - { - "name": "ipc_antenna_towers", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_blank.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_blank.png deleted file mode 100644 index 4361a36c1ed..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_blank.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_blue.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_blue.png deleted file mode 100644 index f1568848807..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_blue.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_breakout.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_breakout.png deleted file mode 100644 index 54a282bd95c..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_breakout.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_bsod.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_bsod.png deleted file mode 100644 index 7d7a8efb62e..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_bsod.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_console.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_console.png deleted file mode 100644 index dfed44e10cd..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_console.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_ecgwave.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_ecgwave.png deleted file mode 100644 index 2d2c405734d..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_ecgwave.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_eight.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_eight.png deleted file mode 100644 index 8421ae30bd9..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_eight.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_exclaim.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_exclaim.png deleted file mode 100644 index e280615e504..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_exclaim.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyes.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyes.png deleted file mode 100644 index 42ee79361b1..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyes.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyesangry.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyesangry.png deleted file mode 100644 index 8a7e45c7e8f..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyesangry.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyestall.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyestall.png deleted file mode 100644 index d8c03fa3240..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_eyestall.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_frown.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_frown.png deleted file mode 100644 index f297c401a10..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_frown.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_glider.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_glider.png deleted file mode 100644 index afd5349ee6b..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_glider.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_goggles.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_goggles.png deleted file mode 100644 index 422a603cc7c..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_goggles.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_heart.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_heart.png deleted file mode 100644 index 77578d774ed..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_heart.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_l.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_l.png deleted file mode 100644 index 902845f11fc..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_l.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_loading.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_loading.png deleted file mode 100644 index 9a1f705a0d7..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_loading.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_monoeye.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_monoeye.png deleted file mode 100644 index 4e5056528d9..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_monoeye.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_nature.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_nature.png deleted file mode 100644 index 6425fe2b517..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_nature.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_orange.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_orange.png deleted file mode 100644 index f4c98278e1d..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_orange.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_pink.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_pink.png deleted file mode 100644 index dc50eb693db..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_pink.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_question.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_question.png deleted file mode 100644 index f90dcc94abb..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_question.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_rainbowdiag.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_rainbowdiag.png deleted file mode 100644 index 37274191d37..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_rainbowdiag.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_rainbowhoriz.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_rainbowhoriz.png deleted file mode 100644 index 9b6192dd6dc..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_rainbowhoriz.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_redtext.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_redtext.png deleted file mode 100644 index c180b8e674e..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_redtext.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_rgb.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_rgb.png deleted file mode 100644 index 36f48e75d7a..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_rgb.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_ring.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_ring.png deleted file mode 100644 index e5454221602..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_ring.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_scroll.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_scroll.png deleted file mode 100644 index cbf936810a1..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_scroll.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_shower.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_shower.png deleted file mode 100644 index 1546c8dbf13..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_shower.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_sinewave.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_sinewave.png deleted file mode 100644 index c976f421791..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_sinewave.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_smile.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_smile.png deleted file mode 100644 index 7ecd324e898..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_smile.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_squarewave.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_squarewave.png deleted file mode 100644 index 04211f366e8..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_squarewave.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_stars.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_stars.png deleted file mode 100644 index 8feda85c428..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_stars.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_static.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_static.png deleted file mode 100644 index 08e96db1508..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_static.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_tetris.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_tetris.png deleted file mode 100644 index d4ea13ea39b..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_tetris.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_textdrop.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_textdrop.png deleted file mode 100644 index c71ba6d24e9..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_textdrop.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_tv.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_tv.png deleted file mode 100644 index 5b9b25dcd9a..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_tv.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_windowsxp.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_windowsxp.png deleted file mode 100644 index 595ab8444b2..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_windowsxp.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_yellow.png b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_yellow.png deleted file mode 100644 index bbf4c92cb32..00000000000 Binary files a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/ipc_screen_yellow.png and /dev/null differ diff --git a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/meta.json b/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/meta.json deleted file mode 100644 index b6314cde9c2..00000000000 --- a/Resources/Textures/_EE/Mobs/Customization/ipc_screens.rsi/meta.json +++ /dev/null @@ -1,1363 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from Yogstation at https://github.com/yogstation13/Yogstation/commit/9c046aa5327c71f9e93e45a34283b3a4aff58bd1", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "ipc_screen_static", - "directions": 4, - "delays": [ - [ - 0.15, - 0.15, - 0.15, - 0.15 - ], - [ - 0.15, - 0.15, - 0.15, - 0.15 - ], - [ - 0.15, - 0.15, - 0.15, - 0.15 - ], - [ - 0.15, - 0.15, - 0.15, - 0.15 - ] - ] - }, - { - "name": "ipc_screen_blue", - "directions": 4, - "delays": [ - [ - 2.4, - 2.4, - 2.4, - 2.4, - 2.4, - 2.4 - ], - [ - 2.4, - 2.4, - 2.4, - 2.4, - 2.4, - 2.4 - ], - [ - 2.4, - 2.4, - 2.4, - 2.4, - 2.4, - 2.4 - ], - [ - 2.4, - 2.4, - 2.4, - 2.4, - 2.4, - 2.4 - ] - ] - }, - { - "name": "ipc_screen_breakout", - "directions": 4, - "delays": [ - [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 - ], - [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 - ], - [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 - ], - [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 - ] - ] - }, - { - "name": "ipc_screen_eight", - "directions": 4, - "delays": [ - [ - 0.8, - 0.8 - ], - [ - 0.8, - 0.8 - ], - [ - 0.8, - 0.8 - ], - [ - 0.8, - 0.8 - ] - ] - }, - { - "name": "ipc_screen_goggles", - "directions": 4, - "delays": [ - [ - 0.2, - 4 - ], - [ - 0.2, - 4 - ], - [ - 0.2, - 4 - ], - [ - 0.2, - 4 - ] - ] - }, - { - "name": "ipc_screen_exclaim", - "directions": 4, - "delays": [ - [ - 0.6, - 0.6 - ], - [ - 0.6, - 0.6 - ], - [ - 0.6, - 0.6 - ], - [ - 0.6, - 0.6 - ] - ] - }, - { - "name": "ipc_screen_heart", - "directions": 4, - "delays": [ - [ - 0.8, - 0.8 - ], - [ - 0.8, - 0.8 - ], - [ - 0.8, - 0.8 - ], - [ - 0.8, - 0.8 - ] - ] - }, - { - "name": "ipc_screen_monoeye", - "directions": 4, - "delays": [ - [ - 4, - 0.1, - 0.1, - 0.1 - ], - [ - 4, - 0.1, - 0.1, - 0.1 - ], - [ - 4, - 0.1, - 0.1, - 0.1 - ], - [ - 4, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "ipc_screen_nature", - "directions": 4, - "delays": [ - [ - 10, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 10, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 10, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 10, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 10, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 10, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 10, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 10, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "ipc_screen_orange", - "directions": 4, - "delays": [ - [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 - ], - [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 - ], - [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 - ], - [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 - ] - ] - }, - { - "name": "ipc_screen_pink", - "directions": 4, - "delays": [ - [ - 0.8, - 0.8 - ], - [ - 0.8, - 0.8 - ], - [ - 0.8, - 0.8 - ], - [ - 0.8, - 0.8 - ] - ] - }, - { - "name": "ipc_screen_question", - "directions": 4, - "delays": [ - [ - 0.8, - 0.8 - ], - [ - 0.8, - 0.8 - ], - [ - 0.8, - 0.8 - ], - [ - 0.8, - 0.8 - ] - ] - }, - { - "name": "ipc_screen_shower", - "directions": 4, - "delays": [ - [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 - ], - [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 - ], - [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 - ], - [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 - ] - ] - }, - { - "name": "ipc_screen_yellow", - "directions": 4, - "delays": [ - [ - 2, - 2 - ], - [ - 2, - 2 - ], - [ - 2, - 2 - ], - [ - 2, - 2 - ] - ] - }, - { - "name": "ipc_screen_scroll", - "directions": 4, - "delays": [ - [ - 0.125, - 0.125, - 0.125, - 0.125, - 0.125 - ], - [ - 0.125, - 0.125, - 0.125, - 0.125, - 0.125 - ], - [ - 0.125, - 0.125, - 0.125, - 0.125, - 0.125 - ], - [ - 0.125, - 0.125, - 0.125, - 0.125, - 0.125 - ] - ] - }, - { - "name": "ipc_screen_console", - "directions": 4, - "delays": [ - [ - 1, - 1 - ], - [ - 1, - 1 - ], - [ - 1, - 1 - ], - [ - 1, - 1 - ] - ] - }, - { - "name": "ipc_screen_rgb", - "directions": 4, - "delays": [ - [ - 2, - 2, - 2 - ], - [ - 2, - 2, - 2 - ], - [ - 2, - 2, - 2 - ], - [ - 2, - 2, - 2 - ] - ] - }, - { - "name": "ipc_screen_glider", - "directions": 4, - "delays": [ - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "ipc_screen_rainbowhoriz", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "ipc_screen_bsod", - "directions": 4, - "delays": [ - [ - 0.4, - 0.1, - 0.1, - 0.1, - 0.1, - 0.4, - 0.1, - 0.1, - 0.1 - ], - [ - 0.4, - 0.1, - 0.1, - 0.1, - 0.1, - 0.4, - 0.1, - 0.1, - 0.1 - ], - [ - 0.4, - 0.1, - 0.1, - 0.1, - 0.1, - 0.4, - 0.1, - 0.1, - 0.1 - ], - [ - 0.4, - 0.1, - 0.1, - 0.1, - 0.1, - 0.4, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "ipc_screen_redtext", - "directions": 4, - "delays": [ - [ - 0.4, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.4, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.4, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.4, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "ipc_screen_sinewave", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "ipc_screen_squarewave", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "ipc_screen_ecgwave", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "ipc_screen_eyes", - "directions": 4, - "delays": [ - [ - 3, - 0.5 - ], - [ - 3, - 0.5 - ], - [ - 3, - 0.5 - ], - [ - 3, - 0.5 - ] - ] - }, - { - "name": "ipc_screen_eyestall", - "directions": 4, - "delays": [ - [ - 3, - 0.5 - ], - [ - 3, - 0.5 - ], - [ - 3, - 0.5 - ], - [ - 3, - 0.5 - ] - ] - }, - { - "name": "ipc_screen_eyesangry", - "directions": 4, - "delays": [ - [ - 3, - 0.5 - ], - [ - 3, - 0.5 - ], - [ - 3, - 0.5 - ], - [ - 3, - 0.5 - ] - ] - }, - { - "name": "ipc_screen_loading", - "directions": 4, - "delays": [ - [ - 0.2, - 0.1, - 0.2, - 0.1, - 0.2 - ], - [ - 0.2, - 0.1, - 0.2, - 0.1, - 0.2 - ], - [ - 0.2, - 0.1, - 0.2, - 0.1, - 0.2 - ], - [ - 0.2, - 0.1, - 0.2, - 0.1, - 0.2 - ] - ] - }, - { - "name": "ipc_screen_windowsxp", - "directions": 4, - "delays": [ - [ - 0.25, - 0.19, - 0.120000005, - 0.1, - 0.16, - 0.22 - ], - [ - 0.25, - 0.19, - 0.120000005, - 0.1, - 0.16, - 0.22 - ], - [ - 0.25, - 0.19, - 0.120000005, - 0.1, - 0.16, - 0.22 - ], - [ - 0.25, - 0.19, - 0.120000005, - 0.1, - 0.16, - 0.22 - ] - ] - }, - { - "name": "ipc_screen_tetris", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.1, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.1, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.1, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.1, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.1, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.1, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.1, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.1, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "ipc_screen_tv", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.1 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.1 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.1 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.1 - ] - ] - }, - { - "name": "ipc_screen_textdrop", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "ipc_screen_stars", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "ipc_screen_rainbowdiag", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "ipc_screen_blank", - "directions": 4 - }, - { - "name": "ipc_screen_smile", - "directions": 4 - }, - { - "name": "ipc_screen_frown", - "directions": 4 - }, - { - "name": "ipc_screen_ring", - "directions": 4 - }, - { - "name": "ipc_screen_l", - "directions": 4 - } - ] -}