diff --git a/.vscode/settings.json b/.vscode/settings.json index 0e0d3ae890c..dc6e26cbeaa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,10 @@ { "omnisharp.analyzeOpenDocumentsOnly": true, - "dotnet.defaultSolution": "SpaceStation14.sln" + "dotnet.defaultSolution": "SpaceStation14.sln", + "json.schemas": [ + { + "fileMatch": [ "**/meta.json" ], + "url": "https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/.github/rsi-schema.json" + } + ] } diff --git a/Content.Server/Atmos/Serialization/TileAtmosCollectionSerializer.cs b/Content.Server/Atmos/Serialization/TileAtmosCollectionSerializer.cs index 71e4c2d0def..00be83e86d9 100644 --- a/Content.Server/Atmos/Serialization/TileAtmosCollectionSerializer.cs +++ b/Content.Server/Atmos/Serialization/TileAtmosCollectionSerializer.cs @@ -26,7 +26,7 @@ public Dictionary Read(ISerializationManager serializa { node.TryGetValue(new ValueDataNode("version"), out var versionNode); var version = ((ValueDataNode?) versionNode)?.AsInt() ?? 1; - Dictionary tiles; + Dictionary tiles = new(); // Backwards compatability if (version == 1) @@ -36,8 +36,6 @@ public Dictionary Read(ISerializationManager serializa var mixies = serializationManager.Read?>(tile2, hookCtx, context); var unique = serializationManager.Read?>(node["uniqueMixes"], hookCtx, context); - tiles = new Dictionary(); - if (unique != null && mixies != null) { foreach (var (indices, mix) in mixies) @@ -58,15 +56,14 @@ public Dictionary Read(ISerializationManager serializa else { var dataNode = (MappingDataNode) node["data"]; - var tileNode = (MappingDataNode) dataNode["tiles"]; var chunkSize = serializationManager.Read(dataNode["chunkSize"], hookCtx, context); - var unique = serializationManager.Read?>(dataNode["uniqueMixes"], hookCtx, context); - - tiles = new Dictionary(); + dataNode.TryGetValue(new ValueDataNode("uniqueMixes"), out var mixNode); + var unique = mixNode == null ? null : serializationManager.Read?>(mixNode, hookCtx, context); if (unique != null) { + var tileNode = (MappingDataNode) dataNode["tiles"]; foreach (var (chunkNode, valueNode) in tileNode) { var chunkOrigin = serializationManager.Read(chunkNode, hookCtx, context); diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs index 941e908db6d..dc323dc64a8 100644 --- a/Content.Shared/Alert/AlertType.cs +++ b/Content.Shared/Alert/AlertType.cs @@ -37,6 +37,7 @@ public enum AlertType : byte Internals, Toxins, Muted, + Walking, VowOfSilence, VowBroken, Essence, diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index b6f5c5f45e6..c257f9e09d5 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1671,6 +1671,23 @@ public static readonly CVarDef public static readonly CVarDef ViewportWidth = CVarDef.Create("viewport.width", 21, CVar.CLIENTONLY | CVar.ARCHIVE); + /* + * FOV + */ + + /// + /// The number by which the current FOV size is divided for each level. + /// + public static readonly CVarDef ZoomLevelStep = + CVarDef.Create("fov.zoom_step", 1.2f, CVar.SERVER | CVar.REPLICATED); + + /// + /// How many times the player can zoom in until they reach the minimum zoom. + /// This does not affect the maximum zoom. + /// + public static readonly CVarDef ZoomLevels = + CVarDef.Create("fov.zoom_levels", 7, CVar.SERVER | CVar.REPLICATED); + /* * UI */ diff --git a/Content.Shared/Movement/Components/CanWalkComponent.cs b/Content.Shared/Movement/Components/CanWalkComponent.cs new file mode 100644 index 00000000000..fab851595c7 --- /dev/null +++ b/Content.Shared/Movement/Components/CanWalkComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Movement.Components; + +/// +/// Indicates if the entity can toggle walking or not. +/// +[NetworkedComponent, RegisterComponent] +public sealed partial class CanWalkComponent : Component +{ +} diff --git a/Content.Shared/Movement/Components/InputMoverComponent.cs b/Content.Shared/Movement/Components/InputMoverComponent.cs index f1e34c90df4..263190d46fd 100644 --- a/Content.Shared/Movement/Components/InputMoverComponent.cs +++ b/Content.Shared/Movement/Components/InputMoverComponent.cs @@ -1,9 +1,11 @@ using System.Numerics; +using Content.Shared.Alert; using Content.Shared.Movement.Systems; using Robust.Shared.GameStates; using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; using Robust.Shared.Timing; +using Robust.Shared.Prototypes; namespace Content.Shared.Movement.Components { @@ -74,6 +76,9 @@ public sealed partial class InputMoverComponent : Component [ViewVariables(VVAccess.ReadWrite)] public bool CanMove = true; + + [DataField] + public ProtoId WalkingAlert = "Walking"; } [Serializable, NetSerializable] diff --git a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs index 207f14a258a..6dc7fdfd899 100644 --- a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs +++ b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs @@ -1,9 +1,11 @@ using System.Numerics; using Content.Shared.Administration; using Content.Shared.Administration.Managers; +using Content.Shared.CCVar; using Content.Shared.Ghost; using Content.Shared.Input; using Content.Shared.Movement.Components; +using Robust.Shared.Configuration; using Robust.Shared.Input.Binding; using Robust.Shared.Player; using Robust.Shared.Serialization; @@ -16,10 +18,13 @@ namespace Content.Shared.Movement.Systems; public abstract class SharedContentEyeSystem : EntitySystem { [Dependency] private readonly ISharedAdminManager _admin = default!; + [Dependency] private readonly IConfigurationManager _config = default!; - public const float ZoomMod = 1.5f; - public static readonly Vector2 DefaultZoom = Vector2.One; - public static readonly Vector2 MinZoom = DefaultZoom * (float)Math.Pow(ZoomMod, -3); + // Will be overridden according to config. + public readonly Vector2 DefaultZoom = Vector2.One; + public float ZoomMod { get; private set; } = 1f; + public int ZoomLevels { get; private set; } = 1; + public Vector2 MinZoom { get; private set; } = Vector2.One; [Dependency] private readonly SharedEyeSystem _eye = default!; @@ -38,6 +43,17 @@ public override void Initialize() Log.Level = LogLevel.Info; UpdatesOutsidePrediction = true; + + Subs.CVar(_config, CCVars.ZoomLevelStep, value => + { + ZoomMod = value; + RecalculateZoomLevels(); + }, true); + Subs.CVar(_config, CCVars.ZoomLevels, value => + { + ZoomLevels = value; + RecalculateZoomLevels(); + }, true); } public override void Shutdown() @@ -46,6 +62,11 @@ public override void Shutdown() CommandBinds.Unregister(); } + private void RecalculateZoomLevels() + { + MinZoom = DefaultZoom * (float) Math.Pow(ZoomMod, -ZoomLevels); + } + private void ResetZoom(ICommonSession? session) { if (TryComp(session?.AttachedEntity, out ContentEyeComponent? eye)) diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs index bce3aeff527..891bd518b1c 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs @@ -1,4 +1,5 @@ using System.Numerics; +using Content.Shared.Alert; using Content.Shared.CCVar; using Content.Shared.Follower.Components; using Content.Shared.Input; @@ -333,6 +334,7 @@ private void OnInputInit(EntityUid uid, InputMoverComponent component, Component component.RelativeEntity = xform.GridUid ?? xform.MapUid; component.TargetRelativeRotation = Angle.Zero; + WalkingAlert(uid, !component.Sprinting); } private void HandleRunChange(EntityUid uid, ushort subTick, bool walking) @@ -344,6 +346,7 @@ private void HandleRunChange(EntityUid uid, ushort subTick, bool walking) // if we swap to relay then stop our existing input if we ever change back. if (moverComp != null) { + WalkingAlert(uid, walking); SetMoveInput(moverComp, MoveButtons.None); } @@ -460,10 +463,11 @@ private void ResetSubtick(InputMoverComponent component) component.LastInputSubTick = 0; } + public void SetSprinting(EntityUid entity, InputMoverComponent component, ushort subTick, bool walking) { // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}"); - + WalkingAlert(entity, walking); SetMoveInput(entity, component, subTick, walking, MoveButtons.Walk); } diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 79d2e9f2551..4c2c91db6a1 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -1,5 +1,6 @@ using System.Diagnostics.CodeAnalysis; using System.Numerics; +using Content.Shared.Alert; using Content.Shared.Bed.Sleep; using Content.Shared.CCVar; using Content.Shared.Friction; @@ -25,6 +26,7 @@ using Robust.Shared.Utility; using PullableComponent = Content.Shared.Movement.Pulling.Components.PullableComponent; + namespace Content.Shared.Movement.Systems { /// @@ -33,6 +35,7 @@ namespace Content.Shared.Movement.Systems /// public abstract partial class SharedMoverController : VirtualController { + [Dependency] private readonly AlertsSystem _alerts = default!; [Dependency] private readonly IConfigurationManager _configManager = default!; [Dependency] protected readonly IGameTiming Timing = default!; [Dependency] private readonly IMapManager _mapManager = default!; @@ -165,6 +168,7 @@ protected void HandleMobMovement( var (walkDir, sprintDir) = GetVelocityInput(mover); var touching = false; + // Handle wall-pushes. if (weightless) { @@ -285,6 +289,14 @@ protected void HandleMobMovement( PhysicsSystem.SetAngularVelocity(physicsUid, 0, body: physicsComponent); } + public void WalkingAlert(EntityUid player, bool walking) + { + if (HasComp(player)) + { + _alerts.ShowAlert(player, AlertType.Walking, walking ? (short) 0 : (short) 1); + } + } + public void LerpRotation(EntityUid uid, InputMoverComponent mover, float frameTime) { var angleDiff = Angle.ShortestDistance(mover.RelativeRotation, mover.TargetRelativeRotation); diff --git a/Content.Shared/Strip/Components/ThievingComponent.cs b/Content.Shared/Strip/Components/ThievingComponent.cs index 1d584627727..bc66c7d8328 100644 --- a/Content.Shared/Strip/Components/ThievingComponent.cs +++ b/Content.Shared/Strip/Components/ThievingComponent.cs @@ -1,9 +1,11 @@ +using Robust.Shared.GameStates; + namespace Content.Shared.Strip.Components; /// /// Give this to an entity when you want to decrease stripping times /// -[RegisterComponent] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] public sealed partial class ThievingComponent : Component { /// @@ -27,6 +29,6 @@ public sealed partial class ThievingComponent : Component /// /// Should the user be able to see hidden items? (i.e pockets) /// - [DataField] + [DataField, AutoNetworkedField] public bool IgnoreStripHidden; } diff --git a/Resources/Audio/Admin/Smites/bookify.ogg b/Resources/Audio/Admin/Smites/bookify.ogg new file mode 100644 index 00000000000..522225e3ac4 Binary files /dev/null and b/Resources/Audio/Admin/Smites/bookify.ogg differ diff --git a/Resources/Audio/Admin/Smites/manup.ogg b/Resources/Audio/Admin/Smites/manup.ogg new file mode 100644 index 00000000000..cdfa76fbf7e Binary files /dev/null and b/Resources/Audio/Admin/Smites/manup.ogg differ diff --git a/Resources/Audio/Admin/Smites/pleaseroleplay.ogg b/Resources/Audio/Admin/Smites/pleaseroleplay.ogg new file mode 100644 index 00000000000..3d2c301229e Binary files /dev/null and b/Resources/Audio/Admin/Smites/pleaseroleplay.ogg differ diff --git a/Resources/Audio/Admin/Smites/smite.ogg b/Resources/Audio/Admin/Smites/smite.ogg new file mode 100644 index 00000000000..2f62cfb3691 Binary files /dev/null and b/Resources/Audio/Admin/Smites/smite.ogg differ diff --git a/Resources/Audio/Announcements/Intern/aliens.ogg b/Resources/Audio/Announcements/Intern/aliens.ogg new file mode 100644 index 00000000000..9dd3c076978 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/aliens.ogg differ diff --git a/Resources/Audio/Announcements/Intern/animes.ogg b/Resources/Audio/Announcements/Intern/animes.ogg new file mode 100644 index 00000000000..36102c3e60e Binary files /dev/null and b/Resources/Audio/Announcements/Intern/animes.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce.ogg b/Resources/Audio/Announcements/Intern/announce.ogg new file mode 100644 index 00000000000..0ee0f36d56f Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/1.ogg b/Resources/Audio/Announcements/Intern/announce/1.ogg new file mode 100644 index 00000000000..c4d182bc8c9 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/1.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/10.ogg b/Resources/Audio/Announcements/Intern/announce/10.ogg new file mode 100644 index 00000000000..7380ccdeefd Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/10.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/11.ogg b/Resources/Audio/Announcements/Intern/announce/11.ogg new file mode 100644 index 00000000000..ca548dcc20a Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/11.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/12.ogg b/Resources/Audio/Announcements/Intern/announce/12.ogg new file mode 100644 index 00000000000..8d71419798f Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/12.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/13.ogg b/Resources/Audio/Announcements/Intern/announce/13.ogg new file mode 100644 index 00000000000..128c7aa424d Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/13.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/14.ogg b/Resources/Audio/Announcements/Intern/announce/14.ogg new file mode 100644 index 00000000000..81d54101be5 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/14.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/2.ogg b/Resources/Audio/Announcements/Intern/announce/2.ogg new file mode 100644 index 00000000000..a2ef615d56c Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/2.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/3.ogg b/Resources/Audio/Announcements/Intern/announce/3.ogg new file mode 100644 index 00000000000..51613ff0367 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/3.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/4.ogg b/Resources/Audio/Announcements/Intern/announce/4.ogg new file mode 100644 index 00000000000..874536ca72f Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/4.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/5.ogg b/Resources/Audio/Announcements/Intern/announce/5.ogg new file mode 100644 index 00000000000..0af0d28ce18 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/5.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/6.ogg b/Resources/Audio/Announcements/Intern/announce/6.ogg new file mode 100644 index 00000000000..a65006a8c01 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/6.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/7.ogg b/Resources/Audio/Announcements/Intern/announce/7.ogg new file mode 100644 index 00000000000..4a1d3f013ae Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/7.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/8.ogg b/Resources/Audio/Announcements/Intern/announce/8.ogg new file mode 100644 index 00000000000..83ca80f4939 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/8.ogg differ diff --git a/Resources/Audio/Announcements/Intern/announce/9.ogg b/Resources/Audio/Announcements/Intern/announce/9.ogg new file mode 100644 index 00000000000..3c0c45b25d0 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/announce/9.ogg differ diff --git a/Resources/Audio/Announcements/Intern/anomaly.ogg b/Resources/Audio/Announcements/Intern/anomaly.ogg new file mode 100644 index 00000000000..9bed8eae3aa Binary files /dev/null and b/Resources/Audio/Announcements/Intern/anomaly.ogg differ diff --git a/Resources/Audio/Announcements/Intern/commandreport/1.ogg b/Resources/Audio/Announcements/Intern/commandreport/1.ogg new file mode 100644 index 00000000000..e3108b13d17 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/commandreport/1.ogg differ diff --git a/Resources/Audio/Announcements/Intern/commandreport/2.ogg b/Resources/Audio/Announcements/Intern/commandreport/2.ogg new file mode 100644 index 00000000000..cd67500426c Binary files /dev/null and b/Resources/Audio/Announcements/Intern/commandreport/2.ogg differ diff --git a/Resources/Audio/Announcements/Intern/commandreport/3.ogg b/Resources/Audio/Announcements/Intern/commandreport/3.ogg new file mode 100644 index 00000000000..94241c5ba52 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/commandreport/3.ogg differ diff --git a/Resources/Audio/Announcements/Intern/intercept.ogg b/Resources/Audio/Announcements/Intern/intercept.ogg new file mode 100644 index 00000000000..a87274abd97 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/intercept.ogg differ diff --git a/Resources/Audio/Announcements/Intern/ionstorm.ogg b/Resources/Audio/Announcements/Intern/ionstorm.ogg new file mode 100644 index 00000000000..9e7b5c6b23e Binary files /dev/null and b/Resources/Audio/Announcements/Intern/ionstorm.ogg differ diff --git a/Resources/Audio/Announcements/Intern/meteors.ogg b/Resources/Audio/Announcements/Intern/meteors.ogg new file mode 100644 index 00000000000..c68c4bd8cc4 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/meteors.ogg differ diff --git a/Resources/Audio/Announcements/Intern/newai.ogg b/Resources/Audio/Announcements/Intern/newai.ogg new file mode 100644 index 00000000000..c40b0990206 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/newai.ogg differ diff --git a/Resources/Audio/Announcements/Intern/outbreak7.ogg b/Resources/Audio/Announcements/Intern/outbreak7.ogg new file mode 100644 index 00000000000..297a1bbe8db Binary files /dev/null and b/Resources/Audio/Announcements/Intern/outbreak7.ogg differ diff --git a/Resources/Audio/Announcements/Intern/poweroff.ogg b/Resources/Audio/Announcements/Intern/poweroff.ogg new file mode 100644 index 00000000000..4b71053653f Binary files /dev/null and b/Resources/Audio/Announcements/Intern/poweroff.ogg differ diff --git a/Resources/Audio/Announcements/Intern/poweron.ogg b/Resources/Audio/Announcements/Intern/poweron.ogg new file mode 100644 index 00000000000..509cd398e6e Binary files /dev/null and b/Resources/Audio/Announcements/Intern/poweron.ogg differ diff --git a/Resources/Audio/Announcements/Intern/radiation.ogg b/Resources/Audio/Announcements/Intern/radiation.ogg new file mode 100644 index 00000000000..08db53ebfd2 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/radiation.ogg differ diff --git a/Resources/Audio/Announcements/Intern/shuttlecalled.ogg b/Resources/Audio/Announcements/Intern/shuttlecalled.ogg new file mode 100644 index 00000000000..c903367cdff Binary files /dev/null and b/Resources/Audio/Announcements/Intern/shuttlecalled.ogg differ diff --git a/Resources/Audio/Announcements/Intern/shuttledock.ogg b/Resources/Audio/Announcements/Intern/shuttledock.ogg new file mode 100644 index 00000000000..9f6ccd1a937 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/shuttledock.ogg differ diff --git a/Resources/Audio/Announcements/Intern/shuttlerecalled.ogg b/Resources/Audio/Announcements/Intern/shuttlerecalled.ogg new file mode 100644 index 00000000000..e259a79f35e Binary files /dev/null and b/Resources/Audio/Announcements/Intern/shuttlerecalled.ogg differ diff --git a/Resources/Audio/Announcements/Intern/welcome/1.ogg b/Resources/Audio/Announcements/Intern/welcome/1.ogg new file mode 100644 index 00000000000..758f1967e09 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/welcome/1.ogg differ diff --git a/Resources/Audio/Announcements/Intern/welcome/2.ogg b/Resources/Audio/Announcements/Intern/welcome/2.ogg new file mode 100644 index 00000000000..c2e72be510e Binary files /dev/null and b/Resources/Audio/Announcements/Intern/welcome/2.ogg differ diff --git a/Resources/Audio/Announcements/Intern/welcome/3.ogg b/Resources/Audio/Announcements/Intern/welcome/3.ogg new file mode 100644 index 00000000000..004f57371de Binary files /dev/null and b/Resources/Audio/Announcements/Intern/welcome/3.ogg differ diff --git a/Resources/Audio/Announcements/Intern/welcome/4.ogg b/Resources/Audio/Announcements/Intern/welcome/4.ogg new file mode 100644 index 00000000000..c4e1f7667cd Binary files /dev/null and b/Resources/Audio/Announcements/Intern/welcome/4.ogg differ diff --git a/Resources/Audio/Announcements/Intern/welcome/5.ogg b/Resources/Audio/Announcements/Intern/welcome/5.ogg new file mode 100644 index 00000000000..641b8208a4e Binary files /dev/null and b/Resources/Audio/Announcements/Intern/welcome/5.ogg differ diff --git a/Resources/Audio/Announcements/Intern/welcome/6.ogg b/Resources/Audio/Announcements/Intern/welcome/6.ogg new file mode 100644 index 00000000000..b0fc38237f8 Binary files /dev/null and b/Resources/Audio/Announcements/Intern/welcome/6.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/aliens.ogg b/Resources/Audio/Announcements/MedBot/aliens.ogg new file mode 100644 index 00000000000..57fa70c3cae Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/aliens.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/animes.ogg b/Resources/Audio/Announcements/MedBot/animes.ogg new file mode 100644 index 00000000000..7615a744a66 Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/animes.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/announce.ogg b/Resources/Audio/Announcements/MedBot/announce.ogg new file mode 100644 index 00000000000..0ee0f36d56f Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/announce.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/anomaly.ogg b/Resources/Audio/Announcements/MedBot/anomaly.ogg new file mode 100644 index 00000000000..d710999e1e1 Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/anomaly.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/attention.ogg b/Resources/Audio/Announcements/MedBot/attention.ogg new file mode 100644 index 00000000000..d4d5a270852 Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/attention.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/commandreport.ogg b/Resources/Audio/Announcements/MedBot/commandreport.ogg new file mode 100644 index 00000000000..4e5c2e1d1ff Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/commandreport.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/fallback.ogg b/Resources/Audio/Announcements/MedBot/fallback.ogg new file mode 100644 index 00000000000..d4d5a270852 Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/fallback.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/intercept.ogg b/Resources/Audio/Announcements/MedBot/intercept.ogg new file mode 100644 index 00000000000..c59d0455c1c Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/intercept.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/ionstorm.ogg b/Resources/Audio/Announcements/MedBot/ionstorm.ogg new file mode 100644 index 00000000000..15aeac9f7ff Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/ionstorm.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/meteors.ogg b/Resources/Audio/Announcements/MedBot/meteors.ogg new file mode 100644 index 00000000000..91208cae122 Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/meteors.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/newai.ogg b/Resources/Audio/Announcements/MedBot/newai.ogg new file mode 100644 index 00000000000..c40b0990206 Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/newai.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/outbreak7.ogg b/Resources/Audio/Announcements/MedBot/outbreak7.ogg new file mode 100644 index 00000000000..1fc542534db Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/outbreak7.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/poweroff.ogg b/Resources/Audio/Announcements/MedBot/poweroff.ogg new file mode 100644 index 00000000000..875df350025 Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/poweroff.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/poweron.ogg b/Resources/Audio/Announcements/MedBot/poweron.ogg new file mode 100644 index 00000000000..4b1605b1c74 Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/poweron.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/radiation.ogg b/Resources/Audio/Announcements/MedBot/radiation.ogg new file mode 100644 index 00000000000..5c48830b5f2 Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/radiation.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/shuttlecalled.ogg b/Resources/Audio/Announcements/MedBot/shuttlecalled.ogg new file mode 100644 index 00000000000..a775567abed Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/shuttlecalled.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/shuttledock.ogg b/Resources/Audio/Announcements/MedBot/shuttledock.ogg new file mode 100644 index 00000000000..933928db067 Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/shuttledock.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/shuttlerecalled.ogg b/Resources/Audio/Announcements/MedBot/shuttlerecalled.ogg new file mode 100644 index 00000000000..53b622576d4 Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/shuttlerecalled.ogg differ diff --git a/Resources/Audio/Announcements/MedBot/welcome.ogg b/Resources/Audio/Announcements/MedBot/welcome.ogg new file mode 100644 index 00000000000..f9a698fd080 Binary files /dev/null and b/Resources/Audio/Announcements/MedBot/welcome.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/announce.ogg b/Resources/Audio/Announcements/NEIL/announce.ogg new file mode 100644 index 00000000000..0ee0f36d56f Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/announce.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/attention.ogg b/Resources/Audio/Announcements/NEIL/attention.ogg new file mode 100644 index 00000000000..310fad3ef63 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/attention.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/bureaucraticerror.ogg b/Resources/Audio/Announcements/NEIL/bureaucraticerror.ogg new file mode 100644 index 00000000000..0cbafcf6276 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/bureaucraticerror.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/code_blue.ogg b/Resources/Audio/Announcements/NEIL/code_blue.ogg new file mode 100644 index 00000000000..48d9c6548b6 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_blue.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/code_delta.ogg b/Resources/Audio/Announcements/NEIL/code_delta.ogg new file mode 100644 index 00000000000..70826719156 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_delta.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/code_epsilon.ogg b/Resources/Audio/Announcements/NEIL/code_epsilon.ogg new file mode 100644 index 00000000000..a8db858b1af Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_epsilon.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/code_gamma.ogg b/Resources/Audio/Announcements/NEIL/code_gamma.ogg new file mode 100644 index 00000000000..3351acc2e0d Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_gamma.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/code_green.ogg b/Resources/Audio/Announcements/NEIL/code_green.ogg new file mode 100644 index 00000000000..3c0031833be Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_green.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/code_red.ogg b/Resources/Audio/Announcements/NEIL/code_red.ogg new file mode 100644 index 00000000000..209eb36ba11 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_red.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/code_violet.ogg b/Resources/Audio/Announcements/NEIL/code_violet.ogg new file mode 100644 index 00000000000..c1681c1edb8 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_violet.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/code_white.ogg b/Resources/Audio/Announcements/NEIL/code_white.ogg new file mode 100644 index 00000000000..24c942dfcb2 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_white.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/code_yellow.ogg b/Resources/Audio/Announcements/NEIL/code_yellow.ogg new file mode 100644 index 00000000000..9139446d2b6 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/code_yellow.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/fallback.ogg b/Resources/Audio/Announcements/NEIL/fallback.ogg new file mode 100644 index 00000000000..310fad3ef63 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/fallback.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/gasleak.ogg b/Resources/Audio/Announcements/NEIL/gasleak.ogg new file mode 100644 index 00000000000..8efffd02c45 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/gasleak.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/kudzu.ogg b/Resources/Audio/Announcements/NEIL/kudzu.ogg new file mode 100644 index 00000000000..4ddd2f636bc Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/kudzu.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/meteors.ogg b/Resources/Audio/Announcements/NEIL/meteors.ogg new file mode 100644 index 00000000000..cf525441745 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/meteors.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/newai.ogg b/Resources/Audio/Announcements/NEIL/newai.ogg new file mode 100644 index 00000000000..35aba34564f Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/newai.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/noosphericstorm.ogg b/Resources/Audio/Announcements/NEIL/noosphericstorm.ogg new file mode 100644 index 00000000000..47b52f7cb47 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/noosphericstorm.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/outbreak7.ogg b/Resources/Audio/Announcements/NEIL/outbreak7.ogg new file mode 100644 index 00000000000..91067960125 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/outbreak7.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/poweroff.ogg b/Resources/Audio/Announcements/NEIL/poweroff.ogg new file mode 100644 index 00000000000..7d7a43825fe Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/poweroff.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/poweron.ogg b/Resources/Audio/Announcements/NEIL/poweron.ogg new file mode 100644 index 00000000000..961b50a5031 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/poweron.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/radiation.ogg b/Resources/Audio/Announcements/NEIL/radiation.ogg new file mode 100644 index 00000000000..3ea2928c1d9 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/radiation.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/shuttlecalled.ogg b/Resources/Audio/Announcements/NEIL/shuttlecalled.ogg new file mode 100644 index 00000000000..482bf133193 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/shuttlecalled.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/shuttledock.ogg b/Resources/Audio/Announcements/NEIL/shuttledock.ogg new file mode 100644 index 00000000000..0615536555b Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/shuttledock.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/shuttlerecalled.ogg b/Resources/Audio/Announcements/NEIL/shuttlerecalled.ogg new file mode 100644 index 00000000000..5a198ca5fe4 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/shuttlerecalled.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/ventclog.ogg b/Resources/Audio/Announcements/NEIL/ventclog.ogg new file mode 100644 index 00000000000..90350f0e359 Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/ventclog.ogg differ diff --git a/Resources/Audio/Announcements/NEIL/welcome.ogg b/Resources/Audio/Announcements/NEIL/welcome.ogg new file mode 100644 index 00000000000..00c8991276c Binary files /dev/null and b/Resources/Audio/Announcements/NEIL/welcome.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/aliens.ogg b/Resources/Audio/Announcements/VoxFem/aliens.ogg new file mode 100644 index 00000000000..f7d1746247f Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/aliens.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/announce.ogg b/Resources/Audio/Announcements/VoxFem/announce.ogg new file mode 100644 index 00000000000..0ee0f36d56f Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/announce.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/anomaly.ogg b/Resources/Audio/Announcements/VoxFem/anomaly.ogg new file mode 100644 index 00000000000..7680726f153 Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/anomaly.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/attention.ogg b/Resources/Audio/Announcements/VoxFem/attention.ogg new file mode 100644 index 00000000000..912be4425eb Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/attention.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/commandreport.ogg b/Resources/Audio/Announcements/VoxFem/commandreport.ogg new file mode 100644 index 00000000000..82e4ca425de Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/commandreport.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/fallback.ogg b/Resources/Audio/Announcements/VoxFem/fallback.ogg new file mode 100644 index 00000000000..912be4425eb Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/fallback.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/ionstorm.ogg b/Resources/Audio/Announcements/VoxFem/ionstorm.ogg new file mode 100644 index 00000000000..9f39713de6e Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/ionstorm.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/meteors.ogg b/Resources/Audio/Announcements/VoxFem/meteors.ogg new file mode 100644 index 00000000000..8f1c3aeacbb Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/meteors.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/newai.ogg b/Resources/Audio/Announcements/VoxFem/newai.ogg new file mode 100644 index 00000000000..35aba34564f Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/newai.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/outbreak7.ogg b/Resources/Audio/Announcements/VoxFem/outbreak7.ogg new file mode 100644 index 00000000000..f21d4fca443 Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/outbreak7.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/poweroff.ogg b/Resources/Audio/Announcements/VoxFem/poweroff.ogg new file mode 100644 index 00000000000..1c6377c9d8d Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/poweroff.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/poweron.ogg b/Resources/Audio/Announcements/VoxFem/poweron.ogg new file mode 100644 index 00000000000..9d18797d6ea Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/poweron.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/radiation.ogg b/Resources/Audio/Announcements/VoxFem/radiation.ogg new file mode 100644 index 00000000000..ef395af3101 Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/radiation.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/shuttlecalled.ogg b/Resources/Audio/Announcements/VoxFem/shuttlecalled.ogg new file mode 100644 index 00000000000..716bf824654 Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/shuttlecalled.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/shuttledock.ogg b/Resources/Audio/Announcements/VoxFem/shuttledock.ogg new file mode 100644 index 00000000000..0f70bebc751 Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/shuttledock.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/shuttlerecalled.ogg b/Resources/Audio/Announcements/VoxFem/shuttlerecalled.ogg new file mode 100644 index 00000000000..5f6db404b87 Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/shuttlerecalled.ogg differ diff --git a/Resources/Audio/Announcements/VoxFem/welcome.ogg b/Resources/Audio/Announcements/VoxFem/welcome.ogg new file mode 100644 index 00000000000..c7013dcbd5f Binary files /dev/null and b/Resources/Audio/Announcements/VoxFem/welcome.ogg differ diff --git a/Resources/Audio/Effects/Shadowkin/Powers/darkswapoff.ogg b/Resources/Audio/Effects/Shadowkin/Powers/darkswapoff.ogg new file mode 100644 index 00000000000..61f331a68a1 Binary files /dev/null and b/Resources/Audio/Effects/Shadowkin/Powers/darkswapoff.ogg differ diff --git a/Resources/Audio/Effects/Shadowkin/Powers/darkswapon.ogg b/Resources/Audio/Effects/Shadowkin/Powers/darkswapon.ogg new file mode 100644 index 00000000000..deb6139934e Binary files /dev/null and b/Resources/Audio/Effects/Shadowkin/Powers/darkswapon.ogg differ diff --git a/Resources/Audio/Effects/Shadowkin/Powers/futuristic-teleport.ogg b/Resources/Audio/Effects/Shadowkin/Powers/futuristic-teleport.ogg new file mode 100644 index 00000000000..87aeb33fdd9 Binary files /dev/null and b/Resources/Audio/Effects/Shadowkin/Powers/futuristic-teleport.ogg differ diff --git a/Resources/Audio/Effects/Shadowkin/Powers/license.txt b/Resources/Audio/Effects/Shadowkin/Powers/license.txt new file mode 100644 index 00000000000..c77ea8eb098 --- /dev/null +++ b/Resources/Audio/Effects/Shadowkin/Powers/license.txt @@ -0,0 +1,4 @@ +darkswapon.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/ +darkswapoff.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/ +futuristic-teleport.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/ +teleport.ogg licensed under Pixabay Licence taken from https://pixabay.com/users/cristian_changing-30278997/ diff --git a/Resources/Audio/Effects/Shadowkin/Powers/teleport.ogg b/Resources/Audio/Effects/Shadowkin/Powers/teleport.ogg new file mode 100644 index 00000000000..3cca66b47cb Binary files /dev/null and b/Resources/Audio/Effects/Shadowkin/Powers/teleport.ogg differ diff --git a/Resources/Audio/Effects/closet_close.ogg b/Resources/Audio/Effects/closet_close.ogg new file mode 100644 index 00000000000..124f5d85f5e Binary files /dev/null and b/Resources/Audio/Effects/closet_close.ogg differ diff --git a/Resources/Audio/Effects/closet_open.ogg b/Resources/Audio/Effects/closet_open.ogg new file mode 100644 index 00000000000..86cbcea0d01 Binary files /dev/null and b/Resources/Audio/Effects/closet_open.ogg differ diff --git a/Resources/Audio/Effects/phasein.ogg b/Resources/Audio/Effects/phasein.ogg new file mode 100644 index 00000000000..8b74a7d42fd Binary files /dev/null and b/Resources/Audio/Effects/phasein.ogg differ diff --git a/Resources/Audio/Effects/podwoosh.ogg b/Resources/Audio/Effects/podwoosh.ogg new file mode 100644 index 00000000000..e6fd58c7fc2 Binary files /dev/null and b/Resources/Audio/Effects/podwoosh.ogg differ diff --git a/Resources/Audio/Effects/toggleoffcombat.ogg b/Resources/Audio/Effects/toggleoffcombat.ogg new file mode 100644 index 00000000000..98df1726e98 Binary files /dev/null and b/Resources/Audio/Effects/toggleoffcombat.ogg differ diff --git a/Resources/Audio/Effects/toggleoncombat.ogg b/Resources/Audio/Effects/toggleoncombat.ogg new file mode 100644 index 00000000000..7336b9cf0e1 Binary files /dev/null and b/Resources/Audio/Effects/toggleoncombat.ogg differ diff --git a/Resources/Audio/Items/Equip/toolbelt_equip.ogg b/Resources/Audio/Items/Equip/toolbelt_equip.ogg new file mode 100644 index 00000000000..0ef67a3fd6c Binary files /dev/null and b/Resources/Audio/Items/Equip/toolbelt_equip.ogg differ diff --git a/Resources/Audio/Items/Handling/ammobox_drop.ogg b/Resources/Audio/Items/Handling/ammobox_drop.ogg new file mode 100644 index 00000000000..13fce70fe3d Binary files /dev/null and b/Resources/Audio/Items/Handling/ammobox_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/ammobox_pickup.ogg b/Resources/Audio/Items/Handling/ammobox_pickup.ogg new file mode 100644 index 00000000000..9532a7697b9 Binary files /dev/null and b/Resources/Audio/Items/Handling/ammobox_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/book_drop.ogg b/Resources/Audio/Items/Handling/book_drop.ogg new file mode 100644 index 00000000000..b492b665f59 Binary files /dev/null and b/Resources/Audio/Items/Handling/book_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/book_pickup.ogg b/Resources/Audio/Items/Handling/book_pickup.ogg new file mode 100644 index 00000000000..120a4e4721a Binary files /dev/null and b/Resources/Audio/Items/Handling/book_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/cardboardbox_drop.ogg b/Resources/Audio/Items/Handling/cardboardbox_drop.ogg new file mode 100644 index 00000000000..7070ba1c342 Binary files /dev/null and b/Resources/Audio/Items/Handling/cardboardbox_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/cardboardbox_pickup.ogg b/Resources/Audio/Items/Handling/cardboardbox_pickup.ogg new file mode 100644 index 00000000000..aa4e72129b0 Binary files /dev/null and b/Resources/Audio/Items/Handling/cardboardbox_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/cloth_drop.ogg b/Resources/Audio/Items/Handling/cloth_drop.ogg new file mode 100644 index 00000000000..5bf734caba0 Binary files /dev/null and b/Resources/Audio/Items/Handling/cloth_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/cloth_pickup.ogg b/Resources/Audio/Items/Handling/cloth_pickup.ogg new file mode 100644 index 00000000000..f46988887d1 Binary files /dev/null and b/Resources/Audio/Items/Handling/cloth_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/component_drop.ogg b/Resources/Audio/Items/Handling/component_drop.ogg new file mode 100644 index 00000000000..95ba2591a31 Binary files /dev/null and b/Resources/Audio/Items/Handling/component_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/component_pickup.ogg b/Resources/Audio/Items/Handling/component_pickup.ogg new file mode 100644 index 00000000000..fee7dd9d29f Binary files /dev/null and b/Resources/Audio/Items/Handling/component_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/crowbar_drop.ogg b/Resources/Audio/Items/Handling/crowbar_drop.ogg new file mode 100644 index 00000000000..77464110661 Binary files /dev/null and b/Resources/Audio/Items/Handling/crowbar_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/crowbar_pickup.ogg b/Resources/Audio/Items/Handling/crowbar_pickup.ogg new file mode 100644 index 00000000000..79b276f8451 Binary files /dev/null and b/Resources/Audio/Items/Handling/crowbar_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/disk_drop.ogg b/Resources/Audio/Items/Handling/disk_drop.ogg new file mode 100644 index 00000000000..3174b88117f Binary files /dev/null and b/Resources/Audio/Items/Handling/disk_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/disk_pickup.ogg b/Resources/Audio/Items/Handling/disk_pickup.ogg new file mode 100644 index 00000000000..8f67406a5fb Binary files /dev/null and b/Resources/Audio/Items/Handling/disk_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/drinkglass_drop.ogg b/Resources/Audio/Items/Handling/drinkglass_drop.ogg new file mode 100644 index 00000000000..43bb732db3d Binary files /dev/null and b/Resources/Audio/Items/Handling/drinkglass_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/drinkglass_pickup.ogg b/Resources/Audio/Items/Handling/drinkglass_pickup.ogg new file mode 100644 index 00000000000..fcd1c7d3126 Binary files /dev/null and b/Resources/Audio/Items/Handling/drinkglass_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/matchbox_drop.ogg b/Resources/Audio/Items/Handling/matchbox_drop.ogg new file mode 100644 index 00000000000..8e4e276c9e1 Binary files /dev/null and b/Resources/Audio/Items/Handling/matchbox_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/matchbox_pickup.ogg b/Resources/Audio/Items/Handling/matchbox_pickup.ogg new file mode 100644 index 00000000000..82c23410e11 Binary files /dev/null and b/Resources/Audio/Items/Handling/matchbox_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/multitool_drop.ogg b/Resources/Audio/Items/Handling/multitool_drop.ogg new file mode 100644 index 00000000000..67e0a41042c Binary files /dev/null and b/Resources/Audio/Items/Handling/multitool_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/multitool_pickup.ogg b/Resources/Audio/Items/Handling/multitool_pickup.ogg new file mode 100644 index 00000000000..cbd598ce896 Binary files /dev/null and b/Resources/Audio/Items/Handling/multitool_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/paper_drop.ogg b/Resources/Audio/Items/Handling/paper_drop.ogg new file mode 100644 index 00000000000..27ce2b3d1a7 Binary files /dev/null and b/Resources/Audio/Items/Handling/paper_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/paper_pickup.ogg b/Resources/Audio/Items/Handling/paper_pickup.ogg new file mode 100644 index 00000000000..55ae2b3d2db Binary files /dev/null and b/Resources/Audio/Items/Handling/paper_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/screwdriver_drop.ogg b/Resources/Audio/Items/Handling/screwdriver_drop.ogg new file mode 100644 index 00000000000..cca91f4dddd Binary files /dev/null and b/Resources/Audio/Items/Handling/screwdriver_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/screwdriver_pickup.ogg b/Resources/Audio/Items/Handling/screwdriver_pickup.ogg new file mode 100644 index 00000000000..6f6b29ddfc9 Binary files /dev/null and b/Resources/Audio/Items/Handling/screwdriver_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/sword_sheath.ogg b/Resources/Audio/Items/Handling/sword_sheath.ogg new file mode 100644 index 00000000000..9e1d5cdc009 Binary files /dev/null and b/Resources/Audio/Items/Handling/sword_sheath.ogg differ diff --git a/Resources/Audio/Items/Handling/sword_unsheath.ogg b/Resources/Audio/Items/Handling/sword_unsheath.ogg new file mode 100644 index 00000000000..09867f5966a Binary files /dev/null and b/Resources/Audio/Items/Handling/sword_unsheath.ogg differ diff --git a/Resources/Audio/Items/Handling/toolbelt_drop.ogg b/Resources/Audio/Items/Handling/toolbelt_drop.ogg new file mode 100644 index 00000000000..2a3c4655c49 Binary files /dev/null and b/Resources/Audio/Items/Handling/toolbelt_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/toolbelt_pickup.ogg b/Resources/Audio/Items/Handling/toolbelt_pickup.ogg new file mode 100644 index 00000000000..58e5d25979a Binary files /dev/null and b/Resources/Audio/Items/Handling/toolbelt_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/toolbox_drop.ogg b/Resources/Audio/Items/Handling/toolbox_drop.ogg new file mode 100644 index 00000000000..abf56946278 Binary files /dev/null and b/Resources/Audio/Items/Handling/toolbox_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/toolbox_pickup.ogg b/Resources/Audio/Items/Handling/toolbox_pickup.ogg new file mode 100644 index 00000000000..01a4ab4b3fa Binary files /dev/null and b/Resources/Audio/Items/Handling/toolbox_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/welder_drop.ogg b/Resources/Audio/Items/Handling/welder_drop.ogg new file mode 100644 index 00000000000..58b722ad7a7 Binary files /dev/null and b/Resources/Audio/Items/Handling/welder_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/welder_pickup.ogg b/Resources/Audio/Items/Handling/welder_pickup.ogg new file mode 100644 index 00000000000..da78b06b848 Binary files /dev/null and b/Resources/Audio/Items/Handling/welder_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/wirecutter_drop.ogg b/Resources/Audio/Items/Handling/wirecutter_drop.ogg new file mode 100644 index 00000000000..e099870fc7d Binary files /dev/null and b/Resources/Audio/Items/Handling/wirecutter_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/wirecutter_pickup.ogg b/Resources/Audio/Items/Handling/wirecutter_pickup.ogg new file mode 100644 index 00000000000..078faaf4324 Binary files /dev/null and b/Resources/Audio/Items/Handling/wirecutter_pickup.ogg differ diff --git a/Resources/Audio/Items/Handling/wrench_drop.ogg b/Resources/Audio/Items/Handling/wrench_drop.ogg new file mode 100644 index 00000000000..86020bf822c Binary files /dev/null and b/Resources/Audio/Items/Handling/wrench_drop.ogg differ diff --git a/Resources/Audio/Items/Handling/wrench_pickup.ogg b/Resources/Audio/Items/Handling/wrench_pickup.ogg new file mode 100644 index 00000000000..860e0d70879 Binary files /dev/null and b/Resources/Audio/Items/Handling/wrench_pickup.ogg differ diff --git a/Resources/Audio/Items/Whistle/closet_close.ogg b/Resources/Audio/Items/Whistle/closet_close.ogg new file mode 100644 index 00000000000..124f5d85f5e Binary files /dev/null and b/Resources/Audio/Items/Whistle/closet_close.ogg differ diff --git a/Resources/Audio/Items/Whistle/closet_open.ogg b/Resources/Audio/Items/Whistle/closet_open.ogg new file mode 100644 index 00000000000..86cbcea0d01 Binary files /dev/null and b/Resources/Audio/Items/Whistle/closet_open.ogg differ diff --git a/Resources/Audio/Items/Whistle/phasein.ogg b/Resources/Audio/Items/Whistle/phasein.ogg new file mode 100644 index 00000000000..8b74a7d42fd Binary files /dev/null and b/Resources/Audio/Items/Whistle/phasein.ogg differ diff --git a/Resources/Audio/Items/Whistle/podwoosh.ogg b/Resources/Audio/Items/Whistle/podwoosh.ogg new file mode 100644 index 00000000000..e6fd58c7fc2 Binary files /dev/null and b/Resources/Audio/Items/Whistle/podwoosh.ogg differ diff --git a/Resources/Audio/Lobby/01 The Gamble.ogg b/Resources/Audio/Lobby/01 The Gamble.ogg new file mode 100644 index 00000000000..c1cfdd53850 Binary files /dev/null and b/Resources/Audio/Lobby/01 The Gamble.ogg differ diff --git a/Resources/Audio/Lobby/02 Guilty Pleasures.ogg b/Resources/Audio/Lobby/02 Guilty Pleasures.ogg new file mode 100644 index 00000000000..9a281d19485 Binary files /dev/null and b/Resources/Audio/Lobby/02 Guilty Pleasures.ogg differ diff --git a/Resources/Audio/Lobby/03 Jazzcuzzi.ogg b/Resources/Audio/Lobby/03 Jazzcuzzi.ogg new file mode 100644 index 00000000000..49e7a332050 Binary files /dev/null and b/Resources/Audio/Lobby/03 Jazzcuzzi.ogg differ diff --git a/Resources/Audio/Lobby/04 The Walk.ogg b/Resources/Audio/Lobby/04 The Walk.ogg new file mode 100644 index 00000000000..481b08e650f Binary files /dev/null and b/Resources/Audio/Lobby/04 The Walk.ogg differ diff --git a/Resources/Audio/Lobby/05 Velvet Bossa.ogg b/Resources/Audio/Lobby/05 Velvet Bossa.ogg new file mode 100644 index 00000000000..dcb639de436 Binary files /dev/null and b/Resources/Audio/Lobby/05 Velvet Bossa.ogg differ diff --git a/Resources/Audio/Lobby/06 Colors.ogg b/Resources/Audio/Lobby/06 Colors.ogg new file mode 100644 index 00000000000..83a8d3a3ee2 Binary files /dev/null and b/Resources/Audio/Lobby/06 Colors.ogg differ diff --git a/Resources/Audio/Lobby/07 Midnight Jam.ogg b/Resources/Audio/Lobby/07 Midnight Jam.ogg new file mode 100644 index 00000000000..18e4e8de8a1 Binary files /dev/null and b/Resources/Audio/Lobby/07 Midnight Jam.ogg differ diff --git a/Resources/Audio/Lobby/08 Miles Ahead.ogg b/Resources/Audio/Lobby/08 Miles Ahead.ogg new file mode 100644 index 00000000000..db632e77218 Binary files /dev/null and b/Resources/Audio/Lobby/08 Miles Ahead.ogg differ diff --git a/Resources/Audio/Lobby/09 Moody.ogg b/Resources/Audio/Lobby/09 Moody.ogg new file mode 100644 index 00000000000..29720317d21 Binary files /dev/null and b/Resources/Audio/Lobby/09 Moody.ogg differ diff --git a/Resources/Audio/Lobby/10 Flying Away.ogg b/Resources/Audio/Lobby/10 Flying Away.ogg new file mode 100644 index 00000000000..84bda9db8f7 Binary files /dev/null and b/Resources/Audio/Lobby/10 Flying Away.ogg differ diff --git a/Resources/Audio/Lobby/11 Take It Easy.ogg b/Resources/Audio/Lobby/11 Take It Easy.ogg new file mode 100644 index 00000000000..f305357554d Binary files /dev/null and b/Resources/Audio/Lobby/11 Take It Easy.ogg differ diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml index e37196494fb..9e777c37d10 100644 --- a/Resources/Audio/Lobby/attributions.yml +++ b/Resources/Audio/Lobby/attributions.yml @@ -1,89 +1,4 @@ -- files: ["434387_Time_Lapse_of_Clouds.ogg"] - license: "CC-BY-3.0" - copyright: "==(Time Lapse of Clouds)== by Buoy" - source: "https://www.newgrounds.com/audio/listen/434387" - -- files: ["a_different_reality_lagoona_remix.xm.ogg"] - license: "CC-BY-4.0" - copyright: "A.D.R (Lagoona rmx) by Andreas Viklund" - source: "https://modarchive.org/index.php?request=view_by_moduleid&query=134786" - -- files: ["aggravated.it.ogg"] - license: "CC-BY-NC-SA-4.0" - copyright: "MEL -Aggravated Assault by melcom" - source: "https://modarchive.org/index.php?request=view_by_moduleid&query=176234" - -- files: ["autumnal_equinox.xm.ogg"] - license: "CC-BY-NC-4.0" - copyright: "Autumnal Equinox by lemonade" - source: "https://modarchive.org/index.php?request=view_by_moduleid&query=143993" - -- files: ["comet_haley.ogg"] +- files: ["01 The Gamble.ogg", "02 Guilty Pleasures.ogg", "03 Jazzcuzzi.ogg", "04 The Walk.ogg", "05 Velvet Bossa.ogg", "06 Colors.ogg", "07 Midnight Jam.ogg", "08 Miles Ahead.ogg", "09 Moody.ogg", "10 Flying Away.ogg", "11 Take It Easy.ogg"] license: "CC-BY-NC-SA-3.0" - copyright: "Comet Haley by Stellardrone. Converted from MP3 to OGG." - source: "https://freemusicarchive.org/music/Stellardrone/Light_Years_1227/07_Comet_Halley" - -- files: ["drozerix_-_alone.xm.ogg"] - license: "Custom" - copyright: "Alone by Drozerix" - source: "https://modarchive.org/index.php?request=view_by_moduleid&query=199968" - -- files: ["drozerix_-_leisurely_voice.xm.ogg"] - license: "Custom" - copyright: "Leisurely Voice by Drozerix" - source: "https://modarchive.org/index.php?request=view_by_moduleid&query=183837" - -- files: ["endless_space.ogg"] - license: "CC-BY-3.0" - copyright: "Endless Space by SolusLunes. Converted from MP3 to OGG." - source: "https://www.newgrounds.com/audio/listen/67583" - -- files: ["marhaba.ogg"] - license: "CC-BY-NC-SA-3.0" - copyright: "Marhaba by Ian Alex Mac. Converted from MP3 to OGG." - source: "https://freemusicarchive.org/music/Ian_Alex_Mac/Cues/Marhaba" - -- files: ["melcom-cyberpunk.it.ogg"] - license: "CC-BY-NC-SA-4.0" - copyright: "MEL -Cyberpunk by melcom" - source: "https://modarchive.org/index.php?request=view_by_moduleid&query=184215" - -- files: ["midori_-_conundrum_final.it.ogg"] - license: "CC-BY-NC-SA-4.0" - copyright: "Conundrum by Midori Mizuno" - source: "https://modarchive.org/index.php?request=view_by_moduleid&query=181705" - -- files: ["mod.flip-flap.ogg"] - license: "Custom" - copyright: "Flip Flap by X-ceed is licensed under a short but clear license (see flip-flap.txt in this directory) and is free for non-commercial use. It was converted from MOD to WAV using Schism Tracker, in 16 Bit, Non-Interpolated mode, no output equalizer settings, Ramp volume at start of sample enabled. From there it was converted to OGG Vorbis with `ffmpeg -i flip-flap.wav -q 2.9 flip-flap-renc.ogg` (quality scale chosen to match size of the OGG file being replaced). Non-interpolated mode was chosen as the module has a high enough sample rate to balance it out, but seems muffled in other interpolation modes. If 'Ramp volume at start of sample' is not enabled, a clicking phenomenon results." - source: "http://aminet.net/package/mods/xceed/Flipflap" - -- files: ["psirius_-_nights_of_orion.xm.ogg"] - license: "CC-BY-NC-SA-4.0" - copyright: "Nights of Orion by Psirius" - source: "https://modarchive.org/index.php?request=view_by_moduleid&query=184962" - -- files: ["psirius_-_nymphs_of_the_forest.mptm.ogg"] - license: "CC-BY-NC-SA-4.0" - copyright: "Nymphs of the forest by Psirius" - source: "https://modarchive.org/index.php?request=view_by_moduleid&query=185545" - -- files: ["hackers.ogg"] - license: "CC-BY-NC-SA-3.0" - copyright: "Hackers by Karl Casey @ White Bat Audio" - source: "https://www.youtube.com/watch?v=k8nHWwO1U2Q" - -- files: ["superposition.ogg"] - license: "CC-BY-NC-3.0" - copyright: "Superposition by Amie Waters" - source: "https://amiewaters.bandcamp.com/track/superposition-2" - -- files: ["every_light_is_blinking_at_once.ogg"] - license: "CC-BY-NC-SA-3.0" - copyright: "every light is blinking at once by Alexander Divine." - source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once" - -- files: ["DOS=HIGH,_UMB.ogg"] - license: "Custom" - copyright: "DOS=HIGH, UMB by MASTER BOOT RECORD may be used non-commercially in the Delta-V fork of SS14. Converted from FLAC to OGG." - source: "https://masterbootrecord.bandcamp.com/album/c-edit-config-sys" + copyright: "All songs used are produced by Danya Vodovoz, royalty free." + source: "https://soundcloud.com/danyavodovoz" diff --git a/Resources/Audio/Machines/AI/borg_death.ogg b/Resources/Audio/Machines/AI/borg_death.ogg new file mode 100644 index 00000000000..9f6d1861904 Binary files /dev/null and b/Resources/Audio/Machines/AI/borg_death.ogg differ diff --git a/Resources/Audio/Machines/machine_vend.ogg b/Resources/Audio/Machines/machine_vend.ogg index 8f7c187d0c3..92867a1f3d3 100644 Binary files a/Resources/Audio/Machines/machine_vend.ogg and b/Resources/Audio/Machines/machine_vend.ogg differ diff --git a/Resources/Audio/Music/attributions.yml b/Resources/Audio/Music/attributions.yml new file mode 100644 index 00000000000..c1ed2f1027f --- /dev/null +++ b/Resources/Audio/Music/attributions.yml @@ -0,0 +1,4 @@ +- files: ["deadling.ogg"] + license: "CC-BY-3.0" + copyright: "Created by Bolgarich" + source: "https://youtu.be/q7_NFEeeEac" diff --git a/Resources/Audio/Music/deadline.ogg b/Resources/Audio/Music/deadline.ogg new file mode 100644 index 00000000000..6ab081fc236 Binary files /dev/null and b/Resources/Audio/Music/deadline.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Equip/toolbelt_equip.ogg b/Resources/Audio/SimpleStation14/Items/Equip/toolbelt_equip.ogg new file mode 100644 index 00000000000..0ef67a3fd6c Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Equip/toolbelt_equip.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/ammobox_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/ammobox_drop.ogg new file mode 100644 index 00000000000..13fce70fe3d Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/ammobox_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/ammobox_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/ammobox_pickup.ogg new file mode 100644 index 00000000000..9532a7697b9 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/ammobox_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/book_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/book_drop.ogg new file mode 100644 index 00000000000..b492b665f59 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/book_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/book_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/book_pickup.ogg new file mode 100644 index 00000000000..120a4e4721a Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/book_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/cardboardbox_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/cardboardbox_drop.ogg new file mode 100644 index 00000000000..7070ba1c342 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/cardboardbox_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/cardboardbox_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/cardboardbox_pickup.ogg new file mode 100644 index 00000000000..aa4e72129b0 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/cardboardbox_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/cloth_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/cloth_drop.ogg new file mode 100644 index 00000000000..5bf734caba0 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/cloth_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/cloth_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/cloth_pickup.ogg new file mode 100644 index 00000000000..f46988887d1 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/cloth_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/component_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/component_drop.ogg new file mode 100644 index 00000000000..95ba2591a31 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/component_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/component_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/component_pickup.ogg new file mode 100644 index 00000000000..fee7dd9d29f Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/component_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/crowbar_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/crowbar_drop.ogg new file mode 100644 index 00000000000..77464110661 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/crowbar_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/crowbar_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/crowbar_pickup.ogg new file mode 100644 index 00000000000..79b276f8451 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/crowbar_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/disk_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/disk_drop.ogg new file mode 100644 index 00000000000..3174b88117f Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/disk_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/disk_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/disk_pickup.ogg new file mode 100644 index 00000000000..8f67406a5fb Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/disk_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg new file mode 100644 index 00000000000..43bb732db3d Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg new file mode 100644 index 00000000000..fcd1c7d3126 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/matchbox_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/matchbox_drop.ogg new file mode 100644 index 00000000000..8e4e276c9e1 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/matchbox_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/matchbox_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/matchbox_pickup.ogg new file mode 100644 index 00000000000..82c23410e11 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/matchbox_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/multitool_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/multitool_drop.ogg new file mode 100644 index 00000000000..67e0a41042c Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/multitool_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/multitool_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/multitool_pickup.ogg new file mode 100644 index 00000000000..cbd598ce896 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/multitool_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/paper_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/paper_drop.ogg new file mode 100644 index 00000000000..27ce2b3d1a7 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/paper_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/paper_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/paper_pickup.ogg new file mode 100644 index 00000000000..55ae2b3d2db Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/paper_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/screwdriver_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/screwdriver_drop.ogg new file mode 100644 index 00000000000..cca91f4dddd Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/screwdriver_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/screwdriver_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/screwdriver_pickup.ogg new file mode 100644 index 00000000000..6f6b29ddfc9 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/screwdriver_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/sword_sheath.ogg b/Resources/Audio/SimpleStation14/Items/Handling/sword_sheath.ogg new file mode 100644 index 00000000000..9e1d5cdc009 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/sword_sheath.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg b/Resources/Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg new file mode 100644 index 00000000000..09867f5966a Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/toolbelt_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/toolbelt_drop.ogg new file mode 100644 index 00000000000..2a3c4655c49 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/toolbelt_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/toolbelt_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/toolbelt_pickup.ogg new file mode 100644 index 00000000000..58e5d25979a Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/toolbelt_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/toolbox_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/toolbox_drop.ogg new file mode 100644 index 00000000000..abf56946278 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/toolbox_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/toolbox_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/toolbox_pickup.ogg new file mode 100644 index 00000000000..01a4ab4b3fa Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/toolbox_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/welder_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/welder_drop.ogg new file mode 100644 index 00000000000..58b722ad7a7 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/welder_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/welder_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/welder_pickup.ogg new file mode 100644 index 00000000000..da78b06b848 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/welder_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/wirecutter_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/wirecutter_drop.ogg new file mode 100644 index 00000000000..e099870fc7d Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/wirecutter_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/wirecutter_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/wirecutter_pickup.ogg new file mode 100644 index 00000000000..078faaf4324 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/wirecutter_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/wrench_drop.ogg b/Resources/Audio/SimpleStation14/Items/Handling/wrench_drop.ogg new file mode 100644 index 00000000000..86020bf822c Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/wrench_drop.ogg differ diff --git a/Resources/Audio/SimpleStation14/Items/Handling/wrench_pickup.ogg b/Resources/Audio/SimpleStation14/Items/Handling/wrench_pickup.ogg new file mode 100644 index 00000000000..860e0d70879 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Items/Handling/wrench_pickup.ogg differ diff --git a/Resources/Audio/SimpleStation14/Machines/machine_vend.ogg b/Resources/Audio/SimpleStation14/Machines/machine_vend.ogg new file mode 100644 index 00000000000..92867a1f3d3 Binary files /dev/null and b/Resources/Audio/SimpleStation14/Machines/machine_vend.ogg differ diff --git a/Resources/Audio/SimpleStation14/Weapons/Melee/banjohit.ogg b/Resources/Audio/SimpleStation14/Weapons/Melee/banjohit.ogg new file mode 100644 index 00000000000..06a86a535dd Binary files /dev/null and b/Resources/Audio/SimpleStation14/Weapons/Melee/banjohit.ogg differ diff --git a/Resources/Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg b/Resources/Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg new file mode 100644 index 00000000000..401fcf9677c Binary files /dev/null and b/Resources/Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg differ diff --git a/Resources/Audio/Voice/Slime/slime_crackleslap.ogg b/Resources/Audio/Voice/Slime/slime_crackleslap.ogg new file mode 100644 index 00000000000..c9fcfbee448 Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_crackleslap.ogg differ diff --git a/Resources/Audio/Voice/Slime/slime_laugh_f1.ogg b/Resources/Audio/Voice/Slime/slime_laugh_f1.ogg new file mode 100644 index 00000000000..4b3b36810f3 Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_laugh_f1.ogg differ diff --git a/Resources/Audio/Voice/Slime/slime_laugh_m1.ogg b/Resources/Audio/Voice/Slime/slime_laugh_m1.ogg new file mode 100644 index 00000000000..7ad1ba95dae Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_laugh_m1.ogg differ diff --git a/Resources/Audio/Voice/Slime/slime_laugh_m2.ogg b/Resources/Audio/Voice/Slime/slime_laugh_m2.ogg new file mode 100644 index 00000000000..0d08e954523 Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_laugh_m2.ogg differ diff --git a/Resources/Audio/Voice/Slime/slime_schlorp.ogg b/Resources/Audio/Voice/Slime/slime_schlorp.ogg new file mode 100644 index 00000000000..f125fbc03b0 Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_schlorp.ogg differ diff --git a/Resources/Audio/Voice/Slime/slime_scream_f1.ogg b/Resources/Audio/Voice/Slime/slime_scream_f1.ogg new file mode 100644 index 00000000000..99f8e7f91fa Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_scream_f1.ogg differ diff --git a/Resources/Audio/Voice/Slime/slime_scream_f2.ogg b/Resources/Audio/Voice/Slime/slime_scream_f2.ogg new file mode 100644 index 00000000000..71ea5f4bdce Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_scream_f2.ogg differ diff --git a/Resources/Audio/Voice/Slime/slime_scream_m1.ogg b/Resources/Audio/Voice/Slime/slime_scream_m1.ogg new file mode 100644 index 00000000000..67f4734bcf4 Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_scream_m1.ogg differ diff --git a/Resources/Audio/Voice/Slime/slime_scream_m2.ogg b/Resources/Audio/Voice/Slime/slime_scream_m2.ogg new file mode 100644 index 00000000000..bc499bad782 Binary files /dev/null and b/Resources/Audio/Voice/Slime/slime_scream_m2.ogg differ diff --git a/Resources/Audio/Voice/Slime/slime_squish.ogg b/Resources/Audio/Voice/Slime/slime_squish.ogg index 60e118e217b..e7c3509c4d8 100644 Binary files a/Resources/Audio/Voice/Slime/slime_squish.ogg and b/Resources/Audio/Voice/Slime/slime_squish.ogg differ diff --git a/Resources/Audio/Weapons/Melee/banjohit.ogg b/Resources/Audio/Weapons/Melee/banjohit.ogg new file mode 100644 index 00000000000..06a86a535dd Binary files /dev/null and b/Resources/Audio/Weapons/Melee/banjohit.ogg differ diff --git a/Resources/Audio/Weapons/Melee/rapierhit.ogg b/Resources/Audio/Weapons/Melee/rapierhit.ogg new file mode 100644 index 00000000000..401fcf9677c Binary files /dev/null and b/Resources/Audio/Weapons/Melee/rapierhit.ogg differ diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 986023f54bd..1b3d12b2810 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4475,3 +4475,41 @@ Entries: deal less damage and ignore insulated gloves. id: 6160 time: '2024-07-14T23:14:03.0000000+00:00' +- author: WarMechanic + changes: + - type: Fix + message: Fixed thieving trait not granting pocket vision + id: 6161 + time: '2024-07-16T17:41:42.0000000+00:00' +- author: VMSolidus + changes: + - type: Add + message: Many new sound effects have been implemented for items. + id: 6162 + time: '2024-07-16T17:52:03.0000000+00:00' +- author: gluesniffler + changes: + - type: Add + message: Added a new icon to the offer item interaction. + - type: Fix + message: Fixed typos in the offer item prompts. + id: 6163 + time: '2024-07-16T18:18:18.0000000+00:00' +- author: Mnemotechnician + changes: + - type: Add + message: You can now configure your zoom more precisely. + id: 6164 + time: '2024-07-16T18:18:57.0000000+00:00' +- author: dootythefrooty + changes: + - type: Add + message: Added Harpy Wings as a delicious dish. + id: 6165 + time: '2024-07-16T18:21:27.0000000+00:00' +- author: gluesniffler + changes: + - type: Add + message: Added an alert on the UI for when the user is walking or running. + id: 6166 + time: '2024-07-16T21:39:46.0000000+00:00' diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl index 5f880e8dacd..ff2c0d9ee29 100644 --- a/Resources/Locale/en-US/alerts/alerts.ftl +++ b/Resources/Locale/en-US/alerts/alerts.ftl @@ -111,5 +111,8 @@ alerts-revenant-essence-desc = The power of souls. It sustains you and is used f alerts-revenant-corporeal-name = Corporeal alerts-revenant-corporeal-desc = You have manifested physically. People around you can see and hurt you. +alerts-walking-name = Walking +alerts-walking-desc = Indicates how fast you're moving. + alerts-offer-name = Offer alerts-offer-desc = Someone offers you an item. diff --git a/Resources/Locale/en-US/interaction/offer-item-system.ftl b/Resources/Locale/en-US/interaction/offer-item-system.ftl index 718c94cb0e9..a0847afa308 100644 --- a/Resources/Locale/en-US/interaction/offer-item-system.ftl +++ b/Resources/Locale/en-US/interaction/offer-item-system.ftl @@ -2,12 +2,12 @@ offer-item-empty-hand = You don't have anything in your hand to give! offer-item-full-hand = Your hand isn't free to receive the item. -offer-item-try-give = You offer the {THE($item)} to {$target} -offer-item-try-give-target = {$user} offers you a {THE($item)} +offer-item-try-give = You offer {THE($item)} to {$target} +offer-item-try-give-target = {$user} offers you {THE($item)} offer-item-give = You handed {THE($item)} to {$target} offer-item-give-other = {$user} handed {THE($item)} to {$target} -offer-item-give-target = {$user} handed you a {THE($item)} +offer-item-give-target = {$user} handed you {THE($item)} offer-item-no-give = You stop offering {THE($item)} to {$target} -offer-item-no-give-target = {$user} is no longer offer a {THE($item)} to you +offer-item-no-give-target = {$user} is no longer offering {THE($item)} to you diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml index 24f34bc5182..75d4ca8a862 100644 --- a/Resources/Prototypes/Alerts/alerts.yml +++ b/Resources/Prototypes/Alerts/alerts.yml @@ -429,6 +429,18 @@ name: alerts-pacified-name description: alerts-pacified-desc +- type: alert + id: Walking + icons: + - sprite: /Textures/Interface/Alerts/walking.rsi + state: walking0 + - sprite: /Textures/Interface/Alerts/walking.rsi + state: walking1 + name: alerts-walking-name + description: alerts-walking-desc + minSeverity: 0 + maxSeverity: 1 + - type: alert id: Debug1 icons: diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 40606bb9f35..e4181d27a21 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -14,6 +14,12 @@ - 0,0,2,2 - type: Sprite state: box + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/cardboardbox_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/cardboardbox_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/cardboardbox_drop.ogg - type: Tag tags: - BoxCardboard diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml index d9a3fd92173..68133faac09 100644 --- a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml +++ b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml @@ -19,6 +19,10 @@ - /Audio/Voice/Moth/moth_scream.ogg - /Audio/Voice/Skeleton/skeleton_scream.ogg - /Audio/Voice/Reptilian/reptilian_scream.ogg + - /Audio/Voice/Slime/slime_scream_m1.ogg + - /Audio/Voice/Slime/slime_scream_m2.ogg + - /Audio/Voice/Slime/slime_scream_f1.ogg + - /Audio/Voice/Slime/slime_scream_f2.ogg - type: soundCollection id: HarpyLaugh @@ -32,6 +36,9 @@ - /Audio/Animals/lizard_happy.ogg - /Audio/Animals/ferret_happy.ogg - /Audio/Voice/Moth/moth_laugh.ogg + - /Audio/Voice/Slime/slime_laugh_m1.ogg + - /Audio/Voice/Slime/slime_laugh_m2.ogg + - /Audio/Voice/Slime/slime_laugh_f1.ogg - type: soundCollection id: HarpyHisses @@ -217,7 +224,7 @@ - type: soundCollection id: HarpyChitter - files: + files: - /Audio/Voice/Moth/moth_chitter.ogg - /Audio/Machines/circuitprinter.ogg - /Audio/Machines/diagnoser_printing.ogg @@ -226,18 +233,18 @@ - type: soundCollection id: HarpySqueak - files: + files: - /Audio/Voice/Moth/moth_squeak.ogg - /Audio/Animals/mouse_squeak.ogg - type: soundCollection id: HarpyCaws - files: + files: - /Audio/DeltaV/Voice/Harpy/caw1.ogg - type: soundCollection id: HarpyChirps - files: + files: - /Audio/DeltaV/Voice/Harpy/chirp1.ogg - /Audio/Voice/Talk/pai.ogg - /Audio/Voice/Talk/pai_ask.ogg diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml index 2f904d3438c..50b1596c725 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml @@ -10,11 +10,22 @@ - type: Clothing slots: [belt] quickEquip: false + equipSound: + path: /Audio/SimpleStation14/Items/Equip/toolbelt_equip.ogg + clothingVisuals: + belt2: #there should be a cleaner way to do this tbh + - state: equipped-BELT - type: PhysicalComposition materialComposition: Cloth: 50 - type: StaticPrice price: 25 + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/toolbelt_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/toolbelt_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/toolbelt_drop.ogg - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index e6c08bf90b9..d90945a7eba 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -514,6 +514,8 @@ name: Sabre insertVerbText: sheath-insert-verb ejectVerbText: sheath-eject-verb + insertSound: /Audio/SimpleStation14/Items/Handling/sword_sheath.ogg + ejectSound: /Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg whitelist: tags: - CaptainSabre diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index de9875b3ad6..9c896786c26 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -50,6 +50,12 @@ - type: WirelessNetworkConnection range: 1200 - type: StationLimitedNetwork + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/cloth_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/cloth_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/cloth_drop.ogg - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 196abcfab76..a75be106f3c 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -220,6 +220,7 @@ understands: - GalacticCommon - RobotTalk + - type: CanWalk - type: entity id: BaseBorgChassisNT diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index ec917607abc..5d8753e669e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1309,6 +1309,7 @@ tags: - VimPilot - DoorBumpOpener + - type: CanWalk - type: entity name: monkey diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml index fda467cb32d..a310d3ee2be 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml @@ -304,6 +304,7 @@ amplification: 1 psychicFeedback: - "reagent-slime-feedback" + - type: CanWalk - type: entity name: Reagent Slime Spawner diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 42da84323f6..db594873fe3 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -126,6 +126,7 @@ understands: - GalacticCommon - Mouse + - type: CanWalk - type: entity id: MobRatKingBuff diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index c4d88e80705..690a4c5d291 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -128,6 +128,7 @@ speechSounds: Slime - type: TypingIndicator proto: slime + - type: CanWalk - type: entity name: blue slime diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index eeb6dfc852c..9f3269abda6 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -229,6 +229,7 @@ - CanPilot - FootstepSound - DoorBumpOpener + - type: CanWalk - type: entity save: false diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 9ed5918574c..17e2a4df5ee 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -33,6 +33,12 @@ interfaces: - key: enum.TransferAmountUiKey.Key type: TransferAmountBoundUserInterface + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg - type: entity parent: DrinkBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 0a1f5251b03..e488fb26eec 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -62,6 +62,12 @@ - type: Tag tags: - DrinkCan + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg - type: entity parent: DrinkCanBaseFull diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 4fc2e170d5b..c4693c6a719 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -37,6 +37,12 @@ damage: types: Blunt: 0 + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg - type: entity parent: DrinkBaseCup diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index c80398e3496..9a523c997b9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -31,6 +31,12 @@ - type: PhysicalComposition materialComposition: Steel: 50 + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg - type: entity parent: DrinkGlassBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml index 86bc34f3c8b..3cf2e77e8b6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml @@ -136,6 +136,12 @@ materialComposition: Cardboard: 20 - type: SpaceGarbage + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/drinkglass_drop.ogg - type: entity name: base empty bottle @@ -303,7 +309,6 @@ - type: Sprite sprite: Objects/Consumable/TrashDrinks/winebottle_empty.rsi - - type: entity name: lime juice carton parent: DrinkCartonBaseEmpty @@ -347,6 +352,10 @@ components: - type: Sprite sprite: Objects/Consumable/Drinks/milk.rsi + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 - type: entity name: soy milk carton diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 5fbfe9c09b2..74277cf7ff4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -609,3 +609,24 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 4 + +- type: entity + name: harpy wings + parent: FoodMealBase + id: FoodHarpyWings + description: It's a bit stringy. + components: + - type: FlavorProfile + flavors: + - chicken + - type: Sprite + state: harpywings + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 13 + - ReagentId: Protein + Quantity: 7 diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml index 7224efa9e02..fab8b56b06f 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml @@ -183,6 +183,13 @@ - type: Tag tags: - StringInstrument + - type: MeleeWeapon + soundHit: + path: /Audio/SimpleStation14/Weapons/Melee/banjohit.ogg + damage: + types: + Blunt: 7 + bluntStaminaDamageFactor: 1.5 - type: entity parent: BaseHandheldInstrument diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml index 89acd9e7dab..4d1c585e4b8 100644 --- a/Resources/Prototypes/Entities/Objects/Magic/books.yml +++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml @@ -12,6 +12,12 @@ - type: Tag tags: - Spellbook + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/book_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg - type: entity id: SpawnSpellbook diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml index ab6beb70af1..635f0888a1b 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml @@ -25,6 +25,12 @@ backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png" backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0 contentMargin: 20.0, 20.0, 20.0, 20.0 + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/book_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg - type: entity id: BookSpaceEncyclopedia diff --git a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml index e389bc6b378..f4b4f4c96cd 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml @@ -22,6 +22,12 @@ - HighRiskItem - type: StealTarget stealGroup: NukeDisk + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/disk_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg - type: entity name: nuclear authentication disk @@ -35,3 +41,9 @@ state: icon - type: StaticPrice price: 1 # it's worth even less than normal items. Perfection. + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/disk_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml index 592f8be693b..341acb52f0b 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml @@ -7,8 +7,17 @@ components: - type: Sprite sprite: Objects/Misc/stock_parts.rsi + scale: 0.8, 0.8 - type: Item size: Tiny + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/component_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/component_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/component_drop.ogg + +# Rating 1 - type: entity id: CapacitorStockPart diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index c1a5d9a1bfd..1767a956c8c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -70,6 +70,12 @@ reagents: - ReagentId: Fiber Quantity: 1 + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/paper_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/paper_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/paper_drop.ogg - type: entity name: paper scrap diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index 748ab123185..5a8726ff5ce 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml @@ -52,6 +52,12 @@ - Book - type: StealTarget stealGroup: Bible + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/book_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg - type: entity parent: Bible diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 5a2587ff710..ffa4e7ade7a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -95,6 +95,7 @@ - type: GuideHelp guides: - Robotics + - type: CanWalk - type: entity id: MechRipley diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml index 0cb605cee64..fa1b75530b6 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml @@ -11,6 +11,12 @@ - type: GuideHelp guides: - Science + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/disk_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg - type: entity parent: ResearchDisk @@ -69,3 +75,9 @@ components: - type: TechnologyDisk tierWeightPrototype: RareTechDiskTierWeights + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/disk_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/disk_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index e8601fcf355..561e478d93a 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml @@ -59,6 +59,10 @@ id: Matchbox description: A small box of Almost But Not Quite Plasma Premium Matches. components: + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/matchbox_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/matchbox_drop.ogg - type: EmitSoundOnLand sound: path: /Audio/Items/matchbox_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 667d8559971..eee102bfbd7 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -7,6 +7,10 @@ layers: - map: [ base ] state: icon + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/toolbox_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/toolbox_drop.ogg - type: EmitSoundOnLand sound: path: /Audio/Items/toolbox_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index f1bf2ff98e7..04afa1a3778 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -4,6 +4,10 @@ id: Wirecutter description: This kills the wire. components: + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/wirecutter_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/wirecutter_drop.ogg - type: EmitSoundOnLand sound: path: /Audio/Items/wirecutter_drop.ogg @@ -50,6 +54,10 @@ id: Screwdriver description: Industrial grade torque in a small screwdriving package. components: + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/screwdriver_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/screwdriver_drop.ogg - type: EmitSoundOnLand sound: path: /Audio/Items/screwdriver_drop.ogg @@ -94,6 +102,10 @@ id: Wrench description: 'A common tool for assembly and disassembly. Remember: righty tighty, lefty loosey.' components: + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/wrench_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/wrench_drop.ogg - type: EmitSoundOnLand sound: path: /Audio/Items/wrench_drop.ogg @@ -133,6 +145,10 @@ id: Crowbar description: A multipurpose tool to pry open doors and fight interdimensional invaders. components: + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/crowbar_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/crowbar_drop.ogg - type: EmitSoundOnLand sound: path: /Audio/Items/crowbar_drop.ogg @@ -191,6 +207,10 @@ id: Multitool description: An advanced tool to copy, store, and send electrical pulses and signals through wires and machines components: + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/multitool_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/multitool_drop.ogg - type: EmitSoundOnLand sound: path: /Audio/Items/multitool_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 9bf3f2e2cb9..e141f35caeb 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -4,6 +4,10 @@ id: Welder description: "Melts anything as long as it's fueled, don't forget your eye protection!" components: + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/welder_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/welder_drop.ogg - type: EmitSoundOnLand sound: path: /Audio/Items/welder_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/base_ammo.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/base_ammo.yml new file mode 100644 index 00000000000..eceec8ac3e8 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/base_ammo.yml @@ -0,0 +1,11 @@ +- type: entity + abstract: true + parent: BaseItem + id: BaseMagazineBox + components: + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/ammobox_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/ammobox_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/ammobox_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml index 063268d8b53..f1550cf9a8f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: BaseMagazineBox id: BaseMagazineBoxCaselessRifle name: ammunition box (.25 caseless) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index 0670e376360..22eeeff859d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: BaseMagazineBox id: BaseMagazineBoxLightRifle name: ammunition box (.30 rifle) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index 65f6bff00eb..c304f0af111 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: BaseMagazineBox id: BaseMagazineBoxMagnum components: - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index 9f6a8e8257d..b78551b99bd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: BaseMagazineBox id: BaseMagazineBoxPistol name: ammunition box (.35 auto) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index c321b77d10b..8e6c79dfe57 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: BaseMagazineBox id: BaseMagazineBoxRifle components: - type: BallisticAmmoProvider diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml index 11649f3db3c..a3b1855a746 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - parent: BaseItem + parent: BaseMagazineBox id: BoxDonkSoftBase name: foamdart box components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 426be1386a9..17e31e5893c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -11,11 +11,11 @@ - type: MeleeWeapon wideAnimationRotation: -135 attackRate: 1.5 + soundHit: + path: /Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg damage: types: Slash: 17 #cmon, it has to be at least BETTER than the rest. - soundHit: - path: /Audio/Weapons/bladeslice.ogg - type: Reflect enabled: true reflectProb: .5 @@ -43,11 +43,11 @@ state: icon - type: MeleeWeapon wideAnimationRotation: -135 + soundHit: + path: /Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg damage: types: Slash: 15 - soundHit: - path: /Audio/Weapons/bladeslice.ogg - type: Item size: Normal sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 2c4fccb8b3e..c90d42b42cc 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -111,6 +111,8 @@ understands: - GalacticCommon - RobotTalk + - type: VendingMachine + soundVend: /Audio/SimpleStation14/Machines/machine_vend.ogg - type: entity parent: VendingMachine diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml index 0ef99b9f47e..23b1efdf535 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml @@ -48,6 +48,10 @@ layer: - MachineLayer - type: EntityStorage + closeSound: + path: /Audio/Effects/closet_close.ogg + openSound: + path: /Audio/Effects/closet_open.ogg - type: ContainerContainer containers: entity_storage: !type:Container diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml new file mode 100644 index 00000000000..03426729d98 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Books/hyperlinks.yml @@ -0,0 +1,204 @@ +- type: entity + parent: BaseItem + id: BaseHyperlinkBook + abstract: true + components: + - type: Sprite + sprite: Objects/Misc/books.rsi + - type: Tag + tags: + - Book + - type: EmitSoundOnPickup + sound: /Audio/SimpleStation14/Items/Handling/book_pickup.ogg + - type: EmitSoundOnDrop + sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg + - type: EmitSoundOnLand + sound: /Audio/SimpleStation14/Items/Handling/book_drop.ogg + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookSpaceLaw + name: space law + description: A big book of laws for space courts. + components: + - type: Sprite + layers: + - state: book_space_law +# - type: HyperlinkBook +# url: https://wiki.nyanotrasen.moe/view/Space_Law + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookSupernanny + name: book of unsanctioned space punishments + description: The ravings of a madman. + components: + - type: Sprite + layers: + - state: book_space_law +# - type: HyperlinkBook +# url: https://supernannyfanon.fandom.com/wiki/Category:Discipline_Techniques + +#- type: entity +# parent: BaseHyperlinkBook +# id: HyperlinkBookGlimmer +# suffix: GuidebookBook +# name: A Layman's Guide to the Mind +# description: A guide on psionics. +# components: +# - type: Sprite +# sprite: SimpleStation14/Objects/Misc/books.rsi +# layers: +# - state: book_psionics +# - type: HyperlinkBook +# url: https://wiki.nyanotrasen.moe/view/Glimmer +# - type: GuidebookBook +# guides: +# - Psionics +# - AltarsGolemancy + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookChemistry + name: chemical recipe book + description: A list of chemical recipes. + components: + - type: Sprite + layers: + - state: book_chemistry +# - type: HyperlinkBook +# url: https://wiki.nyanotrasen.moe/view/Chemistry + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookBartending + name: bartender's guide + description: A list of drink recipes. + components: + - type: Sprite + layers: + - state: book_bar +# - type: HyperlinkBook +# url: https://wiki.nyanotrasen.moe/view/Drinks + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookCooking + name: cookbook + description: A list of food recipes. + components: + - type: Sprite + layers: + - state: book_cooking +# - type: HyperlinkBook +# url: https://wiki.nyanotrasen.moe/view/Cooking + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookBotany + name: botanical field guide + description: A guide to plants. + components: + - type: Sprite + layers: + - state: book_hydroponics_pod_people +# - type: HyperlinkBook +# url: https://wiki.nyanotrasen.moe/view/Hydroponics + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookShuttle + name: guide to shuttle construction + description: A guide to building shuttles. + components: + - type: Sprite + layers: + - state: book_engineering +# - type: HyperlinkBook +# url: https://wiki.nyanotrasen.moe/view/Shuttle_Construction + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookAlerts + suffix: GuidebookBook + name: What to do When Things are Blowing Up + description: Procedure for when and why each alert should be put in effect, and what to do. + components: + - type: Sprite + layers: + - state: book_nuclear + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Alert_Procedure +# - type: GuidebookBook +# guides: +# - CommonAlerts +# - SpecificAlerts +# - CentCommAlerts + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookProcedure + suffix: GuidebookBook + name: standard operating procedure + description: A guide to normal station function. + components: + - type: Sprite + layers: + - state: book_particle_accelerator + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Standard_Operating_Procedure +# - type: GuidebookBook +# guides: +# - StandardOperatingProcedure + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookPower + name: guide to power + description: A guide to powering the station. + components: + - type: Sprite + layers: + - state: book_engineering2 +# - type: HyperlinkBook +# url: https://wiki.nyanotrasen.moe/view/Power + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookMedical + name: guide to medical + description: A guide to the medical department. + components: + - type: Sprite + layers: + - state: book_infections +# - type: HyperlinkBook +# url: https://wiki.nyanotrasen.moe/view/Medical + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookHacking + name: guide to hacking + description: For emergency use only. + components: + - type: Sprite + layers: + - state: book_hacking +# - type: HyperlinkBook +# url: https://wiki.nyanotrasen.moe/view/Hacking + +- type: entity + parent: BaseHyperlinkBook + id: HyperlinkBookAtmos + suffix: GuidebookBook + name: How to Make Gas Hot + description: A guide on Atmospherics. Make sure to grab the thrilling sequal; What to do When Gas Hot. + components: + - type: Sprite + layers: + - state: book_engineering2 + # - type: HyperlinkBook + # url: https://wiki.nyanotrasen.moe/view/Atmospheric_Science +# - type: GuidebookBook +# guides: +# - Atmospherics diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index a5620fd8efe..2f280f6e46d 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1423,6 +1423,15 @@ FoodSnackChocolateBar: 2 FoodEgg: 3 +- type: microwaveMealRecipe + id: RecipeHarpyWings + name: harpy wings recipe + result: FoodHarpyWings + time: 15 + solids: + LeftLegHarpy: 1 + RightLegHarpy: 1 + #Donks i guess - type: microwaveMealRecipe id: RecipeWarmDonkpocket diff --git a/Resources/Prototypes/SoundCollections/screams.yml b/Resources/Prototypes/SoundCollections/screams.yml index 46965712b0e..518bbf72bb7 100644 --- a/Resources/Prototypes/SoundCollections/screams.yml +++ b/Resources/Prototypes/SoundCollections/screams.yml @@ -30,3 +30,41 @@ - /Audio/Voice/Cluwne/cluwnelaugh1.ogg - /Audio/Voice/Cluwne/cluwnelaugh2.ogg - /Audio/Voice/Cluwne/cluwnelaugh3.ogg + +- type: soundCollection + id: SlimeMaleLaughs + files: + - /Audio/Voice/Slime/slime_laugh_m1.ogg + - /Audio/Voice/Slime/slime_laugh_m2.ogg + +- type: soundCollection + id: SlimeFemaleLaughs + files: + - /Audio/Voice/Slime/slime_laugh_f1.ogg + +- type: soundCollection + id: SlimeUnisexLaughs + files: + - /Audio/Voice/Slime/slime_laugh_m1.ogg + - /Audio/Voice/Slime/slime_laugh_m2.ogg + - /Audio/Voice/Slime/slime_laugh_f1.ogg + +- type: soundCollection + id: SlimeMaleScreams + files: + - /Audio/Voice/Slime/slime_scream_m1.ogg + - /Audio/Voice/Slime/slime_scream_m2.ogg + +- type: soundCollection + id: SlimeFemaleScreams + files: + - /Audio/Voice/Slime/slime_scream_f1.ogg + - /Audio/Voice/Slime/slime_scream_f2.ogg + +- type: soundCollection + id: SlimeUnisexScreams + files: + - /Audio/Voice/Slime/slime_scream_m1.ogg + - /Audio/Voice/Slime/slime_scream_m2.ogg + - /Audio/Voice/Slime/slime_scream_f1.ogg + - /Audio/Voice/Slime/slime_scream_f2.ogg diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index 01fabbadf30..a4588952a88 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -95,9 +95,9 @@ Squish: collection: Squishes Scream: - collection: MaleScreams + collection: SlimeMaleScreams Laugh: - collection: MaleLaugh + collection: SlimeMaleLaughs Sneeze: collection: MaleSneezes Cough: @@ -133,9 +133,9 @@ Squish: collection: Squishes Scream: - collection: FemaleScreams + collection: SlimeFemaleScreams Laugh: - collection: FemaleLaugh + collection: SlimeFemaleLaughs Sneeze: collection: FemaleSneezes Cough: diff --git a/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json b/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json index 6b8580b7dc3..9b5f9361314 100644 --- a/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json +++ b/Resources/Textures/Interface/Alerts/offer_item.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/ss220-space/Paradise/blob/master220/icons/mob/screen_alert.dmi", + "copyright": "Original icon taken from https://github.com/ss220-space/Paradise/blob/master220/icons/mob/screen_alert.dmi, modified by Mocho", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png b/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png index ce39fa92299..44ac380ddb1 100644 Binary files a/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png and b/Resources/Textures/Interface/Alerts/offer_item.rsi/offer_item.png differ diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/meta.json b/Resources/Textures/Interface/Alerts/walking.rsi/meta.json new file mode 100644 index 00000000000..d328b01a45f --- /dev/null +++ b/Resources/Textures/Interface/Alerts/walking.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Walking/Running icons modified by Mocho, original taken from /tg/station https://github.com/tgstation/tgstation/pull/52691/commits/6a1261187c108c8f151c99ebfa567bd1ec34044c", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "walking0" + }, + { + "name": "walking1" + } + ] +} diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/walking0.png b/Resources/Textures/Interface/Alerts/walking.rsi/walking0.png new file mode 100644 index 00000000000..1d1f048fb91 Binary files /dev/null and b/Resources/Textures/Interface/Alerts/walking.rsi/walking0.png differ diff --git a/Resources/Textures/Interface/Alerts/walking.rsi/walking1.png b/Resources/Textures/Interface/Alerts/walking.rsi/walking1.png new file mode 100644 index 00000000000..3980ee73b5d Binary files /dev/null and b/Resources/Textures/Interface/Alerts/walking.rsi/walking1.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/harpywings.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/harpywings.png new file mode 100644 index 00000000000..e355802a95a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/meals.rsi/harpywings.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json index e3fa26223a2..320257ad198 100644 --- a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec, corn in butter from im_kreks", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec, corn in butter from im_kreks, harpywings from dootythefrooty", "size": { "x": 32, "y": 32 @@ -150,6 +150,9 @@ }, { "name": "corn-in-butter" + }, + { + "name": "harpywings" } ] }