diff --git a/CLA.txt b/CLA.txt deleted file mode 100644 index 731b4ec102..0000000000 --- a/CLA.txt +++ /dev/null @@ -1,59 +0,0 @@ -Preamble - -Upon receipt of a copy of the license object by any means, any person can use it if they -accept and agree to all the terms of this license. Violation of the license terms grants us -(the Licensor) the right to apply methods of legal and technological protection using the -DMCA and/or other legislation of the states under whose jurisdiction hosting providers -and other information intermediaries are located, providing services to violators of the -terms of this license. Acceptance of the terms of this license means a definitive conclusion -between you and FDev of a gratuitous simple non-exclusive license, hereinafter referred -to as the "Agreement". The Agreement does not include provisions regulating issues -related to the processing of personal data. - -Definitions - -Build is an object of Agreement, the result of the original author's work or a team of -authors (hereinafter referred to as the "Company"), a complex intellectual property object -– a video game that includes, but is not limited to, source, object code, tools, game assets, -specifications, UI/UX design, elements of narrative and other creative content based on -the revision and translation into Russian of the open version of Space Station 14 and the -artistic vision of the authors. The set of individual elements is a Build. Any elements other -than the original elements are objects of copyright and/or related rights created by the -creative work of the collective. - -Contribution means any original author's work of Contributors, including any -modifications or additions to the Build (any source code, object code, correction, tool, -sample, graphics, assets, specifications, manuals, documentation), which is intentionally -provided by the Licensee to the Licensor. For the purposes of this definition, -submission means any form of electronic, oral or written communication sent to Licensor -or its representatives, including, but not limited to, messages on electronic mailing lists, -source code control systems and issue tracking systems operated by or on behalf of the -Company for the purposes of discussing or improving software or project documentation -and source. Communications for which it is explicitly stated in writing as "Not a -contribution" will not be considered a contribution. When providing a Contribution to the -Build, the Contributor provides the Company with a simple, free, irrevocable, non-exclusive -license for the entire period of validity of the Contributor's rights to the Contribution provided -for by the legislation of the state-jurisdiction of the Contributor -and/or international legislation for certain forms of Contribution. - -Licensor – FDev. For licensing inquiries, please contact: admin@ss14.su - -The scope of the rights granted - -The license grants an unlimited number of persons the right to copy and make changes -solely for the purpose of improving the game and subject to the further transfer of such -changes to FDev on the terms of the Contribution, as well as for non-public hosting and -launching the Build on the Licensee's computer for the purpose of non-commercial use -for its intended purpose (providing access to Players and the Game process). This license -expressly prohibits commercial use, public hosting, as well as non-licensed use. The use -of the Build or its elements in violation of the terms of this License grants the Licensor -the right to contact the hosting provider and other persons – information intermediaries -to block hosting. The Licensee can carry out public hosting of the Build only if they receive -direct permission from the Licensor. - -A reservation about the types of licenses - -Individual elements of the Build (graphics, sounds, source code) may be distributed under -a license other than this one. Most assets are licensed under CC-BY-SA 3.0 unless -otherwise specified. Assets have their own license and copyright in the metadata file. If -the license type is not specified, such files are distributed under the terms of this license. \ No newline at end of file diff --git a/Content.Client/GameTicking/Commands/ShowManifestCommand.cs b/Content.Client/GameTicking/Commands/ShowManifestCommand.cs index d3f77c8f59..bc1a7097c5 100644 --- a/Content.Client/GameTicking/Commands/ShowManifestCommand.cs +++ b/Content.Client/GameTicking/Commands/ShowManifestCommand.cs @@ -1,23 +1,21 @@ -using Content.Client.GameTicking.Managers; -using Content.Shared.Administration; -using Content.Shared.GameTicking; +using Content.Shared.Administration; using Robust.Shared.Console; -using Robust.Shared.Network; +using Content.Client.RoundEnd; +using Robust.Client.UserInterface; namespace Content.Client.GameTicking.Commands { [AnyCommand] public sealed class ShowManifestCommand : IConsoleCommand { - [Dependency] private readonly IEntitySystemManager _entitySystem = default!; - + [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; public string Command => "showmanifest"; public string Description => "Shows round end summary window"; public string Help => "Usage: showmanifest"; public void Execute(IConsoleShell shell, string argStr, string[] args) { - shell.WriteLine("You can't open manifest right now"); + _userInterfaceManager.GetUIController().ShowManifest(); } } } diff --git a/Content.Client/RoundEnd/RoundEndSummaryUIController.cs b/Content.Client/RoundEnd/RoundEndSummaryUIController.cs index cf824833ef..a323f1641a 100644 --- a/Content.Client/RoundEnd/RoundEndSummaryUIController.cs +++ b/Content.Client/RoundEnd/RoundEndSummaryUIController.cs @@ -48,4 +48,13 @@ public sealed class RoundEndSummaryUIController : UIController, _input.SetInputCommand(ContentKeyFunctions.ToggleRoundEndSummaryWindow, InputCmdHandler.FromDelegate(ToggleScoreboardWindow)); } + + /// + /// WD. + /// Used for cosnole command. + /// + public void ShowManifest() + { + ToggleScoreboardWindow(); + } } diff --git a/Content.Server/Construction/Components/WelderRefinableComponent.cs b/Content.Server/Construction/Components/WelderRefinableComponent.cs index ed37d6f74b..daded8565e 100644 --- a/Content.Server/Construction/Components/WelderRefinableComponent.cs +++ b/Content.Server/Construction/Components/WelderRefinableComponent.cs @@ -17,7 +17,7 @@ public sealed partial class WelderRefinableComponent : Component public float RefineTime = 2f; [DataField] - public float RefineFuel; + public float RefineFuel = 3f; // WD ahead of wizden upstream [DataField] public ProtoId QualityNeeded = "Welding"; diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index 3e44542959..92c5818030 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -80,14 +80,12 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem return; // same as store code, but message is only shown to yourself - args.Handled = _store.TryAddCurrency(_store.GetCurrencyValue(args.Used, currency), uid, store); - - if (!args.Handled) + if (!_store.TryAddCurrency((args.Used, currency), (uid, store))) return; + args.Handled = true; var msg = Loc.GetString("store-currency-inserted-implant", ("used", args.Used)); _popup.PopupEntity(msg, args.User, args.User); - QueueDel(args.Used); } private void OnFreedomImplant(EntityUid uid, SubdermalImplantComponent component, UseFreedomImplantEvent args) diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs index fbc25027d0..c07140effb 100644 --- a/Content.Server/Nuke/NukeSystem.cs +++ b/Content.Server/Nuke/NukeSystem.cs @@ -23,6 +23,7 @@ using Robust.Shared.Map.Components; using Robust.Shared.Player; using Robust.Shared.Random; using Robust.Shared.Utility; +using Robust.Shared.Timing; // WD namespace Content.Server.Nuke; @@ -571,7 +572,7 @@ public sealed class NukeSystem : EntitySystem _sound.StopStationEventMusic(uid, StationEventMusicType.Nuke); Del(uid); - _roundEndSystem.EndRound(TimeSpan.FromSeconds(30)); //Giedi EDIT + Timer.Spawn(TimeSpan.FromSeconds(60), () => _roundEndSystem.EndRound(TimeSpan.FromSeconds(60))); //Giedi EDIT } /// diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs index e34592b45f..10d46eb9e2 100644 --- a/Content.Server/Stack/StackSystem.cs +++ b/Content.Server/Stack/StackSystem.cs @@ -91,19 +91,68 @@ namespace Content.Server.Stack /// public List SpawnMultiple(string entityPrototype, int amount, EntityCoordinates spawnPosition) { - var proto = _prototypeManager.Index(entityPrototype); - proto.TryGetComponent(out var stack); - var maxCountPerStack = GetMaxCount(stack); + if (amount <= 0) + { + Log.Error( + $"Attempted to spawn an invalid stack: {entityPrototype}, {amount}. Trace: {Environment.StackTrace}"); + return new(); + } + + var spawns = CalculateSpawns(entityPrototype, amount); + var spawnedEnts = new List(); + foreach (var count in spawns) + { + var entity = SpawnAtPosition(entityPrototype, spawnPosition); + spawnedEnts.Add(entity); + SetCount(entity, count); + } + + return spawnedEnts; + } + + /// + public List SpawnMultiple(string entityPrototype, int amount, EntityUid target) + { + if (amount <= 0) + { + Log.Error( + $"Attempted to spawn an invalid stack: {entityPrototype}, {amount}. Trace: {Environment.StackTrace}"); + return new(); + } + var spawns = CalculateSpawns(entityPrototype, amount); + + var spawnedEnts = new List(); + foreach (var count in spawns) + { + var entity = SpawnNextToOrDrop(entityPrototype, target); + spawnedEnts.Add(entity); + SetCount(entity, count); + } + + return spawnedEnts; + } + + /// + /// Calculates how many stacks to spawn that total up to . + /// + /// The stack to spawn. + /// The amount of pieces across all stacks. + /// The list of stack counts per entity. + private List CalculateSpawns(string entityPrototype, int amount) + { + var proto = _prototypeManager.Index(entityPrototype); + proto.TryGetComponent(out var stack, EntityManager.ComponentFactory); + var maxCountPerStack = GetMaxCount(stack); + var amounts = new List(); while (amount > 0) { - var entity = Spawn(entityPrototype, spawnPosition); - spawnedEnts.Add(entity); var countAmount = Math.Min(maxCountPerStack, amount); - SetCount(entity, countAmount); amount -= countAmount; + amounts.Add(countAmount); } - return spawnedEnts; + + return amounts; } private void OnStackAlternativeInteract(EntityUid uid, StackComponent stack, GetVerbsEvent args) diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs index 6df2f02d40..e8f4ae3630 100644 --- a/Content.Server/Store/Systems/StoreSystem.Ui.cs +++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs @@ -297,6 +297,9 @@ public sealed partial class StoreSystem /// private void OnRequestWithdraw(EntityUid uid, StoreComponent component, StoreRequestWithdrawMessage msg) { + if (msg.Amount <= 0) + return; + //make sure we have enough cash in the bank and we actually support this currency if (!component.Balance.TryGetValue(msg.Currency, out var currentAmount) || currentAmount < msg.Amount) return; @@ -320,7 +323,8 @@ public sealed partial class StoreSystem var cashId = proto.Cash[value]; var amountToSpawn = (int) MathF.Floor((float) (amountRemaining / value)); var ents = _stack.SpawnMultiple(cashId, amountToSpawn, coordinates); - _hands.PickupOrDrop(buyer, ents.First()); + if (ents.FirstOrDefault() is {} ent) + _hands.PickupOrDrop(buyer, ent); amountRemaining -= value * amountToSpawn; } diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs index 397ff26922..0c4bccd0f1 100644 --- a/Content.Server/Store/Systems/StoreSystem.cs +++ b/Content.Server/Store/Systems/StoreSystem.cs @@ -94,14 +94,12 @@ public sealed partial class StoreSystem : EntitySystem if (ev.Cancelled) return; - args.Handled = TryAddCurrency(GetCurrencyValue(uid, component), args.Target.Value, store); + if (!TryAddCurrency((uid, component), (args.Target.Value, store))) + return; - if (args.Handled) - { - var msg = Loc.GetString("store-currency-inserted", ("used", args.Used), ("target", args.Target)); - _popup.PopupEntity(msg, args.Target.Value, args.User); - QueueDel(args.Used); - } + args.Handled = true; + var msg = Loc.GetString("store-currency-inserted", ("used", args.Used), ("target", args.Target)); + _popup.PopupEntity(msg, args.Target.Value, args.User); } private void OnImplantActivate(EntityUid uid, StoreComponent component, OpenUplinkImplantEvent args) @@ -123,19 +121,29 @@ public sealed partial class StoreSystem : EntitySystem } /// - /// Tries to add a currency to a store's balance. + /// Tries to add a currency to a store's balance. Note that if successful, this will consume the currency in the process. /// - /// - /// - /// The currency to add - /// The store to add it to - /// Whether or not the currency was succesfully added - [PublicAPI] - public bool TryAddCurrency(EntityUid currencyEnt, EntityUid storeEnt, StoreComponent? store = null, CurrencyComponent? currency = null) + public bool TryAddCurrency(Entity currency, Entity store) { - if (!Resolve(currencyEnt, ref currency) || !Resolve(storeEnt, ref store)) + if (!Resolve(currency.Owner, ref currency.Comp)) return false; - return TryAddCurrency(GetCurrencyValue(currencyEnt, currency), storeEnt, store); + if (!Resolve(store.Owner, ref store.Comp)) + return false; + var value = currency.Comp.Price; + if (TryComp(currency.Owner, out StackComponent? stack) && stack.Count != 1) + { + value = currency.Comp.Price + .ToDictionary(v => v.Key, p => p.Value * stack.Count); + } + if (!TryAddCurrency(value, store, store.Comp)) + return false; + // Avoid having the currency accidentally be re-used. E.g., if multiple clients try to use the currency in the + // same tick + currency.Comp.Price.Clear(); + if (stack != null) + _stack.SetCount(currency.Owner, 0, stack); + QueueDel(currency); + return true; } /// diff --git a/Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs b/Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs index 9958f821f3..e79a7cace3 100644 --- a/Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs +++ b/Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs @@ -1,4 +1,3 @@ -using Content.Server.Chat.Managers; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Linq; @@ -13,6 +12,7 @@ using Content.Server.Store.Systems; using Content.Server._White.Sponsors; using Content.Server.Antag; using Content.Server.Administration.Managers; +using Content.Server.Chat.Managers; using Content.Server.GameTicking; using Content.Server.GameTicking.Rules.Components; using Content.Shared.FixedPoint; diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs index e2a88105a0..6190e7aa36 100644 --- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs @@ -197,7 +197,7 @@ public sealed class ThirstSystem : EntitySystem component.ActualDecayRate = component.BaseDecayRate * 0.8f; return; case ThirstThreshold.Parched: - _movement.RefreshMovementSpeedModifiers(uid); + //_movement.RefreshMovementSpeedModifiers(uid); WD REMOVED component.LastThirstThreshold = component.CurrentThirstThreshold; component.ActualDecayRate = component.BaseDecayRate * 0.6f; return; diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs index df1290d100..6dea49a385 100644 --- a/Content.Shared/RCD/Systems/RCDSystem.cs +++ b/Content.Shared/RCD/Systems/RCDSystem.cs @@ -400,46 +400,63 @@ public class RCDSystem : EntitySystem } // Entity specific rules - - // Check rule: The tile is unoccupied - var isWindow = component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.IsWindow); - var isCatwalk = component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.IsCatwalk); - - _intersectingEntities.Clear(); - _lookup.GetLocalEntitiesIntersecting(mapGridData.GridUid, mapGridData.Position, _intersectingEntities, -0.05f, LookupFlags.Uncontained); - - foreach (var ent in _intersectingEntities) + if (component.CachedPrototype.Mode == RcdMode.ConstructObject) { - if (isWindow && HasComp(ent)) - continue; + // Check for existing identical entities in the same tile + _intersectingEntities.Clear(); + _lookup.GetLocalEntitiesIntersecting(mapGridData.GridUid, mapGridData.Position, _intersectingEntities, -0.05f, LookupFlags.Uncontained); - if (isCatwalk && _tags.HasTag(ent, "Catwalk")) + if (component.CachedPrototype.Prototype != null) { - if (popMsgs) - _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-on-occupied-tile-message"), uid, user); + foreach (var entity in _intersectingEntities) + { + // Check if the entity has the same prototype ID + if (MetaData(entity).EntityPrototype?.ID == component.CachedPrototype.Prototype) + { + if (popMsgs) + _popup.PopupClient("An identical object already exists in this location.", uid, user); - return false; + return false; + } + } } - if (component.CachedPrototype.CollisionMask != CollisionGroup.None && TryComp(ent, out var fixtures)) + var isWindow = component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.IsWindow); + var isCatwalk = component.CachedPrototype.ConstructionRules.Contains(RcdConstructionRule.IsCatwalk); + + foreach (var ent in _intersectingEntities) { - foreach (var fixture in fixtures.Fixtures.Values) + if (isWindow && HasComp(ent)) + continue; + + if (isCatwalk && _tags.HasTag(ent, "Catwalk")) { - // Continue if no collision is possible - if (!fixture.Hard || fixture.CollisionLayer <= 0 || (fixture.CollisionLayer & (int) component.CachedPrototype.CollisionMask) == 0) - continue; - - // Continue if our custom collision bounds are not intersected - if (component.CachedPrototype.CollisionPolygon != null && - !DoesCustomBoundsIntersectWithFixture(component.CachedPrototype.CollisionPolygon, component.ConstructionTransform, ent, fixture)) - continue; - - // Collision was detected if (popMsgs) _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-on-occupied-tile-message"), uid, user); return false; } + + if (component.CachedPrototype.CollisionMask != CollisionGroup.None && TryComp(ent, out var fixtures)) + { + foreach (var fixture in fixtures.Fixtures.Values) + { + // Continue if no collision is possible + if (!fixture.Hard || fixture.CollisionLayer <= 0 || (fixture.CollisionLayer & (int) component.CachedPrototype.CollisionMask) == 0) + continue; + + // Continue if our custom collision bounds are not intersected + if (component.CachedPrototype.CollisionPolygon != null && + !DoesCustomBoundsIntersectWithFixture(component.CachedPrototype.CollisionPolygon, component.ConstructionTransform, ent, fixture)) + continue; + + // Collision was detected + if (popMsgs) + _popup.PopupClient(Loc.GetString("rcd-component-cannot-build-on-occupied-tile-message"), uid, user); + + return false; + } + } } } diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index 3d9eb67b36..cb5ebfc7db 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -6,6 +6,7 @@ using Content.Shared.Administration.Logs; using Content.Shared.CombatMode; using Content.Shared.Damage; using Content.Shared.Damage.Systems; +using Content.Shared.Damage.Components; // WD using Content.Shared.Database; using Content.Shared.FixedPoint; using Content.Shared.Hands; @@ -644,6 +645,11 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem if (!TryComp(user, out TransformComponent? userXform)) return false; + // WD EDIT + if (TryComp(user, out var stamina) && stamina.StaminaDamage >= stamina.CritThreshold) + return false; + // WD EDIT END + var targetMap = GetCoordinates(ev.Coordinates).ToMap(EntityManager, TransformSystem); if (targetMap.MapId != userXform.MapID) diff --git a/LICENSE.TXT b/LICENSE.TXT index 731b4ec102..e640fb87f6 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,59 +1,535 @@ -Preamble +Reciprocal Public License 1.5 (RPL1.5) -Upon receipt of a copy of the license object by any means, any person can use it if they -accept and agree to all the terms of this license. Violation of the license terms grants us -(the Licensor) the right to apply methods of legal and technological protection using the -DMCA and/or other legislation of the states under whose jurisdiction hosting providers -and other information intermediaries are located, providing services to violators of the -terms of this license. Acceptance of the terms of this license means a definitive conclusion -between you and FDev of a gratuitous simple non-exclusive license, hereinafter referred -to as the "Agreement". The Agreement does not include provisions regulating issues -related to the processing of personal data. +Version 1.5, July 15, 2007 -Definitions +Copyright (C) 2001-2007 Technical Pursuit Inc., All Rights Reserved. -Build is an object of Agreement, the result of the original author's work or a team of -authors (hereinafter referred to as the "Company"), a complex intellectual property object -– a video game that includes, but is not limited to, source, object code, tools, game assets, -specifications, UI/UX design, elements of narrative and other creative content based on -the revision and translation into Russian of the open version of Space Station 14 and the -artistic vision of the authors. The set of individual elements is a Build. Any elements other -than the original elements are objects of copyright and/or related rights created by the -creative work of the collective. +PREAMBLE -Contribution means any original author's work of Contributors, including any -modifications or additions to the Build (any source code, object code, correction, tool, -sample, graphics, assets, specifications, manuals, documentation), which is intentionally -provided by the Licensee to the Licensor. For the purposes of this definition, -submission means any form of electronic, oral or written communication sent to Licensor -or its representatives, including, but not limited to, messages on electronic mailing lists, -source code control systems and issue tracking systems operated by or on behalf of the -Company for the purposes of discussing or improving software or project documentation -and source. Communications for which it is explicitly stated in writing as "Not a -contribution" will not be considered a contribution. When providing a Contribution to the -Build, the Contributor provides the Company with a simple, free, irrevocable, non-exclusive -license for the entire period of validity of the Contributor's rights to the Contribution provided -for by the legislation of the state-jurisdiction of the Contributor -and/or international legislation for certain forms of Contribution. +The Reciprocal Public License (RPL) is based on the concept of reciprocity +or, if you prefer, fairness. -Licensor – FDev. For licensing inquiries, please contact: admin@ss14.su +In short, this license grew out of a desire to close loopholes in previous +open source licenses, loopholes that allowed parties to acquire open source +software and derive financial benefit from it without having to release their +improvements or derivatives to the community which enabled them. This occurred +any time an entity did not release their application to a "third party". -The scope of the rights granted +While there is a certain freedom in this model of licensing, it struck the +authors of the RPL as being unfair to the open source community at large and +to the original authors of the works in particular. After all, bug fixes, +extensions, and meaningful and valuable derivatives were not consistently +finding their way back into the community where they could fuel further, and +faster, growth and expansion of the overall open source software base. -The license grants an unlimited number of persons the right to copy and make changes -solely for the purpose of improving the game and subject to the further transfer of such -changes to FDev on the terms of the Contribution, as well as for non-public hosting and -launching the Build on the Licensee's computer for the purpose of non-commercial use -for its intended purpose (providing access to Players and the Game process). This license -expressly prohibits commercial use, public hosting, as well as non-licensed use. The use -of the Build or its elements in violation of the terms of this License grants the Licensor -the right to contact the hosting provider and other persons – information intermediaries -to block hosting. The Licensee can carry out public hosting of the Build only if they receive -direct permission from the Licensor. +While you should clearly read and understand the entire license, the essence +of the RPL is found in two definitions: "Deploy" and "Required Components". -A reservation about the types of licenses +Regarding deployment, under the RPL your changes, bug fixes, extensions, etc. +must be made available to the open source community at large when you Deploy +in any form -- either internally or to an outside party. Once you start running +the software you have to start sharing the software. -Individual elements of the Build (graphics, sounds, source code) may be distributed under -a license other than this one. Most assets are licensed under CC-BY-SA 3.0 unless -otherwise specified. Assets have their own license and copyright in the metadata file. If -the license type is not specified, such files are distributed under the terms of this license. \ No newline at end of file +Further, under the RPL all components you author including schemas, scripts, +source code, etc. -- regardless of whether they're compiled into a single +binary or used as two halves of client/server application -- must be shared. +You have to share the whole pie, not an isolated slice of it. + +In addition to these goals, the RPL was authored to meet the requirements +of the Open Source Definition as maintained by the Open Source Initiative +(OSI). + +The specific terms and conditions of the license are defined in the remainder +of this document. + +LICENSE TERMS + +1.0 General; Applicability & Definitions. This Reciprocal Public License Version +1.5 ("License") applies to any programs or other works as well as any and +all updates or maintenance releases of said programs or works ("Software") +not already covered by this License which the Software copyright holder ("Licensor") +makes available containing a License Notice (hereinafter defined) from the +Licensor specifying or allowing use or distribution under the terms of this +License. As used in this License: + +1.1 "Contributor" means any person or entity who created or contributed to +the creation of an Extension. + +1.2 "Deploy" means to use, Serve, sublicense or distribute Licensed Software +other than for Your internal Research and/or Personal Use, and includes without +limitation, any and all internal use or distribution of Licensed Software +within Your business or organization other than for Research and/or Personal +Use, as well as direct or indirect sublicensing or distribution of Licensed +Software by You to any third party in any form or manner. + +1.3 "Derivative Works" as used in this License is defined under U.S. copyright +law. + +1.4 "Electronic Distribution Mechanism" means a mechanism generally accepted +in the software development community for the electronic transfer of data +such as download from an FTP server or web site, where such mechanism is publicly +accessible. + +1.5 "Extensions" means any Modifications, Derivative Works, or Required Components +as those terms are defined in this License. + + 1.6 "License" means this Reciprocal Public License. + + 1.7 "License Notice" means any notice contained in EXHIBIT A. + +1.8 "Licensed Software" means any Software licensed pursuant to this License. +Licensed Software also includes all previous Extensions from any Contributor +that You receive. + +1.9 "Licensor" means the copyright holder of any Software previously not covered +by this License who releases the Software under the terms of this License. + +1.10 "Modifications" means any additions to or deletions from the substance +or structure of (i) a file or other storage containing Licensed Software, +or (ii) any new file or storage that contains any part of Licensed Software, +or (iii) any file or storage which replaces or otherwise alters the original +functionality of Licensed Software at runtime. + +1.11 "Personal Use" means use of Licensed Software by an individual solely +for his or her personal, private and non-commercial purposes. An individual's +use of Licensed Software in his or her capacity as an officer, employee, member, +independent contractor or agent of a corporation, business or organization +(commercial or non-commercial) does not qualify as Personal Use. + +1.12 "Required Components" means any text, programs, scripts, schema, interface +definitions, control files, or other works created by You which are required +by a third party of average skill to successfully install and run Licensed +Software containing Your Modifications, or to install and run Your Derivative +Works. + +1.13 "Research" means investigation or experimentation for the purpose of +understanding the nature and limits of the Licensed Software and its potential +uses. + +1.14 "Serve" means to deliver Licensed Software and/or Your Extensions by +means of a computer network to one or more computers for purposes of execution +of Licensed Software and/or Your Extensions. + +1.15 "Software" means any computer programs or other works as well as any +updates or maintenance releases of those programs or works which are distributed +publicly by Licensor. + +1.16 "Source Code" means the preferred form for making modifications to the +Licensed Software and/or Your Extensions, including all modules contained +therein, plus any associated text, interface definition files, scripts used +to control compilation and installation of an executable program or other +components required by a third party of average skill to build a running version +of the Licensed Software or Your Extensions. + +1.17 "User-Visible Attribution Notice" means any notice contained in EXHIBIT +B. + +1.18 "You" or "Your" means an individual or a legal entity exercising rights +under this License. For legal entities, "You" or "Your" includes any entity +which controls, is controlled by, or is under common control with, You, where +"control" means (a) the power, direct or indirect, to cause the direction +or management of such entity, whether by contract or otherwise, or (b) ownership +of fifty percent (50%) or more of the outstanding shares or beneficial ownership +of such entity. + +2.0 Acceptance Of License. You are not required to accept this License since +you have not signed it, however nothing else grants you permission to use, +copy, distribute, modify, or create derivatives of either the Software or +any Extensions created by a Contributor. These actions are prohibited by law +if you do not accept this License. Therefore, by performing any of these actions +You indicate Your acceptance of this License and Your agreement to be bound +by all its terms and conditions. IF YOU DO NOT AGREE WITH ALL THE TERMS AND +CONDITIONS OF THIS LICENSE DO NOT USE, MODIFY, CREATE DERIVATIVES, OR DISTRIBUTE +THE SOFTWARE. IF IT IS IMPOSSIBLE FOR YOU TO COMPLY WITH ALL THE TERMS AND +CONDITIONS OF THIS LICENSE THEN YOU CAN NOT USE, MODIFY, CREATE DERIVATIVES, +OR DISTRIBUTE THE SOFTWARE. + +3.0 Grant of License From Licensor. Subject to the terms and conditions of +this License, Licensor hereby grants You a world-wide, royalty-free, non-exclusive +license, subject to Licensor's intellectual property rights, and any third +party intellectual property claims derived from the Licensed Software under +this License, to do the following: + +3.1 Use, reproduce, modify, display, perform, sublicense and distribute Licensed +Software and Your Extensions in both Source Code form or as an executable +program. + +3.2 Create Derivative Works (as that term is defined under U.S. copyright +law) of Licensed Software by adding to or deleting from the substance or structure +of said Licensed Software. + +3.3 Under claims of patents now or hereafter owned or controlled by Licensor, +to make, use, have made, and/or otherwise dispose of Licensed Software or +portions thereof, but solely to the extent that any such claim is necessary +to enable You to make, use, have made, and/or otherwise dispose of Licensed +Software or portions thereof. + +3.4 Licensor reserves the right to release new versions of the Software with +different features, specifications, capabilities, functions, licensing terms, +general availability or other characteristics. Title, ownership rights, and +intellectual property rights in and to the Licensed Software shall remain +in Licensor and/or its Contributors. + +4.0 Grant of License From Contributor. By application of the provisions in +Section 6 below, each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license, subject to said Contributor's intellectual property +rights, and any third party intellectual property claims derived from the +Licensed Software under this License, to do the following: + +4.1 Use, reproduce, modify, display, perform, sublicense and distribute any +Extensions Deployed by such Contributor or portions thereof, in both Source +Code form or as an executable program, either on an unmodified basis or as +part of Derivative Works. + +4.2 Under claims of patents now or hereafter owned or controlled by Contributor, +to make, use, have made, and/or otherwise dispose of Extensions or portions +thereof, but solely to the extent that any such claim is necessary to enable +You to make, use, have made, and/or otherwise dispose of Licensed Software +or portions thereof. + +5.0 Exclusions From License Grant. Nothing in this License shall be deemed +to grant any rights to trademarks, copyrights, patents, trade secrets or any +other intellectual property of Licensor or any Contributor except as expressly +stated herein. Except as expressly stated in Sections 3 and 4, no other patent +rights, express or implied, are granted herein. Your Extensions may require +additional patent licenses from Licensor or Contributors which each may grant +in its sole discretion. No right is granted to the trademarks of Licensor +or any Contributor even if such marks are included in the Licensed Software. +Nothing in this License shall be interpreted to prohibit Licensor from licensing +under different terms from this License any code that Licensor otherwise would +have a right to license. + +5.1 You expressly acknowledge and agree that although Licensor and each Contributor +grants the licenses to their respective portions of the Licensed Software +set forth herein, no assurances are provided by Licensor or any Contributor +that the Licensed Software does not infringe the patent or other intellectual +property rights of any other entity. Licensor and each Contributor disclaim +any liability to You for claims brought by any other entity based on infringement +of intellectual property rights or otherwise. As a condition to exercising +the rights and licenses granted hereunder, You hereby assume sole responsibility +to secure any other intellectual property rights needed, if any. For example, +if a third party patent license is required to allow You to distribute the +Licensed Software, it is Your responsibility to acquire that license before +distributing the Licensed Software. + +6.0 Your Obligations And Grants. In consideration of, and as an express condition +to, the licenses granted to You under this License You hereby agree that any +Modifications, Derivative Works, or Required Components (collectively Extensions) +that You create or to which You contribute are governed by the terms of this +License including, without limitation, Section 4. Any Extensions that You +create or to which You contribute must be Deployed under the terms of this +License or a future version of this License released under Section 7. You +hereby grant to Licensor and all third parties a world-wide, non-exclusive, +royalty-free license under those intellectual property rights You own or control +to use, reproduce, display, perform, modify, create derivatives, sublicense, +and distribute Licensed Software, in any form. Any Extensions You make and +Deploy must have a distinct title so as to readily tell any subsequent user +or Contributor that the Extensions are by You. You must include a copy of +this License or directions on how to obtain a copy with every copy of the +Extensions You distribute. You agree not to offer or impose any terms on any +Source Code or executable version of the Licensed Software, or its Extensions +that alter or restrict the applicable version of this License or the recipients' +rights hereunder. + +6.1 Availability of Source Code. You must make available, under the terms +of this License, the Source Code of any Extensions that You Deploy, via an +Electronic Distribution Mechanism. The Source Code for any version that You +Deploy must be made available within one (1) month of when you Deploy and +must remain available for no less than twelve (12) months after the date You +cease to Deploy. You are responsible for ensuring that the Source Code to +each version You Deploy remains available even if the Electronic Distribution +Mechanism is maintained by a third party. You may not charge a fee for any +copy of the Source Code distributed under this Section in excess of Your actual +cost of duplication and distribution of said copy. + +6.2 Description of Modifications. You must cause any Modifications that You +create or to which You contribute to be documented in the Source Code, clearly +describing the additions, changes or deletions You made. You must include +a prominent statement that the Modifications are derived, directly or indirectly, +from the Licensed Software and include the names of the Licensor and any Contributor +to the Licensed Software in (i) the Source Code and (ii) in any notice displayed +by the Licensed Software You distribute or in related documentation in which +You describe the origin or ownership of the Licensed Software. You may not +modify or delete any pre-existing copyright notices, change notices or License +text in the Licensed Software without written permission of the respective +Licensor or Contributor. + + 6.3 Intellectual Property Matters. + +a. Third Party Claims. If You have knowledge that a license to a third party's +intellectual property right is required to exercise the rights granted by +this License, You must include a human-readable file with Your distribution +that describes the claim and the party making the claim in sufficient detail +that a recipient will know whom to contact. + +b. Contributor APIs. If Your Extensions include an application programming +interface ("API") and You have knowledge of patent licenses that are reasonably +necessary to implement that API, You must also include this information in +a human-readable file supplied with Your distribution. + +c. Representations. You represent that, except as disclosed pursuant to 6.3(a) +above, You believe that any Extensions You distribute are Your original creations +and that You have sufficient rights to grant the rights conveyed by this License. + + 6.4 Required Notices. + +a. License Text. You must duplicate this License or instructions on how to +acquire a copy in any documentation You provide along with the Source Code +of any Extensions You create or to which You contribute, wherever You describe +recipients' rights relating to Licensed Software. + +b. License Notice. You must duplicate any notice contained in EXHIBIT A (the +"License Notice") in each file of the Source Code of any copy You distribute +of the Licensed Software and Your Extensions. If You create an Extension, +You may add Your name as a Contributor to the Source Code and accompanying +documentation along with a description of the contribution. If it is not possible +to put the License Notice in a particular Source Code file due to its structure, +then You must include such License Notice in a location where a user would +be likely to look for such a notice. + +c. Source Code Availability. You must notify the software community of the +availability of Source Code to Your Extensions within one (1) month of the +date You initially Deploy and include in such notification a description of +the Extensions, and instructions on how to acquire the Source Code. Should +such instructions change you must notify the software community of revised +instructions within one (1) month of the date of change. You must provide +notification by posting to appropriate news groups, mailing lists, weblogs, +or other sites where a publicly accessible search engine would reasonably +be expected to index your post in relationship to queries regarding the Licensed +Software and/or Your Extensions. + +d. User-Visible Attribution. You must duplicate any notice contained in EXHIBIT +B (the "User-Visible Attribution Notice") in each user-visible display of +the Licensed Software and Your Extensions which delineates copyright, ownership, +or similar attribution information. If You create an Extension, You may add +Your name as a Contributor, and add Your attribution notice, as an equally +visible and functional element of any User-Visible Attribution Notice content. +To ensure proper attribution, You must also include such User-Visible Attribution +Notice in at least one location in the Software documentation where a user +would be likely to look for such notice. + +6.5 Additional Terms. You may choose to offer, and charge a fee for, warranty, +support, indemnity or liability obligations to one or more recipients of Licensed +Software. However, You may do so only on Your own behalf, and not on behalf +of the Licensor or any Contributor except as permitted under other agreements +between you and Licensor or Contributor. You must make it clear that any such +warranty, support, indemnity or liability obligation is offered by You alone, +and You hereby agree to indemnify the Licensor and every Contributor for any +liability plus attorney fees, costs, and related expenses due to any such +action or claim incurred by the Licensor or such Contributor as a result of +warranty, support, indemnity or liability terms You offer. + +6.6 Conflicts With Other Licenses. Where any portion of Your Extensions, by +virtue of being Derivative Works of another product or similar circumstance, +fall under the terms of another license, the terms of that license should +be honored however You must also make Your Extensions available under this +License. If the terms of this License continue to conflict with the terms +of the other license you may write the Licensor for permission to resolve +the conflict in a fashion that remains consistent with the intent of this +License. Such permission will be granted at the sole discretion of the Licensor. + +7.0 Versions of This License. Licensor may publish from time to time revised +versions of the License. Once Licensed Software has been published under a +particular version of the License, You may always continue to use it under +the terms of that version. You may also choose to use such Licensed Software +under the terms of any subsequent version of the License published by Licensor. +No one other than Licensor has the right to modify the terms applicable to +Licensed Software created under this License. + +7.1 If You create or use a modified version of this License, which You may +do only in order to apply it to software that is not already Licensed Software +under this License, You must rename Your license so that it is not confusingly +similar to this License, and must make it clear that Your license contains +terms that differ from this License. In so naming Your license, You may not +use any trademark of Licensor or of any Contributor. Should Your modifications +to this License be limited to alteration of a) Section 13.8 solely to modify +the legal Jurisdiction or Venue for disputes, b) EXHIBIT A solely to define +License Notice text, or c) to EXHIBIT B solely to define a User-Visible Attribution +Notice, You may continue to refer to Your License as the Reciprocal Public +License or simply the RPL. + +8.0 Disclaimer of Warranty. LICENSED SOFTWARE IS PROVIDED UNDER THIS LICENSE +ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, +INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE LICENSED SOFTWARE IS FREE +OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. +FURTHER THERE IS NO WARRANTY MADE AND ALL IMPLIED WARRANTIES ARE DISCLAIMED +THAT THE LICENSED SOFTWARE MEETS OR COMPLIES WITH ANY DESCRIPTION OF PERFORMANCE +OR OPERATION, SAID COMPATIBILITY AND SUITABILITY BEING YOUR RESPONSIBILITY. +LICENSOR DISCLAIMS ANY WARRANTY, IMPLIED OR EXPRESSED, THAT ANY CONTRIBUTOR'S +EXTENSIONS MEET ANY STANDARD OF COMPATIBILITY OR DESCRIPTION OF PERFORMANCE. +THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LICENSED SOFTWARE +IS WITH YOU. SHOULD LICENSED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU +(AND NOT THE LICENSOR OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY +SERVICING, REPAIR OR CORRECTION. UNDER THE TERMS OF THIS LICENSOR WILL NOT +SUPPORT THIS SOFTWARE AND IS UNDER NO OBLIGATION TO ISSUE UPDATES TO THIS +SOFTWARE. LICENSOR HAS NO KNOWLEDGE OF ERRANT CODE OR VIRUS IN THIS SOFTWARE, +BUT DOES NOT WARRANT THAT THE SOFTWARE IS FREE FROM SUCH ERRORS OR VIRUSES. +THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. +NO USE OF LICENSED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +9.0 Limitation of Liability. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, +WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE LICENSOR, +ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF LICENSED SOFTWARE, OR ANY SUPPLIER +OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, +INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, +DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, +OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL +HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING +FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. +SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL +OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO +YOU. + +10.0 High Risk Activities. THE LICENSED SOFTWARE IS NOT FAULT-TOLERANT AND +IS NOT DESIGNED, MANUFACTURED, OR INTENDED FOR USE OR DISTRIBUTION AS ON-LINE +CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE PERFORMANCE, +SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT NAVIGATION OR COMMUNICATIONS +SYSTEMS, AIR TRAFFIC CONTROL, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, +IN WHICH THE FAILURE OF THE LICENSED SOFTWARE COULD LEAD DIRECTLY TO DEATH, +PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH RISK ACTIVITIES"). +LICENSOR AND CONTRIBUTORS SPECIFICALLY DISCLAIM ANY EXPRESS OR IMPLIED WARRANTY +OF FITNESS FOR HIGH RISK ACTIVITIES. + +11.0 Responsibility for Claims. As between Licensor and Contributors, each +party is responsible for claims and damages arising, directly or indirectly, +out of its utilization of rights under this License which specifically disclaims +warranties and limits any liability of the Licensor. This paragraph is to +be used in conjunction with and controlled by the Disclaimer Of Warranties +of Section 8, the Limitation Of Damages in Section 9, and the disclaimer against +use for High Risk Activities in Section 10. The Licensor has thereby disclaimed +all warranties and limited any damages that it is or may be liable for. You +agree to work with Licensor and Contributors to distribute such responsibility +on an equitable basis consistent with the terms of this License including +Sections 8, 9, and 10. Nothing herein is intended or shall be deemed to constitute +any admission of liability. + +12.0 Termination. This License and all rights granted hereunder will terminate +immediately in the event of the circumstances described in Section 13.6 or +if applicable law prohibits or restricts You from fully and or specifically +complying with Sections 3, 4 and/or 6, or prevents the enforceability of any +of those Sections, and You must immediately discontinue any use of Licensed +Software. + +12.1 Automatic Termination Upon Breach. This License and the rights granted +hereunder will terminate automatically if You fail to comply with the terms +herein and fail to cure such breach within thirty (30) days of becoming aware +of the breach. All sublicenses to the Licensed Software that are properly +granted shall survive any termination of this License. Provisions that, by +their nature, must remain in effect beyond the termination of this License, +shall survive. + +12.2 Termination Upon Assertion of Patent Infringement. If You initiate litigation +by asserting a patent infringement claim (excluding declaratory judgment actions) +against Licensor or a Contributor (Licensor or Contributor against whom You +file such an action is referred to herein as "Respondent") alleging that Licensed +Software directly or indirectly infringes any patent, then any and all rights +granted by such Respondent to You under Sections 3 or 4 of this License shall +terminate prospectively upon sixty (60) days notice from Respondent (the "Notice +Period") unless within that Notice Period You either agree in writing (i) +to pay Respondent a mutually agreeable reasonably royalty for Your past or +future use of Licensed Software made by such Respondent, or (ii) withdraw +Your litigation claim with respect to Licensed Software against such Respondent. +If within said Notice Period a reasonable royalty and payment arrangement +are not mutually agreed upon in writing by the parties or the litigation claim +is not withdrawn, the rights granted by Licensor to You under Sections 3 and +4 automatically terminate at the expiration of said Notice Period. + +12.3 Reasonable Value of This License. If You assert a patent infringement +claim against Respondent alleging that Licensed Software directly or indirectly +infringes any patent where such claim is resolved (such as by license or settlement) +prior to the initiation of patent infringement litigation, then the reasonable +value of the licenses granted by said Respondent under Sections 3 and 4 shall +be taken into account in determining the amount or value of any payment or +license. + +12.4 No Retroactive Effect of Termination. In the event of termination under +this Section all end user license agreements (excluding licenses to distributors +and resellers) that have been validly granted by You or any distributor hereunder +prior to termination shall survive termination. + +13.0 Miscellaneous. + +13.1 U.S. Government End Users. The Licensed Software is a "commercial item," +as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial +computer software" and "commercial computer software documentation," as such +terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. +12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government +End Users acquire Licensed Software with only those rights set forth herein. + +13.2 Relationship of Parties. This License will not be construed as creating +an agency, partnership, joint venture, or any other form of legal association +between or among You, Licensor, or any Contributor, and You will not represent +to the contrary, whether expressly, by implication, appearance, or otherwise. + +13.3 Independent Development. Nothing in this License will impair Licensor's +right to acquire, license, develop, subcontract, market, or distribute technology +or products that perform the same or similar functions as, or otherwise compete +with, Extensions that You may develop, produce, market, or distribute. + +13.4 Consent To Breach Not Waiver. Failure by Licensor or Contributor to enforce +any provision of this License will not be deemed a waiver of future enforcement +of that or any other provision. + +13.5 Severability. This License represents the complete agreement concerning +the subject matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent necessary +to make it enforceable. + +13.6 Inability to Comply Due to Statute or Regulation. If it is impossible +for You to comply with any of the terms of this License with respect to some +or all of the Licensed Software due to statute, judicial order, or regulation, +then You cannot use, modify, or distribute the software. + +13.7 Export Restrictions. You may be restricted with respect to downloading +or otherwise acquiring, exporting, or reexporting the Licensed Software or +any underlying information or technology by United States and other applicable +laws and regulations. By downloading or by otherwise obtaining the Licensed +Software, You are agreeing to be responsible for compliance with all applicable +laws and regulations. + +13.8 Arbitration, Jurisdiction & Venue. This License shall be governed by +Colorado law provisions (except to the extent applicable law, if any, provides +otherwise), excluding its conflict-of-law provisions. You expressly agree +that any dispute relating to this License shall be submitted to binding arbitration +under the rules then prevailing of the American Arbitration Association. You +further agree that Adams County, Colorado USA is proper venue and grant such +arbitration proceeding jurisdiction as may be appropriate for purposes of +resolving any dispute under this License. Judgement upon any award made in +arbitration may be entered and enforced in any court of competent jurisdiction. +The arbitrator shall award attorney's fees and costs of arbitration to the +prevailing party. Should either party find it necessary to enforce its arbitration +award or seek specific performance of such award in a civil court of competent +jurisdiction, the prevailing party shall be entitled to reasonable attorney's +fees and costs. The application of the United Nations Convention on Contracts +for the International Sale of Goods is expressly excluded. You and Licensor +expressly waive any rights to a jury trial in any litigation concerning Licensed +Software or this License. Any law or regulation that provides that the language +of a contract shall be construed against the drafter shall not apply to this +License. + +13.9 Entire Agreement. This License constitutes the entire agreement between +the parties with respect to the subject matter hereof. + +EXHIBIT A + +The License Notice below must appear in each file of the Source Code of any +copy You distribute of the Licensed Software or any Extensions thereto: + +Unless explicitly acquired and licensed from Licensor under another license, +the contents of this file are subject to the Reciprocal Public License ("RPL") +Version 1.5, or subsequent versions as allowed by the RPL, and You may not +copy or use this file in either source code or executable form, except in +compliance with the terms and conditions of the RPL. + +All software distributed under the RPL is provided strictly on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, AND LICENSOR +HEREBY DISCLAIMS ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT, OR +NON-INFRINGEMENT. See the RPL for specific language governing rights and limitations +under the RPL. + +EXHIBIT B + +The User-Visible Attribution Notice below, when provided, must appear in each +user-visible display as defined in Section 6.4 (d): \ No newline at end of file diff --git a/README.md b/README.md index e64ca834a8..ae8ea3a1a6 100644 --- a/README.md +++ b/README.md @@ -28,4 +28,10 @@ Space Station 14 это ремейк SS13, который работает на ## Лицензия -Код репозитория лицензирован как под MIT - это касается кода Space Wizards Federation, так и под CLA - это касается наших изменений, определение которых дано в тексте CLA. Мы не стремимся к полному разграничению нашего кода и кода Space Wizards Federation, поэтому во избежание инцидентов рекомендуется брать их код из их репозитория. +Этот проект лицензируется по взаимной общественной лицензии (RPL). Основные положения RPL включают: + +- Вы можете свободно использовать, изменять и распространять это программное обеспечение. +- Если вы изменяете программу, вы должны сделать свои изменения доступными по той же лицензии. +- Коммерческое использование разрешено, но любые модификации должны быть доступны. + +Полные условия лицензии см. в файле [LICENSE.TXT](https://github.com/frosty-dev/ss14-core/blob/master/LICENSE.TXT) в репозитории проекта. diff --git a/RPL.txt b/RPL.txt new file mode 100644 index 0000000000..e640fb87f6 --- /dev/null +++ b/RPL.txt @@ -0,0 +1,535 @@ +Reciprocal Public License 1.5 (RPL1.5) + +Version 1.5, July 15, 2007 + +Copyright (C) 2001-2007 Technical Pursuit Inc., All Rights Reserved. + +PREAMBLE + +The Reciprocal Public License (RPL) is based on the concept of reciprocity +or, if you prefer, fairness. + +In short, this license grew out of a desire to close loopholes in previous +open source licenses, loopholes that allowed parties to acquire open source +software and derive financial benefit from it without having to release their +improvements or derivatives to the community which enabled them. This occurred +any time an entity did not release their application to a "third party". + +While there is a certain freedom in this model of licensing, it struck the +authors of the RPL as being unfair to the open source community at large and +to the original authors of the works in particular. After all, bug fixes, +extensions, and meaningful and valuable derivatives were not consistently +finding their way back into the community where they could fuel further, and +faster, growth and expansion of the overall open source software base. + +While you should clearly read and understand the entire license, the essence +of the RPL is found in two definitions: "Deploy" and "Required Components". + +Regarding deployment, under the RPL your changes, bug fixes, extensions, etc. +must be made available to the open source community at large when you Deploy +in any form -- either internally or to an outside party. Once you start running +the software you have to start sharing the software. + +Further, under the RPL all components you author including schemas, scripts, +source code, etc. -- regardless of whether they're compiled into a single +binary or used as two halves of client/server application -- must be shared. +You have to share the whole pie, not an isolated slice of it. + +In addition to these goals, the RPL was authored to meet the requirements +of the Open Source Definition as maintained by the Open Source Initiative +(OSI). + +The specific terms and conditions of the license are defined in the remainder +of this document. + +LICENSE TERMS + +1.0 General; Applicability & Definitions. This Reciprocal Public License Version +1.5 ("License") applies to any programs or other works as well as any and +all updates or maintenance releases of said programs or works ("Software") +not already covered by this License which the Software copyright holder ("Licensor") +makes available containing a License Notice (hereinafter defined) from the +Licensor specifying or allowing use or distribution under the terms of this +License. As used in this License: + +1.1 "Contributor" means any person or entity who created or contributed to +the creation of an Extension. + +1.2 "Deploy" means to use, Serve, sublicense or distribute Licensed Software +other than for Your internal Research and/or Personal Use, and includes without +limitation, any and all internal use or distribution of Licensed Software +within Your business or organization other than for Research and/or Personal +Use, as well as direct or indirect sublicensing or distribution of Licensed +Software by You to any third party in any form or manner. + +1.3 "Derivative Works" as used in this License is defined under U.S. copyright +law. + +1.4 "Electronic Distribution Mechanism" means a mechanism generally accepted +in the software development community for the electronic transfer of data +such as download from an FTP server or web site, where such mechanism is publicly +accessible. + +1.5 "Extensions" means any Modifications, Derivative Works, or Required Components +as those terms are defined in this License. + + 1.6 "License" means this Reciprocal Public License. + + 1.7 "License Notice" means any notice contained in EXHIBIT A. + +1.8 "Licensed Software" means any Software licensed pursuant to this License. +Licensed Software also includes all previous Extensions from any Contributor +that You receive. + +1.9 "Licensor" means the copyright holder of any Software previously not covered +by this License who releases the Software under the terms of this License. + +1.10 "Modifications" means any additions to or deletions from the substance +or structure of (i) a file or other storage containing Licensed Software, +or (ii) any new file or storage that contains any part of Licensed Software, +or (iii) any file or storage which replaces or otherwise alters the original +functionality of Licensed Software at runtime. + +1.11 "Personal Use" means use of Licensed Software by an individual solely +for his or her personal, private and non-commercial purposes. An individual's +use of Licensed Software in his or her capacity as an officer, employee, member, +independent contractor or agent of a corporation, business or organization +(commercial or non-commercial) does not qualify as Personal Use. + +1.12 "Required Components" means any text, programs, scripts, schema, interface +definitions, control files, or other works created by You which are required +by a third party of average skill to successfully install and run Licensed +Software containing Your Modifications, or to install and run Your Derivative +Works. + +1.13 "Research" means investigation or experimentation for the purpose of +understanding the nature and limits of the Licensed Software and its potential +uses. + +1.14 "Serve" means to deliver Licensed Software and/or Your Extensions by +means of a computer network to one or more computers for purposes of execution +of Licensed Software and/or Your Extensions. + +1.15 "Software" means any computer programs or other works as well as any +updates or maintenance releases of those programs or works which are distributed +publicly by Licensor. + +1.16 "Source Code" means the preferred form for making modifications to the +Licensed Software and/or Your Extensions, including all modules contained +therein, plus any associated text, interface definition files, scripts used +to control compilation and installation of an executable program or other +components required by a third party of average skill to build a running version +of the Licensed Software or Your Extensions. + +1.17 "User-Visible Attribution Notice" means any notice contained in EXHIBIT +B. + +1.18 "You" or "Your" means an individual or a legal entity exercising rights +under this License. For legal entities, "You" or "Your" includes any entity +which controls, is controlled by, or is under common control with, You, where +"control" means (a) the power, direct or indirect, to cause the direction +or management of such entity, whether by contract or otherwise, or (b) ownership +of fifty percent (50%) or more of the outstanding shares or beneficial ownership +of such entity. + +2.0 Acceptance Of License. You are not required to accept this License since +you have not signed it, however nothing else grants you permission to use, +copy, distribute, modify, or create derivatives of either the Software or +any Extensions created by a Contributor. These actions are prohibited by law +if you do not accept this License. Therefore, by performing any of these actions +You indicate Your acceptance of this License and Your agreement to be bound +by all its terms and conditions. IF YOU DO NOT AGREE WITH ALL THE TERMS AND +CONDITIONS OF THIS LICENSE DO NOT USE, MODIFY, CREATE DERIVATIVES, OR DISTRIBUTE +THE SOFTWARE. IF IT IS IMPOSSIBLE FOR YOU TO COMPLY WITH ALL THE TERMS AND +CONDITIONS OF THIS LICENSE THEN YOU CAN NOT USE, MODIFY, CREATE DERIVATIVES, +OR DISTRIBUTE THE SOFTWARE. + +3.0 Grant of License From Licensor. Subject to the terms and conditions of +this License, Licensor hereby grants You a world-wide, royalty-free, non-exclusive +license, subject to Licensor's intellectual property rights, and any third +party intellectual property claims derived from the Licensed Software under +this License, to do the following: + +3.1 Use, reproduce, modify, display, perform, sublicense and distribute Licensed +Software and Your Extensions in both Source Code form or as an executable +program. + +3.2 Create Derivative Works (as that term is defined under U.S. copyright +law) of Licensed Software by adding to or deleting from the substance or structure +of said Licensed Software. + +3.3 Under claims of patents now or hereafter owned or controlled by Licensor, +to make, use, have made, and/or otherwise dispose of Licensed Software or +portions thereof, but solely to the extent that any such claim is necessary +to enable You to make, use, have made, and/or otherwise dispose of Licensed +Software or portions thereof. + +3.4 Licensor reserves the right to release new versions of the Software with +different features, specifications, capabilities, functions, licensing terms, +general availability or other characteristics. Title, ownership rights, and +intellectual property rights in and to the Licensed Software shall remain +in Licensor and/or its Contributors. + +4.0 Grant of License From Contributor. By application of the provisions in +Section 6 below, each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license, subject to said Contributor's intellectual property +rights, and any third party intellectual property claims derived from the +Licensed Software under this License, to do the following: + +4.1 Use, reproduce, modify, display, perform, sublicense and distribute any +Extensions Deployed by such Contributor or portions thereof, in both Source +Code form or as an executable program, either on an unmodified basis or as +part of Derivative Works. + +4.2 Under claims of patents now or hereafter owned or controlled by Contributor, +to make, use, have made, and/or otherwise dispose of Extensions or portions +thereof, but solely to the extent that any such claim is necessary to enable +You to make, use, have made, and/or otherwise dispose of Licensed Software +or portions thereof. + +5.0 Exclusions From License Grant. Nothing in this License shall be deemed +to grant any rights to trademarks, copyrights, patents, trade secrets or any +other intellectual property of Licensor or any Contributor except as expressly +stated herein. Except as expressly stated in Sections 3 and 4, no other patent +rights, express or implied, are granted herein. Your Extensions may require +additional patent licenses from Licensor or Contributors which each may grant +in its sole discretion. No right is granted to the trademarks of Licensor +or any Contributor even if such marks are included in the Licensed Software. +Nothing in this License shall be interpreted to prohibit Licensor from licensing +under different terms from this License any code that Licensor otherwise would +have a right to license. + +5.1 You expressly acknowledge and agree that although Licensor and each Contributor +grants the licenses to their respective portions of the Licensed Software +set forth herein, no assurances are provided by Licensor or any Contributor +that the Licensed Software does not infringe the patent or other intellectual +property rights of any other entity. Licensor and each Contributor disclaim +any liability to You for claims brought by any other entity based on infringement +of intellectual property rights or otherwise. As a condition to exercising +the rights and licenses granted hereunder, You hereby assume sole responsibility +to secure any other intellectual property rights needed, if any. For example, +if a third party patent license is required to allow You to distribute the +Licensed Software, it is Your responsibility to acquire that license before +distributing the Licensed Software. + +6.0 Your Obligations And Grants. In consideration of, and as an express condition +to, the licenses granted to You under this License You hereby agree that any +Modifications, Derivative Works, or Required Components (collectively Extensions) +that You create or to which You contribute are governed by the terms of this +License including, without limitation, Section 4. Any Extensions that You +create or to which You contribute must be Deployed under the terms of this +License or a future version of this License released under Section 7. You +hereby grant to Licensor and all third parties a world-wide, non-exclusive, +royalty-free license under those intellectual property rights You own or control +to use, reproduce, display, perform, modify, create derivatives, sublicense, +and distribute Licensed Software, in any form. Any Extensions You make and +Deploy must have a distinct title so as to readily tell any subsequent user +or Contributor that the Extensions are by You. You must include a copy of +this License or directions on how to obtain a copy with every copy of the +Extensions You distribute. You agree not to offer or impose any terms on any +Source Code or executable version of the Licensed Software, or its Extensions +that alter or restrict the applicable version of this License or the recipients' +rights hereunder. + +6.1 Availability of Source Code. You must make available, under the terms +of this License, the Source Code of any Extensions that You Deploy, via an +Electronic Distribution Mechanism. The Source Code for any version that You +Deploy must be made available within one (1) month of when you Deploy and +must remain available for no less than twelve (12) months after the date You +cease to Deploy. You are responsible for ensuring that the Source Code to +each version You Deploy remains available even if the Electronic Distribution +Mechanism is maintained by a third party. You may not charge a fee for any +copy of the Source Code distributed under this Section in excess of Your actual +cost of duplication and distribution of said copy. + +6.2 Description of Modifications. You must cause any Modifications that You +create or to which You contribute to be documented in the Source Code, clearly +describing the additions, changes or deletions You made. You must include +a prominent statement that the Modifications are derived, directly or indirectly, +from the Licensed Software and include the names of the Licensor and any Contributor +to the Licensed Software in (i) the Source Code and (ii) in any notice displayed +by the Licensed Software You distribute or in related documentation in which +You describe the origin or ownership of the Licensed Software. You may not +modify or delete any pre-existing copyright notices, change notices or License +text in the Licensed Software without written permission of the respective +Licensor or Contributor. + + 6.3 Intellectual Property Matters. + +a. Third Party Claims. If You have knowledge that a license to a third party's +intellectual property right is required to exercise the rights granted by +this License, You must include a human-readable file with Your distribution +that describes the claim and the party making the claim in sufficient detail +that a recipient will know whom to contact. + +b. Contributor APIs. If Your Extensions include an application programming +interface ("API") and You have knowledge of patent licenses that are reasonably +necessary to implement that API, You must also include this information in +a human-readable file supplied with Your distribution. + +c. Representations. You represent that, except as disclosed pursuant to 6.3(a) +above, You believe that any Extensions You distribute are Your original creations +and that You have sufficient rights to grant the rights conveyed by this License. + + 6.4 Required Notices. + +a. License Text. You must duplicate this License or instructions on how to +acquire a copy in any documentation You provide along with the Source Code +of any Extensions You create or to which You contribute, wherever You describe +recipients' rights relating to Licensed Software. + +b. License Notice. You must duplicate any notice contained in EXHIBIT A (the +"License Notice") in each file of the Source Code of any copy You distribute +of the Licensed Software and Your Extensions. If You create an Extension, +You may add Your name as a Contributor to the Source Code and accompanying +documentation along with a description of the contribution. If it is not possible +to put the License Notice in a particular Source Code file due to its structure, +then You must include such License Notice in a location where a user would +be likely to look for such a notice. + +c. Source Code Availability. You must notify the software community of the +availability of Source Code to Your Extensions within one (1) month of the +date You initially Deploy and include in such notification a description of +the Extensions, and instructions on how to acquire the Source Code. Should +such instructions change you must notify the software community of revised +instructions within one (1) month of the date of change. You must provide +notification by posting to appropriate news groups, mailing lists, weblogs, +or other sites where a publicly accessible search engine would reasonably +be expected to index your post in relationship to queries regarding the Licensed +Software and/or Your Extensions. + +d. User-Visible Attribution. You must duplicate any notice contained in EXHIBIT +B (the "User-Visible Attribution Notice") in each user-visible display of +the Licensed Software and Your Extensions which delineates copyright, ownership, +or similar attribution information. If You create an Extension, You may add +Your name as a Contributor, and add Your attribution notice, as an equally +visible and functional element of any User-Visible Attribution Notice content. +To ensure proper attribution, You must also include such User-Visible Attribution +Notice in at least one location in the Software documentation where a user +would be likely to look for such notice. + +6.5 Additional Terms. You may choose to offer, and charge a fee for, warranty, +support, indemnity or liability obligations to one or more recipients of Licensed +Software. However, You may do so only on Your own behalf, and not on behalf +of the Licensor or any Contributor except as permitted under other agreements +between you and Licensor or Contributor. You must make it clear that any such +warranty, support, indemnity or liability obligation is offered by You alone, +and You hereby agree to indemnify the Licensor and every Contributor for any +liability plus attorney fees, costs, and related expenses due to any such +action or claim incurred by the Licensor or such Contributor as a result of +warranty, support, indemnity or liability terms You offer. + +6.6 Conflicts With Other Licenses. Where any portion of Your Extensions, by +virtue of being Derivative Works of another product or similar circumstance, +fall under the terms of another license, the terms of that license should +be honored however You must also make Your Extensions available under this +License. If the terms of this License continue to conflict with the terms +of the other license you may write the Licensor for permission to resolve +the conflict in a fashion that remains consistent with the intent of this +License. Such permission will be granted at the sole discretion of the Licensor. + +7.0 Versions of This License. Licensor may publish from time to time revised +versions of the License. Once Licensed Software has been published under a +particular version of the License, You may always continue to use it under +the terms of that version. You may also choose to use such Licensed Software +under the terms of any subsequent version of the License published by Licensor. +No one other than Licensor has the right to modify the terms applicable to +Licensed Software created under this License. + +7.1 If You create or use a modified version of this License, which You may +do only in order to apply it to software that is not already Licensed Software +under this License, You must rename Your license so that it is not confusingly +similar to this License, and must make it clear that Your license contains +terms that differ from this License. In so naming Your license, You may not +use any trademark of Licensor or of any Contributor. Should Your modifications +to this License be limited to alteration of a) Section 13.8 solely to modify +the legal Jurisdiction or Venue for disputes, b) EXHIBIT A solely to define +License Notice text, or c) to EXHIBIT B solely to define a User-Visible Attribution +Notice, You may continue to refer to Your License as the Reciprocal Public +License or simply the RPL. + +8.0 Disclaimer of Warranty. LICENSED SOFTWARE IS PROVIDED UNDER THIS LICENSE +ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, +INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE LICENSED SOFTWARE IS FREE +OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. +FURTHER THERE IS NO WARRANTY MADE AND ALL IMPLIED WARRANTIES ARE DISCLAIMED +THAT THE LICENSED SOFTWARE MEETS OR COMPLIES WITH ANY DESCRIPTION OF PERFORMANCE +OR OPERATION, SAID COMPATIBILITY AND SUITABILITY BEING YOUR RESPONSIBILITY. +LICENSOR DISCLAIMS ANY WARRANTY, IMPLIED OR EXPRESSED, THAT ANY CONTRIBUTOR'S +EXTENSIONS MEET ANY STANDARD OF COMPATIBILITY OR DESCRIPTION OF PERFORMANCE. +THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LICENSED SOFTWARE +IS WITH YOU. SHOULD LICENSED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU +(AND NOT THE LICENSOR OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY +SERVICING, REPAIR OR CORRECTION. UNDER THE TERMS OF THIS LICENSOR WILL NOT +SUPPORT THIS SOFTWARE AND IS UNDER NO OBLIGATION TO ISSUE UPDATES TO THIS +SOFTWARE. LICENSOR HAS NO KNOWLEDGE OF ERRANT CODE OR VIRUS IN THIS SOFTWARE, +BUT DOES NOT WARRANT THAT THE SOFTWARE IS FREE FROM SUCH ERRORS OR VIRUSES. +THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. +NO USE OF LICENSED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +9.0 Limitation of Liability. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, +WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE LICENSOR, +ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF LICENSED SOFTWARE, OR ANY SUPPLIER +OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, +INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, +DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, +OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL +HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING +FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. +SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL +OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO +YOU. + +10.0 High Risk Activities. THE LICENSED SOFTWARE IS NOT FAULT-TOLERANT AND +IS NOT DESIGNED, MANUFACTURED, OR INTENDED FOR USE OR DISTRIBUTION AS ON-LINE +CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE PERFORMANCE, +SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT NAVIGATION OR COMMUNICATIONS +SYSTEMS, AIR TRAFFIC CONTROL, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, +IN WHICH THE FAILURE OF THE LICENSED SOFTWARE COULD LEAD DIRECTLY TO DEATH, +PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH RISK ACTIVITIES"). +LICENSOR AND CONTRIBUTORS SPECIFICALLY DISCLAIM ANY EXPRESS OR IMPLIED WARRANTY +OF FITNESS FOR HIGH RISK ACTIVITIES. + +11.0 Responsibility for Claims. As between Licensor and Contributors, each +party is responsible for claims and damages arising, directly or indirectly, +out of its utilization of rights under this License which specifically disclaims +warranties and limits any liability of the Licensor. This paragraph is to +be used in conjunction with and controlled by the Disclaimer Of Warranties +of Section 8, the Limitation Of Damages in Section 9, and the disclaimer against +use for High Risk Activities in Section 10. The Licensor has thereby disclaimed +all warranties and limited any damages that it is or may be liable for. You +agree to work with Licensor and Contributors to distribute such responsibility +on an equitable basis consistent with the terms of this License including +Sections 8, 9, and 10. Nothing herein is intended or shall be deemed to constitute +any admission of liability. + +12.0 Termination. This License and all rights granted hereunder will terminate +immediately in the event of the circumstances described in Section 13.6 or +if applicable law prohibits or restricts You from fully and or specifically +complying with Sections 3, 4 and/or 6, or prevents the enforceability of any +of those Sections, and You must immediately discontinue any use of Licensed +Software. + +12.1 Automatic Termination Upon Breach. This License and the rights granted +hereunder will terminate automatically if You fail to comply with the terms +herein and fail to cure such breach within thirty (30) days of becoming aware +of the breach. All sublicenses to the Licensed Software that are properly +granted shall survive any termination of this License. Provisions that, by +their nature, must remain in effect beyond the termination of this License, +shall survive. + +12.2 Termination Upon Assertion of Patent Infringement. If You initiate litigation +by asserting a patent infringement claim (excluding declaratory judgment actions) +against Licensor or a Contributor (Licensor or Contributor against whom You +file such an action is referred to herein as "Respondent") alleging that Licensed +Software directly or indirectly infringes any patent, then any and all rights +granted by such Respondent to You under Sections 3 or 4 of this License shall +terminate prospectively upon sixty (60) days notice from Respondent (the "Notice +Period") unless within that Notice Period You either agree in writing (i) +to pay Respondent a mutually agreeable reasonably royalty for Your past or +future use of Licensed Software made by such Respondent, or (ii) withdraw +Your litigation claim with respect to Licensed Software against such Respondent. +If within said Notice Period a reasonable royalty and payment arrangement +are not mutually agreed upon in writing by the parties or the litigation claim +is not withdrawn, the rights granted by Licensor to You under Sections 3 and +4 automatically terminate at the expiration of said Notice Period. + +12.3 Reasonable Value of This License. If You assert a patent infringement +claim against Respondent alleging that Licensed Software directly or indirectly +infringes any patent where such claim is resolved (such as by license or settlement) +prior to the initiation of patent infringement litigation, then the reasonable +value of the licenses granted by said Respondent under Sections 3 and 4 shall +be taken into account in determining the amount or value of any payment or +license. + +12.4 No Retroactive Effect of Termination. In the event of termination under +this Section all end user license agreements (excluding licenses to distributors +and resellers) that have been validly granted by You or any distributor hereunder +prior to termination shall survive termination. + +13.0 Miscellaneous. + +13.1 U.S. Government End Users. The Licensed Software is a "commercial item," +as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial +computer software" and "commercial computer software documentation," as such +terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. +12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government +End Users acquire Licensed Software with only those rights set forth herein. + +13.2 Relationship of Parties. This License will not be construed as creating +an agency, partnership, joint venture, or any other form of legal association +between or among You, Licensor, or any Contributor, and You will not represent +to the contrary, whether expressly, by implication, appearance, or otherwise. + +13.3 Independent Development. Nothing in this License will impair Licensor's +right to acquire, license, develop, subcontract, market, or distribute technology +or products that perform the same or similar functions as, or otherwise compete +with, Extensions that You may develop, produce, market, or distribute. + +13.4 Consent To Breach Not Waiver. Failure by Licensor or Contributor to enforce +any provision of this License will not be deemed a waiver of future enforcement +of that or any other provision. + +13.5 Severability. This License represents the complete agreement concerning +the subject matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent necessary +to make it enforceable. + +13.6 Inability to Comply Due to Statute or Regulation. If it is impossible +for You to comply with any of the terms of this License with respect to some +or all of the Licensed Software due to statute, judicial order, or regulation, +then You cannot use, modify, or distribute the software. + +13.7 Export Restrictions. You may be restricted with respect to downloading +or otherwise acquiring, exporting, or reexporting the Licensed Software or +any underlying information or technology by United States and other applicable +laws and regulations. By downloading or by otherwise obtaining the Licensed +Software, You are agreeing to be responsible for compliance with all applicable +laws and regulations. + +13.8 Arbitration, Jurisdiction & Venue. This License shall be governed by +Colorado law provisions (except to the extent applicable law, if any, provides +otherwise), excluding its conflict-of-law provisions. You expressly agree +that any dispute relating to this License shall be submitted to binding arbitration +under the rules then prevailing of the American Arbitration Association. You +further agree that Adams County, Colorado USA is proper venue and grant such +arbitration proceeding jurisdiction as may be appropriate for purposes of +resolving any dispute under this License. Judgement upon any award made in +arbitration may be entered and enforced in any court of competent jurisdiction. +The arbitrator shall award attorney's fees and costs of arbitration to the +prevailing party. Should either party find it necessary to enforce its arbitration +award or seek specific performance of such award in a civil court of competent +jurisdiction, the prevailing party shall be entitled to reasonable attorney's +fees and costs. The application of the United Nations Convention on Contracts +for the International Sale of Goods is expressly excluded. You and Licensor +expressly waive any rights to a jury trial in any litigation concerning Licensed +Software or this License. Any law or regulation that provides that the language +of a contract shall be construed against the drafter shall not apply to this +License. + +13.9 Entire Agreement. This License constitutes the entire agreement between +the parties with respect to the subject matter hereof. + +EXHIBIT A + +The License Notice below must appear in each file of the Source Code of any +copy You distribute of the Licensed Software or any Extensions thereto: + +Unless explicitly acquired and licensed from Licensor under another license, +the contents of this file are subject to the Reciprocal Public License ("RPL") +Version 1.5, or subsequent versions as allowed by the RPL, and You may not +copy or use this file in either source code or executable form, except in +compliance with the terms and conditions of the RPL. + +All software distributed under the RPL is provided strictly on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, AND LICENSOR +HEREBY DISCLAIMS ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT, OR +NON-INFRINGEMENT. See the RPL for specific language governing rights and limitations +under the RPL. + +EXHIBIT B + +The User-Visible Attribution Notice below, when provided, must appear in each +user-visible display as defined in Section 6.4 (d): \ No newline at end of file diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 64b12d506c..28beb6265a 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,111 +1,4 @@ Entries: -- author: HitPanda - changes: - - message: "\u0413\u043E\u0441\u0442\u0430\u043C \u0434\u043E\u0431\u0430\u0432\u043B\ - \u0435\u043D\u0430 \u043A\u043D\u043E\u043F\u043A\u0430 \u0432\u043E\u0437\u0432\ - \u0440\u0430\u0449\u0435\u043D\u0438\u044F \u0432 \u0440\u0430\u0443\u043D\u0434" - type: Add - id: 73 - time: '2023-02-16T20:17:38.0000000+00:00' -- author: RavMorgan - changes: - - message: "\u041C\u0430\u0441\u043A\u0430 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\ - \u0438\u044F \u0433\u043E\u043B\u043E\u0441\u0430 \u0442\u0435\u043F\u0435\u0440\ - \u044C \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442!" - type: Fix - - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432 \u0447\u0430\u0442\u0435\ - \ \u043D\u0435 \u0431\u0443\u0434\u0443\u0442 \u043F\u043E\u044F\u0432\u043B\ - \u044F\u0442\u0441\u044F \u0440\u0430\u043D\u0434\u043E\u043C\u044B\u0435" - type: Fix - - message: "\u0423\u043B\u0443\u0447\u0448\u0435\u043D\u044B \u0446\u0432\u0435\u0442\ - \u0430 \u0432 \u0447\u0430\u0442\u0435." - type: Add - id: 74 - time: '2023-02-20T11:33:13.0000000+00:00' -- author: wCATw - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E 4 \u043D\u043E\ - \u0432\u044B\u0445 \u044D\u043C\u043E\u0443\u0442\u0430: \u0425\u043C\u0443\u0440\ - \u0438\u0442\u044C\u0441\u044F, \u0423\u043B\u044B\u0431\u0430\u0442\u044C\u0441\ - \u044F, \u041F\u0440\u0438\u043D\u044E\u0445\u0438\u0432\u0430\u0442\u044C\u0441\ - \u044F, \u041E\u0431\u043B\u0438\u0437\u044B\u0432\u0430\u0442\u044C\u0441\u044F\ - ." - type: Add - - message: "\u0420\u043E\u0444\u043B\u0430\u043D \u0432 \u043A\u043E\u0434\u0435\ - \ (\u0437\u0430\u0431\u0435\u0439\u0442\u0435)" - type: Add - id: 75 - time: '2023-02-19T20:08:16.0000000+00:00' -- author: RavMorgan - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043D\u043E\u0432\ - \u043E\u0435 \u043C\u0435\u043D\u044E \u0432 \u043D\u0430\u0441\u0442\u0440\u043E\ - \u0439\u043A\u0438 \u0434\u043B\u044F \u0430\u0434\u043C\u0438\u043D\u0438\u0441\ - \u0442\u0440\u0430\u0442\u043E\u0440\u043E\u0432!" - type: Add - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\ - \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043C\u0435\u043D\u044F\u0442\ - \u044C \u0433\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u044C \u0431\u0432\u043E\ - \u043D\u044C\u043A\u0430 \u0434\u043B\u044F \u0430\u0434\u043C\u0438\u043D\u0438\ - \u0441\u0442\u0440\u0430\u0442\u043E\u0440\u043E\u0432!" - type: Add - id: 76 - time: '2023-02-20T12:20:31.0000000+00:00' -- author: HitPanda - changes: - - message: "\u041F\u0435\u0440\u0435\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u0430\ - \ \u0441\u0438\u0441\u0442\u0435\u043C\u0430 \u0432\u043E\u0437\u0432\u0440\u0430\ - \u0449\u0435\u043D\u0438\u044F \u0432 \u0440\u0430\u0443\u043D\u0434 \u0434\u043B\ - \u044F \u043F\u0440\u0438\u0437\u0440\u0430\u043A\u0430, \u0442\u0435\u043F\u0435\ - \u0440\u044C \u043F\u0440\u0438 \u043F\u0435\u0440\u0435\u0437\u0430\u0445\u043E\ - \u0434\u0435 \u043D\u0430 \u0441\u0435\u0440\u0432\u0435\u0440 \u0438\u043B\u0438\ - \ \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0435\u043D\u0438\u0438 \u0432\ - \ \u0442\u0435\u043B\u043E \u043D\u0435 \u0431\u0443\u0434\u0435\u0442 \u0441\ - \u043B\u0435\u0442\u0430\u0442\u044C \u0442\u0430\u0439\u043C\u0435\u0440." - type: Fix - id: 77 - time: '2023-02-20T19:21:23.0000000+00:00' -- author: KettlebellOfCreation - changes: - - message: "\u0434\u0430\u043C \u0442\u0435\u043F\u0435\u0440\u044C \u043F\u043E\ - \u0442\u0440\u0435\u0431\u043B\u044F\u0435\u0442 \u0432 3 \u0440\u0430\u0437\ - \u0430 \u0431\u043E\u043B\u044C\u0448\u0435 \u0442\u043E\u043F\u043B\u0438\u0432\ - \u0430 (1 \u0438\u043D\u0436\u0435\u043A\u0446\u0438\u044F - 3 \u0442\u043E\u043F\ - \u043B\u0438\u0432\u0430)" - type: Add - - message: "\u0442\u043E\u043F\u043B\u0438\u0432\u043E \u0441\u0442\u043E\u0438\u0442\ - \ \u0432 4 \u0440\u0430\u0437\u0430 \u0431\u043E\u043B\u044C\u0448\u0435 (8\ - \ 000)" - type: Add - - message: "\u0435\u043C\u043A\u043E\u0441\u0442\u044C \u0441\u043C\u0435\u0441\u0430\ - \ \u0432 3 \u0440\u0430\u0437\u0430 \u0431\u043E\u043B\u044C\u0448\u0435 (24\ - \ 000 000)" - type: Add - id: 78 - time: '2023-02-20T20:44:55.0000000+00:00' -- author: KettlebellOfCreation - changes: - - message: "\u0434\u0430\u043C \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0435\ - \ \u0431\u0430\u0440\u0430\u0445\u043B\u0438\u0442" - type: Fix - id: 79 - time: '2023-02-21T12:40:10.0000000+00:00' -- author: RavMorgan - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043D\u043E\u0432\u044B\ - \u0439 \u0438\u0433\u0440\u043E\u0432\u043E\u0439 \u0440\u0435\u0436\u0438\u043C\ - \ - \u0420\u0415\u0412\u041E\u041B\u042E\u0426\u0418\u042F!" - type: Add - id: 80 - time: '2023-02-21T21:06:19.0000000+00:00' -- author: RavMorgan - changes: - - message: "\u0412\u043E\u0441\u0441\u0442\u0430\u043D\u0438\u0435 \u043A\u0438\u0431\ - \u043E\u0440\u0433\u043E\u0432 \u043E\u0442\u043C\u0435\u043D\u044F\u0435\u0442\ - \u0441\u044F!" - type: Fix - id: 81 - time: '2023-02-21T23:08:59.0000000+00:00' - author: RavMorgan changes: - message: "\u0420\u0435\u0432\u043E\u043B\u044E\u0446\u0438\u044F \u0442\u0435\u043F\ @@ -8784,3 +8677,100 @@ id: 572 time: '2024-10-12T21:01:02.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/730 +- author: BIG_Zi_348 + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u0435\u0434\ + \u043E\u0441\u0442\u0430\u044E\u0449\u0438\u0435 \u043F\u0435\u0440\u0435\u0432\ + \u043E\u0434\u044B \u043E\u0441\u043D\u043E\u0432\u043D\u043E\u0433\u043E \u043C\ + \u0435\u043D\u044E." + type: Add + id: 573 + time: '2024-10-19T18:37:41.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/737 +- author: BIG_Zi_348 + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u0438\u0437\ + \u043C\u0435\u043D\u0435\u043D\u0438\u0435 \u0441\u043A\u043E\u0440\u043E\u0441\ + \u0442\u0438 \u0438\u0437-\u0437\u0430 \u0436\u0430\u0436\u0434\u044B." + type: Fix + id: 574 + time: '2024-10-19T18:38:14.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/736 +- author: BIG_Zi_348 + changes: + - message: "\u041E\u0441\u043A\u043E\u043B\u043A\u0438 \u0441\u0442\u0435\u043A\u043B\ + \u0430 \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\ + \ \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C \u0432\u044B\u043A\ + \u043B\u044E\u0447\u0435\u043D\u043D\u043E\u0439 \u0441\u0432\u0430\u0440\u043A\ + \u043E\u0439." + type: Fix + id: 575 + time: '2024-10-19T18:39:55.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/734 +- author: BIG_Zi_348 + changes: + - message: "\u041A\u043E\u043C\u0430\u043D\u0434\u0430 ShowManifest \u0442\u0435\ + \u043F\u0435\u0440\u044C \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442." + type: Fix + id: 576 + time: '2024-10-19T21:34:25.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/738 +- author: BIG_Zi_348 + changes: + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0440\u0430\u0437\u043C\ + \u0435\u0440\u044B \u0431\u043E\u043B\u044C\u0448\u0438\u043D\u0441\u0442\u0432\ + \u0430 \u043E\u0440\u0443\u0434\u0438\u0439 \u0431\u043B\u0438\u0436\u043D\u0435\ + \u0433\u043E \u0431\u043E\u044F." + type: Tweak + id: 577 + time: '2024-10-20T10:07:21.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/739 +- author: BIG_Zi_348 + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0431\u043E\u043B\ + \u044C\u0448\u0435 \u0432\u0440\u0435\u043C\u0435\u043D\u0438 \u043A\u043E\u0441\ + \u043C\u043E\u043D\u0430\u0432\u0442\u0430\u043C \u043D\u0430 \u0441\u043E\u0437\ + \u0435\u0440\u0446\u0430\u043D\u0438\u0435 \u044F\u0434\u0435\u0440\u043D\u043E\ + \u0433\u043E \u0432\u0437\u0440\u044B\u0432\u0430. \u0411\u044B\u043B\u043E\ + \ \u2014 0 \u0441\u0435\u043A\u0443\u043D\u0434 \u0434\u043E \u043C\u0430\u043D\ + \u0438\u0444\u0435\u0441\u0442\u0430 + 30 \u0441\u0435\u043A\u0443\u043D\u0434\ + \ \u043F\u043E\u0441\u043B\u0435 \u043C\u0430\u043D\u0438\u0444\u0435\u0441\u0442\ + \u0430. \u0421\u0442\u0430\u043B\u043E \u2014 1 \u043C\u0438\u043D\u0443\u0442\ + \u0430 \u0434\u043E \u043C\u0430\u043D\u0438\u0444\u0435\u0441\u0442\u0430 +\ + \ 1 \u043C\u0438\u043D\u0443\u0442\u044B \u043F\u043E\u0441\u043B\u0435 \u043C\ + \u0430\u043D\u0438\u0444\u0435\u0441\u0442\u0430." + type: Tweak + id: 578 + time: '2024-10-20T10:21:48.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/740 +- author: BIG_Zi_348 + changes: + - message: "\u0412\u043E\u0437\u0432\u0440\u0430\u0449\u0435\u043D\u0430 \u0432\u043E\ + \u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043F\u043E\u043B\u043E\ + \u0436\u0438\u0442\u044C \u0441\u043A\u0430\u043B\u044C\u043F\u0435\u043B\u044C\ + \ \u0432 \u0430\u0440\u043C\u0435\u0439\u0441\u043A\u0438\u0435 \u0431\u043E\ + \u0442\u0438\u043D\u043A\u0438." + type: Fix + id: 579 + time: '2024-10-20T19:25:41.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/741 +- author: BIG_Zi_348 + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0433\ + , \u0440\u0430\u0437\u0440\u0435\u0448\u0430\u044E\u0449\u0438\u0439 \u0431\u0435\ + \u0441\u043A\u043E\u043D\u0435\u0447\u043D\u043E \u0430\u0442\u0430\u043A\u043E\ + \u0432\u0430\u0442\u044C \u041F\u041A\u041C \u0431\u0435\u0437 \u0437\u0430\u0442\ + \u0440\u0430\u0442 \u0441\u0442\u0430\u043C\u0438\u043D\u044B." + type: Fix + id: 580 + time: '2024-10-21T19:15:09.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/742 +- author: Valtosin + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0434\u044E\u043F\ + \ \u0442\u0435\u043B\u0435\u043A\u0440\u0438\u0441\u0442\u0430\u043B\u043B\u043E\ + \u0432." + type: Fix + id: 581 + time: '2024-10-24T14:15:00.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/744 diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl index b03439ad11..0ed7962815 100644 --- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl @@ -175,6 +175,7 @@ ui-options-function-open-crafting-menu = Open crafting menu ui-options-function-open-inventory-menu = Open inventory ui-options-function-open-a-help = Open admin help ui-options-function-open-abilities-menu = Open action menu +ui-options-function-open-emotes-menu = Open emotes menu ui-options-function-toggle-round-end-summary-window = Toggle round end summary window ui-options-function-open-entity-spawn-window = Open entity spawn menu ui-options-function-open-sandbox-window = Open sandbox menu diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl index f47019e5ec..d73ad715d8 100644 --- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl @@ -75,6 +75,7 @@ ui-options-hud-theme-clockwork = Механизм ui-options-hud-theme-retro = Ретро ui-options-hud-theme-minimalist = Минимализм ui-options-hud-theme-eris = Эрис +ui-options-hud-theme-ashen = Пепельный ui-options-vp-stretch = Растянуть изображение для соответствия окну игры ui-options-vp-scale = Фиксированный масштаб окна игры: x{ $scale } ui-options-vp-integer-scaling = Предпочитать целочисленное масштабирование (может привести к появлению черных полос / отсечению) @@ -83,6 +84,10 @@ ui-options-vp-integer-scaling-tooltip = целочисленного значения в конкретных разрешениях экрана. Хотя в результате получается четкая текстура, также часто черные полосы могут появиться в верхней/нижней части экрана. +ui-options-vp-vertical-fit = Вертикальная подгонка области просмотра +ui-options-vp-vertical-fit-tooltip = Если включено, основная область просмотра будет полностью игнорировать горизонтальную + ось при подгонке под ваш экран. Если ваш экран меньше области просмотра, то это + приведет к обрезанию области просмотра по горизонтальной оси. ui-options-vp-low-res = Изображение низкого разрешения ui-options-parallax-low-quality = Низкокачественный параллакс (фон) ui-options-fps-counter = Показать счетчик FPS @@ -175,6 +180,8 @@ ui-options-function-open-crafting-menu = Открыть меню строите ui-options-function-open-inventory-menu = Открыть снаряжение ui-options-function-open-a-help = Открыть админ помощь ui-options-function-open-abilities-menu = Открыть меню действий +ui-options-function-open-emotes-menu = Открыть меню эмоций +ui-options-function-toggle-round-end-summary-window = Открыть итоги раунда ui-options-function-open-entity-spawn-window = Открыть меню спавна сущностей ui-options-function-open-sandbox-window = Открыть меню песочницы ui-options-function-open-tile-spawn-window = Открыть меню спавна тайлов diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/gohei.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/gohei.ftl index ed6be8e73e..b5bdfc276d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/gohei.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/melee/gohei.ftl @@ -1,2 +1,2 @@ ent-Gohei = гохэй - .desc = деревянныей жезл, украшенный двумя бумажными лентами сидэ. Изначально использовался жрицами синтоистских храмов для очищения предметов. Теперь используется станционными виабушниками. \ No newline at end of file + .desc = Деревянныей жезл, украшенный двумя бумажными лентами сидэ. Изначально использовался жрицами синтоистских храмов для очищения предметов. Теперь используется станционными виабушниками. diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml index efce0fec57..0f4d7c753b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml @@ -86,6 +86,9 @@ Slash: 8 soundHit: path: /Audio/Weapons/bladeslice.ogg + - type: Tag # WD + tags: + - Knife - type: entity name: shiv diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index aa34d83455..8dc8493817 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -228,7 +228,6 @@ - PowerDrill # WD - WelderExperimental # WD - Tricorder # WD - - AccessConfigurator # WD - trayScanner # WD - GeigerCounter diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml index 02bd2b5f0d..7c092d6b09 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -24,6 +24,9 @@ Structural: 10 - type: Item size: Normal + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 - type: Tool qualities: - Rolling @@ -63,6 +66,9 @@ state: icon - type: Item size: Normal + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 - type: Construction graph: WoodenBat node: incompleteBat diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml index eb66e095a3..9f5c32efdc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml @@ -9,6 +9,9 @@ state: cane - type: Item size: Normal + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 sprite: Objects/Weapons/Melee/cane.rsi - type: Appearance - type: MeleeWeapon @@ -46,6 +49,9 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: Normal + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 sprite: Objects/Weapons/Melee/cane_blade.rsi - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 558f53cd02..425d93ee30 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -19,7 +19,7 @@ - type: ItemToggleDisarmMalus activatedDisarmMalus: 0.6 - type: ItemToggleSize - activatedSize: Huge + activatedSize: Ginormous # WD EDIT - type: ItemToggleMeleeWeapon activatedSoundOnHit: path: /Audio/Weapons/eblade1.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 0d59037069..947bc01bcc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -88,6 +88,8 @@ - type: Tag tags: - Knife + - type: Item # WD + storedRotation: -44 # Like a crusher... but better - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml index 7347bb0d41..2a39c20089 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml @@ -25,3 +25,6 @@ Structural: 10 - type: Item size: Large + storedRotation: -44 # WD + shape: # WD + - 0,0,1,3 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml index e93e151605..f55a9b7586 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml @@ -77,6 +77,9 @@ - state: stunprod_nocell map: [ "enum.ToggleVisuals.Layer" ] - type: Item + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 sprite: Objects/Weapons/Melee/stunprod.rsi - type: Clothing sprite: Objects/Weapons/Melee/stunprod.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 0bcd987881..fc1fd2b4de 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -24,9 +24,9 @@ - type: Item size: Large sprite: Objects/Weapons/Melee/captain_sabre.rsi - storedRotation: 44 # It just works + storedRotation: -44 # WD shape: - - 0, 0, 4, 0 + - 0, 0, 0, 3 # WD - type: DisarmMalus - type: MeleeBlock delay: 6.1 @@ -56,6 +56,9 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: Huge + storedRotation: -44 # WD + shape: + - 0, 0, 1, 3 # WD sprite: Objects/Weapons/Melee/katana.rsi - type: Clothing sprite: Objects/Weapons/Melee/katana.rsi @@ -83,6 +86,9 @@ Slash: 33 # WD - type: Item size: Huge + storedRotation: 70 # WD + shape: # WD + - 0, 0, 1, 3 sprite: Objects/Weapons/Melee/energykatana.rsi - type: EnergyKatana - type: DashAbility @@ -128,6 +134,9 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: Large + storedRotation: -44 # WD + shape: # WD + - 0, 0, 1, 2 sprite: Objects/Weapons/Melee/machete.rsi - type: Clothing sprite: Objects/Weapons/Melee/machete.rsi @@ -160,6 +169,9 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: Huge + storedRotation: -44 # WD + shape: # WD + - 0, 0, 1, 3 - type: Clothing sprite: Objects/Weapons/Melee/claymore.rsi slots: @@ -196,6 +208,9 @@ path: /Audio/Weapons/bladeslice.ogg - type: Item size: Large + storedRotation: -44 # WD + shape: # WD + - 0, 0, 1, 3 sprite: Objects/Weapons/Melee/cutlass.rsi - type: DisarmMalus - type: MeleeBlock diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml index d69652b1f5..87cc9307b3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/white_cane.yml @@ -9,6 +9,9 @@ state: icon - type: Item size: Normal + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 sprite: Objects/Weapons/Melee/white_cane.rsi - type: MeleeWeapon wideAnimationRotation: 45 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 6332df533b..d72322bfd0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -114,6 +114,9 @@ bluntStaminaDamageFactor: 1.5 - type: Item size: Normal + storedRotation: -44 # WD + shape: # WD + - 0,0,0,2 - type: Tag tags: - Truncheon diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml index 8bb031ba6d..43d4460ec5 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml @@ -104,6 +104,10 @@ - belt - suitStorage - type: Item + size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/claymore.rsi - type: MeleeWeapon damage: @@ -130,6 +134,10 @@ - belt - suitStorage - type: Item + size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/chainsword.rsi - type: MeleeWeapon soundHit: @@ -159,6 +167,10 @@ energy: 2 color: lightblue - type: Item + size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/forceweapon.rsi # Позволяет блокировать быстрее, средненький урон. @@ -177,6 +189,10 @@ - belt - suitStorage - type: Item + size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/katana.rsi - type: MeleeWeapon wideAnimationRotation: -135 @@ -212,6 +228,10 @@ - back - suitStorage - type: Item + size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/multiverse.rsi - type: RandomDamage - type: Sharp @@ -236,6 +256,10 @@ - back - suitStorage - type: Item + size: Huge + storedRotation: -44 + shape: + - 0, 0, 2, 3 sprite: White/Objects/Weapons/Chaplain/scythe-inhands.rsi - type: Sharp @@ -263,6 +287,10 @@ - type: GhostTakeoverAvailable - type: Examiner - type: Item + size: Huge + storedRotation: 44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/possessed.rsi # Приклеен к руке, быстро и громко бьет @@ -340,6 +368,9 @@ state: icon - type: Item size: Huge + storedRotation: 44 + shape: + - 0, 0, 0, 4 sprite: White/Objects/Weapons/Chaplain/staff.rsi - type: Clothing sprite: White/Objects/Weapons/Chaplain/staff.rsi @@ -380,6 +411,9 @@ - type: Item sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 - type: Clothing sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi slots: @@ -438,6 +472,9 @@ state: icon - type: Item size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/Chaplain/hammer.rsi - type: Clothing sprite: White/Objects/Weapons/Chaplain/hammer.rsi diff --git a/Resources/Prototypes/_White/Wizard/magic_items.yml b/Resources/Prototypes/_White/Wizard/magic_items.yml index 7bc0ef44c9..5fda381d38 100644 --- a/Resources/Prototypes/_White/Wizard/magic_items.yml +++ b/Resources/Prototypes/_White/Wizard/magic_items.yml @@ -48,6 +48,10 @@ - suitStorage - type: Item sprite: White/Objects/Weapons/Chaplain/spellblade.rsi + size: Large + storedRotation: 44 + shape: + - 0, 0, 1, 3 - type: UserInterface interfaces: enum.SpellBladeUiKey.Key: @@ -88,6 +92,9 @@ Structural: 60 - type: Item size: Huge + storedRotation: -44 + shape: + - 0, 0, 1, 3 sprite: White/Objects/Weapons/mjolnir.rsi - type: Clothing quickEquip: false diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index 536a86c935..5626322985 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -458,7 +458,7 @@ binds: - function: OpenDecalSpawnWindow type: State key: F8 -- function: OpenScoreboardWindow +- function: ToggleRoundEndSummaryWindow # WD ahead of wizden upstream type: State key: F9 - function: OpenSandboxWindow