diff --git a/Content.Client/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineBoundUserInterface.cs b/Content.Client/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineBoundUserInterface.cs new file mode 100644 index 00000000000..8986e6f9e22 --- /dev/null +++ b/Content.Client/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineBoundUserInterface.cs @@ -0,0 +1,80 @@ +using Content.Shared.ReverseEngineering; +using Robust.Client.GameObjects; +using Robust.Shared.Timing; + +namespace Content.Client.Nyanotrasen.ReverseEngineering; + +public sealed class ReverseEngineeringMachineBoundUserInterface : BoundUserInterface +{ + [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private readonly IGameTiming _timing = default!; + + private ReverseEngineeringMachineMenu? _menu; + + public ReverseEngineeringMachineBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) + { + } + + protected override void Open() + { + base.Open(); + + if (_menu != null) + return; + + _menu = new ReverseEngineeringMachineMenu(Owner, _entMan, _timing); + + _menu.OnClose += Close; + _menu.OpenCentered(); + + _menu.OnScanButtonPressed += () => + { + // every button flickering is bad so no prediction + SendMessage(new ReverseEngineeringScanMessage()); + }; + + _menu.OnSafetyButtonToggled += () => + { + SendPredictedMessage(new ReverseEngineeringSafetyMessage()); + }; + + _menu.OnAutoScanButtonToggled += () => + { + SendPredictedMessage(new ReverseEngineeringAutoScanMessage()); + }; + + _menu.OnStopButtonPressed += () => + { + // see scan button + SendMessage(new ReverseEngineeringStopMessage()); + }; + + _menu.OnEjectButtonPressed += () => + { + // doesn't sound nice when predicted + SendMessage(new ReverseEngineeringEjectMessage()); + }; + } + + protected override void UpdateState(BoundUserInterfaceState state) + { + base.UpdateState(state); + + if (state is not ReverseEngineeringMachineState cast) + return; + + _menu?.UpdateState(cast); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (!disposing) + return; + + _menu?.Close(); + _menu?.Dispose(); + } +} + diff --git a/Content.Client/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineMenu.xaml b/Content.Client/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineMenu.xaml new file mode 100644 index 00000000000..f2ebee5657b --- /dev/null +++ b/Content.Client/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineMenu.xaml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Content.Client/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineMenu.xaml.cs b/Content.Client/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineMenu.xaml.cs new file mode 100644 index 00000000000..77243798d76 --- /dev/null +++ b/Content.Client/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineMenu.xaml.cs @@ -0,0 +1,87 @@ +using Content.Client.UserInterface.Controls; +using Content.Shared.ReverseEngineering; +using Robust.Client.AutoGenerated; +using Robust.Client.GameObjects; +using Robust.Client.State; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; +using Robust.Shared.Timing; + +namespace Content.Client.Nyanotrasen.ReverseEngineering; + +[GenerateTypedNameReferences] +public sealed partial class ReverseEngineeringMachineMenu : FancyWindow +{ + private readonly IEntityManager _entMan; + private readonly IGameTiming _timing; + private readonly SharedReverseEngineeringSystem _revEng; + + private readonly Entity _owner; + + public event Action? OnScanButtonPressed; + public event Action? OnSafetyButtonToggled; + public event Action? OnAutoScanButtonToggled; + public event Action? OnStopButtonPressed; + public event Action? OnEjectButtonPressed; + + public ReverseEngineeringMachineMenu(EntityUid owner, IEntityManager entMan, IGameTiming timing) + { + RobustXamlLoader.Load(this); + + _entMan = entMan; + _timing = timing; + _revEng = entMan.System(); + + _owner = (owner, entMan.GetComponent(owner)); + + ScanButton.OnPressed += _ => OnScanButtonPressed?.Invoke(); + SafetyButton.OnToggled += _ => OnSafetyButtonToggled?.Invoke(); + AutoScanButton.OnToggled += _ => OnAutoScanButtonToggled?.Invoke(); + StopButton.OnPressed += _ => OnStopButtonPressed?.Invoke(); + EjectButton.OnPressed += _ => OnEjectButtonPressed?.Invoke(); + } + + private void UpdateArtifactIcon(EntityUid? uid) + { + if (uid == null) + { + ItemDisplay.Visible = false; + return; + } + + ItemDisplay.Visible = true; + ItemDisplay.SetEntity(uid); + } + + public void UpdateState(ReverseEngineeringMachineState state) + { + Information.SetMessage(state.ScanMessage); + } + + protected override void FrameUpdate(FrameEventArgs args) + { + base.FrameUpdate(args); + + var scanning = _revEng.IsActive(_owner); + var item = _revEng.GetItem(_owner); + ScanButton.Disabled = scanning || item == null; + StopButton.Disabled = !scanning; + SafetyButton.Pressed = _owner.Comp.SafetyOn; + AutoScanButton.Pressed = _owner.Comp.AutoScan; + EjectButton.Disabled = ScanButton.Disabled; + + UpdateArtifactIcon(item); + + ProgressBox.Visible = scanning; + + if (!_entMan.TryGetComponent(_owner, out var active) + || !_entMan.TryGetComponent(item, out var rev)) + return; + + TotalProgressBar.Value = (float) rev.Progress; + + var remaining = Math.Max(active.NextProbe.TotalSeconds - _timing.CurTime.TotalSeconds, 0.0); + ProgressLabel.Text = Loc.GetString("analysis-console-progress-text", ("seconds", (int) remaining)); + ProgressBar.Value = 1f - (float) (remaining / _owner.Comp.AnalysisDuration.TotalSeconds); + } +} diff --git a/Content.Client/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs b/Content.Client/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs new file mode 100644 index 00000000000..6a95bbe4281 --- /dev/null +++ b/Content.Client/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs @@ -0,0 +1,5 @@ +using Content.Shared.ReverseEngineering; + +namespace Content.Client.ReverseEngineering; + +public sealed class ReverseEngineeringSystem : SharedReverseEngineeringSystem; diff --git a/Content.Server/Backmen/Supermatter/SupermatterSystem.cs b/Content.Server/Backmen/Supermatter/SupermatterSystem.cs new file mode 100644 index 00000000000..81a19dab9a9 --- /dev/null +++ b/Content.Server/Backmen/Supermatter/SupermatterSystem.cs @@ -0,0 +1,647 @@ +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Content.Server.AlertLevel; +using Content.Server.Atmos.EntitySystems; +using Content.Server.Audio; +using Content.Server.Chat.Systems; +using Content.Server.Explosion.Components; +using Content.Server.Explosion.EntitySystems; +using Content.Server.Lightning; +using Content.Server.Station.Systems; +using Content.Shared.Atmos; +using Content.Shared.Audio; +using Content.Shared.Backmen.CCVar; +using Content.Shared.Backmen.Supermatter; +using Content.Shared.Backmen.Supermatter.Components; +using Content.Shared.Explosion.Components; +using Content.Shared.Interaction; +using Content.Shared.Mobs.Components; +using Content.Shared.Projectiles; +using Content.Shared.Radiation.Components; +using Content.Shared.Tag; +using Content.Shared.Whitelist; +using Robust.Server.GameObjects; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Configuration; +using Robust.Shared.Containers; +using Robust.Shared.CPUJob.JobQueues; +using Robust.Shared.CPUJob.JobQueues.Queues; +using Robust.Shared.Physics; +using Robust.Shared.Physics.Events; +using Robust.Shared.Prototypes; +using Robust.Shared.Timing; + +namespace Content.Server.Backmen.Supermatter; + +public sealed class SupermatterSystem : SharedSupermatterSystem +{ + public override void Initialize() + { + base.Initialize(); + + + SubscribeLocalEvent(OnHandInteract); + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnComponentRemove); + } + + private const double PwrJobTime = 0.5; + private readonly JobQueue _pwrJobQueue = new(PwrJobTime); + + + + public sealed class HandleOutputJob( + float frameTime, + SupermatterSystem self, + Entity ent, + GasMixture gasMixture, + double maxTime, + CancellationToken cancellation = default) + : Job(maxTime, cancellation) + { + private readonly CancellationToken _cancellation = cancellation; + + protected override async Task Process() + { + self.HandleOutput(ent,frameTime, ent, ent, gasMixture); + return null; + } + } + + public sealed class HandleDamageJob( + float frameTime, + SupermatterSystem self, + Entity ent, + GasMixture? gasMixture, + double maxTime, + CancellationToken cancellation = default) + : Job(maxTime, cancellation) + { + private readonly CancellationToken _cancellation = cancellation; + + protected override async Task Process() + { + self.HandleDamage(ent,frameTime, ent, ent, gasMixture); + return null; + } + } + + public sealed class HandleLightingJob( + float frameTime, + SupermatterSystem self, + Entity ent, + double maxTime, + CancellationToken cancellation = default) + : Job(maxTime, cancellation) + { + private readonly CancellationToken _cancellation = cancellation; + + protected override async Task Process() + { + self.SupermatterZap(ent); + return null; + } + } + + + public override void Update(float frameTime) + { + base.Update(frameTime); + _pwrJobQueue.Process(); + + var q = EntityQueryEnumerator(); + + while (q.MoveNext(out var owner, out var supermatter, out var xplode, out var rads, out var metaDataComponent)) + { + if(metaDataComponent.EntityPaused) + continue; + + var mixture = _atmosphere.GetContainingMixture(owner, true, true); + + { + supermatter.AtmosUpdateAccumulator += frameTime; + + if (supermatter.AtmosUpdateAccumulator > supermatter.AtmosUpdateTimer && + mixture is { }) + { + supermatter.AtmosUpdateAccumulator -= supermatter.AtmosUpdateTimer; + _pwrJobQueue.EnqueueJob(new HandleOutputJob(frameTime, this, (owner, supermatter, xplode, rads), mixture, PwrJobTime)); + } + } + { + supermatter.DamageUpdateAccumulator += frameTime; + + if (supermatter.DamageUpdateAccumulator > supermatter.DamageUpdateTimer) + { + supermatter.DamageUpdateAccumulator -= supermatter.DamageUpdateTimer; + _pwrJobQueue.EnqueueJob(new HandleDamageJob(frameTime, this, (owner, supermatter, xplode, rads), mixture, PwrJobTime)); + } + } + { + if (supermatter.ZapAccumulator >= supermatter.ZapTimer) + { + supermatter.ZapAccumulator -= supermatter.ZapTimer; + _pwrJobQueue.EnqueueJob(new HandleLightingJob(frameTime, this, (owner, supermatter), PwrJobTime)); + } + } + { + supermatter.YellAccumulator += frameTime; + if (supermatter.YellAccumulator >= supermatter.YellTimer) + { + supermatter.YellAccumulator -= supermatter.YellTimer; + AnnounceCoreDamage(owner, supermatter); + } + } + } + } + /// + /// Handle outputting based off enery, damage, gas mix and radiation + /// + private void HandleOutput( + EntityUid uid, + float frameTime, + BkmSupermatterComponent sMcomponent, + RadiationSourceComponent radcomponent, + GasMixture mixture) + { + + + //Absorbed gas from surrounding area + var absorbedGas = mixture.Remove(sMcomponent.GasEfficiency * mixture.TotalMoles); + var absorbedTotalMoles = absorbedGas.TotalMoles; + + if (!(absorbedTotalMoles > 0f)) + return; + + var gasStorage = sMcomponent.GasStorage; + var gasEffect = sMcomponent.GasDataFields; + + //Lets get the proportions of the gasses in the mix for scaling stuff later + //They range between 0 and 1 + gasStorage = gasStorage.ToDictionary( + gas => gas.Key, + gas => Math.Clamp(absorbedGas.GetMoles(gas.Key) / absorbedTotalMoles, 0, 1) + ); + + //No less then zero, and no greater then one, we use this to do explosions + //and heat to power transfer + var gasmixPowerRatio = gasStorage.Sum(gas => gasStorage[gas.Key] * gasEffect[gas.Key].PowerMixRatio); + + //Minimum value of -10, maximum value of 23. Affects plasma and o2 output + //and the output heat + var dynamicHeatModifier = gasStorage.Sum(gas => gasStorage[gas.Key] * gasEffect[gas.Key].HeatPenalty); + + //Minimum value of -10, maximum value of 23. Effects plasma and o2 output + // and the output heat + var powerTransmissionBonus = + gasStorage.Sum(gas => gasStorage[gas.Key] * gasEffect[gas.Key].TransmitModifier); + + var h2OBonus = 1 - gasStorage[Gas.WaterVapor] * 0.25f; + + gasmixPowerRatio = Math.Clamp(gasmixPowerRatio, 0, 1); + dynamicHeatModifier = Math.Max(dynamicHeatModifier, 0.5f); + powerTransmissionBonus *= h2OBonus; + + //Effects the damage heat does to the crystal + sMcomponent.DynamicHeatResistance = 1f; + + //more moles of gases are harder to heat than fewer, + //so let's scale heat damage around them + sMcomponent.MoleHeatPenaltyThreshold = + (float) Math.Max(absorbedTotalMoles * sMcomponent.MoleHeatPenalty, 0.25); + + //Ramps up or down in increments of 0.02 up to the proportion of co2 + //Given infinite time, powerloss_dynamic_scaling = co2comp + //Some value between 0 and 1 + if (absorbedTotalMoles > sMcomponent.PowerlossInhibitionMoleThreshold && + gasStorage[Gas.CarbonDioxide] > sMcomponent.PowerlossInhibitionGasThreshold) + { + sMcomponent.PowerlossDynamicScaling = + Math.Clamp( + sMcomponent.PowerlossDynamicScaling + Math.Clamp( + gasStorage[Gas.CarbonDioxide] - sMcomponent.PowerlossDynamicScaling, -0.02f, 0.02f), 0f, + 1f); + } + else + { + sMcomponent.PowerlossDynamicScaling = Math.Clamp(sMcomponent.PowerlossDynamicScaling - 0.05f, 0f, 1f); + } + + //Ranges from 0 to 1(1-(value between 0 and 1 * ranges from 1 to 1.5(mol / 500))) + //We take the mol count, and scale it to be our inhibitor + var powerlossInhibitor = + Math.Clamp( + 1 - sMcomponent.PowerlossDynamicScaling * + Math.Clamp(absorbedTotalMoles / sMcomponent.PowerlossInhibitionMoleBoostThreshold, 1f, 1.5f), + 0f, 1f); + + if (sMcomponent.MatterPower != 0) //We base our removed power off one 10th of the matter_power. + { + var removedMatter = Math.Max(sMcomponent.MatterPower / sMcomponent.MatterPowerConversion, 40); + //Adds at least 40 power + sMcomponent.Power = Math.Max(sMcomponent.Power + removedMatter, 0); + //Removes at least 40 matter power + sMcomponent.MatterPower = Math.Max(sMcomponent.MatterPower - removedMatter, 0); + } + + //based on gas mix, makes the power more based on heat or less effected by heat + var tempFactor = gasmixPowerRatio > 0.8 ? 50f : 30f; + + //if there is more pluox and n2 then anything else, we receive no power increase from heat + sMcomponent.Power = + Math.Max( + absorbedGas.Temperature * tempFactor / Atmospherics.T0C * gasmixPowerRatio + sMcomponent.Power, + 0); + + //Rad Pulse Calculation + radcomponent.Intensity = sMcomponent.Power * + Math.Max(0, 1f + powerTransmissionBonus / 10f) + * 0.003f + * _config.GetCVar(CCVars.SupermatterRadsModifier); + + //Power * 0.55 * a value between 1 and 0.8 + var energy = sMcomponent.Power * sMcomponent.ReactionPowerModifier; + + //Keep in mind we are only adding this temperature to (efficiency)% of the one tile the rock + //is on. An increase of 4*C @ 25% efficiency here results in an increase of 1*C / (#tilesincore) overall. + //Power * 0.55 * (some value between 1.5 and 23) / 5 + + absorbedGas.Temperature += energy * dynamicHeatModifier * sMcomponent.ThermalReleaseModifier; + absorbedGas.Temperature = Math.Max(0, + Math.Min(absorbedGas.Temperature, sMcomponent.HeatThreshold * dynamicHeatModifier)); + + //Calculate how much gas to release + //Varies based on power and gas content + + absorbedGas.AdjustMoles(Gas.Plasma, + Math.Max(energy * dynamicHeatModifier * sMcomponent.PlasmaReleaseModifier, 0f)); + + absorbedGas.AdjustMoles(Gas.Oxygen, + Math.Max( + (energy + absorbedGas.Temperature * dynamicHeatModifier - Atmospherics.T0C) * + sMcomponent.OxygenReleaseEfficiencyModifier, 0f)); + + _atmosphere.Merge(mixture, absorbedGas); + + var powerReduction = (float) Math.Pow(sMcomponent.Power / 500, 3); + + //After this point power is lowered + //This wraps around to the begining of the function + sMcomponent.Power = Math.Max( + sMcomponent.Power - Math.Min(powerReduction * powerlossInhibitor, + sMcomponent.Power * 0.83f * powerlossInhibitor), 0f); + } + + /// + /// Shoot lightning bolts depensing on accumulated power. + /// + private void SupermatterZap(Entity sm) + { + // Divide power by its' threshold to get a value from 0-1, then multiply by the amount of possible lightnings + var zapPower = sm.Comp.Power / sm.Comp.PowerPenaltyThreshold * sm.Comp.LightningPrototypes.Length; + var zapPowerNorm = (int) Math.Clamp(zapPower, 0, sm.Comp.LightningPrototypes.Length - 1); + _lightning.ShootRandomLightnings(sm, 3.5f, sm.Comp.Power > sm.Comp.PowerPenaltyThreshold ? 3 : 1, sm.Comp.LightningPrototypes[zapPowerNorm]); + } + + /// + /// Handles environmental damage and dispatching damage warning + /// + private void HandleDamage( + EntityUid uid, + float frameTime, + BkmSupermatterComponent? sMcomponent = null, + ExplosiveComponent? xplode = null, + GasMixture? mixture = null) + { + if (!Resolve(uid, ref sMcomponent, ref xplode)) + { + return; + } + + try + { + var xform = Transform(uid); + var indices = _xform.GetGridOrMapTilePosition(uid, xform); + + sMcomponent.DamageArchived = sMcomponent.Damage; + //we're in space or there is no gas to process + if (!xform.GridUid.HasValue || mixture is not { } || mixture.TotalMoles == 0f) + { + sMcomponent.Damage += Math.Max(sMcomponent.Power / 1000 * sMcomponent.DamageIncreaseMultiplier, 0.1f); + } + else + { + //Absorbed gas from surrounding area + var absorbedGas = mixture.Remove(sMcomponent.GasEfficiency * mixture.TotalMoles); + var absorbedTotalMoles = absorbedGas.TotalMoles; + + //Mols start to have a positive effect on damage after 350 + sMcomponent.Damage = (float) Math.Max( + sMcomponent.Damage + + Math.Max( + Math.Clamp(absorbedTotalMoles / 200, 0.5, 1) * absorbedGas.Temperature - + (Atmospherics.T0C + sMcomponent.HeatPenaltyThreshold) * sMcomponent.DynamicHeatResistance, + 0) * sMcomponent.MoleHeatThreshold / 150 * sMcomponent.DamageIncreaseMultiplier, 0); + + //Power only starts affecting damage when it is above 5000 + sMcomponent.Damage = + Math.Max( + sMcomponent.Damage + + Math.Max(sMcomponent.Power - sMcomponent.PowerPenaltyThreshold, 0) / 500 * + sMcomponent.DamageIncreaseMultiplier, 0); + + //Molar count only starts affecting damage when it is above 1800 + sMcomponent.Damage = + Math.Max( + sMcomponent.Damage + Math.Max(absorbedTotalMoles - sMcomponent.MolePenaltyThreshold, 0) / 80 * + sMcomponent.DamageIncreaseMultiplier, 0); + + //There might be a way to integrate healing and hurting via heat + //healing damage + if (absorbedTotalMoles < sMcomponent.MolePenaltyThreshold) + { + //Only has a net positive effect when the temp is below 313.15, heals up to 2 damage. Psycologists increase this temp min by up to 45 + sMcomponent.Damage = + Math.Max( + sMcomponent.Damage + + Math.Min(absorbedGas.Temperature - (Atmospherics.T0C + sMcomponent.HeatPenaltyThreshold), + 0) / 150, 0); + } + + //if there are space tiles next to SM + //TODO: change moles out for checking if adjacent tiles exist + var q = _atmosphere.GetAdjacentTileMixtures(xform.GridUid.Value, indices); + while (q.MoveNext(out var ind)) + { + if (ind.TotalMoles != 0) + continue; + + var integrity = GetIntegrity(sMcomponent.Damage, sMcomponent.ExplosionPoint); + + var factor = integrity switch + { + < 10 => 0.0005f, + < 25 => 0.0009f, + < 45 => 0.005f, + < 75 => 0.002f, + _ => 0f + }; + + sMcomponent.Damage += Math.Clamp(sMcomponent.Power * factor * sMcomponent.DamageIncreaseMultiplier, + 0, sMcomponent.MaxSpaceExposureDamage); + + break; + } + + sMcomponent.Damage = + Math.Min(sMcomponent.DamageArchived + sMcomponent.DamageHardcap * sMcomponent.ExplosionPoint, + sMcomponent.Damage); + } + + HandleSoundLoop(uid, sMcomponent); + + if (sMcomponent.Damage > sMcomponent.ExplosionPoint || sMcomponent.Delamming) + { + HandleDelamination(uid, frameTime, sMcomponent, xplode, mixture); + } + } + finally + { + Dirty(uid,sMcomponent); + } + } + + + /// + /// Decide on how to delaminate. + /// + public DelamType ChooseDelamType(EntityUid uid, BkmSupermatterComponent sm) + { + if (_config.GetCVar(CCVars.SupermatterDoForceDelam) && + Enum.TryParse(_config.GetCVar(CCVars.SupermatterForcedDelamType), out var forceDelamType)) + return forceDelamType; + + var mix = _atmosphere.GetContainingMixture(uid, true, true); + + if (mix is { }) + { + var absorbedGas = mix.Remove(sm.GasEfficiency * mix.TotalMoles); + var moles = absorbedGas.TotalMoles; + + if (_config.GetCVar(CCVars.SupermatterDoSingulooseDelam) + && moles >= sm.MolePenaltyThreshold * _config.GetCVar(CCVars.SupermatterSingulooseMolesModifier)) + return DelamType.Singulo; + } + + if (_config.GetCVar(CCVars.SupermatterDoTeslooseDelam) + && sm.Power >= sm.PowerPenaltyThreshold * _config.GetCVar(CCVars.SupermatterTesloosePowerModifier)) + return DelamType.Tesla; + + //TODO: Add resonance cascade when there's crazy conditions or a destabilizing crystal + + return DelamType.Explosion; + } + + /// + /// Runs the logic and timers for Delamination + /// + private void HandleDelamination( + EntityUid uid, + float frameTime, + BkmSupermatterComponent sMcomponent, + ExplosiveComponent xplode, + GasMixture? mixture = null) + { + var xform = Transform(uid); + + //before we actually start counting down, check to see what delam type we're doing. + if (!sMcomponent.Delamming) + { + sMcomponent.Delamming = true; + sMcomponent.PreferredDelamType = ChooseDelamType(uid, sMcomponent); + AnnounceCoreDamage(uid, sMcomponent); + + } + if (sMcomponent.Damage < sMcomponent.DamageDelaminationPoint && sMcomponent.Delamming) + { + sMcomponent.Delamming = false; + AnnounceCoreDamage(uid, sMcomponent); + return; + } + + sMcomponent.DelamTimerAccumulator += frameTime + sMcomponent.DamageUpdateTimer; + + + //TODO: make tesla(?) spawn at SupermatterComponent.PowerPenaltyThreshold and think up other delam types + //times up, explode or make a singulo + if (!(sMcomponent.DelamTimerAccumulator >= sMcomponent.DelamTimer)) + return; + + switch (sMcomponent.PreferredDelamType) + { + //case DelamType.Cascade: + // Spawn(sMcomponent.KudzuSpawnPrototype, xform.Coordinates); + // break; + + case DelamType.Singulo: + Spawn(sMcomponent.SingularitySpawnPrototype, xform.Coordinates); + break; + + case DelamType.Tesla: + Spawn(sMcomponent.TeslaSpawnPrototype, xform.Coordinates); + break; + + default: + _explosion.TriggerExplosive(uid); + break; + } + + sMcomponent.AudioStream = _audio.Stop(sMcomponent.AudioStream); + _ambient.SetAmbience(uid, false); + sMcomponent.Delamming = false; + } + + private void HandleSoundLoop(EntityUid uid, BkmSupermatterComponent sm) + { + var ambient = CompOrNull(uid); + + if (ambient == null) + return; + + if (sm.Delamming && sm.CurrentSoundLoop != sm.DelamSound) + sm.CurrentSoundLoop = sm.DelamSound; + + else if (!sm.Delamming && sm.CurrentSoundLoop != sm.CalmSound) + sm.CurrentSoundLoop = sm.CalmSound; + + if (ambient.Sound != sm.CurrentSoundLoop) + _ambient.SetSound(uid, sm.CurrentSoundLoop, ambient); + } + + /// + /// Handles core damage announcements + /// + private void AnnounceCoreDamage(EntityUid uid, BkmSupermatterComponent sm) + { + var message = string.Empty; + var global = false; + + var integrity = GetIntegrity((uid, sm)).ToString("0.00"); + + // Special cases + if (sm.Damage < sm.DamageDelaminationPoint && sm.Delamming) + { + message = Loc.GetString("supermatter-delam-cancel", ("integrity", integrity)); + sm.DelamAnnounced = false; + global = true; + } + + if (sm.Delamming && !sm.DelamAnnounced) + { + var sb = new StringBuilder(); + var loc = string.Empty; + + switch (sm.PreferredDelamType) + { + case DelamType.Cascade: loc = "supermatter-delam-cascade"; break; + case DelamType.Singulo: loc = "supermatter-delam-overmass"; break; + case DelamType.Tesla: loc = "supermatter-delam-tesla"; break; + default: loc = "supermatter-delam-explosion"; break; + } + + var station = _station.GetOwningStation(uid); + if (station != null) + _alert.SetLevel((EntityUid) station, sm.AlertCodeDeltaId, true, true, true, false); + + sb.AppendLine(Loc.GetString(loc)); + sb.AppendLine(Loc.GetString("supermatter-seconds-before-delam", ("seconds", sm.DelamTimer))); + + message = sb.ToString(); + global = true; + sm.DelamAnnounced = true; + + SendSupermatterAnnouncement(uid, message, global); + return; + } + + // Ignore the 0% integrity alarm + if (sm.Delamming) + return; + + // We are not taking consistent damage, Engineers aren't needed + if (sm.Damage <= sm.DamageArchived) + return; + + if (sm.Damage >= sm.DamageWarningThreshold) + { + message = Loc.GetString("supermatter-warning", ("integrity", integrity)); + if (sm.Damage >= sm.DamageEmergencyThreshold) + { + message = Loc.GetString("supermatter-emergency", ("integrity", integrity)); + global = true; + } + } + + SendSupermatterAnnouncement(uid, message, global); + } + + /// If true, sends a station announcement + /// Localisation string for a custom announcer name + public void SendSupermatterAnnouncement(EntityUid uid, string message, bool global = false, string? customSender = null) + { + if (global) + { + var sender = Loc.GetString(customSender != null ? customSender : "supermatter-announcer"); + _chat.DispatchStationAnnouncement(uid, message, sender, colorOverride: Color.Yellow); + return; + } + + _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Speak, hideChat: false, checkRadioPrefix: true); + } + + + private void OnHandInteract(EntityUid uid, BkmSupermatterComponent supermatter, InteractHandEvent args) + { + var target = args.User; + if (_supermatterImmuneQuery.HasComp(target)) + return; + + supermatter.MatterPower += 200; + Spawn(Ash, Transform(target).Coordinates); + _audio.PlayPvs(supermatter.DustSound, uid); + QueueDel(target); + } + + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + // Set the Sound + _ambient.SetAmbience(ent, true); + + //Add Air to the initialized SM in the Map so it doesnt delam on default + var mixture = _atmosphere.GetContainingMixture(ent.Owner, true, true); + mixture?.AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesStandard); + mixture?.AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard); + } + + private void OnComponentRemove(Entity ent, ref ComponentRemove args) + { + // turn off any ambient if component is removed (ex. entity deleted) + _ambient.SetAmbience(ent, false); + ent.Comp.AudioStream = _audio.Stop(ent.Comp.AudioStream); + } + + + [Dependency] private readonly AtmosphereSystem _atmosphere = default!; + [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private readonly ExplosionSystem _explosion = default!; + [Dependency] private readonly TransformSystem _xform = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly AmbientSoundSystem _ambient = default!; + [Dependency] private readonly LightningSystem _lightning = default!; + [Dependency] private readonly IConfigurationManager _config = default!; + [Dependency] private readonly AlertLevelSystem _alert = default!; + [Dependency] private readonly StationSystem _station = default!; + +} diff --git a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs new file mode 100644 index 00000000000..4bafd1b7caa --- /dev/null +++ b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs @@ -0,0 +1,152 @@ +using Content.Server.Research.TechnologyDisk.Components; +using Content.Server.UserInterface; +using Content.Server.Power.Components; +using Content.Shared.Popups; +using Content.Shared.Power; +using Content.Shared.Research.Prototypes; +using Content.Shared.Research.TechnologyDisk.Components; +using Content.Shared.ReverseEngineering; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; + +namespace Content.Server.ReverseEngineering; + +public sealed class ReverseEngineeringSystem : SharedReverseEngineeringSystem +{ + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnPowerChanged); + } + + public override void Update(float frameTime) + { + base.Update(frameTime); + + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var active, out var rev)) + { + if (GetItem((uid, rev)) == null) + { + CancelProbe((uid, rev)); + continue; + } + + if (Timing.CurTime < active.NextProbe) + continue; + + ProbeItem((uid, rev, active)); + } + } + + private void OnPowerChanged(Entity ent, ref PowerChangedEvent args) + { + if (!args.Powered) + CancelProbe(ent); + } + + private ReverseEngineeringTickResult Roll(Entity ent) + { + var (uid, comp) = ent; + var roll = comp.ScanBonus; + for (var i = 0; i < 3; i++) + roll += _random.Next(1, 6); + + if (!comp.SafetyOn) + roll += comp.DangerBonus; + + roll -= GetDifficulty(ent); + + return roll switch + { + // never let it be destroyed with safety on + <= 9 => comp.SafetyOn + ? ReverseEngineeringTickResult.Stagnation + : ReverseEngineeringTickResult.Destruction, + <= 10 => ReverseEngineeringTickResult.Stagnation, + <= 12 => ReverseEngineeringTickResult.SuccessMinor, + <= 15 => ReverseEngineeringTickResult.SuccessAverage, + <= 17 => ReverseEngineeringTickResult.SuccessMajor, + _ => ReverseEngineeringTickResult.InstantSuccess + }; + } + + private void ProbeItem(Entity ent) + { + var (uid, comp, active) = ent; + if (GetItem((uid, comp)) is not {} item) + return; + + if (!TryComp(item, out var rev)) + { + Log.Error($"We somehow scanned a {ToPrettyString(item):item} for reverse engineering..."); + return; + } + + var result = Roll((uid, comp)); + if (result == ReverseEngineeringTickResult.Destruction) + { + _popup.PopupEntity(Loc.GetString("reverse-engineering-popup-failure", ("machine", uid)), uid, PopupType.MediumCaution); + + Eject((uid, comp)); + Del(item); + + foreach (var sound in comp.FailSounds) + Audio.PlayPvs(sound, uid); + + UpdateUI((uid, comp)); + CancelProbe((uid, comp)); + return; + } + + comp.LastResult = result; + Dirty(uid, comp); + + var bonus = result switch + { + ReverseEngineeringTickResult.Stagnation => 1, + ReverseEngineeringTickResult.SuccessMinor => 10, + ReverseEngineeringTickResult.SuccessAverage => 25, + ReverseEngineeringTickResult.SuccessMajor => 40, + ReverseEngineeringTickResult.InstantSuccess => 100 + }; + + rev.Progress = Math.Clamp(rev.Progress + bonus, 0, 100); + Dirty(item, rev); + + if (rev.Progress < 100) + { + if (ent.Comp1.AutoScan) + StartProbing(ent); + else + CancelProbe((uid, comp)); + } + else + { + rev.Progress = 0; + CreateDisk((uid, comp), rev.Recipes); + Eject((uid, comp)); + Audio.PlayPvs(comp.SuccessSound, uid); + if (rev.NewItem is {} proto) + { + Spawn(proto, Transform(uid).Coordinates); + Del(item); + } + } + + UpdateUI((uid, comp)); + } + + private void CreateDisk(Entity ent, List> recipes) + { + var uid = Spawn(ent.Comp.DiskPrototype, Transform(ent).Coordinates); + var disk = Comp(uid); + disk.Recipes = new(); + foreach (var id in recipes) + disk.Recipes.Add(id); + } +} diff --git a/Content.Shared/Backmen/CCVar/CCVars.cs b/Content.Shared/Backmen/CCVar/CCVars.cs new file mode 100644 index 00000000000..258e209ce01 --- /dev/null +++ b/Content.Shared/Backmen/CCVar/CCVars.cs @@ -0,0 +1,58 @@ +using Robust.Shared.Configuration; + +namespace Content.Shared.Backmen.CCVar; + +// ReSharper disable once InconsistentNaming +[CVarDefs] +public sealed class CCVars +{ + + #region Supermatter System + + /// + /// With completely default supermatter values, Singuloose delamination will occur if engineers inject at least 900 moles of coolant per tile + /// in the crystal chamber. For reference, a gas canister contains 1800 moles of air. This Cvar directly multiplies the amount of moles required to singuloose. + /// + public static readonly CVarDef SupermatterSingulooseMolesModifier = + CVarDef.Create("supermatter.singuloose_moles_modifier", 1f, CVar.SERVER); + + /// + /// Toggles whether or not Singuloose delaminations can occur. If both Singuloose and Tesloose are disabled, it will always delam into a Nuke. + /// + public static readonly CVarDef SupermatterDoSingulooseDelam = + CVarDef.Create("supermatter.do_singuloose", true, CVar.SERVER); + + /// + /// By default, Supermatter will "Tesloose" if the conditions for Singuloose are not met, and the core's power is at least 4000. + /// The actual reasons for being at least this amount vary by how the core was screwed up, but traditionally it's caused by "The core is on fire". + /// This Cvar multiplies said power threshold for the purpose of determining if the delam is a Tesloose. + /// + public static readonly CVarDef SupermatterTesloosePowerModifier = + CVarDef.Create("supermatter.tesloose_power_modifier", 1f, CVar.SERVER); + + /// + /// Toggles whether or not Tesloose delaminations can occur. If both Singuloose and Tesloose are disabled, it will always delam into a Nuke. + /// + public static readonly CVarDef SupermatterDoTeslooseDelam = + CVarDef.Create("supermatter.do_tesloose", true, CVar.SERVER); + + /// + /// When true, bypass the normal checks to determine delam type, and instead use the type chosen by supermatter.forced_delam_type + /// + public static readonly CVarDef SupermatterDoForceDelam = + CVarDef.Create("supermatter.do_force_delam", false, CVar.SERVER); + + /// + /// If supermatter.do_force_delam is true, this determines the delamination type, bypassing the normal checks. + /// + public static readonly CVarDef SupermatterForcedDelamType = + CVarDef.Create("supermatter.forced_delam_type", "Singulo", CVar.SERVER); + + /// + /// Directly multiplies the amount of rads put out by the supermatter. Be VERY conservative with this. + /// + public static readonly CVarDef SupermatterRadsModifier = + CVarDef.Create("supermatter.rads_modifier", 1f, CVar.SERVER); + + #endregion +} diff --git a/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.announcements.cs b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.announcements.cs new file mode 100644 index 00000000000..9d08df41bd9 --- /dev/null +++ b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.announcements.cs @@ -0,0 +1,13 @@ +namespace Content.Shared.Backmen.Supermatter.Components; + +public partial class BkmSupermatterComponent +{ + [DataField] + public string AlertCodeYellowId = "yellow"; + + [DataField] + public string AlertCodeDeltaId = "delta"; + + [DataField] + public bool DelamAnnounced = false; +} diff --git a/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.calculation.cs b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.calculation.cs new file mode 100644 index 00000000000..b8f986af3cc --- /dev/null +++ b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.calculation.cs @@ -0,0 +1,61 @@ +namespace Content.Shared.Backmen.Supermatter.Components; + +public partial class BkmSupermatterComponent +{ + /// + /// Based on co2 percentage, slowly moves between + /// 0 and 1. We use it to calc the powerloss_inhibitor + /// + [ViewVariables(VVAccess.ReadOnly)] + public float PowerlossDynamicScaling; + + /// + /// Affects the amount of damage and minimum point + /// at which the sm takes heat damage + /// + [ViewVariables(VVAccess.ReadOnly)] + public float DynamicHeatResistance = 1; + + /// + /// Multiplier on damage the core takes from absorbing hot gas + /// Default is ~1/350 + /// + [ViewVariables(VVAccess.ReadOnly)] + public float MoleHeatPenalty = 0.00286f; + + /// + /// Inverse of MoleHeatPenalty + /// + [ViewVariables(VVAccess.ReadOnly)] + public float MoleHeatThreshold = 350f; + + /// + /// Multiplier on power generated by nuclear reactions + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("reactionpowerModifier")] + public float ReactionPowerModifier = 0.55f; + + /// + /// Acts as a multiplier on the amount that nuclear reactions increase the supermatter core temperature + /// + [ViewVariables(VVAccess.ReadWrite)] + [DataField("thermalreleaseModifier")] + public float ThermalReleaseModifier = 0.2f; + + /// + /// Multiplier on how much plasma is released during supermatter reactions + /// Default is ~1/750 + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("plasmareleaseModifier")] + public float PlasmaReleaseModifier = 0.001333f; + + /// + /// Multiplier on how much oxygen is released during supermatter reactions. + /// Default is ~1/325 + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("oxygenreleaseModifier")] + public float OxygenReleaseEfficiencyModifier = 0.0031f; +} diff --git a/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.cs b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.cs new file mode 100644 index 00000000000..c4d7efee3cb --- /dev/null +++ b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.cs @@ -0,0 +1,90 @@ +using Content.Shared.Atmos; +using Content.Shared.Tag; +using Content.Shared.Whitelist; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Backmen.Supermatter.Components; + +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class BkmSupermatterComponent : Component +{ + [ViewVariables(VVAccess.ReadWrite)] + public float Power; + + /// + /// The amount of damage we have currently + /// + [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] + public float Damage = 0f; + + [ViewVariables(VVAccess.ReadWrite)] + public float MatterPower; + + [ViewVariables(VVAccess.ReadWrite)] + public float MatterPowerConversion = 10f; + + /// + /// The portion of the gasmix we're on + /// + [ViewVariables(VVAccess.ReadWrite)] + public float GasEfficiency = 0.15f; + + /// + /// The amount of heat we apply scaled + /// + [ViewVariables(VVAccess.ReadWrite)] + public float HeatThreshold = 2500f; + + /// + /// Is used to store gas + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("gasStorage")] + public Dictionary GasStorage = new Dictionary() + { + {Gas.Oxygen, 0f}, + {Gas.Nitrogen, 0f}, + {Gas.NitrousOxide, 0f}, + {Gas.CarbonDioxide, 0f}, + {Gas.Plasma, 0f}, + {Gas.Tritium, 0f}, + {Gas.WaterVapor, 0f}, + {Gas.Frezon, 0f}, + {Gas.Ammonia, 0f} + }; + + /// + /// Stores each gases calculation + /// + public readonly Dictionary GasDataFields = new() + { + [Gas.Oxygen] = (TransmitModifier: 1.5f, HeatPenalty: 1f, PowerMixRatio: 1f), + [Gas.Nitrogen] = (TransmitModifier: 0f, HeatPenalty: -1.5f, PowerMixRatio: -1f), + [Gas.NitrousOxide] = (TransmitModifier: 1f, HeatPenalty: -5f, PowerMixRatio: 1f), + [Gas.CarbonDioxide] = (TransmitModifier: 0f, HeatPenalty: 0.1f, PowerMixRatio: 1f), + [Gas.Plasma] = (TransmitModifier: 4f, HeatPenalty: 15f, PowerMixRatio: 1f), + [Gas.Tritium] = (TransmitModifier: 30f, HeatPenalty: 10f, PowerMixRatio: 1f), + [Gas.WaterVapor] = (TransmitModifier: 2f, HeatPenalty: 12f, PowerMixRatio: 1f), + [Gas.Frezon] = (TransmitModifier: 3f, HeatPenalty: -9f, PowerMixRatio: -1f), + [Gas.Ammonia] = (TransmitModifier: 1.5f, HeatPenalty: 1.5f, PowerMixRatio: 1.5f) + }; + + public EntProtoId[] LightningPrototypes = + { + "Lightning", + "ChargedLightning", + "SuperchargedLightning", + "HyperchargedLightning" + }; + + [DataField] + public EntProtoId SingularitySpawnPrototype = "Singularity"; + + [DataField] + public EntProtoId TeslaSpawnPrototype = "TeslaEnergyBall"; + + //[DataField] + //public EntProtoId KudzuSpawnPrototype = "SupermatterKudzu"; +} diff --git a/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.delamm.cs b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.delamm.cs new file mode 100644 index 00000000000..a89717e5c6c --- /dev/null +++ b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.delamm.cs @@ -0,0 +1,35 @@ +namespace Content.Shared.Backmen.Supermatter.Components; + +public partial class BkmSupermatterComponent +{ + /// + /// The point at which we delamm + /// + [ViewVariables(VVAccess.ReadOnly), AutoNetworkedField] + [DataField("explosionPoint")] + public int ExplosionPoint = 900; + + [ViewVariables(VVAccess.ReadOnly)] + public DelamType PreferredDelamType = DelamType.Explosion; + + //Are we delamming? + [ViewVariables(VVAccess.ReadOnly)] + public bool Delamming = false; + + //Explosion totalIntensity value + [ViewVariables(VVAccess.ReadOnly)] + [DataField("totalIntensity")] + public float TotalIntensity= 500000f; + + //Explosion radius value + [ViewVariables(VVAccess.ReadOnly)] + [DataField("radius")] + public float Radius = 500f; + + /// + /// These would be what you would get at point blank, decreases with distance + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("detonationRads")] + public float DetonationRads = 200f; +} diff --git a/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.sound.cs b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.sound.cs new file mode 100644 index 00000000000..d9c9e175a60 --- /dev/null +++ b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.sound.cs @@ -0,0 +1,28 @@ +using Robust.Shared.Audio; + +namespace Content.Shared.Backmen.Supermatter.Components; + +public sealed partial class BkmSupermatterComponent +{ + /// + /// Current stream of SM audio. + /// + public EntityUid? AudioStream; + + public SuperMatterSound? SmSound; + + [DataField("dustSound")] + public SoundSpecifier DustSound = new SoundPathSpecifier("/Audio/Backmen/Supermatter/dust.ogg"); + + [DataField("delamSound")] + public SoundSpecifier DelamSound = new SoundPathSpecifier("/Audio/Backmen/Supermatter/delamming.ogg"); + + [DataField] + public SoundSpecifier CalmSound = new SoundPathSpecifier("/Audio/Backmen/Supermatter/calm.ogg"); + + [DataField] + public SoundSpecifier CurrentSoundLoop = new SoundPathSpecifier("/Audio/Backmen/Supermatter/calm.ogg"); + + [DataField("delamAlarm")] + public SoundSpecifier DelamAlarm = new SoundPathSpecifier("/Audio/Machines/alarm.ogg"); +} diff --git a/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.threshold.cs b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.threshold.cs new file mode 100644 index 00000000000..b2c7a59cea7 --- /dev/null +++ b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.threshold.cs @@ -0,0 +1,104 @@ +namespace Content.Shared.Backmen.Supermatter.Components; + +public partial class BkmSupermatterComponent +{ + /// + /// Higher == Higher percentage of inhibitor gas needed + /// before the charge inertia chain reaction effect starts. + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("powerlossinhibitiongasThreshold")] + public float PowerlossInhibitionGasThreshold = 0.20f; + + /// + /// Higher == More moles of the gas are needed before the charge + /// inertia chain reaction effect starts. + /// Scales powerloss inhibition down until this amount of moles is reached + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("powerlossinhibitionmoleThreshold")] + public float PowerlossInhibitionMoleThreshold = 20f; + + /// + /// bonus powerloss inhibition boost if this amount of moles is reached + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("powerlossinhibitionmoleboostThreshold")] + public float PowerlossInhibitionMoleBoostThreshold = 500f; + + /// + /// Above this value we can get lord singulo and independent mol damage, + /// below it we can heal damage + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("molepenaltyThreshold")] + public float MolePenaltyThreshold = 1800f; + + /// + /// more moles of gases are harder to heat than fewer, + /// so let's scale heat damage around them + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("moleheatpenaltyThreshold")] + public float MoleHeatPenaltyThreshold; + + /// + /// The cutoff on power properly doing damage, pulling shit around, + /// and delamming into a tesla. Low chance of pyro anomalies, +2 bolts of electricity + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("powerPenaltyThreshold")] + public float PowerPenaltyThreshold = 5000f; + + /// + /// Maximum safe operational temperature in degrees Celsius. Supermatter begins taking damage above this temperature. + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("heatpenaltyThreshold")] + public float HeatPenaltyThreshold = 40f; + + /// + /// The damage we had before this cycle. Used to limit the damage we can take each cycle, and for safe alert + /// + [ViewVariables(VVAccess.ReadWrite)] + public float DamageArchived = 0f; + + /// + /// is multiplied by ExplosionPoint to cap + /// evironmental damage per cycle + /// + [ViewVariables(VVAccess.ReadOnly)] + public float DamageHardcap = 0.002f; + + /// + /// environmental damage is scaled by this + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("damageincreaseMultiplier")] + public float DamageIncreaseMultiplier = 0.25f; + + /// + /// if spaced sm wont take more than 2 damage per cycle + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("maxspaceexposureDamage")] + public float MaxSpaceExposureDamage = 2; + + /// + /// The point at which we should start sending radio messages about the damage. + /// + [DataField] + public float DamageWarningThreshold = 50; + + /// + /// The point at which we start sending station announcements about the damage. + /// + [DataField] + public float DamageEmergencyThreshold = 500; + + /// + /// The point at which the SM begins delaminating. + /// + [DataField] + public int DamageDelaminationPoint = 900; +} diff --git a/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.timer.cs b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.timer.cs new file mode 100644 index 00000000000..bc47d9e6e07 --- /dev/null +++ b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterComponent.timer.cs @@ -0,0 +1,86 @@ +namespace Content.Shared.Backmen.Supermatter.Components; + +public partial class BkmSupermatterComponent +{ + /// + /// The point at which we should start sending messeges + /// about the damage to the engi channels. + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("WarningPoint")] + public float WarningPoint = 50; + + /// + /// The point at which we start sending messages to the common channel + /// + [ViewVariables(VVAccess.ReadOnly)] + [DataField("emergencyPoint")] + public float EmergencyPoint = 500; + + /// + /// we yell if over 50 damage every YellTimer Seconds + /// + [ViewVariables(VVAccess.ReadOnly)] + public float YellTimer = 30f; + + /// + /// set to YellTimer at first so it doesnt yell a minute after being hit + /// + [ViewVariables(VVAccess.ReadOnly)] + public float YellAccumulator = 30f; + + /// + /// YellTimer before the SM is about the delam + /// + [ViewVariables(VVAccess.ReadOnly)] + public float YellDelam = 5f; + + /// + /// Timer for Damage + /// + [ViewVariables(VVAccess.ReadOnly)] + public float DamageUpdateAccumulator; + + /// + /// update environment damage every 1 second + /// + [ViewVariables(VVAccess.ReadOnly)] + public float DamageUpdateTimer = 1f; + + /// + /// Timer for delam + /// + [ViewVariables(VVAccess.ReadOnly)] + public float DelamTimerAccumulator; + + /// + /// Time until delam + /// + [ViewVariables(VVAccess.ReadWrite)] + [DataField] + public float DelamTimer = 120f; + + /// + /// The message timer + /// + [ViewVariables(VVAccess.ReadOnly)] + public float SpeakAccumulator = 5f; + + /// + /// Atmos update timer + /// + [ViewVariables(VVAccess.ReadOnly)] + public float AtmosUpdateAccumulator; + + /// + /// update atmos every 1 second + /// + [ViewVariables(VVAccess.ReadOnly)] + public float AtmosUpdateTimer = 1f; + + [DataField] + public float ZapAccumulator = 0f; + + [DataField] + public float ZapTimer = 10f; +} diff --git a/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterFoodComponent.cs b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterFoodComponent.cs new file mode 100644 index 00000000000..07565ac880b --- /dev/null +++ b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterFoodComponent.cs @@ -0,0 +1,9 @@ +namespace Content.Shared.Backmen.Supermatter.Components; + +[RegisterComponent] +public sealed partial class BkmSupermatterFoodComponent : Component +{ + [ViewVariables(VVAccess.ReadWrite)] + [DataField("energy")] + public int Energy { get; set; } = 1; +} diff --git a/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterImmuneComponent.cs b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterImmuneComponent.cs new file mode 100644 index 00000000000..1ff60482eaf --- /dev/null +++ b/Content.Shared/Backmen/Supermatter/Components/BkmSupermatterImmuneComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Backmen.Supermatter.Components; + +[RegisterComponent, NetworkedComponent] +public sealed partial class BkmSupermatterImmuneComponent : Component +{ + +} diff --git a/Content.Shared/Backmen/Supermatter/DelamType.cs b/Content.Shared/Backmen/Supermatter/DelamType.cs new file mode 100644 index 00000000000..4c4f7eca4b1 --- /dev/null +++ b/Content.Shared/Backmen/Supermatter/DelamType.cs @@ -0,0 +1,9 @@ +namespace Content.Shared.Backmen.Supermatter; + +public enum DelamType : sbyte +{ + Explosion = 0, + Singulo = 1, + Tesla = 2, + Cascade = 3 +} diff --git a/Content.Shared/Backmen/Supermatter/SharedSupermatterSystem.cs b/Content.Shared/Backmen/Supermatter/SharedSupermatterSystem.cs new file mode 100644 index 00000000000..3e8915a27c1 --- /dev/null +++ b/Content.Shared/Backmen/Supermatter/SharedSupermatterSystem.cs @@ -0,0 +1,80 @@ +using Content.Shared.Backmen.Supermatter.Components; +using Content.Shared.Examine; +using Content.Shared.Mobs.Components; +using Content.Shared.Projectiles; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Containers; +using Robust.Shared.Physics; +using Robust.Shared.Physics.Events; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Backmen.Supermatter; + +public abstract class SharedSupermatterSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnExamine); + SubscribeLocalEvent(OnCollideEvent); + + + _projectileQuery = GetEntityQuery(); + _supermatterImmuneQuery = GetEntityQuery(); + } + + protected float GetIntegrity(float damage, float explosionPoint) + { + var integrity = damage / explosionPoint; + integrity = (float) Math.Round(100 - integrity * 100, 2); + integrity = integrity < 0 ? 0 : integrity; + return integrity; + } + + protected float GetIntegrity(Entity ent) + { + return GetIntegrity(ent.Comp.Damage, ent.Comp.ExplosionPoint); + } + + private void OnExamine(Entity ent, ref ExaminedEvent args) + { + if (args.IsInDetailsRange) + args.PushMarkup(Loc.GetString("supermatter-examine-integrity", ("integrity", GetIntegrity(ent).ToString("0.00")))); + } + + private void OnCollideEvent(EntityUid uid, BkmSupermatterComponent supermatter, ref StartCollideEvent args) + { + var target = args.OtherEntity; + if (args.OtherBody.BodyType == BodyType.Static + || _supermatterImmuneQuery.HasComp(target) + || _container.IsEntityInContainer(uid)) + return; + + if (TryComp(target, out var supermatterFood)) + supermatter.Power += supermatterFood.Energy; + else if (_projectileQuery.TryComp(target, out var projectile)) + supermatter.Power += (float) projectile.Damage.GetTotal(); + else + supermatter.Power++; + + supermatter.MatterPower += HasComp(target) ? 200 : 0; + if (!_projectileQuery.HasComp(target)) + { + Spawn(Ash, Transform(target).Coordinates); + _audio.PlayPvs(supermatter.DustSound, uid); + QueueDel(target); + } + } + + + [ValidatePrototypeId] + protected const string Ash = "Ash"; + + + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedContainerSystem _container = default!; + + private EntityQuery _projectileQuery; + protected EntityQuery _supermatterImmuneQuery; +} diff --git a/Content.Shared/Backmen/Supermatter/SuperMatterSound.cs b/Content.Shared/Backmen/Supermatter/SuperMatterSound.cs new file mode 100644 index 00000000000..27834b5ea50 --- /dev/null +++ b/Content.Shared/Backmen/Supermatter/SuperMatterSound.cs @@ -0,0 +1,7 @@ +namespace Content.Shared.Backmen.Supermatter; + +public enum SuperMatterSound : sbyte +{ + Aggressive = 0, + Delam = 1 +} diff --git a/Content.Shared/Nyanotrasen/ReverseEngineering/ActiveReverseEngineeringMachineComponent.cs b/Content.Shared/Nyanotrasen/ReverseEngineering/ActiveReverseEngineeringMachineComponent.cs new file mode 100644 index 00000000000..28e31fb24fe --- /dev/null +++ b/Content.Shared/Nyanotrasen/ReverseEngineering/ActiveReverseEngineeringMachineComponent.cs @@ -0,0 +1,18 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; + +namespace Content.Shared.ReverseEngineering; + +/// +/// Added to RE machines when they are actively scanning an item. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedReverseEngineeringSystem))] +[AutoGenerateComponentPause, AutoGenerateComponentState] +public sealed partial class ActiveReverseEngineeringMachineComponent : Component +{ + /// + /// When is the next probe roll due for? + /// + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField, AutoPausedField] + public TimeSpan NextProbe = TimeSpan.Zero; +} diff --git a/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringComponent.cs b/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringComponent.cs new file mode 100644 index 00000000000..92ec167c554 --- /dev/null +++ b/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringComponent.cs @@ -0,0 +1,46 @@ +using Content.Shared.Research.Prototypes; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; + +namespace Content.Shared.ReverseEngineering; + +/// +/// This item has some value in reverse engineering lathe recipes. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedReverseEngineeringSystem))] +[AutoGenerateComponentState] +public sealed partial class ReverseEngineeringComponent : Component +{ + /// + /// The recipes that can be reverse engineered from this. + /// + [DataField(required: true)] + public List> Recipes = new(); + + /// + /// Difficulty score 1-5 how hard this is to reverse engineer. + /// Rolls have this number taken away from them. + /// + [DataField] + public int Difficulty = 1; + + /// + /// A new item that should be given back by the reverse engineering machine instead of this one. + /// E.g., NT aligned versions of syndicate items. + /// + [DataField] + public EntProtoId? NewItem; + + /// + /// How far along this specific item has been reverse engineered. + /// Lets you resume if ejected, after completion it gets reset. + /// + [DataField, AutoNetworkedField] + public int Progress; + + /// + /// On client, the message shown in the scan information box. + /// + public FormattedMessage ScanMessage = new(); +} diff --git a/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineComponent.cs b/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineComponent.cs new file mode 100644 index 00000000000..52df142ad25 --- /dev/null +++ b/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineComponent.cs @@ -0,0 +1,90 @@ +using Content.Shared.Construction.Prototypes; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; + +namespace Content.Shared.ReverseEngineering; + +/// +/// This machine can reverse engineer items and get a technology disk from them. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedReverseEngineeringSystem))] +[AutoGenerateComponentState] +public sealed partial class ReverseEngineeringMachineComponent : Component +{ + /// + /// Name of the slot in ItemSlotsComponent that stores the target item. + /// + [DataField] + public string Slot = "target_slot"; + + /// + /// Tech disk prototype to spawn after completion. + /// Must have TechDiskComponent + /// + [DataField] + public EntProtoId DiskPrototype = "TechnologyDisk"; + + /// + /// Added to the 3d6, scales off of scanner. + /// + [DataField] + public int ScanBonus = 1; + + /// + /// If we rolled destruction, this is added to the roll and if it <= 9 it becomes + /// stagnation instead. + /// + [DataField] + public int DangerAversionScore = 1; + + /// + /// Whether the machine is going to receive the danger bonus. + /// + [DataField] + public int DangerBonus = 3; + + /// + /// Sounds simultaneously played when an item is destroyed. + /// + [DataField] + public List FailSounds = new() + { + new SoundPathSpecifier("/Audio/Effects/spray.ogg"), + new SoundPathSpecifier("/Audio/Effects/sparks4.ogg") + }; + + /// + /// Sound played when an item is successfully reverse engineered. + /// + [DataField] + public SoundSpecifier? SuccessSound = new SoundPathSpecifier("/Audio/Machines/microwave_done_beep.ogg"); + + [DataField] + public SoundSpecifier? ClickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg"); + + /// + /// Whether the safety is on. + /// + [DataField, AutoNetworkedField] + public bool SafetyOn = true; + + /// + /// Whether autoscan is on. + /// + [DataField, AutoNetworkedField] + public bool AutoScan = true; + + /// + /// How long to wait between analysis rolls. + /// + [DataField] + public TimeSpan AnalysisDuration = TimeSpan.FromSeconds(30); + + /// + /// Last result to show in the ui + /// + [DataField, AutoNetworkedField] + public ReverseEngineeringTickResult? LastResult; +} diff --git a/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringUi.cs b/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringUi.cs new file mode 100644 index 00000000000..3a0a5e2ec10 --- /dev/null +++ b/Content.Shared/Nyanotrasen/ReverseEngineering/ReverseEngineeringUi.cs @@ -0,0 +1,53 @@ +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.ReverseEngineering; + +[Serializable, NetSerializable] +public enum ReverseEngineeringMachineUiKey : byte +{ + Key +} + +[Serializable, NetSerializable] +public sealed class ReverseEngineeringScanMessage : BoundUserInterfaceMessage; + +[Serializable, NetSerializable] +public sealed class ReverseEngineeringSafetyMessage : BoundUserInterfaceMessage; + +[Serializable, NetSerializable] +public sealed class ReverseEngineeringAutoScanMessage : BoundUserInterfaceMessage; + +[Serializable, NetSerializable] +public sealed class ReverseEngineeringStopMessage : BoundUserInterfaceMessage; + +[Serializable, NetSerializable] +public sealed class ReverseEngineeringEjectMessage : BoundUserInterfaceMessage; + +/// +/// State updated when the values it uses changes to avoid creating it every frame. +/// +[Serializable, NetSerializable] +public sealed class ReverseEngineeringMachineState : BoundUserInterfaceState +{ + public readonly FormattedMessage ScanMessage; + + public ReverseEngineeringMachineState(FormattedMessage scanMessage) + { + ScanMessage = scanMessage; + } +} + +/// +// 3d6 + scanner bonus + danger bonus - item difficulty +/// +[Serializable, NetSerializable] +public enum ReverseEngineeringTickResult : byte +{ + Destruction, // 9 (only destroys if danger bonus is active, less the aversion bonus) + Stagnation, // 10 + SuccessMinor, // 11-12 + SuccessAverage, // 13-15 + SuccessMajor, // 16-17 + InstantSuccess // 18 +} diff --git a/Content.Shared/Nyanotrasen/ReverseEngineering/SharedReverseEngineeringSystem.cs b/Content.Shared/Nyanotrasen/ReverseEngineering/SharedReverseEngineeringSystem.cs new file mode 100644 index 00000000000..5ca61fefc03 --- /dev/null +++ b/Content.Shared/Nyanotrasen/ReverseEngineering/SharedReverseEngineeringSystem.cs @@ -0,0 +1,244 @@ +using Content.Shared.Audio; +using Content.Shared.Containers.ItemSlots; +using Content.Shared.Examine; +using Content.Shared.Nutrition.Components; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Containers; +using Robust.Shared.Timing; +using Robust.Shared.Utility; + +namespace Content.Shared.ReverseEngineering; + +public abstract class SharedReverseEngineeringSystem : EntitySystem +{ + [Dependency] protected readonly IGameTiming Timing = default!; + [Dependency] private readonly ItemSlotsSystem _slots = default!; + [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] protected readonly SharedAudioSystem Audio = default!; + [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnItemExamined); + + SubscribeLocalEvent(OnEntInserted); + SubscribeLocalEvent(OnEntRemoved); + Subs.BuiEvents(ReverseEngineeringMachineUiKey.Key, subs => + { + subs.Event(OnOpened); + subs.Event(OnScanPressed); + subs.Event(OnSafetyToggled); + subs.Event(OnAutoScanToggled); + subs.Event(OnStopPressed); + subs.Event(OnEjectPressed); + }); + + SubscribeLocalEvent(OnActiveStartup); + SubscribeLocalEvent(OnActiveShutdown); + } + + /// + /// Returns true if the machine is actively reverse engineering something. + /// + public bool IsActive(EntityUid uid) + { + return HasComp(uid); + } + + /// + /// Gets the item currently in the machine's target slot. + /// + public EntityUid? GetItem(Entity ent) + { + if (!_slots.TryGetSlot(ent, ent.Comp.Slot, out var slot)) + return null; + + return slot.Item; + } + + /// + /// Gets the difficulty of the current item, or 0 if there is none. + /// + public int GetDifficulty(Entity ent) + { + if (GetItem(ent) is not {} item || !TryComp(item, out var rev)) + return 0; + + return rev.Difficulty; + } + + private void OnItemExamined(Entity ent, ref ExaminedEvent args) + { + // TODO: Eventually this should probably get shoved into a contextual examine somewhere like health or machine upgrading. + args.PushMarkup(Loc.GetString("reverse-engineering-examine", ("diff", ent.Comp.Difficulty))); + } + + private void OnEntInserted(Entity ent, ref EntInsertedIntoContainerMessage args) + { + var (uid, comp) = ent; + if (args.Container.ID != comp.Slot) + return; + + _slots.SetLock(uid, comp.Slot, true); + UpdateUI(ent); + + _appearance.SetData(uid, OpenableVisuals.Opened, false); + } + + private void OnEntRemoved(Entity ent, ref EntRemovedFromContainerMessage args) + { + if (args.Container.ID != ent.Comp.Slot) + return; + + CancelProbe(ent); + + _appearance.SetData(ent, OpenableVisuals.Opened, true); + } + + private void OnActiveStartup(Entity ent, ref ComponentStartup args) + { + _ambientSound.SetAmbience(ent, true); + } + + private void OnActiveShutdown(Entity ent, ref ComponentShutdown args) + { + _ambientSound.SetAmbience(ent, false); + } + + #region UI + + protected void UpdateUI(Entity ent) + { + var scanMessage = GetScanMessage(ent); + var state = new ReverseEngineeringMachineState(scanMessage); + _ui.SetUiState(ent.Owner, ReverseEngineeringMachineUiKey.Key, state); + } + + private void OnOpened(Entity ent, ref BoundUIOpenedEvent args) + { + UpdateUI(ent); + } + + private void OnScanPressed(Entity ent, ref ReverseEngineeringScanMessage args) + { + if (!Timing.IsFirstTimePredicted) + return; + + if (IsActive(ent) || GetItem(ent) == null) + return; + + var (uid, comp) = ent; + Audio.PlayPredicted(comp.ClickSound, uid, args.Actor); + + var active = EnsureComp(uid); + StartProbing((uid, comp, active)); + } + + private void OnSafetyToggled(Entity ent, ref ReverseEngineeringSafetyMessage args) + { + if (!Timing.IsFirstTimePredicted) + return; + + var (uid, comp) = ent; + Audio.PlayPredicted(comp.ClickSound, uid, args.Actor); + + comp.SafetyOn = !comp.SafetyOn; + Dirty(uid, comp); + + UpdateUI(ent); + } + + private void OnAutoScanToggled(Entity ent, ref ReverseEngineeringAutoScanMessage args) + { + if (!Timing.IsFirstTimePredicted) + return; + + var (uid, comp) = ent; + Audio.PlayPredicted(comp.ClickSound, uid, args.Actor); + + comp.AutoScan = !comp.AutoScan; + Dirty(uid, comp); + + UpdateUI(ent); + } + + private void OnStopPressed(Entity ent, ref ReverseEngineeringStopMessage args) + { + if (!Timing.IsFirstTimePredicted) + return; + + Audio.PlayPredicted(ent.Comp.ClickSound, ent, args.Actor); + + CancelProbe(ent); + } + + private void OnEjectPressed(Entity ent, ref ReverseEngineeringEjectMessage args) + { + if (!Timing.IsFirstTimePredicted) + return; + + Audio.PlayPredicted(ent.Comp.ClickSound, ent, args.Actor); + + Eject(ent); + } + + #endregion + + protected void StartProbing(Entity ent) + { + ent.Comp2.NextProbe = Timing.CurTime + ent.Comp1.AnalysisDuration; + Dirty(ent, ent.Comp2); + } + + protected void CancelProbe(Entity ent) + { + ent.Comp.LastResult = null; + Dirty(ent, ent.Comp); + RemComp(ent); + + UpdateUI(ent); + } + + protected void Eject(Entity ent) + { + if (!TryComp(ent, out var slots) || !_slots.TryGetSlot(ent, ent.Comp.Slot, out var slot, slots)) + return; + + _slots.SetLock(ent, slot, false, slots); + _slots.TryEject(ent, slot, user: null, out _); + } + + private FormattedMessage GetScanMessage(Entity ent) + { + var msg = new FormattedMessage(); + if (GetItem(ent) is not {} item || !TryComp(item, out var rev)) + { + msg.AddMarkup(Loc.GetString("reverse-engineering-status-ready")); + return msg; + } + + var comp = ent.Comp; + msg.PushMarkup(Loc.GetString("reverse-engineering-current-item", ("item", item))); + msg.PushNewline(); + + var analysisScore = comp.ScanBonus; + if (!comp.SafetyOn) + analysisScore += comp.DangerBonus; + + msg.PushMarkup(Loc.GetString("reverse-engineering-analysis-score", ("score", analysisScore))); + msg.PushMarkup(Loc.GetString("reverse-engineering-item-difficulty", ("difficulty", rev.Difficulty))); + msg.PushMarkup(Loc.GetString("reverse-engineering-progress", ("progress", rev.Progress))); + + if (comp.LastResult is {} result) + { + var lastProbe = Loc.GetString($"reverse-engineering-result-{result}"); + + msg.AddMarkup(Loc.GetString("reverse-engineering-last-attempt-result", ("result", lastProbe))); + } + + return msg; + } +} diff --git a/Resources/Audio/Backmen/Supermatter/calm.ogg b/Resources/Audio/Backmen/Supermatter/calm.ogg new file mode 100644 index 00000000000..dc3102e5786 Binary files /dev/null and b/Resources/Audio/Backmen/Supermatter/calm.ogg differ diff --git a/Resources/Audio/Backmen/Supermatter/delamming.ogg b/Resources/Audio/Backmen/Supermatter/delamming.ogg new file mode 100644 index 00000000000..a48878ec42f Binary files /dev/null and b/Resources/Audio/Backmen/Supermatter/delamming.ogg differ diff --git a/Resources/Audio/Backmen/Supermatter/dust.ogg b/Resources/Audio/Backmen/Supermatter/dust.ogg new file mode 100644 index 00000000000..c6e87b61e6c Binary files /dev/null and b/Resources/Audio/Backmen/Supermatter/dust.ogg differ diff --git a/Resources/Audio/Nyanotrasen/Ambience/Objects/revMachine_ambience.ogg b/Resources/Audio/Nyanotrasen/Ambience/Objects/revMachine_ambience.ogg new file mode 100644 index 00000000000..b1f5c4f6ec2 Binary files /dev/null and b/Resources/Audio/Nyanotrasen/Ambience/Objects/revMachine_ambience.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/Femtanyl-PUSH-UR-T3MPR.ogg b/Resources/Audio/_Silver/Jukebox/Femtanyl-PUSH-UR-T3MPR.ogg new file mode 100644 index 00000000000..5b1a8e56e4b Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/Femtanyl-PUSH-UR-T3MPR.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/HOS_HUESOS.ogg b/Resources/Audio/_Silver/Jukebox/HOS_HUESOS.ogg new file mode 100644 index 00000000000..3cd07379957 Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/HOS_HUESOS.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/Neverlove - NATO_instructor.ogg b/Resources/Audio/_Silver/Jukebox/Neverlove - NATO_instructor.ogg new file mode 100644 index 00000000000..264a2a68d1f Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/Neverlove - NATO_instructor.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/The Living Tombstone - I Got No Time.ogg b/Resources/Audio/_Silver/Jukebox/The Living Tombstone - I Got No Time.ogg new file mode 100644 index 00000000000..83b7ba48cb2 Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/The Living Tombstone - I Got No Time.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/The Living Tombstone - It's Been So Long.ogg b/Resources/Audio/_Silver/Jukebox/The Living Tombstone - It's Been So Long.ogg new file mode 100644 index 00000000000..7adaa23e612 Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/The Living Tombstone - It's Been So Long.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/The Living Tombstone - My Ordinary Life.ogg b/Resources/Audio/_Silver/Jukebox/The Living Tombstone - My Ordinary Life.ogg new file mode 100644 index 00000000000..1e5cad166cd Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/The Living Tombstone - My Ordinary Life.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/The_Caretaker_-_Its_just_a_burning_memory.ogg b/Resources/Audio/_Silver/Jukebox/The_Caretaker_-_Its_just_a_burning_memory.ogg new file mode 100644 index 00000000000..046582fdc75 Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/The_Caretaker_-_Its_just_a_burning_memory.ogg differ diff --git a/Resources/Audio/Jukebox/attributions.yml b/Resources/Audio/_Silver/Jukebox/attributions.yml similarity index 100% rename from Resources/Audio/Jukebox/attributions.yml rename to Resources/Audio/_Silver/Jukebox/attributions.yml diff --git a/Resources/Audio/Jukebox/constellations.ogg b/Resources/Audio/_Silver/Jukebox/constellations.ogg similarity index 100% rename from Resources/Audio/Jukebox/constellations.ogg rename to Resources/Audio/_Silver/Jukebox/constellations.ogg diff --git a/Resources/Audio/Jukebox/drifting.ogg b/Resources/Audio/_Silver/Jukebox/drifting.ogg similarity index 100% rename from Resources/Audio/Jukebox/drifting.ogg rename to Resources/Audio/_Silver/Jukebox/drifting.ogg diff --git a/Resources/Audio/_Silver/Jukebox/femtanyl - DINNER.ogg b/Resources/Audio/_Silver/Jukebox/femtanyl - DINNER.ogg new file mode 100644 index 00000000000..223e7043b01 Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/femtanyl - DINNER.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/femtanyl - DOGMATICA.ogg b/Resources/Audio/_Silver/Jukebox/femtanyl - DOGMATICA.ogg new file mode 100644 index 00000000000..05658b52a0a Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/femtanyl - DOGMATICA.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/femtanyl - Weightless.ogg b/Resources/Audio/_Silver/Jukebox/femtanyl - Weightless.ogg new file mode 100644 index 00000000000..e31d1e8eaf5 Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/femtanyl - Weightless.ogg differ diff --git "a/Resources/Audio/_Silver/Jukebox/femtanyl \342\200\224 GIRL HELL 1999.ogg" "b/Resources/Audio/_Silver/Jukebox/femtanyl \342\200\224 GIRL HELL 1999.ogg" new file mode 100644 index 00000000000..5db534c23f0 Binary files /dev/null and "b/Resources/Audio/_Silver/Jukebox/femtanyl \342\200\224 GIRL HELL 1999.ogg" differ diff --git "a/Resources/Audio/_Silver/Jukebox/femtanyl \342\200\224 KATAMARI.ogg" "b/Resources/Audio/_Silver/Jukebox/femtanyl \342\200\224 KATAMARI.ogg" new file mode 100644 index 00000000000..23c43ff2d72 Binary files /dev/null and "b/Resources/Audio/_Silver/Jukebox/femtanyl \342\200\224 KATAMARI.ogg" differ diff --git "a/Resources/Audio/_Silver/Jukebox/femtanyl \342\200\224 S33K H3LP.ogg" "b/Resources/Audio/_Silver/Jukebox/femtanyl \342\200\224 S33K H3LP.ogg" new file mode 100644 index 00000000000..ee4dc4465d3 Binary files /dev/null and "b/Resources/Audio/_Silver/Jukebox/femtanyl \342\200\224 S33K H3LP.ogg" differ diff --git "a/Resources/Audio/_Silver/Jukebox/femtanyl \342\200\224 WORLDWID3 feat. zombAe.ogg" "b/Resources/Audio/_Silver/Jukebox/femtanyl \342\200\224 WORLDWID3 feat. zombAe.ogg" new file mode 100644 index 00000000000..e05d95ce6bf Binary files /dev/null and "b/Resources/Audio/_Silver/Jukebox/femtanyl \342\200\224 WORLDWID3 feat. zombAe.ogg" differ diff --git a/Resources/Audio/_Silver/Jukebox/femtanyl-ACT-RIGHT.ogg b/Resources/Audio/_Silver/Jukebox/femtanyl-ACT-RIGHT.ogg new file mode 100644 index 00000000000..cc997c418cc Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/femtanyl-ACT-RIGHT.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/femtanyl-AND-I_M-GONE.ogg b/Resources/Audio/_Silver/Jukebox/femtanyl-AND-I_M-GONE.ogg new file mode 100644 index 00000000000..0125d7a8a7e Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/femtanyl-AND-I_M-GONE.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/femtanyl-I-MIGHT-B3-SICK.ogg b/Resources/Audio/_Silver/Jukebox/femtanyl-I-MIGHT-B3-SICK.ogg new file mode 100644 index 00000000000..09c6b821dce Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/femtanyl-I-MIGHT-B3-SICK.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/femtanyl-LOVESICK_-CANNIBAL.ogg b/Resources/Audio/_Silver/Jukebox/femtanyl-LOVESICK_-CANNIBAL.ogg new file mode 100644 index 00000000000..df590c4b456 Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/femtanyl-LOVESICK_-CANNIBAL.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/femtanyl-MURDER-EVERY-1-U-KNOW_-_feat.-takihasdied_.ogg b/Resources/Audio/_Silver/Jukebox/femtanyl-MURDER-EVERY-1-U-KNOW_-_feat.-takihasdied_.ogg new file mode 100644 index 00000000000..074310b7ae4 Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/femtanyl-MURDER-EVERY-1-U-KNOW_-_feat.-takihasdied_.ogg differ diff --git a/Resources/Audio/_Silver/Jukebox/femtanyl-P3T.ogg b/Resources/Audio/_Silver/Jukebox/femtanyl-P3T.ogg new file mode 100644 index 00000000000..1b9805b668d Binary files /dev/null and b/Resources/Audio/_Silver/Jukebox/femtanyl-P3T.ogg differ diff --git a/Resources/Audio/Jukebox/flip-flap.ogg b/Resources/Audio/_Silver/Jukebox/flip-flap.ogg similarity index 100% rename from Resources/Audio/Jukebox/flip-flap.ogg rename to Resources/Audio/_Silver/Jukebox/flip-flap.ogg diff --git a/Resources/Audio/Jukebox/sector11.ogg b/Resources/Audio/_Silver/Jukebox/sector11.ogg similarity index 100% rename from Resources/Audio/Jukebox/sector11.ogg rename to Resources/Audio/_Silver/Jukebox/sector11.ogg diff --git a/Resources/Audio/Jukebox/starlight.ogg b/Resources/Audio/_Silver/Jukebox/starlight.ogg similarity index 100% rename from Resources/Audio/Jukebox/starlight.ogg rename to Resources/Audio/_Silver/Jukebox/starlight.ogg diff --git a/Resources/Audio/Jukebox/sunset.ogg b/Resources/Audio/_Silver/Jukebox/sunset.ogg similarity index 100% rename from Resources/Audio/Jukebox/sunset.ogg rename to Resources/Audio/_Silver/Jukebox/sunset.ogg diff --git a/Resources/Audio/Jukebox/title3.ogg b/Resources/Audio/_Silver/Jukebox/title3.ogg similarity index 100% rename from Resources/Audio/Jukebox/title3.ogg rename to Resources/Audio/_Silver/Jukebox/title3.ogg diff --git a/Resources/Locale/ru-RU/_silver/reverseengineering.ftl b/Resources/Locale/ru-RU/_silver/reverseengineering.ftl new file mode 100644 index 00000000000..ec2273de1e5 --- /dev/null +++ b/Resources/Locale/ru-RU/_silver/reverseengineering.ftl @@ -0,0 +1,38 @@ +ent-ReverseEngineeringMachineCircuitboard = машина обратного проектирования (машинная плата) +ent-ReverseEngineeringMachine = машина обратного проектирования + +reverse-engineering-machine-menu-title = Реверсивная инженерная машина +reverse-engineering-machine-server-list-button = Список серверов +reverse-engineering-machine-scan-button = Анализ +reverse-engineering-machine-scan-tooltip-info = Проанализировать вставленный элемент для попытки его реинжиниринга. +reverse-engineering-machine-safety-button = Безопасность +reverse-engineering-machine-safety-tooltip-info = Переключение протоколов безопасности. При отключении безопасности будут использоваться более сильные, но, возможно, разрушительные методы анализа. +reverse-engineering-machine-autoscan-button = Автосисследование +reverse-engineering-machine-autoscan-tooltip-info = Включить автоматический запуск нового исследования после завершения предыдущего. +reverse-engineering-machine-stop-button = Остановить +reverse-engineering-machine-stop-tooltip-info = Остановить текущее исследование. +reverse-engineering-machine-eject-button = Извлечь +reverse-engineering-machine-eject-tooltip-info = Извлечь текущий объект. + +reverse-engineering-status-ready = Вставить элемент для реинжиниринга. +reverse-engineering-current-item = Текущий объект: {$item} +reverse-engineering-analysis-score = Мощность анализа: {$score}. +reverse-engineering-item-difficulty = Сложность: {$difficulty} +reverse-engineering-progress = Прогресс: {$progress}% +reverse-engineering-last-attempt-result = Результат последнего исследования: {$result} + +reverse-engineering-total-progress-label = Всего + +reverse-engineering-failure = КРИТИЧЕСКАЯ НЕИСПРАВНОСТЬ +reverse-engineering-stagnation = Минимальный прогресс +reverse-engineering-minor = Незначительный прогресс +reverse-engineering-average = Приемлемый прогресс +reverse-engineering-major = Значительный прогресс +reverse-engineering-success = Прорыв + +reverse-engineering-machine-bonus-upgrade = Аналитическая мощность +reverse-engineering-machine-aversion-upgrade = Бонус разрушения + +reverse-engineering-popup-failure = {CAPITALIZE(THE($machine))} повсюду дым и обломки! + +reverse-engineering-examine = [color=yellow]Этот предмет может быть подвергнут обратной разработке. Сложность: {$diff}[/color] \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 7108b785a9f..e192b1a8021 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -170,6 +170,7 @@ - id: RCD - id: RCDAmmo - id: RubberStampCE +# - id: SupermatterFlatpack # Hardsuit table, used for suit storage as well - type: entityTable diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 58e9bea0b46..36c074a9de8 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -14,6 +14,10 @@ walkModifier: 1 sprintModifier: 0.9 - type: HeldSpeedModifier + - type: ReverseEngineering # DeltaV: can RE any valid bag for BoH + difficulty: 4 + recipes: + - ClothingBackpackHolding - type: entity parent: ClothingBackpackDuffel diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 7393532654d..32e885f6cf5 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -213,6 +213,10 @@ layers: - state: crypt_red - state: synd_label + - type: ReverseEngineering # Nyano + difficulty: 5 + recipes: + - EncryptionKeySyndie - type: entity parent: [ EncryptionKey, BaseSiliconScienceContraband ] diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml index a36bfaf676b..e73f9d7ba47 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml @@ -26,3 +26,7 @@ - ArtifactFragment - Ore - type: Dumpable + - type: ReverseEngineering # DeltaV + difficulty: 2 + recipes: + - OreBagOfHolding diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index edaa8288145..14a6c60e6d0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -156,6 +156,7 @@ price: 30 - type: DnaSubstanceTrace + - type: entity name: beaker parent: BaseBeaker diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index efada99e7cb..151c52206ca 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -57,6 +57,10 @@ - type: Appearance - type: StaticPrice price: 100 + - type: ReverseEngineering # DeltaV: all jetpacks can RE to void jetpacks, the best kind which can't be bought + difficulty: 3 + recipes: + - JetpackVoid - type: entity id: ActionToggleJetpack diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml index 21f0e2b1d16..dd8ca172c95 100644 --- a/Resources/Prototypes/Entities/Stations/base.yml +++ b/Resources/Prototypes/Entities/Stations/base.yml @@ -60,7 +60,6 @@ maxCount: 2 stationGrid: false paths: - - /Maps/Ruins/abandoned_outpost.yml # Corvax-Mapping-Start - /Maps/Ruins/corvax_accident.yml - /Maps/Ruins/corvax_adventurer.yml diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 6b97fa69eb4..ae446145ffb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -362,6 +362,10 @@ # Corvax-Next-BluespaceHarvester-Start - ArtificialBluespaceCrystal # Corvax-Next-BluespaceHarvester-End + - EnergyScalpel # _CorvaxNext: surgery Change + - EnergyCautery # _CorvaxNext: surgery Change + - AdvancedRetractor # _CorvaxNext: surgery Change + - EncryptionKeySyndie - type: EmagLatheRecipes emagDynamicRecipes: - BoxBeanbag @@ -465,6 +469,7 @@ - StationAnchorCircuitboard - SalvageMagnetMachineCircuitboard dynamicRecipes: + - ReverseEngineeringMachineCircuitboard - ThermomachineFreezerMachineCircuitBoard - HellfireFreezerMachineCircuitBoard - PortableScrubberMachineCircuitBoard diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index d2a84036eb1..29f27650591 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -56,6 +56,7 @@ cost: 5000 recipeUnlocks: - TechDiskComputerCircuitboard + - ReverseEngineeringMachineCircuitboard - type: technology id: MagnetsTech diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 472933239c6..45896efaf01 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -4,17 +4,9 @@ description: job-description-qm playTimeTracker: JobQuartermaster requirements: -# - !type:RoleTimeRequirement -# role: JobCargoTechnician -# time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobSalvageSpecialist - time: 36000 #10 hrs # Corvax-RoleTime - !type:DepartmentTimeRequirement department: Cargo - time: 36000 #10 hours - - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 600 #10 hours weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 685a8c386a8..4e69037ed07 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -3,12 +3,6 @@ name: job-name-salvagespec description: job-description-salvagespec playTimeTracker: JobSalvageSpecialist - requirements: - - !type:DepartmentTimeRequirement - department: Cargo - time: 10800 # 3 hrs -# - !type:OverallPlaytimeRequirement -# time: 36000 #10 hrs icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear supervisors: job-supervisors-qm diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 2ad9dc79355..e443cef90aa 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 3600 #1 hrs # Corvax-RoleTime + time: 600 #10 minutes startingGear: BartenderGear icon: "JobIconBartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index f0ac7a28e63..a2f482be7f8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -4,9 +4,6 @@ description: job-description-chef playTimeTracker: JobChef requirements: - - !type:DepartmentTimeRequirement - department: Civilian - time: 3600 #1 hrs # Corvax-RoleTime startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index ccd764e47e1..e58d85c3b45 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -4,8 +4,9 @@ description: job-description-clown playTimeTracker: JobClown requirements: - - !type:OverallPlaytimeRequirement - time: 3600 #1 hrs # Corvax-RoleTime + - !type:DepartmentTimeRequirement + department: Command + time: 600 #10 minutes startingGear: ClownGear icon: "JobIconClown" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 07c76b9d1b0..7837323a129 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -4,8 +4,6 @@ description: job-description-lawyer playTimeTracker: JobLawyer requirements: - - !type:OverallPlaytimeRequirement - time: 36000 # 10 hrs startingGear: LawyerGear setPreference: false # Corvax-IAA icon: "JobIconLawyer" diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 1ed954bf13e..1fa9efb81c3 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -4,8 +4,9 @@ description: job-description-mime playTimeTracker: JobMime requirements: - - !type:OverallPlaytimeRequirement - time: 3600 #1 hrs # Corvax-RoleTime + - !type:DepartmentTimeRequirement + department: Command + time: 600 #10 minutes startingGear: MimeGear icon: "JobIconMime" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 255fb7fc3a8..2e52cbc610c 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -5,19 +5,8 @@ playTimeTracker: JobCaptain requirements: - !type:DepartmentTimeRequirement - department: Engineering - time: 72000 #20 hrs # Corvax-RoleTime - - !type:DepartmentTimeRequirement - department: Medical - time: 72000 #20 hrs # Corvax-RoleTime - - !type:DepartmentTimeRequirement - department: Security - time: 72000 #20 hrs # Corvax-RoleTime -# - !type:DepartmentTimeRequirement -# department: Command -# time: 54000 # 15 hours - - !type:OverallPlaytimeRequirement - time: 504000 #140 hrs # Corvax-RoleTime + department: Command + time: 600 # 10 minutes weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 8f30887b225..a347c50859a 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -5,19 +5,8 @@ playTimeTracker: JobHeadOfPersonnel requirements: - !type:DepartmentTimeRequirement - department: Engineering - time: 18000 #5 hrs # Corvax-RoleTime - - !type:DepartmentTimeRequirement - department: Medical - time: 18000 #5 hrs # Corvax-RoleTime - - !type:DepartmentTimeRequirement - department: Security - time: 18000 #5 hrs # Corvax-RoleTime -# - !type:DepartmentTimeRequirement -# department: Command -# time: 72000 # 20 hrs - - !type:OverallPlaytimeRequirement - time: 180000 #50 hrs # Corvax-RoleTime + department: Command + time: 600 # 10 minutes weight: 20 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index e81f9bba668..1cd4bd4e0b6 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -3,10 +3,6 @@ name: job-name-atmostech description: job-description-atmostech playTimeTracker: JobAtmosphericTechnician - requirements: - - !type:DepartmentTimeRequirement - department: Engineering - time: 36000 #10 hrs # Corvax-RoleTime startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 9133a73eaf0..cacf29f8b0e 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,16 +6,11 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 36000 #10 hrs # Corvax-RoleTime -# - !type:RoleTimeRequirement -# role: JobStationEngineer -# time: 21600 #6 hrs + time: 600 #10 minutes - !type:DepartmentTimeRequirement department: Engineering - time: 54000 #15 hrs # Corvax-RoleTime -# - !type:OverallPlaytimeRequirement -# time: 144000 #40 hrs - weight: 10 + time: 600 #10 minutes + weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" supervisors: job-supervisors-captain diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 32d1182f24a..8a771769519 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -3,10 +3,6 @@ name: job-name-engineer description: job-description-engineer playTimeTracker: JobStationEngineer - requirements: - - !type:DepartmentTimeRequirement - department: Engineering - time: 18000 #5 hrs # Corvax-RoleTime startingGear: StationEngineerGear icon: "JobIconStationEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index d978d985d64..29042911d36 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -3,13 +3,6 @@ name: job-name-technical-assistant description: job-description-technical-assistant playTimeTracker: JobTechnicalAssistant - requirements: - - !type:OverallPlaytimeRequirement - time: 3600 #1 hr - - !type:DepartmentTimeRequirement - department: Engineering - time: 36000 #10 hrs # Corvax-RoleTime - inverted: true # stop playing intern if you're good at engineering! startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" supervisors: job-supervisors-engineering diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 50901af3763..9ad15ee8e75 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -3,10 +3,6 @@ name: job-name-chemist description: job-description-chemist playTimeTracker: JobChemist - requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 18000 #5 hrs # Corvax-RoleTime startingGear: ChemistGear icon: "JobIconChemist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 455e1a149c2..90947c7e003 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -8,15 +8,10 @@ requirements: - !type:RoleTimeRequirement role: JobChemist - time: 18000 #5 hrs # Corvax-RoleTime -# - !type:RoleTimeRequirement -# role: JobMedicalDoctor -# time: 21600 #6 hrs + time: 600 #10 minutes - !type:DepartmentTimeRequirement department: Medical - time: 54000 #15 hrs # Corvax-RoleTime -# - !type:OverallPlaytimeRequirement -# time: 144000 #40 hrs + time: 600 #10 minutes weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 13ffa053658..c73bd050377 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -3,10 +3,6 @@ name: job-name-doctor description: job-description-doctor playTimeTracker: JobMedicalDoctor - requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 7200 #2 hrs # Corvax-RoleTime startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index fee2e4e3202..2626d9dd13e 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -3,11 +3,6 @@ name: job-name-intern description: job-description-intern playTimeTracker: JobMedicalIntern - requirements: - - !type:DepartmentTimeRequirement - department: Medical - time: 36000 #10 hrs # Corvax-RoleTime - inverted: true # stop playing intern if you're good at med! startingGear: MedicalInternGear icon: "JobIconMedicalIntern" supervisors: job-supervisors-medicine diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 79c50097dd9..5d3ffc6572f 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -3,12 +3,6 @@ name: job-name-paramedic description: job-description-paramedic playTimeTracker: JobParamedic - requirements: - - !type:RoleTimeRequirement - role: JobMedicalDoctor - time: 14400 #4 hrs - - !type:OverallPlaytimeRequirement - time: 54000 # 15 hrs startingGear: ParamedicGear icon: "JobIconParamedic" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Science/borg.yml b/Resources/Prototypes/Roles/Jobs/Science/borg.yml index c62482d286e..c12d19122d2 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/borg.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/borg.yml @@ -4,10 +4,6 @@ name: job-name-station-ai description: job-description-station-ai playTimeTracker: JobStationAi - requirements: - - !type:RoleTimeRequirement - role: JobBorg - time: 54000 # 15 hrs canBeAntag: false icon: JobIconStationAi supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index e88f106f388..928c316cbc1 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -3,11 +3,6 @@ name: job-name-research-assistant description: job-description-research-assistant playTimeTracker: JobResearchAssistant - requirements: - - !type:DepartmentTimeRequirement - department: Science - time: 36000 #10 hrs # Corvax-RoleTime - inverted: true # stop playing intern if you're good at science! startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" supervisors: job-supervisors-science diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 24a6b8774b4..8cae1e648ac 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -6,9 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 54000 #15 hrs # Corvax-RoleTime -# - !type:OverallPlaytimeRequirement -# time: 144000 #40 hrs + time: 600 #10 minutes weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 827305dd06c..13fc352ce9f 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -3,10 +3,6 @@ name: job-name-scientist description: job-description-scientist playTimeTracker: JobScientist - requirements: - - !type:DepartmentTimeRequirement - department: Science - time: 18000 #5 hrs # Corvax-RoleTime startingGear: ScientistGear icon: "JobIconScientist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 6cba0c36159..f35ed017752 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 72000 #20 hrs # Corvax-RoleTime + time: 600 #10 minutes startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 8e25c72b90e..5c77dcf7076 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,15 +6,10 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 36000 #10 hrs # Corvax-RoleTime -# - !type:RoleTimeRequirement -# role: JobSecurityOfficer -# time: 36000 #10 hrs + time: 600 #10 minutes - !type:DepartmentTimeRequirement department: Security - time: 108000 #50 hrs # Corvax-RoleTime -# - !type:OverallPlaytimeRequirement -# time: 144000 #40 hrs + time: 600 #10 minutes weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 697f79a4d53..9be0e11ee53 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -3,13 +3,6 @@ name: job-name-cadet description: job-description-cadet playTimeTracker: JobSecurityCadet - requirements: - - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs # Corvax-RoleTime - - !type:DepartmentTimeRequirement - department: Security - time: 72000 #20 hrs # Corvax-RoleTime - inverted: true # stop playing intern if you're good at security! startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" supervisors: job-supervisors-security diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 39ce543d9d5..429dd4d229e 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 36000 #10 hrs # Corvax-RoleTime + time: 600 #10 minutes startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 6c95343b7ac..10e6887efe8 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 108000 #50 hrs # Corvax-RoleTime + time: 600 #10 minutes startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/_Silver/Catalog/Jukebox/Standart.yml b/Resources/Prototypes/_Silver/Catalog/Jukebox/Standart.yml new file mode 100644 index 00000000000..28ca851a57b --- /dev/null +++ b/Resources/Prototypes/_Silver/Catalog/Jukebox/Standart.yml @@ -0,0 +1,119 @@ +- type: jukebox + id: guusHoshuesos + name: Gasper Horned(YT) - Хос-Хуесос + path: + path: /Audio/_Silver/Jukebox/HOS_HUESOS.ogg + +- type: jukebox + id: guusAndimgone + name: Femtanyl - AND IM GONE + path: + path: /Audio/_Silver/Jukebox/femtanyl-AND-I_M-GONE.ogg + +- type: jukebox + id: guusImightbesick + name: Femtanyl - I MIGHT B3 SICK + path: + path: /Audio/_Silver/Jukebox/femtanyl-I-MIGHT-B3-SICK.ogg + +- type: jukebox + id: guusLovesickcannibal + name: Femtanyl - LOVESICK CANNIBAL + path: + path: /Audio/_Silver/Jukebox/femtanyl-LOVESICK_-CANNIBAL.ogg + +- type: jukebox + id: guusPushurtempr + name: Femtanyl - PUSH UR T3MPR + path: + path: /Audio/_Silver/Jukebox/Femtanyl-PUSH-UR-T3MPR.ogg + +- type: jukebox + id: guusPet + name: Femtanyl - P3T + path: + path: /Audio/_Silver/Jukebox/femtanyl-P3T.ogg + +- type: jukebox + id: guusMurderevery1uknow + name: Femtanyl - MURDER EVERY 1 U KNOW (feat. takihasdied) + path: + path: /Audio/_Silver/Jukebox/femtanyl-MURDER-EVERY-1-U-KNOW_-_feat.-takihasdied_.ogg + +- type: jukebox + id: guusActright + name: Femtanyl - ACT RIGHT + path: + path: /Audio/_Silver/Jukebox/femtanyl-ACT-RIGHT_.ogg + +- type: jukebox + id: guusWorldwide + name: Femtanyl - WORLDWID3 (feat. zombAe) + path: + path: /Audio/_Silver/Jukebox/femtanyl — WORLDWID3 feat. zombAe.ogg + +- type: jukebox + id: guusGirlhell1999 + name: Femtanyl - GIRL HELL 1999 + path: + path: /Audio/_Silver/Jukebox/femtanyl — GIRL HELL 1999.ogg + +- type: jukebox + id: guusWeightless + name: Femtanyl - WEIGHTLESS + path: + path: /Audio/_Silver/Jukebox/femtanyl - Weightless.ogg + +- type: jukebox + id: guusDinner + name: Femtanyl - DINNER + path: + path: /Audio/_Silver/Jukebox/femtanyl - DINNER.ogg + +- type: jukebox + id: guusDogmatica + name: Femtanyl - DOGMATICA + path: + path: /Audio/_Silver/Jukebox/femtanyl - DOGMATICA.ogg + +- type: jukebox + id: guusSeekhelp + name: Femtanyl - S33K H3LP + path: + path: /Audio/_Silver/Jukebox/femtanyl — S33K H3LP.ogg + +- type: jukebox + id: guusKatamari + name: Femtanyl - KATAMARI + path: + path: /Audio/_Silver/Jukebox/femtanyl — KATAMARI.ogg + +- type: jukebox + id: guusNatoinstructor + name: Neverlove - Инструктор из НАТО + path: + path: /Audio/_Silver/Jukebox/Neverlove - NATO_instructor.ogg + +- type: jukebox + id: guusItsjustaburningmemory + name: The Caretaker - Its just a burning memory + path: + path: /Audio/_Silver/Jukebox/The_Caretaker_-_Its_just_a_burning_memory.ogg + +- type: jukebox + id: guusItsbeensolong + name: The Living Tombstone - It's Been So Long + path: + path: /Audio/_Silver/Jukebox/The Living Tombstone - It's Been So Long.ogg + +- type: jukebox + id: guusMyordinarylife + name: The Living Tombstone - My Ordinary Life + path: + path: /Audio/_Silver/Jukebox/The Living Tombstone - My Ordinary Life.ogg + +- type: jukebox + id: guusIgotnotime + name: The Living Tombstone - I Got No Time + path: + path: /Audio/_Silver/Jukebox/The Living Tombstone - I Got No Time.ogg \ No newline at end of file diff --git a/Resources/Prototypes/_Silver/Entities/Objects/Consumable/Drinks/Drinks.yml b/Resources/Prototypes/_Silver/Entities/Objects/Consumable/Drinks/Drinks.yml new file mode 100644 index 00000000000..c7f359fb931 --- /dev/null +++ b/Resources/Prototypes/_Silver/Entities/Objects/Consumable/Drinks/Drinks.yml @@ -0,0 +1,205 @@ +- type: entity + parent: DrinkGlassBase + id: DrinkInglandSidr + name: Английский Сидр + description: О да тебя придеться по кусочкам собирать. В АДУ! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + reagents: + - ReagentId: InglandSidr + Quantity: 100 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/Sidr.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkBiomassDring + name: Жидкая биомасса + description: Ты будешь захлёбываться своими органами! Мёртвые души жаждят мести + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: BiomassDrink + Quantity: 18 + - ReagentId: Blood + Quantity: 12 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/BiomassDrink.rsi + +- type: entity + parent: DrinkBottlePlasticBaseFull + id: JuiceAppleJug + name: Кувшин яблочного сока + description: Это Кувшин яблочного сока + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 300 + reagents: + - ReagentId: JuiceApple + Quantity: 300 + - type: Drink + - type: Label + currentLabel: Яблочный сок + +- type: entity + parent: DrinkGlassBase + id: DrinkAnnasGift + name: Подарок Анны + description: Подарок всем кто даёт Спокойной Анне Сингуло! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: AnnasGift + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/Annasgift.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGayach + name: Гаечный ключ + description: Он всегда тут был. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Gayach + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/gayach.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkInjir + name: Инженер + description: Заряжает 220 вольтами удовольствия! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 60 + reagents: + - ReagentId: Injir + Quantity: 60 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/injir.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSinZan + name: "Сингуло" + description: На вкус прямо как сингуло. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: SinZan + Quantity: 50 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/singulozam.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkDilEater + name: Пожиратель диловена + description: Он жаждет диловен! Он УБИВАЕТ! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: DilEater + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/dilovenEater.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSbiv + name: Сбиватель с ног + description: Один глоток, и ты прилёг! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Sbiv + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/sbivatelsnog.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkDeadGob + name: Мёртвый гоблин + description: Он был великим воином. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: DeadGob + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/deadgoblin.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkBomba + name: Бомба + description: У нас есть 10 секунд, ПЕЙ! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Bomba + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/bomba.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkBosTea + name: Бостонский чай + description: самый наикрепчайший чай из всех. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: BosTea + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/BosTea.rsi diff --git a/Resources/Prototypes/_Silver/Entities/Objects/Consumable/Drinks/NewDrinks.yml b/Resources/Prototypes/_Silver/Entities/Objects/Consumable/Drinks/NewDrinks.yml new file mode 100644 index 00000000000..fcfee981ce5 --- /dev/null +++ b/Resources/Prototypes/_Silver/Entities/Objects/Consumable/Drinks/NewDrinks.yml @@ -0,0 +1,356 @@ +- type: entity + parent: DrinkGlassBase + id: DrinkEmpt + name: Пустота + description: чем больше вглядываешся в этот напиток тем больше он вглядывается в тебя + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Empt + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/Empt.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkFireMix + name: Огненный микс + description: Боже эта штука ПРОСТО ПЫЛАЕТ! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: FireMix + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/FireMix.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkCreator + name: Творец + description: Позволяет видеть веши за гранью нашего понимания + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Creator + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/Creator.rsi + +#- type: entity +# parent: DrinkGlassBase +# id: DrinkGodsBlood +# name: Кровь богов +# description: это кровь богов Олимпа +# components: +# - type: SolutionContainerManager +# solutions: +# drink: +# maxVol: 30 +# reagents: +# - ReagentId: GodsBlood +# Quantity: 30 +# - type: Drink +# - type: Sprite +# sprite: _Silver/Objects/Consumable/Drinks/GodsBlood.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkIchorNast + name: Настойка на ихоре + description: Оскорбляет любого ценителя алкоголя, и в напитке нет ихора абсолютно совсем + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: IchorNast + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/IchorNast.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkBestHealing + name: Превосходный Источник Исцеления + description: Точно не жидкое скопление нанитов с ИИ + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: BestHealing + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/BestHealing.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSlimeTea + name: Слизне-чай + description: Напоминает слайма, Возможно оно живое... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: SlimeTea + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/SlimeTea.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkSmileTea + name: Смайло-чай + description: Смайл? Это ты? + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: SmileTea + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/SmileTea.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkOldNavar + name: Древняя наварка + description: Это пили ещё твои пра-пра-прадеды и пра-пра-прабабушки... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: OldNavar + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/OldNavar.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkHeadAcce + name: Головная боль + description: Напиток обожаемый некромантами и скелетами + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: HeadAcce + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/HeadAcce.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkPoisonedVoodka + name: Заряженная водка + description: ты осмелился попробывать это? + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: PoisonedVoodka + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/PoisonedVoodka.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkMilkedGreenTea + name: Зелëный чай с молоком + description: Чай с молоком, я конешно понимаю, НО ЗЕЛËНЫЙ ЧАЙ С МОЛОКОМ!? Это отвратительно + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: MilkedGreenTea + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/MilkedGreenTea.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGermanSmuzi + name: Черно-жёлтый красный смузи + description: Es ist Zeit sich daran zu erinnern, dass du Deutscher bist! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: GermanSmuzi + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/GermanSmuzi.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkAtmoJoy + name: Счастье Атмосианина + description: Видимо у кого-то слишком много свободного времени... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: AtmoJoy + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/AtmoJoy.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkLiquidSilic + name: Жидкий кремний + description: О боже, вот куда ты дел весь кремний из ядра + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: LiquidSilic + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/LiquidSilic.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkAngelCry + name: Коктейль слезы ангела + description: Cами небеса развернулась и поделись рекой их слëзы. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: AngelCry + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/AngelCry.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkHappySumrak + name: Счастливый Сумеречник + description: У кого-то сегодня точно выдался хороший день! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: HappySumrak + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/HappySumrak.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkBurningBlood + name: Пылающая кровь + description: Этот коктейль олицетворяет сам ад в вашем желудке . Прощайтесь с печень + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: BurningBlood + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/BurningBlood.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkDeadJonnyCoktail + name: Предсмертный Коктейль Джони + description: Последний коктель который испил джони перет своей кончиной + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: DeadJonnyCoktail + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/DeadJonnyCoktail.rsi + +#- type: entity +# parent: DrinkGlassBase +# id: DrinkGoodTea +# name: Вкусный Чай +# description: Напиток используемый как способ доказать свою верность банде в некоторых мафиозных организациях +# components: +# - type: SolutionContainerManager +# solutions: +# drink: +# maxVol: 30 +# reagents: +# - ReagentId: GoodTea +# Quantity: 30 +# - type: Drink +# - type: Sprite +# sprite: _Silver/Objects/Consumable/Drinks/GoodTea.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkMushroonNast + name: Грибная настойка + description: Это оно странно пахнет и штукатурка вкуснее чем вчера... + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: MushroonNast + Quantity: 30 + - type: Drink + - type: Sprite + sprite: _Silver/Objects/Consumable/Drinks/MushroonNast.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Silver/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_Silver/Entities/Objects/Fun/toys.yml new file mode 100644 index 00000000000..6e0de0547f2 --- /dev/null +++ b/Resources/Prototypes/_Silver/Entities/Objects/Fun/toys.yml @@ -0,0 +1,39 @@ +- type: entity + parent: BasePlushie + id: guusToyNiko + name: Странный котик + description: "вы не уверены, но вам кажется что вы его где-то видели" + components: + - type: Sprite + sprite: _Silver/Objects/Fun/toys.rsi + state: niko + +- type: entity + parent: BasePlushie + id: guusToyNikolamp + name: Лампочка + description: "какая знакомая лампочка..." + components: + - type: Sprite + sprite: _Silver/Objects/Fun/toys.rsi + state: lamp + +- type: entity + parent: BasePlushie + id: guusToyGoose + name: Плюшевый гусь + description: "Кусь!" + components: + - type: Sprite + sprite: _Silver/Objects/Fun/toys.rsi + state: goose + +- type: entity + parent: BasePlushie + id: guusToyDestroyer + name: Плюшевая Валерия Лапкина + description: "Она одним своим видом бесит." + components: + - type: Sprite + sprite: _Silver/Objects/Fun/toys.rsi + state: destroyer \ No newline at end of file diff --git a/Resources/Prototypes/_Silver/Entities/Objects/Tools/RCD.yml b/Resources/Prototypes/_Silver/Entities/Objects/Tools/RCD.yml new file mode 100644 index 00000000000..583fe072cb7 --- /dev/null +++ b/Resources/Prototypes/_Silver/Entities/Objects/Tools/RCD.yml @@ -0,0 +1,160 @@ +- type: entity + id: BaseAdavancedRCD + parent: BaseItem + name: Combat RCD + categories: [ HideSpawnMenu ] + description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function. + components: + - type: RCD + availablePrototypes: + - WallSolid + - FloorSteel + - Plating + - Catwalk + - Grille + - Window + - WindowDirectional + - WindowReinforcedDirectional + - ReinforcedWindow + - Airlock + - AirlockGlass + - Firelock + - TubeLight + - BulbLight + - LVCable + - MVCable + - HVCable + - CableTerminal + - Deconstruct + - GasVentPump + - GasVentScrubber + - GasPipeStraight + - GasPipeTJunction + - GasPipeBend + - GasPipeFourway + - GasPressurePump + - GasMixer + - GasFilter + - FanTiny + - ComputerFrame + - MachineFrame + - WindoorSecure + - Windoor + - AirlockGlassShuttle + - AirlockShuttle + - WallShuttle + - WallReinforced + - type: LimitedCharges + maxCharges: 500 + charges: 500 + - type: AutoRecharge + rechargeDuration: 240 + - type: UseDelay + - type: Sprite + sprite: _Silver/Objects/Tools/crcd.rsi + state: icon + - type: Item + sprite: _Silver/Objects/Tools/crcd.rsi + size: Normal + - type: PhysicalComposition + materialComposition: + Steel: 600 + Plastic: 100 + - type: StaticPrice + price: 110 + - type: UserInterface + interfaces: + enum.RcdUiKey.Key: + type: RCDMenuBoundUserInterface + - type: ActivatableUI + key: enum.RcdUiKey.Key + +- type: entity + id: RACD + parent: [BaseItem, BaseEngineeringContraband] + name: RACD + description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function. + components: + - type: RCD + availablePrototypes: + - GasPassiveVent + - GasVentPump + - GasVentScrubber + - GasPipeStraight + - GasPipeTJunction + - GasPipeBend + - GasPipeFourway + - GasPressurePump + - GasVolumePump + - GasMixer + - GasFilter + - FanTiny + - FloorSteel + - Airlock + - AirlockGlass + - Firelock + - Deconstruct + - type: LimitedCharges + maxCharges: 30 + charges: 30 + - type: UseDelay + - type: Sprite + sprite: _Silver/Objects/Tools/rcad.rsi + state: icon + - type: Item + sprite: _Silver/Objects/Tools/rcad.rsi + size: Normal + - type: PhysicalComposition + materialComposition: + Steel: 600 + Plastic: 100 + - type: StaticPrice + price: 110 + - type: UserInterface + interfaces: + enum.RcdUiKey.Key: + type: RCDMenuBoundUserInterface + - type: ActivatableUI + key: enum.RcdUiKey.Key + +- type: entity + id: CombatRCD + parent: [BaseAdavancedRCD, BaseCommandContraband] + name: Combat RCD + description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function. + components: + - type: AutoRecharge + rechargeDuration: 10 + +- type: entity + id: AdavancedRCD + parent: BaseAdavancedRCD + name: Adavanced RCD + description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function. + components: + - type: LimitedCharges + maxCharges: 60 + charges: 60 + - type: Sprite + sprite: _Silver/Objects/Tools/arcd.rsi + state: icon + - type: Item + sprite: _Silver/Objects/Tools/arcd.rsi + +- type: entity + id: AdavancedRCDEmpty + parent: AdavancedRCD + suffix: пустое + components: + - type: LimitedCharges + maxCharges: 60 + charges: 0 + +- type: entity + id: RACDEmpty + parent: RACD + suffix: пустое + components: + - type: LimitedCharges + maxCharges: 30 + charges: 0 diff --git a/Resources/Prototypes/_Silver/Parallax/silly_Island_ice.yml b/Resources/Prototypes/_Silver/Parallax/silly_Island_ice.yml new file mode 100644 index 00000000000..1a6b5fe43e5 --- /dev/null +++ b/Resources/Prototypes/_Silver/Parallax/silly_Island_ice.yml @@ -0,0 +1,26 @@ +- type: parallax + id: SillyIslandIce + layers: + - texture: + !type:ImageParallaxTextureSource + path: "/Textures/_Silver/Parallax/SillyIce.png" + slowness: 0.5 + scale: "1, 1" + scrolling: "0, -0.05" + shader: "" + - texture: + !type:ImageParallaxTextureSource + path: "/Textures/Corvax/Parallax/SillyBlueice.png" + slowness: 0.3 + scale: "0.5, 0.5" + scrolling: "0.08, 0.08" + shader: "" + layersLQ: + - texture: + !type:ImageParallaxTextureSource + path: "/Textures/Corvax/Parallax/SillyIce.png" + slowness: 0.5 + scale: "1, 1" + scrolling: "0, -0.05" + shader: "" + layersLQUseHQ: false diff --git a/Resources/Prototypes/_Silver/RCD/rcd.yml b/Resources/Prototypes/_Silver/RCD/rcd.yml new file mode 100644 index 00000000000..b05be86bc09 --- /dev/null +++ b/Resources/Prototypes/_Silver/RCD/rcd.yml @@ -0,0 +1,261 @@ +- type: rcd + id: GasPassiveVent + category: Tubes + sprite: /Textures/Interface/Radial/RCD/PVent.png + mode: ConstructObject + prototype: GasPassiveVent + cost: 1 + delay: 1 + collisionMask: FullTileMask + rules: + - IsWindow + rotation: User + fx: EffectRCDConstruct1 + +- type: rcd + id: GasVentPump + category: Tubes + sprite: /Textures/Interface/Radial/RCD/Vent.png + mode: ConstructObject + prototype: GasVentPump + cost: 1 + delay: 1 + collisionMask: FullTileMask + rules: + - IsWindow + rotation: User + fx: EffectRCDConstruct1 + +- type: rcd + id: GasVentScrubber + category: Tubes + sprite: /Textures/Interface/Radial/RCD/Scrubber.png + mode: ConstructObject + prototype: GasVentScrubber + cost: 1 + delay: 1 + collisionMask: FullTileMask + rules: + - IsWindow + rotation: User + fx: EffectRCDConstruct1 + +- type: rcd + id: GasPipeStraight + category: Tubes + sprite: /Textures/Interface/Radial/RCD/Pipe.png + mode: ConstructObject + prototype: GasPipeStraight + cost: 1 + delay: 1 + collisionMask: FullTileMask + rules: + - IsWindow + rotation: User + fx: EffectRCDConstruct1 + +- type: rcd + id: GasPipeTJunction + category: Tubes + sprite: /Textures/Interface/Radial/RCD/TPipe.png + mode: ConstructObject + prototype: GasPipeTJunction + cost: 1 + delay: 1 + collisionMask: FullTileMask + rules: + - IsWindow + rotation: User + fx: EffectRCDConstruct1 + +- type: rcd + id: GasPipeBend + category: Tubes + sprite: /Textures/Interface/Radial/RCD/BPipe.png + mode: ConstructObject + prototype: GasPipeBend + cost: 1 + delay: 1 + collisionMask: FullTileMask + rules: + - IsWindow + rotation: User + fx: EffectRCDConstruct1 + +- type: rcd + id: GasPipeFourway + category: Tubes + sprite: /Textures/Interface/Radial/RCD/FPipe.png + mode: ConstructObject + prototype: GasPipeFourway + cost: 1 + delay: 1 + collisionMask: FullTileMask + rules: + - IsWindow + rotation: User + fx: EffectRCDConstruct1 + +- type: rcd + id: GasPressurePump + category: Tubes + sprite: /Textures/Interface/Radial/RCD/PPump.png + mode: ConstructObject + prototype: GasPressurePump + cost: 1 + delay: 1 + collisionMask: FullTileMask + rules: + - IsWindow + rotation: User + fx: EffectRCDConstruct1 + +- type: rcd + id: GasVolumePump + category: Tubes + sprite: /Textures/Interface/Radial/RCD/VPump.png + mode: ConstructObject + prototype: GasVolumePump + cost: 1 + delay: 1 + collisionMask: FullTileMask + rules: + - IsWindow + rotation: User + fx: EffectRCDConstruct1 + +- type: rcd + id: GasMixer + category: Tubes + sprite: /Textures/Interface/Radial/RCD/Mixer.png + mode: ConstructObject + prototype: GasMixer + cost: 1 + delay: 1 + collisionMask: FullTileMask + rules: + - IsWindow + rotation: User + fx: EffectRCDConstruct1 + +- type: rcd + id: GasFilter + category: Tubes + sprite: /Textures/Interface/Radial/RCD/Filter.png + mode: ConstructObject + prototype: GasFilter + cost: 1 + delay: 1 + collisionMask: FullTileMask + rules: + - IsWindow + rotation: User + fx: EffectRCDConstruct1 + +- type: rcd + id: FanTiny + category: Tubes + sprite: /Textures/Interface/Radial/RCD/tiny_fan.png + mode: ConstructObject + prototype: AtmosDeviceFanTiny + cost: 1 + delay: 1 + collisionMask: FullTileMask + rotation: User + fx: EffectRCDConstruct1 + +- type: rcd + id: WallReinforced + category: WallsAndFlooring + sprite: /Textures/Interface/Radial/RCD/reinforced_wall.png + mode: ConstructObject + prototype: WallReinforced + cost: 6 + delay: 4 + collisionMask: FullTileMask + rotation: Fixed + fx: EffectRCDConstruct4 + +- type: rcd + id: WallShuttle + category: WallsAndFlooring + sprite: /Textures/Interface/Radial/RCD/shuttle_wall.png + mode: ConstructObject + prototype: WallShuttle + cost: 6 + delay: 4 + collisionMask: FullTileMask + rotation: Fixed + fx: EffectRCDConstruct4 + +- type: rcd + id: AirlockShuttle + category: Airlocks + sprite: /Textures/Interface/Radial/RCD/shuttle_airlock.png + mode: ConstructObject + prototype: AirlockShuttle + cost: 8 + delay: 4 + collisionMask: FullTileMask + rotation: User + fx: EffectRCDConstruct4 + +- type: rcd + id: AirlockGlassShuttle + category: Airlocks + sprite: /Textures/Interface/Radial/RCD/glass_shuttle_airlock.png + mode: ConstructObject + prototype: AirlockGlassShuttle + cost: 7 + delay: 4 + collisionMask: FullTileMask + rotation: User + fx: EffectRCDConstruct4 + +- type: rcd + id: Windoor + category: WindowsAndGrilles + sprite: /Textures/Interface/Radial/RCD/Windoor.png + mode: ConstructObject + prototype: Windoor + cost: 3 + delay: 2 + collisionMask: FullTileMask + rotation: User + fx: EffectRCDConstruct2 + +- type: rcd + id: WindoorSecure + category: WindowsAndGrilles + sprite: /Textures/Interface/Radial/RCD/WindoorSecure.png + mode: ConstructObject + prototype: WindoorSecure + cost: 4 + delay: 3 + collisionMask: FullTileMask + rotation: User + fx: EffectRCDConstruct3 + +- type: rcd + id: MachineFrame + category: Electrical + sprite: /Textures/Interface/Radial/RCD/machine_frame.png + mode: ConstructObject + prototype: MachineFrame + cost: 1 + delay: 2 + collisionMask: FullTileMask + rotation: Fixed + fx: EffectRCDConstruct2 + +- type: rcd + id: ComputerFrame + category: Electrical + sprite: /Textures/Interface/Radial/RCD/computer_frame.png + mode: ConstructObject + prototype: ComputerFrame + cost: 1 + delay: 2 + collisionMask: FullTileMask + rotation: User + fx: EffectRCDConstruct2 diff --git a/Resources/Prototypes/_Silver/Reagents/Materials/Consumable/Drink/NewAlcohol.yml b/Resources/Prototypes/_Silver/Reagents/Materials/Consumable/Drink/NewAlcohol.yml new file mode 100644 index 00000000000..6244bbdf618 --- /dev/null +++ b/Resources/Prototypes/_Silver/Reagents/Materials/Consumable/Drink/NewAlcohol.yml @@ -0,0 +1,993 @@ +- type: reagent + id: InglandSidr + name: reagent-name-inglandsidr + parent: BaseAlcohol + desc: reagent-desc-inglandsidr + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#BC9377" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/Sidr.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.08 + +- type: reagent + id: BiomassDrink + name: reagent-name-biomassdrink + parent: BaseAlcohol + group: Biological + desc: reagent-desc-biomassdrink + physicalDesc: reagent-physical-desc-ferrous + flavor: metallic + color: "#960000" + slippery: true + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/BiomassDrink.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: -15 + - !type:ModifyBleedAmount + amount: 0.2 + - !type:Emote + emote: Scream + probability: 0.25 + +- type: reagent + id: AnnasGift + name: reagent-name-annasgift + parent: BaseAlcohol + desc: reagent-desc-annasgift + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#d1d1d155" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/annasgift.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.5 + +- type: reagent + id: SinZan + name: reagent-name-sinzan + parent: BaseAlcohol + desc: reagent-desc-sinzan + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#7E4043" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/singulozam.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.06 + +- type: reagent + id: DeadGob + name: reagent-name-deadgob + parent: BaseAlcohol + desc: reagent-desc-deadgob + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#1FA431" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/deadgoblin.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.06 + - !type:HealthChange + damage: + types: + Poison: 2 + +- type: reagent + id: Gayach + name: reagent-name-gayach + parent: BaseAlcohol + desc: reagent-desc-gayach + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#32B383" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/gayach.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.1 + +- type: reagent + id: Injir + name: reagent-name-injir + parent: BaseAlcohol + desc: reagent-desc-injir + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#9EB383" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/injir.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.5 + +- type: reagent + id: DilEater + name: reagent-name-dileater + parent: BaseAlcohol + desc: reagent-desc-dileater + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#000000" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/dilovenEater.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: -15 + - !type:AdjustReagent + reagent: Ethanol + amount: 2 + Medicine: + effects: + - !type:AdjustReagent + reagent: Dylovene + amount: -1 + +- type: reagent + id: Sbiv + name: reagent-name-sbiv + parent: BaseAlcohol + desc: reagent-desc-sbiv + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#9B4E80" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/sbivatelsnog.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.1 + Narcotic: + effects: + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: Sbiv + min: 8 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + +- type: reagent + id: Bomba + name: reagent-name-bomba + parent: BaseAlcohol + desc: reagent-desc-bomba + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#000000" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/bomba.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: -25 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.1 + - !type:AdjustReagent + reagent: Bomba + amount: -1 + - !type:ExplosionReactionEffect + explosionType: Default + maxIntensity: 100 + intensityPerUnit: 0.5 # 50+50 reagent for maximum explosion + intensitySlope: 4 + maxTotalIntensity: 100 + +# Base Alcohol + + +- type: reagent + id: BosTea + name: reagent-name-BosTea + parent: BaseAlcohol + desc: reagent-desc-BosTea + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#A45500" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/BosTea.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.4 + +- type: reagent + id: Empt + name: reagent-name-Empt + parent: BaseAlcohol + desc: reagent-desc-Empt + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#d1d1d155" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/Empt.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: -3 + +- type: reagent + id: FireMix + name: reagent-name-FireMix + parent: BaseAlcohol + desc: reagent-desc-FireMix + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#FF5300" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/FireMix.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - !type:HealthChange + damage: + groups: + Burn: 1 + +- type: reagent + id: Creator + name: reagent-name-Creator + parent: BaseAlcohol + desc: reagent-desc-Creator + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#d1d1d155" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/Creator.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 10 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.5 + - !type:AdjustReagent + reagent: SpaceDrugs + amount: 1 + +#- type: reagent +# id: GodsBlood +# name: reagent-name-GodsBlood +# parent: BaseAlcohol +# desc: reagent-desc-GodsBlood +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/GodsBlood.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 5 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.05 +# - !type:HealthChange +# damage: +# groups: +# Burn: -1 +# Toxin: -1 +# Airloss: -1 +# Brute: -1 + +- type: reagent + id: IchorNast + name: reagent-name-IchorNast + parent: BaseAlcohol + desc: reagent-desc-IchorNast + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#FFFF00" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/IchorNast.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: -25 + - !type:AdjustReagent + reagent: Ethanol + amount: 1 + - !type:HealthChange + damage: + types: + Poison: 1 + +- type: reagent + id: BestHealing + name: reagent-name-BestHealing + parent: BaseAlcohol + desc: reagent-desc-BestHealing + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#929A91" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/BestHealing.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 5 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.5 + +#- type: reagent +# id: SugarRain +# name: reagent-name-SugarRain +# parent: BaseAlcohol +# desc: reagent-desc-SugarRain +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/SugarRain.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 1 +# - !type:AdjustReagent +# reagent: Sugar +# amount: 2 + + + +- type: reagent + id: SlimeTea + name: reagent-name-SlimeTea + parent: BaseAlcohol + desc: reagent-desc-SlimeTea + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#929A91" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/SlimeTea.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 5 + +- type: reagent + id: SmileTea + name: reagent-name-SmileTea + parent: BaseAlcohol + desc: reagent-desc-SmileTea + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#00FF00" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/SmileTea.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + Narcotic: + effects: + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + +- type: reagent + id: OldNavar + name: reagent-name-OldNavar + parent: BaseAlcohol + desc: reagent-desc-OldNavar + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#009900" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/OldNavar.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 4 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 + Narcotic: + effects: + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + +#- type: reagent +# id: HmelKash +# name: reagent-name-HmelKash +# parent: BaseAlcohol +# desc: reagent-desc-HmelKash +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/HmelKash.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 3 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.2 + +- type: reagent + id: HeadAcce + name: reagent-name-HeadAcce + parent: BaseAlcohol + desc: reagent-desc-HeadAcce + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#d1d1d155" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/HeadAcce.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 10 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.5 + - !type:AdjustReagent + reagent: Milk + amount: 1 + +#- type: reagent +# id: GoodForest +# name: reagent-name-GoodForest +# parent: BaseAlcohol +# desc: reagent-desc-GoodForest +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/GoodForest.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 2 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.4 + +- type: reagent + id: PoisonedVoodka + name: reagent-name-PoisonedVoodka + parent: BaseAlcohol + desc: reagent-desc-PoisonedVoodka + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#0098FF" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/PoisonedVoodka.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 3 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 + - !type:HealthChange + damage: + types: + Shock: 0.1 + +- type: reagent + id: MilkedGreenTea + name: reagent-name-MilkedGreenTea + parent: BaseAlcohol + desc: reagent-desc-MilkedGreenTea + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#BEFFC5" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/MilkedGreenTea.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + +#- type: reagent +# id: AlchollessBeer +# name: reagent-name-AlchollessBeer +# parent: BaseAlcohol +# desc: reagent-desc-AlchollessBeer +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/AlchollessBeer.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 3 + +- type: reagent + id: GermanSmuzi + name: reagent-name-GermanSmuzi + parent: BaseAlcohol + desc: reagent-desc-GermanSmuzi + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#592300" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/GermanSmuzi.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 3 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 + +#- type: reagent +# id: KislSladNechto +# name: reagent-name-KislSladNechto +# parent: BaseAlcohol +# desc: reagent-desc-KislSladNechto +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/KislSladNechto.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 1 + +- type: reagent + id: MushroonNast + name: reagent-name-MushroonNast + parent: BaseAlcohol + desc: reagent-desc-MushroonNast + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#F01472" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/MushroonNast.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: -10 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.1 + - !type:HealthChange + damage: + types: + Poison: 0.5 + Narcotic: + effects: + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + + +#- type: reagent +# id: TermoatomicReactor +# name: reagent-name-TermoatomicReactor +# parent: BaseAlcohol +# desc: reagent-desc-TermoatomicReactor +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/TermoatomicReactor.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 2 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.4 +# - !type:HealthChange +# damage: +# types: +# Poison: 1 +# Radiation: 1 + +- type: reagent + id: AtmoJoy + name: reagent-name-AtmoJoy + parent: BaseAlcohol + desc: reagent-desc-AtmoJoy + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#009A72" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/AtmoJoy.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 #////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + - !type:AdjustReagent + reagent: Ethanol + amount: 0.4 #////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +- type: reagent + id: LiquidSilic + name: reagent-name-LiquidSilic + parent: BaseAlcohol + desc: reagent-desc-LiquidSilic + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#DFDADE" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/LiquidSilic.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 3 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.06 + - !type:HealthChange + damage: + groups: + Burn: -0.1 + +#- type: reagent +# id: LiquidGen +# name: reagent-name-LiquidGen +# parent: BaseAlcohol +# desc: reagent-desc-LiquidGen +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/LiquidGen.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 3 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.2 +# - !type:HealthChange +# damage: +# groups: +# Burn: 2 + +- type: reagent + id: AngelCry + name: reagent-name-AngelCry + parent: BaseAlcohol + desc: reagent-desc-AngelCry + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#7DCAFF" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/AngelCry.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:AdjustReagent + reagent: Ethanol + amount: 0.0001 + - !type:HealthChange + damage: + types: + Blunt: -0.1 + +#- type: reagent +# id: BankaCoktail +# name: reagent-name-BankaCoktail +# parent: BaseAlcohol +# desc: reagent-desc-BankaCoktail +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/BankaCoktail.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 4 +# - !type:AdjustTemperature +# conditions: +# - !type:Temperature +# max: 293.15 +# amount: 10 # thermal energy, not temperature! + +- type: reagent + id: HappySumrak + name: reagent-name-HappySumrak + parent: BaseAlcohol + desc: reagent-desc-HappySumrak + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#7D0041" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/HappySumrak.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 #////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + - !type:AdjustReagent + reagent: Ethanol + amount: 0.4 #////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +#- type: reagent +# id: Shlak +# name: reagent-name-Shlak +# parent: BaseAlcohol +# desc: reagent-desc-Shlak +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/Shlak.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 2 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.4 + +- type: reagent + id: BurningBlood + name: reagent-name-BurningBlood + parent: BaseAlcohol + desc: reagent-desc-BurningBlood + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#9F3200" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/BurningBlood.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: -10 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.01 + - !type:HealthChange + damage: + groups: + Burn: 2 + +- type: reagent + id: DeadJonnyCoktail + name: reagent-name-DeadJonnyCoktail + parent: BaseAlcohol + desc: reagent-desc-DeadJonnyCoktail + physicalDesc: reagent-physical-desc-strong-smelling + flavor: alcohol + color: "#1C53A1" + metamorphicSprite: + sprite: Stray/Objects/Consumable/Drinks/DeadJonnyCoktail.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: -2 + - !type:AdjustReagent + reagent: Ethanol + amount: 1 + +#- type: reagent +# id: LoveCoktail +# name: reagent-name-LoveCoktail +# parent: BaseAlcohol +# desc: reagent-desc-LoveCoktail +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/LoveCoktail.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: -20 + +#- type: reagent +# id: GogolMogol +# name: reagent-name-GogolMogol +# parent: BaseAlcohol +# desc: reagent-desc-GogolMogol +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/GogolMogol.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 5 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.2 + +#- type: reagent +# id: Chinga +# name: reagent-name-Chinga +# parent: BaseAlcohol +# desc: reagent-desc-Chinga +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/Chinga.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 0.1 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.3 +# - !type:HealthChange +# damage: +# types: +# Poison: -1 + + +#- type: reagent +# id: NekoKofe +# name: reagent-name-NekoKofe +# parent: BaseAlcohol +# desc: reagent-desc-NekoKofe +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/NekoKofe.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 2 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.02 + +#- type: reagent +# id: GoodTea +# name: reagent-name-GoodTea +# parent: BaseAlcohol +# desc: reagent-desc-GoodTea +# physicalDesc: reagent-physical-desc-strong-smelling +# flavor: alcohol +# color: "#d1d1d155" +# metamorphicSprite: +# sprite: Stray/Objects/Consumable/Drinks/GoodTea.rsi +# state: icon +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 5 diff --git a/Resources/Prototypes/_Silver/Recipes/Reactions/NewDrinks.yml b/Resources/Prototypes/_Silver/Recipes/Reactions/NewDrinks.yml new file mode 100644 index 00000000000..48cc02a96a0 --- /dev/null +++ b/Resources/Prototypes/_Silver/Recipes/Reactions/NewDrinks.yml @@ -0,0 +1,519 @@ +- type: reaction + id: InglandSidr + reactants: + JuiceApple: + amount: 2 + Sugar: + amount: 1 + products: + InglandSidr: 3 + +- type: reaction + id: AnnasGift + reactants: + Cream: + amount: 2 + Milk: + amount: 2 + Blood: + amount: 1 + products: + AnnasGift: 5 + +- type: reaction + id: Gayach + reactants: + Mojito: + amount: 1 + TonicWater: + amount: 4 + products: + Gayach: 5 + +- type: reaction + id: Injir + reactants: + Gayach: + amount: 1 + ScrewdriverCocktail: + amount: 1 + products: + Injir: 2 + +- type: reaction + id: SinZan + reactants: + Blood: + amount: 3 + Wine: + amount: 1 + products: + SinZan: 4 + +- type: reaction + id: DilEater + reactants: + Whiskey: + amount: 1 + CoffeeLiqueur: + amount: 1 + Ale: + amount: 1 + products: + DilEater: 3 + +- type: reaction + id: Sbiv + reactants: + Gin: + amount: 1 + Vodka: + amount: 1 + Nocturine: + amount: 1 + products: + Sbiv: 3 + +- type: reaction + id: Bomba + reactants: + Vodka: + amount: 3 + Sodium: + amount: 1 + Sulfur: + amount: 1 + products: + Bomba: 5 + +- type: reaction + id: DeadGob + reactants: + Vermouth: + amount: 3 + SulfuricAcid: + amount: 1 + Blood: + amount: 1 + products: + DeadGob: 5 + +- type: reaction + id: BosTea + reactants: + GreenTea: + amount: 2 + Tea: + amount: 2 + Rum: + amount: 1 + JuiceLime: + amount: 1 + products: + BosTea: 6 + +- type: reaction + id: Empt + reactants: + Blood: + amount: 5 + Nothing: + amount: 1 + products: + Empt: 6 + +- type: reaction + id: FireMix + reactants: + Whiskey: + amount: 1 + ToxinsSpecial: + amount: 1 + IrishCarBomb: + amount: 1 + products: + FireMix: 3 + +- type: reaction + id: Creator + reactants: + Nothing: + amount: 1 + SinZan: + amount: 1 + SpaceDrugs: + amount: 1 + products: + Creator: 3 + +#- type: reaction +# id: GodsBlood +# reactants: +# Blood: +# amount: 2 +# Gold: +# amount: 2 +# Ichor: +# amount: 1 +# products: +# GodsBlood: 6 + +- type: reaction + id: IchorNast + reactants: + Rum: + amount: 1 + Gin: + amount: 1 + Whiskey: + amount: 1 + Margarita: + amount: 1 + IcedBeer: + amount: 1 + products: + IchorNast: 5 + +- type: reaction + id: BestHealing + reactants: + Iron: + amount: 1 + ScrewdriverCocktail: + amount: 1 + Gayach: + amount: 1 + products: + BestHealing: 3 + +#- type: reaction +# id: SugarRain +# reactants: +# Sugar: +# amount: 5 +# Water: +# amount: 2 +# JuiceOrange: +# amount: 1 +# products: +# SugarRain: 8 + +- type: reaction + id: SlimeTea + reactants: + IcedGreenTea: + amount: 1 + Slime: + amount: 2 + Mojito: + amount: 1 + products: + SlimeTea: 4 + +- type: reaction + id: SmileTea + reactants: + Tea: + amount: 2 + Slime: + amount: 5 + Mojito: + amount: 1 + JuiceLime: + amount: 1 + SpaceDrugs: + amount: 5 + products: + SmileTea: 14 + +- type: reaction + id: OldNavar + reactants: + Omnizine: + amount: 1 + Vodka: + amount: 2 + Mojito: + amount: 1 + Water: + amount: 1 + products: + OldNavar: 5 + +#- type: reaction +# id: HmelKash +# reactants: +# Beer: +# amount: 2 +# Nutriment: +# amount: 1 +# products: +# HmelKash: 3 + +- type: reaction + id: HeadAcce + reactants: + Milk: + amount: 2 + Protein: + amount: 1 + products: + HeadAcce: 3 + +#- type: reaction +# id: GoodForest +# reactants: +# Beer: +# amount: 2 +# Coffee: +# amount: 1 +# IrishCream: +# amount: 1 +# products: +# GoodForest: 3 + +- type: reaction + id: PoisonedVoodka + reactants: + Vodka: + amount: 5 + Iron: + amount: 1 + Plasma: + amount: 1 + products: + PoisonedVoodka: 7 + +- type: reaction + id: MilkedGreenTea + reactants: + Milk: + amount: 5 + GreenTea: + amount: 1 + Sugar: + amount: 1 + products: + MilkedGreenTea: 7 + +#- type: reaction +# id: AlchollessBeer +# reactants: +# Nutriment: +# amount: 1 +# WeldingFuel: +# amount: 1 +# Enzyme: +# amount: 1 +# products: +# AlchollessBeer: 3 + +- type: reaction + id: GermanSmuzi + reactants: + Blood: + amount: 1 + Beer: + amount: 1 + Cola: + amount: 1 + products: + GermanSmuzi: 3 + +#- type: reaction +# id: KislSladNechto +# reactants: +# JuiceTomato: +# amount: 2 +# Ketchup: +# amount: 2 +# JuiceLime: +# amount: 2 +# Sugar: +# amount: 1 +# products: +# KislSladNechto: 7 + +- type: reaction + id: MushroonNast + reactants: + SpaceDrugs: + amount: 1 + WeldingFuel: + amount: 1 + products: + MushroonNast: 2 + +#- type: reaction +# id: TermoatomicReactor +# reactants: +# Uranium: +# amount: 1 +# Plasma: +# amount: 1 +# Vodka: +# amount: 1 +# products: +# TermoatomicReactor: 3 + +- type: reaction + id: AtmoJoy + reactants: + Frezon: + amount: 1 + Oxygen: + amount: 1 + Dylovene: + amount: 1 + products: + AtmoJoy: 3 + +- type: reaction + id: LiquidSilic + reactants: + Iron: + amount: 3 + Silicon: + amount: 3 + Cognac: + amount: 1 + products: + LiquidSilic: 7 + +#- type: reaction +# id: LiquidGen +# reactants: +# Iron: +# amount: 1 +# Plasma: +# amount: 1 +# Uranium: +# amount: 1 +# products: +# LiquidGen: 3 + +- type: reaction + id: AngelCry + reactants: + Water: + amount: 1 + Blood: + amount: 2 + Vodka: + amount: 1 + TableSalt: + amount: 1 + products: + AngelCry: 4 + +#- type: reaction +# id: BankaCoktail +# reactants: +# Plasma: +# amount: 1 +# WeldingFuel: +# amount: 1 +# products: +# BankaCoktail: 2 + +- type: reaction + id: HappySumrak + reactants: + GinFizz: + amount: 1 + Cognac: + amount: 1 + B52: + amount: 2 + products: + HappySumrak: 4 + +#- type: reaction +# id: Shlak +# reactants: +# Iron: +# amount: 1 +# Copper: +# amount: 1 +# Uranium: +# amount: 1 +# products: +# Shlak: 3 + +- type: reaction + id: BurningBlood + reactants: + Blood: + amount: 2 + Plasma: + amount: 1 + Napalm: + amount: 1 + products: + BurningBlood: 4 + +- type: reaction + id: DeadJonnyCoktail + reactants: + Whiskey: + amount: 1 + Tequila: + amount: 1 + WhiteRussian: + amount: 1 + products: + DeadJonnyCoktail: 3 + +#- type: reaction +# id: LoveCoktail +# reactants: +# Vodka: +# amount: 2 +# TableSalt: +# amount: 1 +# products: +# LoveCoktail: 3 + +#- type: reaction +# id: GogolMogol +# reactants: +# Vodka: +# amount: 1 +# Sugar: +# amount: 1 +# Egg: +# amount: 1 +# products: +# GogolMogol: 3 + +#- type: reaction +# id: Chinga +# reactants: +# Rum: +# amount: 1 +# LemonLime: +# amount: 1 +# products: +# Chinga: 2 + +#- type: reaction +# id: NekoKofe +# reactants: +# Coffee: +# amount: 5 +# Cognac: +# amount: 5 +# Blood: +# amount: 2 +# products: +# NekoKofe: 12 + +#- type: reaction +# id: GoodTea +# reactants: +# Tea: +# amount: 1 +# Beer: +# amount: 1 +# products: +# GoodTea: 2 diff --git a/Resources/Prototypes/_Silver/RevearseEngineering/mics.yml b/Resources/Prototypes/_Silver/RevearseEngineering/mics.yml new file mode 100644 index 00000000000..082f4bb64f0 --- /dev/null +++ b/Resources/Prototypes/_Silver/RevearseEngineering/mics.yml @@ -0,0 +1,98 @@ +- type: entity + id: ReverseEngineeringMachineCircuitboard + parent: BaseMachineCircuitboard + name: reverse engineering machine machine board + description: A machine printed circuit board for a reverse engineering machine + components: + - type: Sprite + state: engineering + - type: MachineBoard + prototype: ReverseEngineeringMachine + stackRequirements: + Cable: 1 + PlasmaGlass: 5 + MatterBin: 1 + Manipulator: 1 + +- type: latheRecipe + parent: BaseGoldCircuitboardRecipe + id: ReverseEngineeringMachineCircuitboard + result: ReverseEngineeringMachineCircuitboard + +- type: entity + parent: [BaseMachinePowered, ConstructibleMachine] + id: ReverseEngineeringMachine + name: reverse engineering machine + description: Destructively analyses pieces of technology in the hopes that we can retrieve information from them. + components: + - type: ReverseEngineeringMachine + - type: Sprite + sprite: _Silver/reverse_engineering.rsi + snapCardinals: true + layers: + - state: open + map: ["enum.OpenableVisuals.Layer"] + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + noRot: true + - type: ActivatableUI + key: enum.ReverseEngineeringMachineUiKey.Key + - type: UserInterface + interfaces: + enum.ReverseEngineeringMachineUiKey.Key: + type: ReverseEngineeringMachineBoundUserInterface + - type: ActivatableUIRequiresPower + - type: ItemSlots + slots: + target_slot: + name: ReverseEngineeringTarget + whitelist: + components: + - ReverseEngineering + - type: Construction + graph: Machine + node: machine + containers: + - machine_board + - machine_parts + - type: ContainerContainer + containers: + machine_board: !type:Container + machine_parts: !type:Container + target_slot: !type:ContainerSlot + - type: Machine + board: ReverseEngineeringMachineCircuitboard + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:EmptyAllContainersBehaviour + - !type:ChangeConstructionNodeBehavior + node: machineFrame + - !type:DoActsBehavior + acts: ["Destruction"] + - type: AmbientSound + enabled: false + volume: -5 + range: 5 + sound: + path: /Audio/Ambience/Objects/revMachine_ambience.ogg + - type: Appearance + - type: GenericVisualizer + visuals: + enum.PowerDeviceVisuals.Powered: + enum.PowerDeviceVisualLayers.Powered: + True: { visible: true } + False: { visible: false } + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: { state: open } + False: { state: closed } + +- type: latheRecipe + parent: BaseGoldCircuitboardRecipe + id: EncryptionKeySyndie + result: EncryptionKeySyndie diff --git a/Resources/Prototypes/_Silver/Surgeryds/d b/Resources/Prototypes/_Silver/Surgeryds/d new file mode 100644 index 00000000000..b498fd495d6 --- /dev/null +++ b/Resources/Prototypes/_Silver/Surgeryds/d @@ -0,0 +1 @@ +/ diff --git a/Resources/Prototypes/_Silver/supermatter.yml b/Resources/Prototypes/_Silver/supermatter.yml new file mode 100644 index 00000000000..b3b4612e0d3 --- /dev/null +++ b/Resources/Prototypes/_Silver/supermatter.yml @@ -0,0 +1,150 @@ +- type: entity + parent: BaseFlatpack + id: SupermatterFlatpack + name: Supermatter flatpack + description: A flatpack used for constructing an supermatter engine reactor. + components: + - type: Flatpack + entity: Supermatter + - type: StaticPrice + price: 500 + - type: CargoSellBlacklist + + +- type: entity + id: Supermatter + name: Supermatter + description: A strangely translucent and iridescent crystal. + placement: + mode: SnapgridCenter + components: + - type: BkmSupermatter + - type: RadiationSource + - type: AmbientSound + range: 5 + volume: 0 + sound: + path: /Audio/Backmen/Supermatter/calm.ogg + - type: Physics + - type: Speech + speechSounds: Pai + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + density: 600 + mask: + - FullTileMask + layer: + - WallLayer + - type: Transform + anchored: true + noRot: true + - type: Clickable + - type: InteractionOutline + - type: Sprite + drawdepth: WallMountedItems + sprite: _Silver/supermatter.rsi + state: supermatter + - type: Icon + sprite: _Silver/supermatter.rsi + state: supermatter + - type: PointLight + enabled: true + radius: 10 + energy: 5 + color: "#ffe000" + - type: Explosive + explosionType: Supermatter + maxIntensity: 25000 + intensitySlope: 5 + totalIntensity: 25000 + +- type: entity + id: SupermaterGenerator + description: Бессконечный источник электричества + name: суперматерьевый генератор + placement: + mode: SnapgridCenter + components: + - type: AmbientSound + range: 5 + sound: + path: /Audio/Ambience/Objects/engine_hum.ogg + - type: Clickable + - type: InteractionOutline + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.4,-0.5,0.4,0.3" + density: 190 + mask: + - MachineMask + layer: + - MachineLayer + - type: Transform + anchored: true + noRot: true + - type: Sprite + sprite: Structures/Power/power.rsi + state: generator + snapCardinals: true + - type: NodeContainer + examinable: true + nodes: + output: + !type:CableDeviceNode + nodeGroupID: HVPower + - type: PowerMonitoringDevice + group: Generator + loadNode: output + sprite: _Silver\supermattergen.rsi + state: supermatter + - type: PowerSupplier + supplyRate: 30000 + supplyRampRate: 500 + supplyRampTolerance: 500 + - type: Anchorable + - type: Pullable + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Metallic + - type: PacifismDangerousAttack + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:ExplodeBehavior + - type: Explosive + explosionType: Default + # Same as AME, but numbers still picked from a hat. + maxIntensity: 300 + intensitySlope: 2 + totalIntensity: 600 + - type: StaticPrice + price: 500 + - type: Electrified + onHandInteract: false + onInteractUsing: false + onBump: false + requirePower: true + highVoltageNode: output \ No newline at end of file diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/ai_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/ai_label.png deleted file mode 100644 index 02409127a3f..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/ai_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/borg_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/borg_label.png deleted file mode 100644 index 2b56e167730..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/borg_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/cap_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/cap_label.png deleted file mode 100644 index 4fc28df9521..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/cap_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/cargo_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/cargo_label.png deleted file mode 100644 index 7ec1c7c05e2..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/cargo_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/ce_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/ce_label.png deleted file mode 100644 index 3ff9d8be0f7..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/ce_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/cmo_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/cmo_label.png deleted file mode 100644 index fcdee41c3c5..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/cmo_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/com_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/com_label.png deleted file mode 100644 index d2dad338011..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/com_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/common_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/common_label.png deleted file mode 100644 index d144a088a51..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/common_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png deleted file mode 100644 index 45e0c9755e4..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png deleted file mode 100644 index 53b97f4c783..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png deleted file mode 100644 index 8f905fb9a88..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png deleted file mode 100644 index 638d7509a0a..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png deleted file mode 100644 index 14b22cf14a4..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png deleted file mode 100644 index 8223bcca8fa..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png deleted file mode 100644 index 03e29607792..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/eng_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/eng_label.png deleted file mode 100644 index 12473d4dd0b..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/eng_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/hop_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/hop_label.png deleted file mode 100644 index 9fc60cb3dc5..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/hop_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/hos_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/hos_label.png deleted file mode 100644 index c8f7f68ee4e..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/hos_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/med_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/med_label.png deleted file mode 100644 index 9ae93894832..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/med_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/medsci_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/medsci_label.png deleted file mode 100644 index cc1b31d6c4e..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/medsci_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/miner_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/miner_label.png deleted file mode 100644 index f997527fd45..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/miner_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/nano_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/nano_label.png deleted file mode 100644 index 24e1ce4f3ae..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/nano_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/pirate_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/pirate_label.png deleted file mode 100644 index e80518253f8..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/pirate_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/qm_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/qm_label.png deleted file mode 100644 index b2d9a59d1d2..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/qm_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/rd_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/rd_label.png deleted file mode 100644 index ef2819077c5..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/rd_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/robotics_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/robotics_label.png deleted file mode 100644 index 224fade5750..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/robotics_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/sci_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/sci_label.png deleted file mode 100644 index e598481f65f..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/sci_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/sec_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/sec_label.png deleted file mode 100644 index 5df941ad10b..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/sec_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/service_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/service_label.png deleted file mode 100644 index bcee9be21a9..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/service_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/synd_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/synd_label.png deleted file mode 100644 index f62fa45097f..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/synd_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/Flashlight.png b/Resources/Textures/Objects/Devices/pda.rsi/Flashlight.png new file mode 100644 index 00000000000..286a6c32558 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/Flashlight.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index ba292e8165b..0bcd77197f3 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -28,6 +28,9 @@ { "name": "light_overlay" }, + { + "name": "Flashlight" + }, { "name": "pda" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-atmos.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-atmos.png index b1eb54fe6ba..c11ac55f916 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-atmos.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-atmos.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-bartender.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-bartender.png index c9348a7cf44..99d96082630 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-bartender.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-bartender.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-boxer.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-boxer.png index d1196362082..3f28498f70e 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-boxer.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-boxer.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmedic.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmedic.png index 684aaaac1fa..8a9d592e34d 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmedic.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-brigmedic.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-captain.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-captain.png index c9880c57a61..fb087ea099a 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-captain.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-captain.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-cargo.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-cargo.png index 8477ee86da8..945b5480f91 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-cargo.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-cargo.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-ce.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-ce.png index d1516cb24ae..821b72b6e74 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-ce.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-ce.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-centcom.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-centcom.png index 921a1610858..d64a6b1264b 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-centcom.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-centcom.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-chaplain.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-chaplain.png index a1695844b2a..2bc8a90a150 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-chaplain.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-chaplain.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-chemistry.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-chemistry.png index e8a4c7cec5d..6f5e5a2a7c8 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-chemistry.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-chemistry.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-clear.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-clear.png index 02de198e996..2dd5e151d3a 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-clear.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-clear.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-clown.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-clown.png index fd0b30f0b32..2e83a3700b6 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-clown.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-clown.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-cluwne.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-cluwne.png index e4873ee8b3a..522ffa9bbe3 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-cluwne.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-cluwne.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-cmo.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-cmo.png index 5d91356252c..4a686ad3710 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-cmo.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-cmo.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-cook.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-cook.png index ab7feeab4c1..aa986349e4e 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-cook.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-cook.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-detective.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-detective.png index 1e75195ec91..ef74ec0fdf4 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-detective.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-detective.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-engineer.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-engineer.png index 42e81c00529..6b42fd7a592 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-engineer.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-engineer.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-ert.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-ert.png index 4ac6961ee6f..080a77aa6a7 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-ert.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-ert.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-genetics.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-genetics.png index bce7b0f55fc..c0d80a56326 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-genetics.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-genetics.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-hop.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-hop.png index 05dca8a4499..62462cbb366 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-hop.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-hop.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-hos.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-hos.png index 3a6c5e6078f..02d6b4f4b83 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-hos.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-hos.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-hydro.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-hydro.png index 386ac64239d..6bc9a277ca0 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-hydro.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-hydro.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-interncadet.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-interncadet.png index 5a54b5f797c..849eada1aee 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-interncadet.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-interncadet.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-internmed.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-internmed.png index ffcc4fb151c..5781002e55d 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-internmed.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-internmed.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-internsci.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-internsci.png index 9f8b2557eb5..9976b0f70e4 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-internsci.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-internsci.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-internservice.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-internservice.png index 09de4c5fb71..2b13ad2bdca 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-internservice.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-internservice.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-interntech.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-interntech.png index 1da79e471d2..5bc7e449f75 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-interntech.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-interntech.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-janitor.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-janitor.png index 85405e4df53..f1fcc8fec85 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-janitor.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-janitor.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-lawyer.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-lawyer.png index d18a4d29110..41aa6aa6b82 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-lawyer.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-lawyer.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-library.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-library.png index 6e8ed2bdf22..a6789183bf3 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-library.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-library.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-medical.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-medical.png index 53ca842166b..d1f5991a7c7 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-medical.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-medical.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-mime.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-mime.png index 3aaa225257f..69fbcb29063 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-mime.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-mime.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-miner.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-miner.png index a5c7fb5b5e4..784f2440e07 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-miner.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-miner.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-musician.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-musician.png index cf5a5b7fca4..ea364882735 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-musician.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-musician.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-paramedic.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-paramedic.png index eed26c66a42..5ee3a8fe92d 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-paramedic.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-paramedic.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-pirate.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-pirate.png index f9408319a74..cf042d07384 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-pirate.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-pirate.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-qm.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-qm.png index 4b8ac99881b..0801dbac063 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-qm.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-qm.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-rd.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-rd.png index 1d84af29b71..ec21cf9f429 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-rd.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-rd.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-reporter.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-reporter.png index d932722546d..ce14facfc54 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-reporter.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-reporter.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-roboticist.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-roboticist.png index c8df94faf0e..00a2b6622fa 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-roboticist.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-roboticist.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-science.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-science.png index c7b103cf245..a5038ecf968 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-science.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-science.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-security.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-security.png index 0af0eafcce3..9b4d6d16271 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-security.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-security.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorengineer.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorengineer.png index 0635de35e39..a134b7dea7c 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorengineer.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorengineer.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorofficer.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorofficer.png index a6e7e6915e3..3dcca660158 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorofficer.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorofficer.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorresearcher.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorresearcher.png index aa6901f0da8..075ab1ddc6a 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorresearcher.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-seniorresearcher.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-agent.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-agent.png index 84fb47cc799..d70e40a443a 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-agent.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-agent.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi.png index 51fa1bd294e..183a20648eb 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-virology.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-virology.png index e259406b587..46d4471ff70 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-virology.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-virology.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-warden.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-warden.png index 0eff5886982..5bcd84eec7d 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-warden.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-warden.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-zookeeper.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-zookeeper.png index 2923bfff371..8b708cde472 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-zookeeper.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-zookeeper.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda.png b/Resources/Textures/Objects/Devices/pda.rsi/pda.png index 8473ddaab11..20f35791e07 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda.png differ diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-1.png index 3ba1ef740e4..bc4d9aab118 100644 Binary files a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-1.png and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-1.png differ diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-2.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-2.png index cce56e308c9..1ef4d7b2417 100644 Binary files a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-2.png and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-2.png differ diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-camera.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-camera.png index 9e780a026d2..1afaaac4a0d 100644 Binary files a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-camera.png and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-camera.png differ diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-1.png index ef06fec161b..8bf7d2f6a98 100644 Binary files a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-1.png and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-1.png differ diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-1.png index 50215597574..1280210529f 100644 Binary files a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-1.png and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-1.png differ diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-2.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-2.png index f85cb575f27..8864e1288b4 100644 Binary files a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-2.png and b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-2.png differ diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/meta.json b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/meta.json index 62875598087..c4902e5ba77 100644 --- a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy & EmoGarbage404 using assets taken from https://github.com/tgstation/tgstation at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae, airlocks, camera resprited by @mishutka09 & canister1 resprited by @dreamlyjack", + "copyright": "Made by Flareguy & EmoGarbage404 using assets taken from https://github.com/tgstation/tgstation at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png index 9e4c57c4722..8fbec3bd1b1 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png index 42dd5b78c5c..4f35aa448b4 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png index 319212cb1bf..7f20c8b1d67 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/glass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png index 46c54b70997..01a8e1d7020 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png index 0527d35073d..78ba2154536 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png index a2e98302a99..0271ca8d878 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/pglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png index 58d874f7502..1aa685a70e6 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png index fe0847de488..de6e0ca53f3 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png index c5662a6bf1e..a7c49b94666 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png index 37ce0bd4558..bbe31febb75 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png index a3f937dcdc7..c8c93af7512 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png index ebcf9408d0a..9e531d5f5c7 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/rpglass_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png index e7d3efcfa03..a783f72790c 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png index 83bfb1c35d0..7561e28b407 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png index 705e5bc7849..045d708bd7d 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/plasteel_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png index 2933c269bdd..ded877b7f27 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png index ae32ff2a299..ee7ce322e33 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png index b98e55106e8..1bd701b79a9 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png and b/Resources/Textures/Objects/Materials/Sheets/metal.rsi/steel_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json index 33eae42527e..dfed65a65b9 100644 --- a/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/Sheets/other.rsi/meta.json @@ -53,64 +53,13 @@ "directions": 4 }, { - "name": "plasma", - "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 - ] - ] - }, - { - "name": "plasma_2", - "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 - ] - ] - }, - { - "name": "plasma_3", - "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 - ] - ] + "name": "plasma" + }, + { + "name": "plasma_2" + }, + { + "name": "plasma_3" }, { "name": "plasma-inhand-left", diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png index b36df0f0055..8d66f70e0ea 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png index d4834ef28ae..9e48a750557 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png index ee05fa2cc99..08d6d20fda3 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plasma_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png index 9e7b52fdf7a..e24f0fa7b38 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png index 1512881de42..a84ceafdd54 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png index ab2e41e38ba..b50b5c70ce3 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/plastic_3.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png index ebd96a9b364..a619cd9162f 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_2.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_2.png index 3647e43e448..38b1cec3c86 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_2.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_2.png differ diff --git a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_3.png b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_3.png index f17d81859d3..759aae38e84 100644 Binary files a/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_3.png and b/Resources/Textures/Objects/Materials/Sheets/other.rsi/uranium_3.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold.png index fca33d19006..3c53d218a64 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/gold.png and b/Resources/Textures/Objects/Materials/ingots.rsi/gold.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png index 44d579ae17d..44d8088ec27 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png and b/Resources/Textures/Objects/Materials/ingots.rsi/gold_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png index f4c088b762d..0b879220099 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png and b/Resources/Textures/Objects/Materials/ingots.rsi/gold_3.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver.png index bff6acfa4fd..8c40fcc955e 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/silver.png and b/Resources/Textures/Objects/Materials/ingots.rsi/silver.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png index 880370e663f..58e667d428c 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png and b/Resources/Textures/Objects/Materials/ingots.rsi/silver_2.png differ diff --git a/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png b/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png index d5160c6ed26..85055a4adee 100644 Binary files a/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png and b/Resources/Textures/Objects/Materials/ingots.rsi/silver_3.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bananium.png b/Resources/Textures/Objects/Materials/materials.rsi/bananium.png index 3f2236c2032..842743696a1 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/bananium.png and b/Resources/Textures/Objects/Materials/materials.rsi/bananium.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bananium_1.png b/Resources/Textures/Objects/Materials/materials.rsi/bananium_1.png index 311911157f1..79956b33aee 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/bananium_1.png and b/Resources/Textures/Objects/Materials/materials.rsi/bananium_1.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth.png index a6e953c7072..d163c7f5641 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/cloth.png and b/Resources/Textures/Objects/Materials/materials.rsi/cloth.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png index cbaaa6cd7a0..87c6078a7a7 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png and b/Resources/Textures/Objects/Materials/materials.rsi/cloth_2.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png b/Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png index 5d2db38b704..e95dafe307e 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png and b/Resources/Textures/Objects/Materials/materials.rsi/cloth_3.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond.png index 8b39437d0ac..b896a94f1ef 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/diamond.png and b/Resources/Textures/Objects/Materials/materials.rsi/diamond.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png index 410d83f1c29..0ff9e1f79d9 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png and b/Resources/Textures/Objects/Materials/materials.rsi/diamond_2.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png b/Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png index 152da2befe8..8038210d748 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png and b/Resources/Textures/Objects/Materials/materials.rsi/diamond_3.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/wood.png b/Resources/Textures/Objects/Materials/materials.rsi/wood.png index 176d456ca7c..1d433b7fc41 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/wood.png and b/Resources/Textures/Objects/Materials/materials.rsi/wood.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/wood_2.png b/Resources/Textures/Objects/Materials/materials.rsi/wood_2.png index ce7c731f57a..732ade02dc7 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/wood_2.png and b/Resources/Textures/Objects/Materials/materials.rsi/wood_2.png differ diff --git a/Resources/Textures/Objects/Materials/materials.rsi/wood_3.png b/Resources/Textures/Objects/Materials/materials.rsi/wood_3.png index 9b5ba4ca3e8..c7a8a663615 100644 Binary files a/Resources/Textures/Objects/Materials/materials.rsi/wood_3.png and b/Resources/Textures/Objects/Materials/materials.rsi/wood_3.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods.png b/Resources/Textures/Objects/Materials/parts.rsi/rods.png index 9b88ebb9964..16e94057286 100644 Binary files a/Resources/Textures/Objects/Materials/parts.rsi/rods.png and b/Resources/Textures/Objects/Materials/parts.rsi/rods.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_2.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_2.png index f3a53194fd6..16e94057286 100644 Binary files a/Resources/Textures/Objects/Materials/parts.rsi/rods_2.png and b/Resources/Textures/Objects/Materials/parts.rsi/rods_2.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png index eef57cbfe9d..fcceebd0fa3 100644 Binary files a/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png and b/Resources/Textures/Objects/Materials/parts.rsi/rods_3.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_4.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_4.png index 3ac8d6bb16a..fcceebd0fa3 100644 Binary files a/Resources/Textures/Objects/Materials/parts.rsi/rods_4.png and b/Resources/Textures/Objects/Materials/parts.rsi/rods_4.png differ diff --git a/Resources/Textures/Objects/Materials/parts.rsi/rods_5.png b/Resources/Textures/Objects/Materials/parts.rsi/rods_5.png index ea5f8ea4eac..4294e116e4b 100644 Binary files a/Resources/Textures/Objects/Materials/parts.rsi/rods_5.png and b/Resources/Textures/Objects/Materials/parts.rsi/rods_5.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/cap_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/cap_label.png new file mode 100644 index 00000000000..de07fb23ae3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/cap_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/cargo_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/cargo_label.png new file mode 100644 index 00000000000..cdf8b2645ad Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/cargo_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/ce_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/ce_label.png new file mode 100644 index 00000000000..1f9b4ba487e Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/ce_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/cmo_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/cmo_label.png new file mode 100644 index 00000000000..559f070bb75 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/cmo_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/com_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/com_label.png new file mode 100644 index 00000000000..de07fb23ae3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/com_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/common_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/common_label.png new file mode 100644 index 00000000000..a525a8057f3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/common_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_blue.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_blue.png new file mode 100644 index 00000000000..1319d756d02 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_blue.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_gold.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_gold.png new file mode 100644 index 00000000000..1aac6e69677 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_gold.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_gray.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_gray.png new file mode 100644 index 00000000000..53440780b9d Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_gray.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_orange.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_orange.png new file mode 100644 index 00000000000..78430d9769d Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_orange.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_red.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_red.png new file mode 100644 index 00000000000..5425fc02e60 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_red.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_rusted.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_rusted.png new file mode 100644 index 00000000000..c6cf5993d5c Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_rusted.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_silver.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_silver.png new file mode 100644 index 00000000000..11ce047d199 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/crypt_silver.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/eng_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/eng_label.png new file mode 100644 index 00000000000..1f9b4ba487e Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/eng_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/hop_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/hop_label.png new file mode 100644 index 00000000000..de07fb23ae3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/hop_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/hos_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/hos_label.png new file mode 100644 index 00000000000..bc5788bbf98 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/hos_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/med_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/med_label.png new file mode 100644 index 00000000000..559f070bb75 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/med_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/medsci_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/medsci_label.png new file mode 100644 index 00000000000..a3d2ba6a34b Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/medsci_label.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/Objects/Misc/encryption_keys.rsi/meta.json similarity index 69% rename from Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json rename to Resources/Textures/Objects/Misc/encryption_keys.rsi/meta.json index 62e47be4ba3..31375dbb64f 100644 --- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/encryption_keys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba, crypt states modified by Flareguy for Space Station 14", + "copyright": "Kapusha", "size": { "x": 32, "y": 32 @@ -34,8 +34,6 @@ {"name": "sci_label"}, {"name": "sec_label"}, {"name": "service_label"}, - {"name": "synd_label"}, - {"name": "borg_label"}, - {"name": "ai_label"} + {"name": "synd_label"} ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/miner_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/miner_label.png new file mode 100644 index 00000000000..cdf8b2645ad Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/miner_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/nano_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/nano_label.png new file mode 100644 index 00000000000..de07fb23ae3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/nano_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/pirate_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/pirate_label.png new file mode 100644 index 00000000000..e1f1237f3f2 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/pirate_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/qm_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/qm_label.png new file mode 100644 index 00000000000..cdf8b2645ad Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/qm_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/rd_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/rd_label.png new file mode 100644 index 00000000000..9f688f8e73c Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/rd_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/robotics_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/robotics_label.png new file mode 100644 index 00000000000..9f688f8e73c Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/robotics_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/sci_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/sci_label.png new file mode 100644 index 00000000000..9f688f8e73c Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/sci_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/sec_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/sec_label.png new file mode 100644 index 00000000000..bc5788bbf98 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/sec_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/service_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/service_label.png new file mode 100644 index 00000000000..8c408db86f1 Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/service_label.png differ diff --git a/Resources/Textures/Objects/Misc/encryption_keys.rsi/synd_label.png b/Resources/Textures/Objects/Misc/encryption_keys.rsi/synd_label.png new file mode 100644 index 00000000000..f5f2f5d55be Binary files /dev/null and b/Resources/Textures/Objects/Misc/encryption_keys.rsi/synd_label.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/black.png b/Resources/Textures/Objects/Misc/id_cards.rsi/black.png new file mode 100644 index 00000000000..20396d849e4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/black.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png index ff1e293183c..710808e986f 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/Objects/Misc/id_cards.rsi/default.png index 95b3d54c270..ba18a825c54 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/default.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/default.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png index 624bb4864db..e32b6ade7f7 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_chaplain.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png index d9c8b6e261d..aa0beb7a186 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png index a7c8b683556..73d8d796aa7 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png index afbe56e5f0d..78ec726f6a6 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png index 6fe2ce6698f..7e47345120c 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png index 6bb3134b557..3bdbcf25ad9 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png b/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png index bb20387315c..6112c3ab39e 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/gold.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png index 3bd5446a3bc..133f488d72d 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idatmospherictechnician.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png index 435ea39ad6a..0d2abf4a553 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png index f5dfdb86629..b7c45823271 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png index 0c2b5298e5f..51c324e5a3a 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png index 1f64eb4845a..fb7b9cb850b 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png index e59e7c3d042..c1c2ccd5ed8 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png index cfa0a35dcc5..76dfe3b3c31 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png index 25b7017a708..ad55af7cb2a 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png index e10e3c82a6e..5b899bd1354 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png index 2dba29c2060..84e11b2a84b 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png index f105b4f88ad..82511378128 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png index 82a608a9a1a..aa8f35a83a9 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png index e0372020448..8d29730bbb8 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png index d57a7e3d416..5c96d2e5243 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcluwne.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png index 09527688a46..b250c757ca7 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png index cd01dc77702..08f07eb0fd5 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png index 3b749d582a5..e5cb3d81b5d 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png index 1303135aa5a..7faa82baeff 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png index be72e37e574..0c22abb56ca 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png index bb03adc665c..75508fd90b2 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idiaa.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idiaa.png index 227b197d74a..179b98e04e3 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idiaa.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idiaa.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png index cebf46fade2..4d5342d32e2 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png index 15c7cde5e86..0fcfea3f072 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png index de676944766..4f4011b16dd 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png index 72d4cd44d38..17ab3332020 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png index f7ed302b23a..c5b665fe7f1 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png index 320c3885e7e..fbbd7eee0b3 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png index b86f437aee1..4cafb8881b5 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idlawyer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png index 9e390bb606f..aa8f35a83a9 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png index b917612dae2..69c91ed96bf 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png index b51dfaaab8e..9bd95422fcd 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png index 1881839e965..90fbfba2f00 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png index 88866eb1693..4fad194ad58 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png index f9337a37c53..3ef07299921 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png index 038a5321d4b..3816fa807de 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png index bfdd0678724..c3b0352b611 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png index e4ea4f95882..6d0cd19c840 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png index fdb1fd2648b..e8b22836dd5 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png index a9d6c5facd5..5c3420a90cf 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png index 893346a9c90..7faa82baeff 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png index 6456d644396..75508fd90b2 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idsecurityofficer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png index 73c8b6d00fe..a7950e56eec 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png index f3a87d6fa4b..4fe3579dfc0 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png index 2d00cf7a164..d7842a5bd4e 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png index 47a2ccb7485..63d3ffd3641 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idseniorresearcher.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png index c232dd439d4..f3fdff96c10 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png index 2e046fbacdd..5645d0feeed 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idstationengineer.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png index bc792fe1a17..5dab993141a 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idunknown.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png index 1d4b2f2d474..2657b5859be 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png index 0b4086478ca..0f90f96bdd1 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png index aa82cb3cb63..71fe1367cb9 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index f79fb2f7dbe..0836641fd34 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -187,6 +187,9 @@ { "name": "pirate" }, + { + "name": "black" + }, { "name": "prisoner_001" }, diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png index a44da608ec0..3136ac9d42a 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png b/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png index d5670a71aa1..5f2e74fcf8a 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png b/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png index b13153a246e..16d324a55cc 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/silver.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png index 3d5cc6e384f..d6f12ba513a 100644 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png index 83e91597166..c8085489251 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png index cfa19a007aa..6d03ed6734b 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png index 7456850c08f..de28bd55339 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png index 796eaf83b05..9d3c6ea0646 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png index 3fe117f2ac6..cd15a2a8a95 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png index 59919b85855..7bdf1e72614 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png index 0bab485fa95..c48f58a970b 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png index e0e563022ab..392c5373dae 100644 Binary files a/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png and b/Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png differ diff --git a/Resources/Textures/Parallaxes/layer1.png b/Resources/Textures/Parallaxes/layer1.png index c5f7954630d..f91bec80cfc 100644 Binary files a/Resources/Textures/Parallaxes/layer1.png and b/Resources/Textures/Parallaxes/layer1.png differ diff --git a/Resources/Textures/Parallaxes/meta.json b/Resources/Textures/Parallaxes/meta.json index cacbbf26596..019d0a1ef6b 100644 --- a/Resources/Textures/Parallaxes/meta.json +++ b/Resources/Textures/Parallaxes/meta.json @@ -3,8 +3,8 @@ "license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/blob/master/icons/effects/parallax.dmi.", "size": { - "x": 480, - "y": 480 + "x": 3000, + "y": 3000 }, "states": [ { diff --git a/Resources/Textures/Parallaxes/space_map2.png b/Resources/Textures/Parallaxes/space_map2.png index d4e69b6a5b5..163d3b7afb1 100644 Binary files a/Resources/Textures/Parallaxes/space_map2.png and b/Resources/Textures/Parallaxes/space_map2.png differ diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire.png b/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire.png index 81418d83ee0..40fa8d36769 100644 Binary files a/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire.png and b/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire.png differ diff --git a/Resources/Textures/Structures/Power/Generation/rtg.rsi/rtg.png b/Resources/Textures/Structures/Power/Generation/rtg.rsi/rtg.png index 729694de2fa..8afeae048f9 100644 Binary files a/Resources/Textures/Structures/Power/Generation/rtg.rsi/rtg.png and b/Resources/Textures/Structures/Power/Generation/rtg.rsi/rtg.png differ diff --git a/Resources/Textures/Tiles/steel.png b/Resources/Textures/Tiles/steel.png index c807baa338b..0e2d0676869 100644 Binary files a/Resources/Textures/Tiles/steel.png and b/Resources/Textures/Tiles/steel.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/AngelCry.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/AngelCry.rsi/icon.png new file mode 100644 index 00000000000..67736db691c Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/AngelCry.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/AngelCry.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/AngelCry.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/AngelCry.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/AtmoJoy.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/AtmoJoy.rsi/icon.png new file mode 100644 index 00000000000..3406c753444 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/AtmoJoy.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/AtmoJoy.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/AtmoJoy.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/AtmoJoy.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/BestHealing.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BestHealing.rsi/icon.png new file mode 100644 index 00000000000..97017e60f8c Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BestHealing.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/BestHealing.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BestHealing.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BestHealing.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/BiomassDrink.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BiomassDrink.rsi/icon.png new file mode 100644 index 00000000000..f5fe4e7d48f Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BiomassDrink.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/BiomassDrink.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BiomassDrink.rsi/meta.json new file mode 100644 index 00000000000..73a9407d60a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BiomassDrink.rsi/meta.json @@ -0,0 +1,7 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Made by biomass for DetlaV - Stray", +"states": +[ + { + "name": "icon", "delays": [[10.0, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]] + } +]} diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/BosTea.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BosTea.rsi/icon.png new file mode 100644 index 00000000000..47f259315df Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BosTea.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/BosTea.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BosTea.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BosTea.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/BurningBlood.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BurningBlood.rsi/icon.png new file mode 100644 index 00000000000..b46f2d82857 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BurningBlood.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/BurningBlood.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BurningBlood.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/BurningBlood.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/Creator.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/Creator.rsi/icon.png new file mode 100644 index 00000000000..ac7f7a0583f Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/Creator.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/Creator.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/Creator.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/Creator.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/DeadJonnyCoktail.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/DeadJonnyCoktail.rsi/icon.png new file mode 100644 index 00000000000..d7bd44fdbb6 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/DeadJonnyCoktail.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/DeadJonnyCoktail.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/DeadJonnyCoktail.rsi/meta.json new file mode 100644 index 00000000000..4c7e0943eed --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/DeadJonnyCoktail.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[0.5, 0.5, 0.5, 0.5]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/Empt.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/Empt.rsi/icon.png new file mode 100644 index 00000000000..40cf436ceed Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/Empt.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/Empt.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/Empt.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/Empt.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/FireMix.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/FireMix.rsi/icon.png new file mode 100644 index 00000000000..44e0cc2349a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/FireMix.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/FireMix.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/FireMix.rsi/meta.json new file mode 100644 index 00000000000..19dced2aee4 --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/FireMix.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[0.1, 0.1, 0.1, 0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/GermanSmuzi.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/GermanSmuzi.rsi/icon.png new file mode 100644 index 00000000000..87bd0f292ba Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/GermanSmuzi.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/GermanSmuzi.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/GermanSmuzi.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/GermanSmuzi.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/HappySumrak.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/HappySumrak.rsi/icon.png new file mode 100644 index 00000000000..0681424f5f3 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/HappySumrak.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/HappySumrak.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/HappySumrak.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/HappySumrak.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/HeadAcce.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/HeadAcce.rsi/icon.png new file mode 100644 index 00000000000..fa8d1890385 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/HeadAcce.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/HeadAcce.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/HeadAcce.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/HeadAcce.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/IchorNast.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/IchorNast.rsi/icon.png new file mode 100644 index 00000000000..cf9d05f0cf1 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/IchorNast.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/IchorNast.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/IchorNast.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/IchorNast.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/LiquidSilic.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/LiquidSilic.rsi/icon.png new file mode 100644 index 00000000000..75aa40141d2 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/LiquidSilic.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/LiquidSilic.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/LiquidSilic.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/LiquidSilic.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/MilkedGreenTea.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/MilkedGreenTea.rsi/icon.png new file mode 100644 index 00000000000..30fc1e8c3a4 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/MilkedGreenTea.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/MilkedGreenTea.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/MilkedGreenTea.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/MilkedGreenTea.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/MushroonNast.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/MushroonNast.rsi/icon.png new file mode 100644 index 00000000000..9486600dcd5 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/MushroonNast.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/MushroonNast.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/MushroonNast.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/MushroonNast.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/OldNavar.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/OldNavar.rsi/icon.png new file mode 100644 index 00000000000..3928590b01a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/OldNavar.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/OldNavar.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/OldNavar.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/OldNavar.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/PoisonedVoodka.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/PoisonedVoodka.rsi/icon.png new file mode 100644 index 00000000000..1aae77197ad Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/PoisonedVoodka.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/PoisonedVoodka.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/PoisonedVoodka.rsi/meta.json new file mode 100644 index 00000000000..19dced2aee4 --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/PoisonedVoodka.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[0.1, 0.1, 0.1, 0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/Sidr.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/Sidr.rsi/icon.png new file mode 100644 index 00000000000..fc15e228569 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/Sidr.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/Sidr.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/Sidr.rsi/meta.json new file mode 100644 index 00000000000..882bbbda620 --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/Sidr.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "DeltaV - Stray made by ne_takumi", "states": [{"name": "icon"}]} diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/SlimeTea.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/SlimeTea.rsi/icon.png new file mode 100644 index 00000000000..d82d71799f5 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/SlimeTea.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/SlimeTea.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/SlimeTea.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/SlimeTea.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/SmileTea.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/SmileTea.rsi/icon.png new file mode 100644 index 00000000000..f56c1e13f74 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/SmileTea.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/SmileTea.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/SmileTea.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/SmileTea.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/annasgift.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/annasgift.rsi/icon.png new file mode 100644 index 00000000000..03d7937a8b6 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/annasgift.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/annasgift.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/annasgift.rsi/meta.json new file mode 100644 index 00000000000..cdf4ccb31ea --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/annasgift.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0, 0.1, 0.1, 0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/bomba.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/bomba.rsi/icon.png new file mode 100644 index 00000000000..8b9a7d98886 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/bomba.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/bomba.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/bomba.rsi/meta.json new file mode 100644 index 00000000000..19dced2aee4 --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/bomba.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[0.1, 0.1, 0.1, 0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/deadgoblin.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/deadgoblin.rsi/icon.png new file mode 100644 index 00000000000..0eed56978dc Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/deadgoblin.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/deadgoblin.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/deadgoblin.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/deadgoblin.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/dilovenEater.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/dilovenEater.rsi/icon.png new file mode 100644 index 00000000000..c57e1362b01 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/dilovenEater.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/dilovenEater.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/dilovenEater.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/dilovenEater.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/gayach.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/gayach.rsi/icon.png new file mode 100644 index 00000000000..da99cf1d3ea Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/gayach.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/gayach.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/gayach.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/gayach.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/injir.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/injir.rsi/icon.png new file mode 100644 index 00000000000..b66def65c61 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/injir.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/injir.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/injir.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/injir.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/myusuo.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/myusuo.rsi/icon.png new file mode 100644 index 00000000000..d683927f041 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/myusuo.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/myusuo.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/myusuo.rsi/meta.json new file mode 100644 index 00000000000..20fbfa5ba8a --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/myusuo.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[10.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/opresn.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/opresn.rsi/icon.png new file mode 100644 index 00000000000..7615621fe10 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/opresn.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/opresn.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/opresn.rsi/meta.json new file mode 100644 index 00000000000..293f7f97b0f --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/opresn.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[1.0, 1.0, 1.0, 1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/sbivatelsnog.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/sbivatelsnog.rsi/icon.png new file mode 100644 index 00000000000..0014230053e Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/sbivatelsnog.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/sbivatelsnog.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/sbivatelsnog.rsi/meta.json new file mode 100644 index 00000000000..293f7f97b0f --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/sbivatelsnog.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[1.0, 1.0, 1.0, 1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/singulozam.rsi/icon.png b/Resources/Textures/_Silver/Objects/Consumable/Drinks/singulozam.rsi/icon.png new file mode 100644 index 00000000000..11f8ae50041 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Consumable/Drinks/singulozam.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Consumable/Drinks/singulozam.rsi/meta.json b/Resources/Textures/_Silver/Objects/Consumable/Drinks/singulozam.rsi/meta.json new file mode 100644 index 00000000000..293f7f97b0f --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Consumable/Drinks/singulozam.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[1.0, 1.0, 1.0, 1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/Flashlight.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/Flashlight.png new file mode 100644 index 00000000000..286a6c32558 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/Flashlight.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/equipped-BELT.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/equipped-BELT.png new file mode 100644 index 00000000000..6901e6c33b1 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/equipped-IDCARD.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/equipped-IDCARD.png new file mode 100644 index 00000000000..6901e6c33b1 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/equipped-IDCARD.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/id_overlay.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/id_overlay.png new file mode 100644 index 00000000000..3f5d310e703 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/id_overlay.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/inhand-left.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/inhand-left.png new file mode 100644 index 00000000000..12b784f81e8 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/inhand-right.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/inhand-right.png new file mode 100644 index 00000000000..6919215bcf5 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/insert_overlay.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/insert_overlay.png new file mode 100644 index 00000000000..61ba781c1ff Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/insert_overlay.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/light_overlay.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/light_overlay.png new file mode 100644 index 00000000000..286a6c32558 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/light_overlay.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/meta.json new file mode 100644 index 00000000000..0bda7ba261b --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/meta.json @@ -0,0 +1,237 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14 | pda-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord), pda-pirate made by brainfood1183 (Github), pda-syndi-agent drawn by Ubaser", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "id_overlay" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "insert_overlay" + }, + { + "name": "light_overlay" + }, + { + "name": "Flashlight" + }, + { + "name": "pda" + }, + { + "name": "pda-atmos" + }, + { + "name": "pda-bartender" + }, + { + "name": "pda-boxer" + }, + { + "name": "pda-captain" + }, + { + "name": "pda-cargo" + }, + { + "name": "pda-ce" + }, + { + "name": "pda-chaplain" + }, + { + "name": "pda-chemistry" + }, + { + "name": "pda-clear" + }, + { + "name": "pda-clown" + }, + { + "name": "pda-cmo" + }, + { + "name": "pda-cook" + }, + { + "name": "pda-detective" + }, + { + "name": "pda-engineer" + }, + { + "name": "pda-genetics" + }, + { + "name": "pda-hop" + }, + { + "name": "pda-hos" + }, + { + "name": "pda-hydro" + }, + { + "name": "pda-janitor" + }, + { + "name": "pda-lawyer" + }, + { + "name": "pda-library", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "pda-medical" + }, + { + "name": "pda-paramedic" + }, + { + "name": "pda-mime" + }, + { + "name": "pda-miner" + }, + { + "name": "pda-pirate" + }, + { + "name": "pda-qm" + }, + { + "name": "pda-r", + "delays": [ + [ + 0.8, + 0.8 + ] + ] + }, + { + "name": "pda-r-library", + "delays": [ + [ + 0.8, + 0.8 + ] + ] + }, + { + "name": "pda-rd" + }, + { + "name": "pda-roboticist" + }, + { + "name": "pda-science" + }, + { + "name": "pda-security" + }, + { + "name": "pda-brigmedic", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "pda-syndi" + }, + { + "name": "pda-syndi-agent" + }, + { + "name": "pda-centcom", + "delays": [ + [ + 1.2, + 1.2, + 1.2, + 1.2 + ] + ] + }, + { + "name": "pda-virology" + }, + { + "name": "pda-warden" + }, + { + "name": "pda-musician" + }, + { + "name": "pda-reporter" + }, + { + "name": "pda-interncadet" + }, + { + "name": "pda-internmed" + }, + { + "name": "pda-internsci" + }, + { + "name": "pda-internservice" + }, + { + "name": "pda-interntech" + }, + { + "name": "pda-zookeeper" + }, + { + "name": "pda-ert" + }, + { + "name": "pda-cluwne" + }, + { + "name": "pda-seniorengineer" + }, + { + "name": "pda-seniorresearcher" + }, + { + "name": "pda-seniorphysician" + }, + { + "name": "pda-seniorofficer" + }, + { + "name": "equipped-IDCARD", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-atmos.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-atmos.png new file mode 100644 index 00000000000..c11ac55f916 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-atmos.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-bartender.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-bartender.png new file mode 100644 index 00000000000..99d96082630 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-bartender.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-boxer.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-boxer.png new file mode 100644 index 00000000000..3f28498f70e Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-boxer.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-brigmedic.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-brigmedic.png new file mode 100644 index 00000000000..8a9d592e34d Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-brigmedic.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-captain.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-captain.png new file mode 100644 index 00000000000..fb087ea099a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-captain.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-cargo.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-cargo.png new file mode 100644 index 00000000000..945b5480f91 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-cargo.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-ce.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-ce.png new file mode 100644 index 00000000000..821b72b6e74 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-ce.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-centcom.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-centcom.png new file mode 100644 index 00000000000..d64a6b1264b Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-centcom.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-chaplain.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-chaplain.png new file mode 100644 index 00000000000..2bc8a90a150 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-chaplain.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-chemistry.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-chemistry.png new file mode 100644 index 00000000000..6f5e5a2a7c8 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-chemistry.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-clear.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-clear.png new file mode 100644 index 00000000000..2dd5e151d3a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-clear.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-clown.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-clown.png new file mode 100644 index 00000000000..2e83a3700b6 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-clown.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-cluwne.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-cluwne.png new file mode 100644 index 00000000000..522ffa9bbe3 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-cluwne.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-cmo.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-cmo.png new file mode 100644 index 00000000000..4a686ad3710 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-cmo.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-cook.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-cook.png new file mode 100644 index 00000000000..aa986349e4e Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-cook.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-detective.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-detective.png new file mode 100644 index 00000000000..ef74ec0fdf4 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-detective.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-engineer.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-engineer.png new file mode 100644 index 00000000000..6b42fd7a592 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-engineer.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-ert.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-ert.png new file mode 100644 index 00000000000..080a77aa6a7 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-ert.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-genetics.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-genetics.png new file mode 100644 index 00000000000..c0d80a56326 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-genetics.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-hop.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-hop.png new file mode 100644 index 00000000000..62462cbb366 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-hop.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-hos.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-hos.png new file mode 100644 index 00000000000..02d6b4f4b83 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-hos.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-hydro.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-hydro.png new file mode 100644 index 00000000000..6bc9a277ca0 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-hydro.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-interncadet.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-interncadet.png new file mode 100644 index 00000000000..849eada1aee Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-interncadet.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-internmed.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-internmed.png new file mode 100644 index 00000000000..5781002e55d Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-internmed.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-internsci.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-internsci.png new file mode 100644 index 00000000000..9976b0f70e4 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-internsci.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-internservice.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-internservice.png new file mode 100644 index 00000000000..2b13ad2bdca Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-internservice.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-interntech.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-interntech.png new file mode 100644 index 00000000000..5bc7e449f75 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-interntech.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-janitor.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-janitor.png new file mode 100644 index 00000000000..f1fcc8fec85 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-janitor.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-lawyer.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-lawyer.png new file mode 100644 index 00000000000..41aa6aa6b82 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-lawyer.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-library.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-library.png new file mode 100644 index 00000000000..a6789183bf3 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-library.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-medical.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-medical.png new file mode 100644 index 00000000000..d1f5991a7c7 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-medical.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-mime.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-mime.png new file mode 100644 index 00000000000..69fbcb29063 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-mime.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-miner.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-miner.png new file mode 100644 index 00000000000..784f2440e07 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-miner.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-musician.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-musician.png new file mode 100644 index 00000000000..ea364882735 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-musician.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-paramedic.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-paramedic.png new file mode 100644 index 00000000000..5ee3a8fe92d Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-paramedic.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-pirate.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-pirate.png new file mode 100644 index 00000000000..cf042d07384 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-pirate.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-qm.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-qm.png new file mode 100644 index 00000000000..0801dbac063 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-qm.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-r-library.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-r-library.png new file mode 100644 index 00000000000..4d36793ed97 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-r-library.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-r.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-r.png new file mode 100644 index 00000000000..b6b37bfc7ba Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-r.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-rd.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-rd.png new file mode 100644 index 00000000000..ec21cf9f429 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-rd.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-reporter.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-reporter.png new file mode 100644 index 00000000000..ce14facfc54 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-reporter.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-roboticist.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-roboticist.png new file mode 100644 index 00000000000..00a2b6622fa Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-roboticist.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-science.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-science.png new file mode 100644 index 00000000000..a5038ecf968 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-science.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-security.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-security.png new file mode 100644 index 00000000000..9b4d6d16271 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-security.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-seniorengineer.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-seniorengineer.png new file mode 100644 index 00000000000..a134b7dea7c Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-seniorengineer.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-seniorofficer.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-seniorofficer.png new file mode 100644 index 00000000000..3dcca660158 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-seniorofficer.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-seniorphysician.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-seniorphysician.png new file mode 100644 index 00000000000..b3e5debb3ff Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-seniorphysician.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-seniorresearcher.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-seniorresearcher.png new file mode 100644 index 00000000000..075ab1ddc6a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-seniorresearcher.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-syndi-agent.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-syndi-agent.png new file mode 100644 index 00000000000..d70e40a443a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-syndi-agent.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-syndi.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-syndi.png new file mode 100644 index 00000000000..183a20648eb Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-syndi.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-virology.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-virology.png new file mode 100644 index 00000000000..46d4471ff70 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-virology.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-warden.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-warden.png new file mode 100644 index 00000000000..5bcd84eec7d Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-warden.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-zookeeper.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-zookeeper.png new file mode 100644 index 00000000000..8b708cde472 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda-zookeeper.png differ diff --git a/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda.png b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda.png new file mode 100644 index 00000000000..20f35791e07 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Devices/pda.rsi/pda.png differ diff --git a/Resources/Textures/_Silver/Objects/Fun/toys.rsi/destroyer.png b/Resources/Textures/_Silver/Objects/Fun/toys.rsi/destroyer.png new file mode 100644 index 00000000000..def0b8a5b18 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Fun/toys.rsi/destroyer.png differ diff --git a/Resources/Textures/_Silver/Objects/Fun/toys.rsi/goose.png b/Resources/Textures/_Silver/Objects/Fun/toys.rsi/goose.png new file mode 100644 index 00000000000..def0b8a5b18 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Fun/toys.rsi/goose.png differ diff --git a/Resources/Textures/_Silver/Objects/Fun/toys.rsi/lamp.png b/Resources/Textures/_Silver/Objects/Fun/toys.rsi/lamp.png new file mode 100644 index 00000000000..e561e31921e Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Fun/toys.rsi/lamp.png differ diff --git a/Resources/Textures/_Silver/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_Silver/Objects/Fun/toys.rsi/meta.json new file mode 100644 index 00000000000..f73461d9e1b --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Fun/toys.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "lamp" + }, + { + "name": "niko" + }, + { + "name": "goose" + }, + { + "name": "destroyer" + } + ] +} diff --git a/Resources/Textures/_Silver/Objects/Fun/toys.rsi/niko.png b/Resources/Textures/_Silver/Objects/Fun/toys.rsi/niko.png new file mode 100644 index 00000000000..7fbeda5fa3f Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Fun/toys.rsi/niko.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/admin.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/admin.png new file mode 100644 index 00000000000..99ca993b0b8 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/admin.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/black.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/black.png new file mode 100644 index 00000000000..20396d849e4 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/black.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/blue-inhand-left.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/blue-inhand-left.png new file mode 100644 index 00000000000..9adcd4b6a3c Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/blue-inhand-left.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/blue-inhand-right.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/blue-inhand-right.png new file mode 100644 index 00000000000..394cc79b274 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/blue-inhand-right.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/centcom.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/centcom.png new file mode 100644 index 00000000000..710808e986f Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/centcom.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/default-inhand-left.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/default-inhand-left.png new file mode 100644 index 00000000000..f7848f63f6a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/default-inhand-left.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/default-inhand-right.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/default-inhand-right.png new file mode 100644 index 00000000000..82b5598806d Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/default-inhand-right.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/default.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/default.png new file mode 100644 index 00000000000..ba18a825c54 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/default.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_chaplain.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_chaplain.png new file mode 100644 index 00000000000..e32b6ade7f7 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_chaplain.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_commander.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_commander.png new file mode 100644 index 00000000000..aa0beb7a186 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_commander.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_engineer.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_engineer.png new file mode 100644 index 00000000000..73d8d796aa7 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_engineer.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_janitor.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_janitor.png new file mode 100644 index 00000000000..78ec726f6a6 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_janitor.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_medic.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_medic.png new file mode 100644 index 00000000000..7e47345120c Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_medic.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_security.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_security.png new file mode 100644 index 00000000000..3bdbcf25ad9 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/ert_security.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/gold-inhand-left.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/gold-inhand-left.png new file mode 100644 index 00000000000..65957acdfbb Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/gold-inhand-left.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/gold-inhand-right.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/gold-inhand-right.png new file mode 100644 index 00000000000..96cdf6d4251 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/gold-inhand-right.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/gold.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/gold.png new file mode 100644 index 00000000000..6112c3ab39e Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/gold.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/green-inhand-left.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/green-inhand-left.png new file mode 100644 index 00000000000..958c3ba056d Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/green-inhand-left.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/green-inhand-right.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/green-inhand-right.png new file mode 100644 index 00000000000..218d68ef5f8 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/green-inhand-right.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idadmin.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idadmin.png new file mode 100644 index 00000000000..3705c6bf4e9 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idadmin.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idatmospherictechnician.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idatmospherictechnician.png new file mode 100644 index 00000000000..133f488d72d Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idatmospherictechnician.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idbartender.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idbartender.png new file mode 100644 index 00000000000..0d2abf4a553 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idbartender.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idbotanist.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idbotanist.png new file mode 100644 index 00000000000..b7c45823271 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idbotanist.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idboxer.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idboxer.png new file mode 100644 index 00000000000..51c324e5a3a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idboxer.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idbrigmedic.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idbrigmedic.png new file mode 100644 index 00000000000..fb7b9cb850b Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idbrigmedic.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcaptain.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcaptain.png new file mode 100644 index 00000000000..c1c2ccd5ed8 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcaptain.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcargotechnician.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcargotechnician.png new file mode 100644 index 00000000000..76dfe3b3c31 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcargotechnician.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcentcom.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcentcom.png new file mode 100644 index 00000000000..ad55af7cb2a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcentcom.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idchaplain.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idchaplain.png new file mode 100644 index 00000000000..5b899bd1354 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idchaplain.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idchemist.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idchemist.png new file mode 100644 index 00000000000..84e11b2a84b Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idchemist.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idchiefengineer.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idchiefengineer.png new file mode 100644 index 00000000000..82511378128 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idchiefengineer.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png new file mode 100644 index 00000000000..aa8f35a83a9 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idclown.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idclown.png new file mode 100644 index 00000000000..8d29730bbb8 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idclown.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcluwne.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcluwne.png new file mode 100644 index 00000000000..5c96d2e5243 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcluwne.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcook.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcook.png new file mode 100644 index 00000000000..b250c757ca7 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcook.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcurator.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcurator.png new file mode 100644 index 00000000000..08f07eb0fd5 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idcurator.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/iddetective.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/iddetective.png new file mode 100644 index 00000000000..e5cb3d81b5d Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/iddetective.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idgeneticist.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idgeneticist.png new file mode 100644 index 00000000000..7faa82baeff Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idgeneticist.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idheadofpersonnel.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idheadofpersonnel.png new file mode 100644 index 00000000000..0c22abb56ca Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idheadofpersonnel.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idheadofsecurity.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idheadofsecurity.png new file mode 100644 index 00000000000..75508fd90b2 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idheadofsecurity.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idiaa.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idiaa.png new file mode 100644 index 00000000000..179b98e04e3 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idiaa.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-cadet.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-cadet.png new file mode 100644 index 00000000000..4d5342d32e2 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-cadet.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-med.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-med.png new file mode 100644 index 00000000000..0fcfea3f072 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-med.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-sci.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-sci.png new file mode 100644 index 00000000000..4f4011b16dd Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-sci.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-service.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-service.png new file mode 100644 index 00000000000..17ab3332020 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-service.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-tech.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-tech.png new file mode 100644 index 00000000000..c5b665fe7f1 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idintern-tech.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idjanitor.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idjanitor.png new file mode 100644 index 00000000000..fbbd7eee0b3 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idjanitor.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idlawyer.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idlawyer.png new file mode 100644 index 00000000000..4cafb8881b5 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idlawyer.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idmedicaldoctor.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idmedicaldoctor.png new file mode 100644 index 00000000000..aa8f35a83a9 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idmedicaldoctor.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idmime.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idmime.png new file mode 100644 index 00000000000..69c91ed96bf Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idmime.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idmusician.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idmusician.png new file mode 100644 index 00000000000..9bd95422fcd Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idmusician.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idparamedic.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idparamedic.png new file mode 100644 index 00000000000..90fbfba2f00 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idparamedic.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idpassenger.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idpassenger.png new file mode 100644 index 00000000000..4fad194ad58 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idpassenger.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idpilot.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idpilot.png new file mode 100644 index 00000000000..9d3df6be641 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idpilot.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idprisoner.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idprisoner.png new file mode 100644 index 00000000000..3ef07299921 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idprisoner.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idpsychologist.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idpsychologist.png new file mode 100644 index 00000000000..3816fa807de Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idpsychologist.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idquartermaster.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idquartermaster.png new file mode 100644 index 00000000000..c3b0352b611 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idquartermaster.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idreporter.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idreporter.png new file mode 100644 index 00000000000..6d0cd19c840 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idreporter.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idresearchdirector.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idresearchdirector.png new file mode 100644 index 00000000000..e8b22836dd5 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idresearchdirector.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idroboticist.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idroboticist.png new file mode 100644 index 00000000000..5c3420a90cf Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idroboticist.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idscientist.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idscientist.png new file mode 100644 index 00000000000..7faa82baeff Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idscientist.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idsecurityofficer.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idsecurityofficer.png new file mode 100644 index 00000000000..75508fd90b2 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idsecurityofficer.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idseniorengineer.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idseniorengineer.png new file mode 100644 index 00000000000..a7950e56eec Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idseniorengineer.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idseniorofficer.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idseniorofficer.png new file mode 100644 index 00000000000..4fe3579dfc0 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idseniorofficer.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idseniorphysician.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idseniorphysician.png new file mode 100644 index 00000000000..d7842a5bd4e Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idseniorphysician.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idseniorresearcher.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idseniorresearcher.png new file mode 100644 index 00000000000..63d3ffd3641 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idseniorresearcher.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idshaftminer.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idshaftminer.png new file mode 100644 index 00000000000..f3fdff96c10 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idshaftminer.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idstationengineer.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idstationengineer.png new file mode 100644 index 00000000000..5645d0feeed Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idstationengineer.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idunknown.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idunknown.png new file mode 100644 index 00000000000..5dab993141a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idunknown.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idvirologist.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idvirologist.png new file mode 100644 index 00000000000..2657b5859be Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idvirologist.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idvisitor.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idvisitor.png new file mode 100644 index 00000000000..93e38cc6aa7 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idvisitor.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idwarden.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idwarden.png new file mode 100644 index 00000000000..0f90f96bdd1 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idwarden.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idzookeeper.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idzookeeper.png new file mode 100644 index 00000000000..71fe1367cb9 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/idzookeeper.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/meta.json new file mode 100644 index 00000000000..146789e6734 --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/meta.json @@ -0,0 +1,287 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "default" + }, + { + "name": "centcom" + }, + { + "name": "admin" + }, + { + "name": "ert_chaplain" + }, + { + "name": "ert_commander" + }, + { + "name": "ert_engineer" + }, + { + "name": "ert_janitor" + }, + { + "name": "ert_medic" + }, + { + "name": "ert_security" + }, + { + "name": "gold" + }, + { + "name": "idpassenger" + }, + { + "name": "idatmospherictechnician" + }, + { + "name": "idbartender" + }, + { + "name": "idbotanist" + }, + { + "name": "idboxer" + }, + { + "name": "idcaptain" + }, + { + "name": "idcargotechnician" + }, + { + "name": "idcentcom" + }, + { + "name": "idchaplain" + }, + { + "name": "idchemist" + }, + { + "name": "idchiefengineer" + }, + { + "name": "idchiefmedicalofficer" + }, + { + "name": "idclown" + }, + { + "name": "idcook" + }, + { + "name": "idcurator" + }, + { + "name": "iddetective" + }, + { + "name": "idgeneticist" + }, + { + "name": "idheadofpersonnel" + }, + { + "name": "idheadofsecurity" + }, + { + "name": "idbrigmedic" + }, + { + "name": "idjanitor" + }, + { + "name": "idlawyer" + }, + { + "name": "idiaa" + }, + { + "name": "idmedicaldoctor" + }, + { + "name": "idmime" + }, + { + "name": "idparamedic" + }, + { + "name": "idpsychologist" + }, + { + "name": "idreporter" + }, + { + "name": "idprisoner" + }, + { + "name": "idquartermaster" + }, + { + "name": "idresearchdirector" + }, + { + "name": "idroboticist" + }, + { + "name": "idscientist" + }, + { + "name": "idsecurityofficer" + }, + { + "name": "idshaftminer" + }, + { + "name": "idstationengineer" + }, + { + "name": "idunknown" + }, + { + "name": "idvirologist" + }, + { + "name": "idvisitor" + }, + { + "name": "idwarden" + }, + { + "name": "idmusician" + }, + { + "name": "idzookeeper" + }, + { + "name": "idintern-sci" + }, + { + "name": "idintern-cadet" + }, + { + "name": "idintern-med" + }, + { + "name": "idintern-service" + }, + { + "name": "idintern-tech" + }, + { + "name": "idadmin" + }, + { + "name": "orange" + }, + { + "name": "pirate" + }, + { + "name": "black" + }, + { + "name": "prisoner_001" + }, + { + "name": "prisoner_002" + }, + { + "name": "prisoner_003" + }, + { + "name": "prisoner_004" + }, + { + "name": "prisoner_005" + }, + { + "name": "prisoner_006" + }, + { + "name": "prisoner_007" + }, + { + "name": "silver" + }, + { + "name": "syndie" + }, + { + "name": "idcluwne" + }, + { + "name": "idseniorengineer" + }, + { + "name": "idseniorresearcher" + }, + { + "name": "idseniorphysician" + }, + { + "name": "idseniorofficer" + }, + { + "name": "idpilot" + }, + { + "name": "gold-inhand-left", + "directions": 4 + }, + { + "name": "gold-inhand-right", + "directions": 4 + }, + { + "name": "default-inhand-left", + "directions": 4 + }, + { + "name": "default-inhand-right", + "directions": 4 + }, + { + "name": "silver-inhand-left", + "directions": 4 + }, + { + "name": "silver-inhand-right", + "directions": 4 + }, + { + "name": "orange-inhand-left", + "directions": 4 + }, + { + "name": "orange-inhand-right", + "directions": 4 + }, + { + "name": "blue-inhand-left", + "directions": 4 + }, + { + "name": "blue-inhand-right", + "directions": 4 + }, + { + "name": "green-inhand-left", + "directions": 4 + }, + { + "name": "green-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/orange-inhand-left.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/orange-inhand-left.png new file mode 100644 index 00000000000..5937b9cd210 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/orange-inhand-left.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/orange-inhand-right.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/orange-inhand-right.png new file mode 100644 index 00000000000..027f8aea2a3 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/orange-inhand-right.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/orange.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/orange.png new file mode 100644 index 00000000000..3136ac9d42a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/orange.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/pirate.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/pirate.png new file mode 100644 index 00000000000..5f2e74fcf8a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/pirate.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_001.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_001.png new file mode 100644 index 00000000000..67dd3e88622 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_001.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_002.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_002.png new file mode 100644 index 00000000000..004677ba4ab Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_002.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_003.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_003.png new file mode 100644 index 00000000000..23c998f1507 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_003.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_004.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_004.png new file mode 100644 index 00000000000..c6e31412cc7 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_004.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_005.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_005.png new file mode 100644 index 00000000000..d1d29bb0558 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_005.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_006.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_006.png new file mode 100644 index 00000000000..8b2305d7587 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_006.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_007.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_007.png new file mode 100644 index 00000000000..a5041faa88b Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/prisoner_007.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/silver-inhand-left.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/silver-inhand-left.png new file mode 100644 index 00000000000..8197fa122f9 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/silver-inhand-left.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/silver-inhand-right.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/silver-inhand-right.png new file mode 100644 index 00000000000..430322e892c Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/silver-inhand-right.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/silver.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/silver.png new file mode 100644 index 00000000000..16d324a55cc Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/silver.png differ diff --git a/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/syndie.png b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/syndie.png new file mode 100644 index 00000000000..d6f12ba513a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Misc/id_cards.rsi/syndie.png differ diff --git a/Resources/Textures/_Silver/Objects/Tools/arcd.rsi/icon.png b/Resources/Textures/_Silver/Objects/Tools/arcd.rsi/icon.png new file mode 100644 index 00000000000..8ba79e24fd4 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Tools/arcd.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Tools/arcd.rsi/inhand-left.png b/Resources/Textures/_Silver/Objects/Tools/arcd.rsi/inhand-left.png new file mode 100644 index 00000000000..2efd82505cf Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Tools/arcd.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Silver/Objects/Tools/arcd.rsi/inhand-right.png b/Resources/Textures/_Silver/Objects/Tools/arcd.rsi/inhand-right.png new file mode 100644 index 00000000000..8bf649fb09d Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Tools/arcd.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Silver/Objects/Tools/arcd.rsi/meta.json b/Resources/Textures/_Silver/Objects/Tools/arcd.rsi/meta.json new file mode 100644 index 00000000000..d74b1134fff --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Tools/arcd.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By endr_animet for Stray server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Silver/Objects/Tools/crcd.rsi/icon.png b/Resources/Textures/_Silver/Objects/Tools/crcd.rsi/icon.png new file mode 100644 index 00000000000..ffcc46029d8 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Tools/crcd.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Tools/crcd.rsi/inhand-left.png b/Resources/Textures/_Silver/Objects/Tools/crcd.rsi/inhand-left.png new file mode 100644 index 00000000000..7aad1863a6e Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Tools/crcd.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Silver/Objects/Tools/crcd.rsi/inhand-right.png b/Resources/Textures/_Silver/Objects/Tools/crcd.rsi/inhand-right.png new file mode 100644 index 00000000000..39e3ab3797a Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Tools/crcd.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Silver/Objects/Tools/crcd.rsi/meta.json b/Resources/Textures/_Silver/Objects/Tools/crcd.rsi/meta.json new file mode 100644 index 00000000000..d74b1134fff --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Tools/crcd.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By endr_animet for Stray server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Silver/Objects/Tools/rcad.rsi/icon.png b/Resources/Textures/_Silver/Objects/Tools/rcad.rsi/icon.png new file mode 100644 index 00000000000..dd5758aa03d Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Tools/rcad.rsi/icon.png differ diff --git a/Resources/Textures/_Silver/Objects/Tools/rcad.rsi/inhand-left.png b/Resources/Textures/_Silver/Objects/Tools/rcad.rsi/inhand-left.png new file mode 100644 index 00000000000..1e0767d7c34 Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Tools/rcad.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Silver/Objects/Tools/rcad.rsi/inhand-right.png b/Resources/Textures/_Silver/Objects/Tools/rcad.rsi/inhand-right.png new file mode 100644 index 00000000000..e315eb0571c Binary files /dev/null and b/Resources/Textures/_Silver/Objects/Tools/rcad.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Silver/Objects/Tools/rcad.rsi/meta.json b/Resources/Textures/_Silver/Objects/Tools/rcad.rsi/meta.json new file mode 100644 index 00000000000..d74b1134fff --- /dev/null +++ b/Resources/Textures/_Silver/Objects/Tools/rcad.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By endr_animet for Stray server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Silver/PAI/dog.rsi/base.png b/Resources/Textures/_Silver/PAI/dog.rsi/base.png new file mode 100644 index 00000000000..f8de89cddc9 Binary files /dev/null and b/Resources/Textures/_Silver/PAI/dog.rsi/base.png differ diff --git a/Resources/Textures/_Silver/PAI/dog.rsi/meta.json b/Resources/Textures/_Silver/PAI/dog.rsi/meta.json new file mode 100644 index 00000000000..91ff2afbad7 --- /dev/null +++ b/Resources/Textures/_Silver/PAI/dog.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , remade by Alekshhh", + "states": [ + { + "name": "base", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Silver/PAI/drone.rsi/base.png b/Resources/Textures/_Silver/PAI/drone.rsi/base.png new file mode 100644 index 00000000000..d0afc53e7cc Binary files /dev/null and b/Resources/Textures/_Silver/PAI/drone.rsi/base.png differ diff --git a/Resources/Textures/_Silver/PAI/drone.rsi/meta.json b/Resources/Textures/_Silver/PAI/drone.rsi/meta.json new file mode 100644 index 00000000000..91ff2afbad7 --- /dev/null +++ b/Resources/Textures/_Silver/PAI/drone.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , remade by Alekshhh", + "states": [ + { + "name": "base", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Silver/PAI/mouse.rsi/base.png b/Resources/Textures/_Silver/PAI/mouse.rsi/base.png new file mode 100644 index 00000000000..409dc939988 Binary files /dev/null and b/Resources/Textures/_Silver/PAI/mouse.rsi/base.png differ diff --git a/Resources/Textures/_Silver/PAI/mouse.rsi/meta.json b/Resources/Textures/_Silver/PAI/mouse.rsi/meta.json new file mode 100644 index 00000000000..91ff2afbad7 --- /dev/null +++ b/Resources/Textures/_Silver/PAI/mouse.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , remade by Alekshhh", + "states": [ + { + "name": "base", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Silver/Parallax/SillyBlueIce.png b/Resources/Textures/_Silver/Parallax/SillyBlueIce.png new file mode 100644 index 00000000000..f0e1e2dc717 Binary files /dev/null and b/Resources/Textures/_Silver/Parallax/SillyBlueIce.png differ diff --git a/Resources/Textures/_Silver/Parallax/SillyIce.png b/Resources/Textures/_Silver/Parallax/SillyIce.png new file mode 100644 index 00000000000..80f0dbd4f79 Binary files /dev/null and b/Resources/Textures/_Silver/Parallax/SillyIce.png differ diff --git a/Resources/Textures/_Silver/kiri.rsi/alive.png b/Resources/Textures/_Silver/kiri.rsi/alive.png new file mode 100644 index 00000000000..46fe57d9d42 Binary files /dev/null and b/Resources/Textures/_Silver/kiri.rsi/alive.png differ diff --git a/Resources/Textures/_Silver/kiri.rsi/dead.png b/Resources/Textures/_Silver/kiri.rsi/dead.png new file mode 100644 index 00000000000..1bb128f23bb Binary files /dev/null and b/Resources/Textures/_Silver/kiri.rsi/dead.png differ diff --git a/Resources/Textures/_Silver/kiri.rsi/meta.json b/Resources/Textures/_Silver/kiri.rsi/meta.json new file mode 100644 index 00000000000..da599dbcb5a --- /dev/null +++ b/Resources/Textures/_Silver/kiri.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "size": { + "x": 64, + "y": 64 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Mor_Dast for silver's", + "states": [ + { + "name": "dead" + }, + { + "name": "alive", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Silver/reverse_engineering.rsi/closed.png b/Resources/Textures/_Silver/reverse_engineering.rsi/closed.png new file mode 100644 index 00000000000..ceb48191451 Binary files /dev/null and b/Resources/Textures/_Silver/reverse_engineering.rsi/closed.png differ diff --git a/Resources/Textures/_Silver/reverse_engineering.rsi/meta.json b/Resources/Textures/_Silver/reverse_engineering.rsi/meta.json new file mode 100644 index 00000000000..a5b1af208ec --- /dev/null +++ b/Resources/Textures/_Silver/reverse_engineering.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Hyenh#6078 (313846233099927552)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "open" + }, + { + "name": "closed" + }, + { + "name": "unlit" + } + ] +} diff --git a/Resources/Textures/_Silver/reverse_engineering.rsi/open.png b/Resources/Textures/_Silver/reverse_engineering.rsi/open.png new file mode 100644 index 00000000000..a6b2fbdf15c Binary files /dev/null and b/Resources/Textures/_Silver/reverse_engineering.rsi/open.png differ diff --git a/Resources/Textures/_Silver/reverse_engineering.rsi/unlit.png b/Resources/Textures/_Silver/reverse_engineering.rsi/unlit.png new file mode 100644 index 00000000000..891e9776d5e Binary files /dev/null and b/Resources/Textures/_Silver/reverse_engineering.rsi/unlit.png differ diff --git a/Resources/Textures/_Silver/supermatter.rsi/meta.json b/Resources/Textures/_Silver/supermatter.rsi/meta.json new file mode 100644 index 00000000000..775fa1069f6 --- /dev/null +++ b/Resources/Textures/_Silver/supermatter.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/supermatter.dmi", + "license": "CC-BY-SA-3.0", + "size": { + "x": 32, + "y": 48 + }, + "states": [ + { + "name": "supermatter" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Silver/supermatter.rsi/supermatter.png b/Resources/Textures/_Silver/supermatter.rsi/supermatter.png new file mode 100644 index 00000000000..b8fa4defeb7 Binary files /dev/null and b/Resources/Textures/_Silver/supermatter.rsi/supermatter.png differ diff --git a/Resources/Textures/_Silver/supermattergen.rsi/meta.json b/Resources/Textures/_Silver/supermattergen.rsi/meta.json new file mode 100644 index 00000000000..7d982d8b585 --- /dev/null +++ b/Resources/Textures/_Silver/supermattergen.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/supermatter.dmi", + "license": "CC-BY-SA-3.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "supermatter" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Silver/supermattergen.rsi/supermatter.png b/Resources/Textures/_Silver/supermattergen.rsi/supermatter.png new file mode 100644 index 00000000000..8447503b6e8 Binary files /dev/null and b/Resources/Textures/_Silver/supermattergen.rsi/supermatter.png differ diff --git a/Resources/manifest.yml b/Resources/manifest.yml index 3bcc72c1392..9622a5c56dd 100644 --- a/Resources/manifest.yml +++ b/Resources/manifest.yml @@ -1,4 +1,4 @@ -defaultWindowTitle: Space Station 14 - Corvax Station [RU] +defaultWindowTitle: Silver Station FM windowIconSet: /Textures/Logo/icon-ru # Corvax-Theme splashLogo: /Textures/Logo/logo-ru.png # Corvax-Theme