diff --git a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs index 633152d992..0859bd5ca9 100644 --- a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs +++ b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs @@ -373,7 +373,7 @@ public sealed partial class AdminLogsControl : Control for (var i = 0; i < impacts.Length - 1; i++) { - LogImpactContainer.GetChild(i).StyleClasses.Add(StyleClass.ButtonSquare); + LogImpactContainer.GetChild(i).StyleClasses.Add("ButtonSquare"); } LogImpactContainer.GetChild(LogImpactContainer.ChildCount - 1).StyleClasses.Add("OpenLeft"); diff --git a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml index aef6365c1e..dfaf36027c 100644 --- a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml +++ b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml @@ -101,7 +101,7 @@ ToolTip="{Loc 'ui-options-function-open-a-help'}" MinSize="42 64" HorizontalExpand="True" - AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}" + AppendStyleClass="{x:Static style:StyleClass.ButtonSquare}" /> ))] + public List? DamageContainers; + // Sunrise-end } + diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs index 5d9cbe3df2..6d1d5c6c08 100644 --- a/Content.Server/Medical/HealthAnalyzerSystem.cs +++ b/Content.Server/Medical/HealthAnalyzerSystem.cs @@ -38,7 +38,7 @@ public sealed class HealthAnalyzerSystem : AbstractAnalyzerSystem(target)) + if (!TryComp(target, out var damageableComponent)) // Sunrise return; var bodyTemperature = float.NaN; @@ -46,6 +46,16 @@ public sealed class HealthAnalyzerSystem : AbstractAnalyzerSystem(target, out var temp)) bodyTemperature = temp.CurrentTemperature; + // Sunrise-Start + if (!TryComp(healthAnalyzer, out var healthAnalyzerComp)) + return; + + if (healthAnalyzerComp.DamageContainers is not null && + damageableComponent.DamageContainerID is not null && + !healthAnalyzerComp.DamageContainers.Contains(damageableComponent.DamageContainerID)) + return; + // Sunrise-End + var bloodAmount = float.NaN; var bleeding = false; var unrevivable = false; diff --git a/Content.Server/_Starlight/Combat/Ranged/PierceSystem.cs b/Content.Server/_Starlight/Combat/Ranged/PierceSystem.cs deleted file mode 100644 index 54fb0d65ee..0000000000 --- a/Content.Server/_Starlight/Combat/Ranged/PierceSystem.cs +++ /dev/null @@ -1,36 +0,0 @@ -using Content.Shared.Actions; -using Content.Shared.DoAfter; -using Robust.Shared.Prototypes; -using Content.Shared.Cuffs.Components; -using Content.Shared.Damage.Components; -using Content.Shared.Weapons.Melee.Events; -using Content.Shared._Starlight.Weapon; -using Content.Shared._Starlight.Combat.Ranged.Pierce; -using Content.Shared.Armor; -using Content.Shared.Damage; -using Content.Shared.Inventory; -using Content.Shared.Weapons.Hitscan.Events; - -namespace Content.Server._Starlight.Combat.Ranged; - -public sealed partial class PierceSystem : EntitySystem -{ - public override void Initialize() - { - SubscribeLocalEvent(OnPierceablePierce); - SubscribeLocalEvent>(OnArmorPierce); - base.Initialize(); - } - - private void OnArmorPierce(Entity ent, ref InventoryRelayedEvent args) - { - if ((byte)ent.Comp.Level > (byte)args.Args.Level) - args.Args.Pierced = false; - } - - private void OnPierceablePierce(Entity ent, ref HitScanPierceAttemptEvent args) - { - if ((byte)ent.Comp.Level > (byte)args.Level) - args.Pierced = false; - } -} diff --git a/Content.Server/_Starlight/Combat/Ranged/RicochetSystem.cs b/Content.Server/_Starlight/Combat/Ranged/RicochetSystem.cs deleted file mode 100644 index 1231d02c46..0000000000 --- a/Content.Server/_Starlight/Combat/Ranged/RicochetSystem.cs +++ /dev/null @@ -1,133 +0,0 @@ -using Content.Shared._Starlight.Weapon; -using Content.Shared._Starlight.Combat.Ranged.Pierce; -using Robust.Shared.Physics; -using Robust.Shared.Random; -using System.Linq; -using Robust.Server.GameObjects; -using System.Numerics; -using Robust.Shared.Physics.Collision.Shapes; - -namespace Content.Server._Starlight.Combat.Ranged; - -public sealed partial class RicochetSystem : EntitySystem -{ - [Dependency] private readonly IRobustRandom _rand = default!; - [Dependency] private readonly TransformSystem _transform = default!; - public override void Initialize() - { - SubscribeLocalEvent(OnRicochetPierce); - base.Initialize(); - } - - private void OnRicochetPierce(Entity ent, ref HitScanRicochetAttemptEvent args) - { - if (!TryComp(ent, out var fixtures) - || fixtures.Fixtures.Count == 0 - || fixtures.Fixtures.FirstOrDefault().Value?.Shape is not PolygonShape shape) - return; - - var chance = Math.Clamp(args.Chance * ent.Comp.Chance, 0f, 1f); - if (chance == 0) return; - - var invMatrix = _transform.GetInvWorldMatrix(ent.Owner); - - var localFrom = Vector2.Transform(args.Pos, invMatrix); - - var invNoTrans = invMatrix; - invNoTrans.M31 = 0f; - invNoTrans.M32 = 0f; - - var localDir = Vector2.Transform(args.Dir, invNoTrans).Normalized(); - - if (!RayCastPolygon(shape, localFrom, localDir, - out var tMin, out var edgeIndex, out var ptLocal)) return; - - var localNormal = shape.Normals[edgeIndex]; - - var dot = Vector2.Dot(localDir, localNormal); - - var clampedDot = Math.Clamp(MathF.Abs(dot), 0f, 1f); - - var angleFactor = 2f * (1f - clampedDot); - - chance = Math.Clamp(args.Chance * angleFactor, 0f, 1f); - if(!_rand.Prob(chance)) return; - - // R = D - 2*(D·N)*N - var reflectedLocal = localDir - (2f * dot * localNormal); - - var matrix = _transform.GetWorldMatrix(ent.Owner); - var matrixNoTrans = matrix; - matrixNoTrans.M31 = 0f; - matrixNoTrans.M32 = 0f; - - var reflectedWorld = Vector2.Transform(reflectedLocal, matrixNoTrans).Normalized(); - - args.Dir = reflectedWorld; - args.Ricocheted = true; - } - - private bool RayCastPolygon( - PolygonShape polygon, - Vector2 origin, - Vector2 dir, - out float tMin, - out int edgeIndex, - out Vector2 ptLocal, - float maxT = float.MaxValue) - { - tMin = float.MaxValue; - edgeIndex = -1; - ptLocal = default; - - var verts = polygon.Vertices; - var count = polygon.VertexCount; - - for (var i = 0; i < count; i++) - { - var next = (i + 1) % count; - var v0 = verts[i]; - var v1 = verts[next]; - - if (RayCastSegment(origin, dir, v0, v1, out var t) && t >= 0f && t < maxT) - { - if (t < tMin) - { - tMin = t; - edgeIndex = i; - } - } - } - - if (edgeIndex < 0) - return false; - - ptLocal = origin + (dir * tMin); - return true; - } - private bool RayCastSegment(Vector2 origin, Vector2 dir, Vector2 v0, Vector2 v1, out float t) - { - t = 0f; - - var edge = v1 - v0; - var denom = Cross2D(edge, dir); - - if (MathF.Abs(denom) < 1e-6f) - return false; - - var diff = origin - v0; - - var s = Cross2D(diff, dir) / denom; - if (s is < 0f or > 1f) - return false; - - var tRay = Cross2D(diff, edge) / denom; - if (tRay < 0f) - return false; - - t = tRay; - return true; - } - - private float Cross2D(Vector2 a, Vector2 b) => (a.X * b.Y) - (a.Y * b.X); -} diff --git a/Content.Server/_Sunrise/EnergyShield/EnergyShieldComponent.cs b/Content.Server/_Sunrise/EnergyShield/EnergyShieldComponent.cs index 6aac3301a6..8f6f167a1d 100644 --- a/Content.Server/_Sunrise/EnergyShield/EnergyShieldComponent.cs +++ b/Content.Server/_Sunrise/EnergyShield/EnergyShieldComponent.cs @@ -18,13 +18,13 @@ public sealed partial class EnergyShieldComponent : Component /// Звук поглощения урона /// [DataField] - public SoundSpecifier AbsorbSound = new SoundPathSpecifier("/Audio/Machines/energyshield_parry.ogg"); + public SoundSpecifier AbsorbSound = new SoundPathSpecifier("/Audio/_Sunrise/Machines/energyshield_parry.ogg"); /// /// Звук отключения щита при нехватке энергии /// [DataField] - public SoundSpecifier ShutdownSound = new SoundPathSpecifier("/Audio/Machines/energyshield_down.ogg"); + public SoundSpecifier ShutdownSound = new SoundPathSpecifier("/Audio/_Sunrise/Machines/energyshield_down.ogg"); /// /// При скольки процентах заряда можно включить щит diff --git a/Content.Server/Botany/Components/PlantAnalyzerComponent.cs b/Content.Shared/Botany/Components/PlantAnalyzerComponent.cs similarity index 100% rename from Content.Server/Botany/Components/PlantAnalyzerComponent.cs rename to Content.Shared/Botany/Components/PlantAnalyzerComponent.cs diff --git a/Content.Shared/Fluids/SharedAbsorbentSystem.cs b/Content.Shared/Fluids/SharedAbsorbentSystem.cs index 2e3a63e43a..8f9765bd41 100644 --- a/Content.Shared/Fluids/SharedAbsorbentSystem.cs +++ b/Content.Shared/Fluids/SharedAbsorbentSystem.cs @@ -32,6 +32,7 @@ public abstract class SharedAbsorbentSystem : EntitySystem [Dependency] private readonly SharedMapSystem _mapSystem = default!; [Dependency] private readonly SharedItemSystem _item = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!; // Sunrise-edit + [Dependency] private readonly ILocalizationManager _loc = default!; // Sunrise-edit public override void Initialize() { @@ -68,14 +69,15 @@ public abstract class SharedAbsorbentSystem : EntitySystem } var coordinates = args.ClickLocation; - var footPrints = new HashSet>(); - var gridUid = _transform.GetGrid(coordinates); if (!TryComp(gridUid, out var grid)) return; var tileCoordinates = _mapSystem.CoordinatesToTile(gridUid.Value, grid, coordinates); var tileRef = _mapSystem.GetTileRef(gridUid.Value, grid, tileCoordinates); + var tileCenterPos = _mapSystem.GridTileToLocal(gridUid.Value, grid, tileRef.GridIndices); + + var footPrints = new HashSet>(); var entities = _lookup.GetLocalEntitiesIntersecting(tileRef, ent.Comp.FootprintEnlargement); foreach (var entity in entities) @@ -91,7 +93,6 @@ public abstract class SharedAbsorbentSystem : EntitySystem if (!SolutionContainer.TryGetSolution(args.Used, ent.Comp.SolutionName, out var absorberSoln)) return; - var tileCenterPos = _mapSystem.GridTileToLocal(gridUid.Value, grid, tileRef.GridIndices); CleanFootprints(args.User, args.Used, ent.Comp, absorberSoln.Value, footPrints, tileCenterPos); args.Handled = true; return; @@ -103,7 +104,7 @@ public abstract class SharedAbsorbentSystem : EntitySystem // Sunrise-Start public void CleanFootprints(EntityUid user, EntityUid used, AbsorbentComponent absorber, - Entity absorberSoln, HashSet> footPrints, + Entity absorberSoln, IEnumerable> footPrints, EntityCoordinates targetCoords) { var soundPlayed = false; @@ -122,7 +123,7 @@ public abstract class SharedAbsorbentSystem : EntitySystem // No material if (available == FixedPoint2.Zero) { - _popups.PopupEntity(Loc.GetString("mopping-system-no-water", ("used", used)), user, user); + TryPopupNoWater(user, used); return; } @@ -164,8 +165,24 @@ public abstract class SharedAbsorbentSystem : EntitySystem _melee.DoLunge(user, used, Angle.Zero, localPos, null, false); } - // Sunrise-End + private void TryPopupNoWater(EntityUid user, EntityUid used) + { + if (TryComp(used, out UseDelayComponent? useDelay) && _useDelay.IsDelayed((used, useDelay))) + return; + + var message = _loc.GetString("mopping-system-no-water", ("used", used)); + + if (HasComp(used)) + _popups.PopupClient(message, user, user); + + else + _popups.PopupEntity(message, user, user); + + if (useDelay != null) + _useDelay.TryResetDelay((used, useDelay)); + } + // Sunrise-End private void OnAbsorbentSolutionChange(Entity ent, ref SolutionContainerChangedEvent args) { if (!SolutionContainer.TryGetSolution(ent.Owner, ent.Comp.SolutionName, out _, out var solution)) diff --git a/Content.Shared/Fluids/SharedPuddleSystem.cs b/Content.Shared/Fluids/SharedPuddleSystem.cs index 8f87734717..12f684b6ff 100644 --- a/Content.Shared/Fluids/SharedPuddleSystem.cs +++ b/Content.Shared/Fluids/SharedPuddleSystem.cs @@ -320,6 +320,14 @@ public abstract partial class SharedPuddleSystem : EntitySystem private void UpdateSlow(EntityUid uid, Solution solution) { + // Sunrise: footprint/drag-mark "puddles" (e.g. slime on shoes) are visual traces and should not apply slowdown. + // They also do not have physics, so adding contact slowdowns causes physics queries to error. + if (TryComp(uid, out PuddleComponent? puddle) && !puddle.CanSlow) + { + RemComp(uid); + return; + } + var maxViscosity = 0f; foreach (var (reagent, _) in solution.Contents) { diff --git a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs index c3d8e75810..7099dd6f9d 100644 --- a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs +++ b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs @@ -493,6 +493,19 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance, var newHairStyle = HairStyles.DefaultHairStyle; List newMarkings = []; + // Sunrise - Start + var hairStyles = markingManager.MarkingsByCategoryAndSpeciesAndSex(MarkingCategories.Hair, species, sex); + if (hairStyles.Count > 0) + newHairStyle = random.Pick(hairStyles.Keys.ToArray()); + + if (sex != Sex.Female) + { + var facialHairStyles = markingManager.MarkingsByCategoryAndSpeciesAndSex(MarkingCategories.FacialHair, species, sex); + if (facialHairStyles.Count > 0) + newFacialHairStyle = random.Pick(facialHairStyles.Keys.ToArray()); + } + // Sunrise - End + // grab a completely random color. var baseColor = new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1); diff --git a/Resources/Audio/Ambience/Temporary/attributions.yml b/Resources/Audio/Ambience/Temporary/attributions.yml index 7560df72a8..bb9be72ad6 100644 --- a/Resources/Audio/Ambience/Temporary/attributions.yml +++ b/Resources/Audio/Ambience/Temporary/attributions.yml @@ -1,4 +1,4 @@ - files: ["flies.ogg"] license: "CC0-1.0" copyright: "Taken from source" - source: "https://freesound.org/people/telezon/sounds/321870/" \ No newline at end of file + source: "https://freesound.org/people/telezon/sounds/321870/" diff --git a/Resources/Audio/Effects/Changeling/attributions.yml b/Resources/Audio/Effects/Changeling/attributions.yml index d7d7931cd6..285b8e9189 100644 --- a/Resources/Audio/Effects/Changeling/attributions.yml +++ b/Resources/Audio/Effects/Changeling/attributions.yml @@ -1,4 +1,4 @@ -- files: ["devour_suck.ogg"] +- files: ["devour_suck.ogg"] license: "CC0-1.0" copyright: "4Cairnz on Freesound: June 5th 2023" source: "https://freesound.org/people/4Cairnz/sounds/689640/" diff --git a/Resources/Audio/Effects/Shuttle/attributions.yml b/Resources/Audio/Effects/Shuttle/attributions.yml index 2342ba8fb6..e39c541700 100644 --- a/Resources/Audio/Effects/Shuttle/attributions.yml +++ b/Resources/Audio/Effects/Shuttle/attributions.yml @@ -14,4 +14,4 @@ - radar_ping.ogg copyright: User unfa from freesound.org Remixed to mono and .ogg by metalgearsloth. license: CC0-1.0 - source: https://freesound.org/people/unfa/sounds/215415/ \ No newline at end of file + source: https://freesound.org/people/unfa/sounds/215415/ diff --git a/Resources/Audio/Items/Anomaly/attributions.yml b/Resources/Audio/Items/Anomaly/attributions.yml index 27bf35d875..e2c9c5761d 100644 --- a/Resources/Audio/Items/Anomaly/attributions.yml +++ b/Resources/Audio/Items/Anomaly/attributions.yml @@ -1,4 +1,4 @@ -- files: ["flesh_crit.ogg"] +- files: ["flesh_crit.ogg"] license: "CC-BY-SA-3.0" copyright: "Mashup by GonTar Quantumcross of malescream_1.ogg, malescream_2.ogg, femalescream_4.ogg, femalescream_5.ogg, alien_claw_flesh_2.ogg, alien_claw_flesh_3.ogg" source: "https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8" diff --git a/Resources/Audio/Items/Handcuffs/attributions.yml b/Resources/Audio/Items/Handcuffs/attributions.yml index 9c189aec2b..4094ba84e5 100644 --- a/Resources/Audio/Items/Handcuffs/attributions.yml +++ b/Resources/Audio/Items/Handcuffs/attributions.yml @@ -1,4 +1,4 @@ - files: ["ziptie_end.ogg"] license: "CC-BY-3.0" copyright: "Taken from cable tie.wav by THE_bizniss on Freesound.org" - source: "https://freesound.org/people/THE_bizniss/sounds/39318/" \ No newline at end of file + source: "https://freesound.org/people/THE_bizniss/sounds/39318/" diff --git a/Resources/Audio/Items/Medical/attributions.yml b/Resources/Audio/Items/Medical/attributions.yml index a6b352ef22..72e228f5ae 100644 --- a/Resources/Audio/Items/Medical/attributions.yml +++ b/Resources/Audio/Items/Medical/attributions.yml @@ -1,4 +1,4 @@ - files: ["healthscanner.ogg"] license: "CC-BY-4.0" copyright: "Taken from FM Synthesis on freesound.org" - source: "https://freesound.org/people/FreqMan/sounds/32683/" \ No newline at end of file + source: "https://freesound.org/people/FreqMan/sounds/32683/" diff --git a/Resources/Audio/Jukebox/attributions.yml b/Resources/Audio/Jukebox/attributions.yml index 48e1458c4c..6d83ef5251 100644 --- a/Resources/Audio/Jukebox/attributions.yml +++ b/Resources/Audio/Jukebox/attributions.yml @@ -24,4 +24,4 @@ - files: ["sunset.ogg"] license: "CC-BY-SA-3.0" copyright: "Sunset by PigeonBeans. Exported in Mono OGG." - source: "https://soundcloud.com/pigeonbeans/sunset" \ No newline at end of file + source: "https://soundcloud.com/pigeonbeans/sunset" diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml index 92c2e095b7..9431780afe 100644 --- a/Resources/Audio/Lobby/attributions.yml +++ b/Resources/Audio/Lobby/attributions.yml @@ -1,4 +1,4 @@ -- files: ["thunderdome.ogg"] +- files: ["thunderdome.ogg"] license: "CC-BY-NC-SA-3.0" copyright: "-Sector11 by MashedByMachines. Converted from MP3 to OGG." source: "https://www.newgrounds.com/audio/listen/312622" diff --git a/Resources/Audio/Magic/Cults/ClockCult/attributions.yml b/Resources/Audio/Magic/Cults/ClockCult/attributions.yml index dae32f0ae2..736cb9d375 100644 --- a/Resources/Audio/Magic/Cults/ClockCult/attributions.yml +++ b/Resources/Audio/Magic/Cults/ClockCult/attributions.yml @@ -1,4 +1,4 @@ - files: ["steam_woosh.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from Citadel Station" - source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/e575bd66854786eb9455eae6954d976cf13c66ea" \ No newline at end of file + source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/e575bd66854786eb9455eae6954d976cf13c66ea" diff --git a/Resources/Audio/Mecha/attributions.yml b/Resources/Audio/Mecha/attributions.yml index 2330e20ad9..bb19933359 100644 --- a/Resources/Audio/Mecha/attributions.yml +++ b/Resources/Audio/Mecha/attributions.yml @@ -9,4 +9,4 @@ - files: ["sound_mecha_powerloader_step.ogg"] license: "CC-BY-NC-SA-3.0" copyright: "Taken from TG station." - source: "https://github.com/tgstation/tgstation/commit/45123dd06cb6dc7c56e8004c528230682ea559b2" \ No newline at end of file + source: "https://github.com/tgstation/tgstation/commit/45123dd06cb6dc7c56e8004c528230682ea559b2" diff --git a/Resources/Audio/UserInterface/attributions.yml b/Resources/Audio/UserInterface/attributions.yml index f0d3612f74..6622aee2b7 100644 --- a/Resources/Audio/UserInterface/attributions.yml +++ b/Resources/Audio/UserInterface/attributions.yml @@ -8,4 +8,4 @@ - hover.ogg license: "CC0-1.0" copyright: "Made by MATRIXXX_, edited by metalgearsloth" - source: "https://freesound.org/people/MATRIXXX_/sounds/703884/" \ No newline at end of file + source: "https://freesound.org/people/MATRIXXX_/sounds/703884/" diff --git a/Resources/Audio/Voice/Arachnid/attributions.yml b/Resources/Audio/Voice/Arachnid/attributions.yml index dc7e5ce1d5..fe1e8c0d61 100644 --- a/Resources/Audio/Voice/Arachnid/attributions.yml +++ b/Resources/Audio/Voice/Arachnid/attributions.yml @@ -5,4 +5,4 @@ - files: ["arachnid_chitter.ogg", "arachnid_click.ogg"] license: "CC-BY-4.0" copyright: "Recorded by https://github.com/PixelTheKermit, modified by Dutch-VanDerLinde" - source: "https://github.com/space-wizards/space-station-14/pull/23548" \ No newline at end of file + source: "https://github.com/space-wizards/space-station-14/pull/23548" diff --git a/Resources/Audio/Voice/Diona/attributions.yml b/Resources/Audio/Voice/Diona/attributions.yml index c5f3903944..51345f1e3d 100644 --- a/Resources/Audio/Voice/Diona/attributions.yml +++ b/Resources/Audio/Voice/Diona/attributions.yml @@ -1,4 +1,4 @@ -- files: ["diona_scream.ogg"] +- files: ["diona_scream.ogg"] license: "CC-BY-4.0" copyright: "Made by InspectorJ (http://www.jshaw.co.uk/) of freesound.org. Modified by Morb0 for SS14 with the following modifications: Noise reduced, cropped, converted to mono" source: "https://freesound.org/people/InspectorJ/sounds/352201/" @@ -17,4 +17,4 @@ - files: ["diona_salute.ogg"] license: "CC-BY-3.0" copyright: "Taken from tgstation" - source: "https://github.com/tgstation/tgstation/tree/943f38bf7c5f9c048cc785deb0c537d57ee6ba77/sound/creatures/venus_trap_hurt.ogg" \ No newline at end of file + source: "https://github.com/tgstation/tgstation/tree/943f38bf7c5f9c048cc785deb0c537d57ee6ba77/sound/creatures/venus_trap_hurt.ogg" diff --git a/Resources/Audio/Voice/Moth/attributions.yml b/Resources/Audio/Voice/Moth/attributions.yml index 9c7727aa51..5d6386b81d 100644 --- a/Resources/Audio/Voice/Moth/attributions.yml +++ b/Resources/Audio/Voice/Moth/attributions.yml @@ -6,4 +6,4 @@ - files: ["moth_laugh.ogg, moth_chitter.ogg, moth_squeak.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from https://github.com/BeeStation/BeeStation-Hornet/commit/11ba3fa04105c93dd96a63ad4afaef4b20c02d0d" - source: "https://github.com/BeeStation/BeeStation-Hornet/blob/11ba3fa04105c93dd96a63ad4afaef4b20c02d0d/sound/emotes/" \ No newline at end of file + source: "https://github.com/BeeStation/BeeStation-Hornet/blob/11ba3fa04105c93dd96a63ad4afaef4b20c02d0d/sound/emotes/" diff --git a/Resources/Audio/Voice/Reptilian/attritbutions.yml b/Resources/Audio/Voice/Reptilian/attritbutions.yml index 7fa86b2ebf..7c97eaa2d8 100644 --- a/Resources/Audio/Voice/Reptilian/attritbutions.yml +++ b/Resources/Audio/Voice/Reptilian/attritbutions.yml @@ -6,4 +6,4 @@ - files: [reptilian_tailthump.ogg] copyright: "Taken from https://freesound.org/" license: "CC0-1.0" - source: https://freesound.org/people/TylerAM/sounds/389665/ \ No newline at end of file + source: https://freesound.org/people/TylerAM/sounds/389665/ diff --git a/Resources/Audio/Voice/Zombie/attributions.yml b/Resources/Audio/Voice/Zombie/attributions.yml index 9fa56bc389..3bbbd81315 100644 --- a/Resources/Audio/Voice/Zombie/attributions.yml +++ b/Resources/Audio/Voice/Zombie/attributions.yml @@ -9,4 +9,4 @@ - files: ["zombie-3.ogg"] license: "CC-BY-NC-SA-3.0" copyright: "Zombie Snarl by gneube. Converted from MP3 to OGG." - source: "https://freesound.org/people/gneube/sounds/315844/" \ No newline at end of file + source: "https://freesound.org/people/gneube/sounds/315844/" diff --git a/Resources/Audio/Weapons/Guns/Gunshots/Magic/attributions.yml b/Resources/Audio/Weapons/Guns/Gunshots/Magic/attributions.yml index c25a5ed484..c057db626b 100644 --- a/Resources/Audio/Weapons/Guns/Gunshots/Magic/attributions.yml +++ b/Resources/Audio/Weapons/Guns/Gunshots/Magic/attributions.yml @@ -4,4 +4,4 @@ - files: [ "staff_animation.ogg", "staff_change.ogg", "staff_chaos.ogg", "staff_door.ogg", "staff_healing.ogg" ] license: "CC-BY-SA-3.0" copyright: "https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7" - source: "https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7" \ No newline at end of file + source: "https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7" diff --git a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml index 1a0136111c..b093408b92 100644 --- a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml +++ b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml @@ -1,4 +1,4 @@ -- files: ["water_spray.ogg"] +- files: ["water_spray.ogg"] license: "CC0-1.0" copyright: "Watering by elittle13. Converted to .OGG and MONO by EmoGarbage404 (github)" source: "https://freesound.org/people/elittle13/sounds/568558" diff --git a/Resources/Audio/Weapons/Guns/Hits/attributions.yml b/Resources/Audio/Weapons/Guns/Hits/attributions.yml index 297fc9dcf2..e00713cb99 100644 --- a/Resources/Audio/Weapons/Guns/Hits/attributions.yml +++ b/Resources/Audio/Weapons/Guns/Hits/attributions.yml @@ -6,4 +6,4 @@ - files: ["ric1.ogg", "ric2.ogg", "ric3.ogg", "ric3.ogg", "ric5.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from tgstation" - source: "https://github.com/tgstation/tgstation/tree/7501504b0ea029d2cf1c0336d09db5c0959aa412/sound/weapons/effects" \ No newline at end of file + source: "https://github.com/tgstation/tgstation/tree/7501504b0ea029d2cf1c0336d09db5c0959aa412/sound/weapons/effects" diff --git a/Resources/Audio/Weapons/Guns/Misc/attributions.yml b/Resources/Audio/Weapons/Guns/Misc/attributions.yml index dab5384b8d..3a1337fc65 100644 --- a/Resources/Audio/Weapons/Guns/Misc/attributions.yml +++ b/Resources/Audio/Weapons/Guns/Misc/attributions.yml @@ -6,4 +6,4 @@ - files: ["selector.ogg"] license: "CC-BY-NC-SA-3.0" copyright: "Taken from tgstation" - source: "https://github.com/tgstation/TerraGov-Marine-Corps/blob/0d97ec86c49e2a89409bd3ddf0b7451b3f1c9a0e/sound/weapons/guns/interact/selector.ogg" \ No newline at end of file + source: "https://github.com/tgstation/TerraGov-Marine-Corps/blob/0d97ec86c49e2a89409bd3ddf0b7451b3f1c9a0e/sound/weapons/guns/interact/selector.ogg" diff --git a/Resources/Audio/Weapons/Guns/Miss/attributions.yml b/Resources/Audio/Weapons/Guns/Miss/attributions.yml index 7fd804b9d0..90e4348fe3 100644 --- a/Resources/Audio/Weapons/Guns/Miss/attributions.yml +++ b/Resources/Audio/Weapons/Guns/Miss/attributions.yml @@ -6,4 +6,4 @@ - files: ["energy_miss1.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from CM-SS13" - source: "https://github.com/cmss13-devs/cmss13/tree/0535055a7abcd3016123f2be2cd3db428c122dac/sound/bullets" \ No newline at end of file + source: "https://github.com/cmss13-devs/cmss13/tree/0535055a7abcd3016123f2be2cd3db428c122dac/sound/bullets" diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_DE50.ogg b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_DE50.ogg index 6dc1133ec8..33de536a1b 100644 Binary files a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_DE50.ogg and b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_DE50.ogg differ diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_cmb_1.ogg b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_cmb_1.ogg index 0edb3c7ed2..7cb84f4aaa 100644 Binary files a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_cmb_1.ogg and b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_cmb_1.ogg differ diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_1.ogg b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_1.ogg index 61b7983d16..fb4d2a8de3 100644 Binary files a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_1.ogg and b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_1.ogg differ diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_2.ogg b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_2.ogg index a7dc46e382..e2cc2a8935 100644 Binary files a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_2.ogg and b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_2.ogg differ diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_3.ogg b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_3.ogg index 9e93c17ada..52fe7af3ff 100644 Binary files a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_3.ogg and b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_3.ogg differ diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_4.ogg b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_4.ogg index e26b1fe85f..e30d694996 100644 Binary files a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_4.ogg and b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_4.ogg differ diff --git a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_5.ogg b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_5.ogg index 1a77a632f9..f36af87d45 100644 Binary files a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_5.ogg and b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_5.ogg differ diff --git a/Resources/Audio/_Starlight/Armor/Ricochet/Cyborg/attributions.yml b/Resources/Audio/_Starlight/Armor/Ricochet/Cyborg/attributions.yml index 028f195aa4..184b088eb5 100644 --- a/Resources/Audio/_Starlight/Armor/Ricochet/Cyborg/attributions.yml +++ b/Resources/Audio/_Starlight/Armor/Ricochet/Cyborg/attributions.yml @@ -1,4 +1,4 @@ - files: ["ricochet1b.ogg", "ricochet2b.ogg", "ricochet3b.ogg", "ricochet4b.ogg"] license: "CC-BY-3.0" copyright: "Made by JustAdler for https://github.com/ss14Starlight/space-station-14" - source: "https://github.com/ss14Starlight/space-station-14" \ No newline at end of file + source: "https://github.com/ss14Starlight/space-station-14" diff --git a/Resources/Audio/_Starlight/Armor/Ricochet/attributions.yml b/Resources/Audio/_Starlight/Armor/Ricochet/attributions.yml index cf1ffe6ac5..23a80a21c6 100644 --- a/Resources/Audio/_Starlight/Armor/Ricochet/attributions.yml +++ b/Resources/Audio/_Starlight/Armor/Ricochet/attributions.yml @@ -1,4 +1,4 @@ - files: ["ricochet1_1.ogg", "ricochet2_2.ogg", "ricochet3_3.ogg", "ricochet4_4.ogg"] license: "CC-BY-3.0" copyright: "Made by JustAdler for https://github.com/ss14Starlight/space-station-14" - source: "https://github.com/ss14Starlight/space-station-14" \ No newline at end of file + source: "https://github.com/ss14Starlight/space-station-14" diff --git a/Resources/Audio/_Starlight/Effects/supermatter/attributions.yml b/Resources/Audio/_Starlight/Effects/supermatter/attributions.yml index 77ea07bf56..961e9b9f52 100644 --- a/Resources/Audio/_Starlight/Effects/supermatter/attributions.yml +++ b/Resources/Audio/_Starlight/Effects/supermatter/attributions.yml @@ -6,4 +6,4 @@ - files: ["emitter2.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from tgstation" - source: "https://github.com/tgstation/tgstation/blob/master/sound/weapons/emitter2.ogg" \ No newline at end of file + source: "https://github.com/tgstation/tgstation/blob/master/sound/weapons/emitter2.ogg" diff --git a/Resources/Audio/_Starlight/Items/Medical/attributions.yml b/Resources/Audio/_Starlight/Items/Medical/attributions.yml index 51d3d58d25..e712dfa07e 100644 --- a/Resources/Audio/_Starlight/Items/Medical/attributions.yml +++ b/Resources/Audio/_Starlight/Items/Medical/attributions.yml @@ -6,4 +6,4 @@ - files: ["medical2.ogg"] license: "CC-BY-NC-SA-3.0" copyright: "Goonstation" - source: "https://github.com/goonstation/goonstation/blob/master/sound/items/mender2.ogg" \ No newline at end of file + source: "https://github.com/goonstation/goonstation/blob/master/sound/items/mender2.ogg" diff --git a/Resources/Audio/_Starlight/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/_Starlight/Weapons/Guns/Gunshots/attributions.yml index 13dc809059..4714878069 100644 --- a/Resources/Audio/_Starlight/Weapons/Guns/Gunshots/attributions.yml +++ b/Resources/Audio/_Starlight/Weapons/Guns/Gunshots/attributions.yml @@ -21,4 +21,4 @@ - files: ["1sp_91.ogg"] license: "CC-BY-SA-3.0" copyright: "Taken from RU Paradise Station" - source: "https://github.com/ss220-space/Paradise/commit/7fb130eac5c2c645fc841769c69f7b7a50dfe854" \ No newline at end of file + source: "https://github.com/ss220-space/Paradise/commit/7fb130eac5c2c645fc841769c69f7b7a50dfe854" diff --git a/Resources/Audio/_Starlight/Weapons/attributions.yml b/Resources/Audio/_Starlight/Weapons/attributions.yml index 2e6b518f06..4269647792 100644 --- a/Resources/Audio/_Starlight/Weapons/attributions.yml +++ b/Resources/Audio/_Starlight/Weapons/attributions.yml @@ -1,4 +1,4 @@ - files: ["knuckle1.ogg", "knuckle2.ogg", "knuckle3.ogg", "knuckle4.ogg", "knuckle5.ogg"] license: "CC-BY-3.0" copyright: "Made by JustAdler for https://github.com/ss14Starlight/space-station-14" - source: "https://github.com/ss14Starlight/space-station-14" \ No newline at end of file + source: "https://github.com/ss14Starlight/space-station-14" diff --git a/Resources/Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg b/Resources/Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg index 4222ae8e86..4cdb267f9b 100644 Binary files a/Resources/Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg and b/Resources/Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg differ diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 20e0055a3c..258e56fb45 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -1,4 +1,4 @@ -AdminOnly: true +AdminOnly: true Entries: - author: DrSmugleaf changes: diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 74666f467b..446f4a08e3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,4 +1,4 @@ -Entries: +Entries: - author: ScarKy0, beck-thompson changes: - message: Various canines will now sometimes clumsily spill things they drink. diff --git a/Resources/Changelog/ChangelogSunrise.yml b/Resources/Changelog/ChangelogSunrise.yml index ae46ff975b..a5c18c4a43 100644 --- a/Resources/Changelog/ChangelogSunrise.yml +++ b/Resources/Changelog/ChangelogSunrise.yml @@ -1,4 +1,4 @@ -Entries: +Entries: - author: VigersRay changes: - message: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0432\u0443\u043B\u044C\u043F\ @@ -23883,12 +23883,12 @@ \ \u043C\u043E\u0436\u043D\u043E \u043D\u0430\u0439\u0442\u0438 \u043C\u0430\ \u0441\u043A\u0443." type: Add - - message: "\u043C\u043E\u0439 \u043A\u0443\u043C\u0438\u0440 Tec-9, \u043E\u043D\ + - message: "\u043C\u043E\u0439 \u043A\u0443\u043C\u0438\u0440 Tac-Tec, \u043E\u043D\ \ \u0434\u0435\u043B\u0430\u0435\u0442 \u0440\u0435\u0430\u043B\u044C\u043D\u044B\ \u0439 \u0437\u0432\u0443\u043A" type: Add - message: "\u0432 \u0430\u043F\u043B\u0438\u043D\u043A\u0435 \u043C\u043E\u0436\ - \u043D\u043E \u043A\u0443\u043F\u0438\u0442\u044C Tec-9" + \u043D\u043E \u043A\u0443\u043F\u0438\u0442\u044C Tac-Tec" type: Add - message: "\u043F\u0435\u0440\u0447\u0430\u0442\u043A\u0438 \u044F\u0434\u0435\u0440\ \u043D\u044B\u0445 \u043E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\u043D\u0438\ diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml index 52aad2badb..5cb7baba5c 100644 --- a/Resources/Changelog/Maps.yml +++ b/Resources/Changelog/Maps.yml @@ -1,4 +1,4 @@ -Entries: +Entries: - author: ArtisticRoomba changes: - message: The mapping changelog has been added! This primarily serves as a way diff --git a/Resources/Changelog/Rules.yml b/Resources/Changelog/Rules.yml index 6fd5f130ca..c610a5f208 100644 --- a/Resources/Changelog/Rules.yml +++ b/Resources/Changelog/Rules.yml @@ -1,4 +1,4 @@ -Entries: +Entries: - author: Errant changes: - message: Tab created. diff --git a/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/basic/crossbow.ftl b/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/basic/crossbow.ftl index 6907d110d3..5d53c24a59 100644 --- a/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/basic/crossbow.ftl +++ b/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/basic/crossbow.ftl @@ -1,4 +1,4 @@ -ent-WeaponEnergyCrossbow = energy crossbow +ent-WeaponEnergyCrossbowLarge = energy crossbow .desc = Fires low-damage kinetic bolts at a short range. -ent-WeaponMiniEnergyCrossbow = mini energy crossbow +ent-WeaponEnergyCrossbow = mini energy crossbow .desc = Fires low-damage kinetic bolts at a short range. diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl index 9eb46cb803..1d2117ae44 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl @@ -2,11 +2,6 @@ ent-MedipenCombatInjector = Combat medi-injector .desc = A sterile injector for 4-use. Containing chemicals that regenerate most types of damage. ent-HyposprayERT = ERT hypospray .desc = A sterile injector for rapid administration of drugs to patients. -ent-HyposprayMedical = medical hypospray - .desc = A sterile injector for rapid administration of drugs to patients. It contains an internal Toxin filter. -ent-HyposprayMedicalNoFilter = medical hypospray - .suffix = no filter - .desc = A sterile injector for rapid administration of drugs to patients. It contains an internal Toxin filter. ent-StimpackNT = ephedrine injector .desc = Contains enough ephedrine for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down. ent-StimpackMiniNT = ephedrine microinjector diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl index 7996ee052d..618fd1ecb3 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl @@ -1,4 +1,4 @@ ent-BaseMagazinePistolCaselessRifleExtended = { ent-BaseMagazinePistolCaselessRifle } .desc = { ent-BaseMagazinePistolCaselessRifle.desc } -ent-BaseMagazinePistolCaselessRifleTec9 = { ent-BaseMagazinePistolCaselessRifleTec9 } - .desc = { ent-BaseMagazinePistolCaselessRifleTec9.desc } +ent-MagazinePistolSubMachineGunCaseless = { ent-MagazinePistolSubMachineGunCaseless } + .desc = { ent-MagazinePistolSubMachineGunCaseless.desc } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl index a62b51e57e..7bb977994a 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl @@ -1,7 +1,3 @@ -ent-MagazineAK = Universal AK magazne - .desc = { ent-BaseItem.desc } -ent-MagazineMP38 = MP38 magazine - .desc = { ent-BaseItem.desc } ent-MagazineScorpion = Scorpion magazine .desc = { ent-BaseItem.desc } ent-MagazineNewVector = New Vector magazine @@ -20,7 +16,5 @@ ent-MagazineACP14 = ACP14 magazine .desc = { ent-BaseItem.desc } ent-MagazineDl6902 = box-magazine DL6902 .desc = { ent-BaseMagazineLightRifle.desc } -ent-MagazinePistolSubMachineGunSIAR52 = extended magazine (caseless) +ent-MagazinePistolSubMachineGunCaselessExtended = extended magazine (caseless) .desc = { ent-BaseMagazineLightRifle.desc } -ent-MagazineScarH = scar-h magazine - .desc = { ent-BaseItem.desc } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl index cb50f91dda..aec432c86f 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl @@ -1,9 +1,6 @@ ent-WeaponRevolverPythonAPBiocode = { ent-WeaponRevolverPythonAP } .suffix = BIOCODE .desc = { ent-WeaponRevolverPythonAP.desc } -ent-WeaponRevolverPythonBiocode = { ent-WeaponRevolverPython } - .suffix = BIOCODE - .desc = { ent-WeaponRevolverPython.desc } ent-WeaponShotgunBulldogBiocode = { ent-WeaponShotgunBulldog } .suffix = BIOCODE .desc = { ent-WeaponShotgunBulldog.desc } @@ -25,12 +22,6 @@ ent-WeaponLauncherM79Biocode = { ent-WeaponLauncherM79 } ent-WeaponSniperHristovBiocode = { ent-WeaponSniperHristov } .suffix = BIOCODE .desc = { ent-WeaponSniperHristov.desc } -ent-WeaponPistolCobraBiocode = { ent-WeaponPistolCobra } - .suffix = BIOCODE - .desc = { ent-WeaponPistolCobra.desc } -ent-WeaponPistolViperBiocode = { ent-WeaponPistolViper } - .suffix = BIOCODE - .desc = { ent-WeaponPistolViper.desc } ent-WeaponRifleM90GrenadeLauncherBiocode = { ent-WeaponRifleM90GrenadeLauncher } .suffix = BIOCODE .desc = { ent-WeaponRifleM90GrenadeLauncher.desc } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl index 6b5e23a462..52c5ef6b22 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl @@ -32,8 +32,5 @@ ent-WeaponPistolM1984 = D1984 ent-WeaponPistolDeagleGolden = Golden Desert Eagle .desc = Fires a .45 magnum cartridge. Engraved: All I remember of him are two gold-plated .45 Desert Eagles. -ent-WeaponPistolTec9 = Tec-9 Tactical - .desc = Very cheap to produce and very easy to use, as reliable as the Egyptian AK-47. -ent-WeaponPistolTec9Biocode = { ent-WeaponPistolTec9 } - .suffix = BIOCODE - .desc = { ent-WeaponPistolTec9.desc } +ent-WeaponPistolTec9 = Tac-Tec + .desc = Very cheap to produce and very easy to use, as reliable as the SKM-24. diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl index 057a35fa3a..84a96f2367 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl @@ -10,8 +10,6 @@ ent-WeaponRifleG36 = G-36 .desc = { ent-BaseWeaponRifle.desc } ent-WeaponRifleM16A4 = M16A4 .desc = { ent-BaseWeaponRifle.desc } -ent-WeaponRifleScarH = scar-h - .desc = { ent-BaseWeaponRifle.desc } ent-WeaponRifleLecterMk2 = Lecter Mk2 .desc = { ent-BaseWeaponRifle.desc } ent-WeaponRifleLecterMk2Empty = Lecter Mk2 diff --git a/Resources/Locale/en-US/_prototypes/catalog/fills/crates/syndicate.ftl b/Resources/Locale/en-US/_prototypes/catalog/fills/crates/syndicate.ftl index f4618b2dee..ee03d5965e 100644 --- a/Resources/Locale/en-US/_prototypes/catalog/fills/crates/syndicate.ftl +++ b/Resources/Locale/en-US/_prototypes/catalog/fills/crates/syndicate.ftl @@ -1,7 +1,7 @@ -ent-CrateSyndicateSurplusBundleAgent = Syndicate surplus crate +ent-CrateSyndicateSurplusBundle = Syndicate surplus crate .desc = Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good. .suffix = Agent -ent-CrateSyndicateSuperSurplusBundleAgent = Syndicate super surplus crate +ent-CrateSyndicateSuperSurplusBundle = Syndicate super surplus crate .desc = Contains 125 telecrystals worth of completely random Syndicate items. .suffix = Agent ent-CrateSyndicateSurplusBundleNuke = Syndicate surplus crate diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/antimateriel.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/antimateriel.ftl index ff86cd598f..3d7f17cab8 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/antimateriel.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/antimateriel.ftl @@ -1,4 +1,4 @@ -ent-CartridgeAntiMateriel = cartridge (15mm armor-pierce) +ent-CartridgeAntiMaterielPenetrator = cartridge (15mm armor-pierce) .desc = { ent-BaseCartridge.desc } ent-CartridgeAntiMateriel = cartridge (15mm anti-materiel) .desc = { ent-BaseCartridge.desc } diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl index 5e66411b18..7b90d8fa32 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl @@ -6,15 +6,15 @@ ent-BaseGrenade = base grenade .desc = { ent-BaseItem.desc } ent-GrenadeBaton = baton grenade .desc = { ent-BaseGrenade.desc } -ent-GrenadeBlastContact = contact blast grenade +ent-GrenadeBlast = contact blast grenade .desc = { ent-BaseGrenade.desc } -ent-GrenadeFlashContact = contact flash grenade +ent-GrenadeFlash = contact flash grenade .desc = { ent-BaseGrenade.desc } -ent-GrenadeFragContact = contact frag grenade +ent-GrenadeFrag = contact frag grenade .desc = { ent-BaseGrenade.desc } ent-GrenadeCleanade = cleanade grenade round .desc = { ent-BaseGrenade.desc } -ent-GrenadeEMPContact = contact EMP grenade +ent-GrenadeEMP = contact EMP grenade .desc = { ent-BaseGrenade.desc } ent-BaseCannonBall = base cannon ball .desc = { ent-BaseItem.desc } diff --git a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl index fbfb74fc6a..3da44af4c4 100644 --- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl @@ -68,15 +68,15 @@ ent-BulletWeakRocket = weak rocket .desc = { ent-BaseBulletTrigger.desc } ent-BulletGrenadeBaton = baton grenade .desc = { ent-BaseBullet.desc } -ent-BulletGrenadeBlastContact = contact blast grenade +ent-BulletGrenadeBlast = contact blast grenade .desc = { ent-BaseBulletTrigger.desc } -ent-BulletGrenadeFlashContact = contact flash grenade +ent-BulletGrenadeFlash = contact flash grenade .desc = { ent-BaseBulletTrigger.desc } -ent-BulletGrenadeFragContact = contact frag grenade +ent-BulletGrenadeFrag = contact frag grenade .desc = { ent-BaseBulletTrigger.desc } ent-BulletGrenadeCleanade = cleanade grenade round .desc = { ent-BaseBulletTrigger.desc } -ent-BulletGrenadeEMPContact = contact EMP grenade +ent-BulletGrenadeEMP = contact EMP grenade .desc = { ent-BaseBulletTrigger.desc } ent-BulletCap = cap bullet .desc = { ent-BaseBullet.desc } diff --git a/Resources/Locale/en-US/_prototypes/entities/structures/wallmounts/tear_gas_walldispenser.ftl b/Resources/Locale/en-US/_prototypes/entities/structures/wallmounts/tear_gas_walldispenser.ftl deleted file mode 100644 index dbce8f0224..0000000000 --- a/Resources/Locale/en-US/_prototypes/entities/structures/wallmounts/tear_gas_walldispenser.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-TearGasDispenser = tear gas dispenser - .desc = Wallmount reagent dispenser. diff --git a/Resources/Locale/en-US/_strings/_sunrise/modsuits/modsuits.ftl b/Resources/Locale/en-US/_strings/_sunrise/modsuits/modsuits.ftl deleted file mode 100644 index b656cf6c2b..0000000000 --- a/Resources/Locale/en-US/_strings/_sunrise/modsuits/modsuits.ftl +++ /dev/null @@ -1,48 +0,0 @@ -research-technology-modsuits = Modsuit core - -ent-ModsuitCore = Modsuit core - .desc = A core designed for activation mod-costumes. - - -ent-ClothingModsuitNanoTrasenRepresentative = NT representative modsuit - .desc = Superior -ent-ClothingBlueShieldModsuit = officer «blue shield» modsuit - .desc = Superior -ent-ClothingModsuitComMaid = com maid modsuit - .desc = Superior. -ent-ClothingCommonModsuit = passenger modsuit - .desc = Superior. -ent-ClothingModsuitERTJanitor = janitorERT modsuit - .desc = Superior. -ent-ClothingModsuitERTSecurity = securityERT modsuit - .desc = Superior. -ent-ClothingModsuitERTMedical = medicalERT modsuit - .desc = Superior. -ent-ClothingModsuitERTLeader = leaderERT modsuit - .desc = Superior. -ent-ClothingModsuitERTEngineer = engineerERT modsuit - .desc = Superior. -ent-ClothingModsuitERTChaplain = chaplainERT modsuit - .desc = Superior. - - -ent-ClothingHeadHelmetBlueshieldModsuit = blueshield hardsuit helmet - .desc = A robust helmet for special operations. -ent-ClothingHeadHelmetRepresentativeModsuit = representative hardsuit helmet - .decs = A robust helmet for special operations. -ent-ClothingHeadHelmetModsuitCommaid = commaid hardsuit helmet - .desc = A robust helmet for special operations. -ent-ClothingHeadHelmetCommonModsuit = passenger hardsuit helmet - .desc = A robust helmet for special operations. - - -ent-ClothingModsuitBlueshield = blueshield hardsuit - .desc = An advanced hardsuit favored by commandos for use in special operations. -ent-ClothingModsuitRepresentative = representative hardsuit - .decs = An advanced hardsuit favored by commandos for use in special operations. -ent-ClothingModsuitCommaid = commaid hardsuit - .desc = An advanced hardsuit favored by commandos for use in special operations. -ent-ClothingModsuitCommon = common hardsuit - .desc = An advanced hardsuit favored by commandos for use in special operations. - -modsuit-equip-failure = You need the modsuit core to expand hardsuit \ No newline at end of file diff --git a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl index 9b88fc93ca..ec4256e18f 100644 --- a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl @@ -20,7 +20,7 @@ uplink-magazine-bulldog-uraniumslug-desc = Shotgun magazine with 8 shells filled uplink-magazine-bulldog-uranium-desc = Shotgun magazine with 8 shells filled with uranium pellet. Compatible with the Bulldog. uplink-pistol-magnum-magazine-name = Магазин для Deagle uplink-pistol-magnum-magazine-desc = 7-зарядный однорядный магазин для пистолета. Содержит патроны SP. Совместим с "Диглом". -uplink-pistoltec9-magazine-name = пистолетный магазин tec-9 (.20 безгильзовый) +uplink-pistoltec9-magazine-name = магазин Tac-Tec (.20 безгильзовый) uplink-pistoltec9-magazine-desc = Кустарный пистолетный магазин на 20 патронов,под калибр, используемый агентами синдиката. ## Misc diff --git a/Resources/Locale/en-US/_strings/clothing/components/toggleable-clothing-component.ftl b/Resources/Locale/en-US/_strings/clothing/components/toggleable-clothing-component.ftl index 746eea4a28..e2bb98c4da 100644 --- a/Resources/Locale/en-US/_strings/clothing/components/toggleable-clothing-component.ftl +++ b/Resources/Locale/en-US/_strings/clothing/components/toggleable-clothing-component.ftl @@ -1,3 +1,3 @@ toggle-clothing-verb-text = Toggle {CAPITALIZE($entity)} - toggleable-clothing-remove-first = You have to unequip {$entity} first. +modsuit-equip-failure = Вам необходимо ядро для раскрытия скафандра Р.И.Г-а. diff --git a/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/basic/crossbow.ftl b/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/basic/crossbow.ftl index ee7dd9e33a..c2460b7c6a 100644 --- a/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/basic/crossbow.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/basic/crossbow.ftl @@ -1,4 +1,4 @@ -ent-WeaponEnergyCrossbow = энергетический арбалет +ent-WeaponEnergyCrossbowLarge = энергетический арбалет + .desc = Выстреливает кинетическими болтами с низким уроном на короткой дистанции. +ent-WeaponEnergyCrossbow = малый энергетический арбалет .desc = Выстреливает кинетическими болтами с низким уроном на короткой дистанции. -ent-WeaponMiniEnergyCrossbow = малый энергетический арбалет - .desc = Выстреливает кинетическими болтами с низким уроном на короткой дистанции. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl index abfde78bf1..a161da7688 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl @@ -1,6 +1,6 @@ ent-ToolboxSyndicateFilledCoreExtraction = { ent-ToolboxSyndicate } .desc = { ent-ToolboxSyndicate.desc } .suffix = Заполнен, Извлечение ядра -ent-ToolboxSyndicateMechRepair = { ent-ToolboxSyndicate } +ent-ToolboxSyndicateFilledRepair = { ent-ToolboxSyndicate } .desc = { ent-ToolboxSyndicate.desc } .suffix = Заполнен, Ремонт мехов diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl index fb27ec2cb1..aa1e347da4 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl @@ -2,11 +2,6 @@ ent-MedipenCombatInjector = Боевой медипен .desc = Стерильный инъектор на 4 применения. Содержит химикаты, которые регенерируют большинство типов повреждений. ent-HyposprayERT = гипоспрей ОБР .desc = Стерильный инжектор для быстрого введения лекарств пациентам. -ent-HyposprayMedical = медицинский гипоспрей - .desc = Стерильный инжектор для быстрого введения лекарств пациентам. Содержит внутренний фильтр токсинов. -ent-HyposprayMedicalNoFilter = медицинский гипоспрей - .suffix = без фильтра - .desc = Стерильный инжектор для быстрого введения лекарств пациентам. Содержит внутренний фильтр токсинов. ent-HyposprayMedicalNoFilterBox = взломанный медицинский гипоспрей .desc = Коробка со стерильным инъектором для быстрого введения препаратов пациентам. Внутренний токсиновый фильтр был удалён во время взлома. Упаковка дезинтегрируется при вскрытии, не оставляя следов. ent-StimpackNT = стимпак diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl index 203ca32546..90b07eefa7 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl @@ -1,6 +1,8 @@ ent-BaseMagazinePistolCaselessRifleExtended = расширенный пистолетный магазин (.20 безгильзовый) .desc = { ent-BaseMagazinePistolCaselessRifle.desc } -ent-BaseMagazinePistolCaselessRifleTec9 = пистолетный магазин tec-9 (.20 безгильзовый) - .desc = Кустарный пистолетный магазин под распостранённый патрон, используемый агентами синдиката. +ent-MagazinePistolSubMachineGunCaseless = магазин Tac-Tec (.20 безгильзовый) + .desc = Магазин под особый патрон, используемый агентами синдиката. ent-MagazineCannonBallMini = чемодан с ядрами .desc = Чемодан для аккуратного хранения ядер от пиратской пушки с ленточной подачей. +ent-MagazinePistolSubMachineGunCaselessExtended = Расширенный магазин (.20 безгильзовые) + .desc = { ent-BaseMagazineLightRifle.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl index 791427eccd..046eb7b981 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl @@ -1,7 +1,3 @@ -ent-MagazineAK = универсальный магазин автомата калашникова - .desc = Использует патроны калибра 7,62x39мм. -ent-MagazineMP38 = магазин ПП MP-38 - .desc = Использует патроны калибра .35 Авто. ent-MagazineScorpion = магазин ПП Скорпион .desc = Использует патроны калибра .35 Авто. ent-MagazineNewVector = магазин Вектора @@ -20,7 +16,3 @@ ent-MagazineACP14 = магазин пистолета ACP-14 .desc = Использует патроны калибра .40. ent-MagazineDl6902 = короб-магазин DL6902 .desc = { ent-BaseMagazineLightRifle.desc } -ent-MagazinePistolSubMachineGunSIAR52 = Расширенный магазин (безгильзовые) - .desc = { ent-BaseMagazineLightRifle.desc } -ent-MagazineScarH = магазин scar-h - .desc = { ent-BaseItem.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl index ff7c28b7f2..da71f3b369 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl @@ -1,9 +1,6 @@ ent-WeaponRevolverPythonAPBiocode = { ent-WeaponRevolverPythonAP } - .desc = { ent-WeaponRevolverPythonAP.desc } - .suffix = БИОКОД -ent-WeaponRevolverPythonBiocode = { ent-WeaponRevolverPython } .desc = { ent-WeaponRevolverPython.desc } - .suffix = БИОКОД + .suffix = БИОКОД, Бронебойный ent-WeaponShotgunBulldogBiocode = { ent-WeaponShotgunBulldog } .desc = { ent-WeaponShotgunBulldog.desc } .suffix = БИОКОД @@ -25,12 +22,6 @@ ent-WeaponLauncherM79Biocode = { ent-WeaponLauncherM79 } ent-WeaponSniperHristovBiocode = { ent-WeaponSniperHristov } .desc = { ent-WeaponSniperHristov.desc } .suffix = БИОКОД -ent-WeaponPistolCobraBiocode = { ent-WeaponPistolCobra } - .desc = { ent-WeaponPistolCobra.desc } - .suffix = БИОКОД -ent-WeaponPistolViperBiocode = { ent-WeaponPistolViper } - .desc = { ent-WeaponPistolViper.desc } - .suffix = БИОКОД ent-WeaponRifleM90GrenadeLauncherBiocode = { ent-WeaponRifleM90GrenadeLauncher } .desc = { ent-WeaponRifleM90GrenadeLauncher.desc } .suffix = БИОКОД @@ -64,9 +55,9 @@ ent-WeaponGrenadeLauncherGL70Biocode = { ent-WeaponGrenadeLauncherGL70 } ent-WeaponShotgunMinotaurBiocode = { ent-WeaponShotgunMinotaur } .suffix = БИОКОД .desc = { ent-WeaponShotgunMinotaur.desc } -ent-WeaponMiniEnergyCrossbowBiocode = { ent-WeaponMiniEnergyCrossbow } +ent-WeaponEnergyCrossbowBiocode = { ent-WeaponEnergyCrossbow } .suffix = БИОКОД - .desc = { ent-WeaponMiniEnergyCrossbow.desc } + .desc = { ent-WeaponEnergyCrossbow.desc } ent-WeaponSubMachineGunC40rBiocode = { ent-WeaponSubMachineGunC40r } .desc = { ent-WeaponSubMachineGunC40r.desc } .suffix = БИОКОД diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl index 91789b36c2..baa2c1b2a8 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl @@ -37,8 +37,5 @@ ent-WeaponPistolDeagleGolden = Золотой Десерт Игл ent-WeaponPistolDeagleGoldenBiocode = { ent-WeaponPistolDeagleGolden } .suffix = БИОКОД .desc = { ent-WeaponPistolDeagleGolden.desc } -ent-WeaponPistolTec9 = Тек-9 тактикал - .desc = Очень дешёвый в производстве и очень простой в использовании, надёжный как Египетский АК-47. -ent-WeaponPistolTec9Biocode = { ent-WeaponPistolTec9 } - .suffix = БИОКОД - .desc = { ent-WeaponPistolTec9.desc } +ent-WeaponPistolTec9 = Tac-Tec + .desc = Очень дешёвый в производстве и очень простой в использовании, надёжный как СКМ-24. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl index 918bc92cf6..567d4d930c 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl @@ -10,8 +10,6 @@ ent-WeaponRifleG36 = G-36 .desc = Бывшая штурмовая винтовка армий Земного правительства. Оснащена встроенным оптическим прицелом, обеспечивающим повышенную точность на средней дистанции. Всё ещё находит применение в вооружённых силах колоний и у частных охранных структур. Использует стандартные патроны калибра 5,56×45мм. ent-WeaponRifleM16A4 = M16A4 .desc = Легкая, универсальная штурмовая винтовка. До сих пор сохраняет актуальность среди наемников и ополченцев. Заряжается патронами калибра 5,56х45мм. -ent-WeaponRifleScarH = scar-h - .desc = { ent-BaseWeaponRifle.desc } ent-WeaponRifleLecterMk2 = Лектер Мк2 .desc = Улучшенный вариант армейской штурмовой винтовки. Встроенна новейшая система автоматического сброса пустого магазина. Использует патроны калибра .20 винтовочный. ent-WeaponRifleLecterMk2Empty = Лектер Мк2 diff --git a/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/syndicate.ftl b/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/syndicate.ftl index d54d6759cf..a1e1acd622 100644 --- a/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/syndicate.ftl +++ b/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/syndicate.ftl @@ -1,9 +1,3 @@ -ent-CrateSyndicateSurplusBundleAgent = ящик с избытками синдиката - .desc = Содержит предметы синдиката на 50 телекристаллов. Может содержать как бесполезный хлам, так и действительно полезные вещи. - .suffix = Синдикат -ent-CrateSyndicateSuperSurplusBundleAgent = ящик с супер-избытками синдиката - .desc = Содержит предметы синдиката на 125 телекристаллов. Может содержать как бесполезный хлам, так и действительно полезные вещи. - .suffix = Синдикат ent-CrateSyndicateSurplusBundleNuke = ящик с избытками синдиката .desc = Содержит предметы синдиката на 50 телекристаллов. Может содержать как бесполезный хлам, так и действительно полезные вещи. .suffix = Ядерные оперативники diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl index 90c4620501..1cf27daa5f 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl @@ -6,15 +6,15 @@ ent-BaseGrenade = базовая граната .desc = { ent-BaseItem.desc } ent-GrenadeBaton = резиновая граната .desc = { ent-BaseGrenade.desc } -ent-GrenadeBlastContact = фугасная граната контактная +ent-GrenadeBlast = фугасная граната контактная .desc = { ent-BaseGrenade.desc } -ent-GrenadeFlashContact = светошумовая граната контактная +ent-GrenadeFlash = светошумовая граната контактная .desc = { ent-BaseGrenade.desc } -ent-GrenadeFragContact = осколочная граната контактная +ent-GrenadeFrag = осколочная граната контактная .desc = { ent-BaseGrenade.desc } ent-GrenadeCleanade = граната с очищающим газом .desc = { ent-BaseGrenade.desc } -ent-GrenadeEMPContact = ЭМИ граната контактная +ent-GrenadeEMP = ЭМИ граната контактная .desc = { ent-BaseGrenade.desc } ent-BaseCannonBall = базовое пушечное ядро .desc = { ent-BaseItem.desc } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/speedloaders/rifle_light.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/speedloaders/rifle_light.ftl index 650f9040f3..09dcb074f7 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/speedloaders/rifle_light.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/speedloaders/rifle_light.ftl @@ -1,2 +1,2 @@ -ent-SpeedLoaderLightRifle = спидлоадер (7.62ммR) - .desc = Пятизарядная "Клипса Обойма" для быстрой перезарядки Карадашев-Мосина. Вмещает 5 патронов калибра 7,62×54 ммR. +ent-SpeedLoaderLightRifle = спидлоадер (7.62мм) + .desc = Пятизарядная "Клипса Обойма" для быстрой перезарядки оружия. Вмещает 5 патронов калибра 7,62х39мм. diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl index 0667881c2e..f2ee585e57 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl @@ -68,15 +68,15 @@ ent-BulletWeakRocket = слабая ракета .desc = { ent-BaseBulletTrigger.desc } ent-BulletGrenadeBaton = шоковая граната .desc = { ent-BaseBullet.desc } -ent-BulletGrenadeBlastContact = контактная фугасная граната +ent-BulletGrenadeBlast = контактная фугасная граната .desc = { ent-BaseBulletTrigger.desc } -ent-BulletGrenadeFlashContact = контактная светошумовая граната +ent-BulletGrenadeFlash = контактная светошумовая граната .desc = { ent-BaseBulletTrigger.desc } -ent-BulletGrenadeFragContact = контактная осколочная граната +ent-BulletGrenadeFrag = контактная осколочная граната .desc = { ent-BaseBulletTrigger.desc } ent-BulletGrenadeCleanade = чистящая граната .desc = { ent-BaseBulletTrigger.desc } -ent-BulletGrenadeEMPContact = контактная ЭМИ граната +ent-BulletGrenadeEMP = контактная ЭМИ граната .desc = { ent-BaseBulletTrigger.desc } ent-BulletCap = фальшивая пуля .desc = { ent-BaseBullet.desc } @@ -127,4 +127,4 @@ ent-BaseBulletGrenade = { ent-BaseItem } ent-BulletLaserHeavy = тяжёлый лазерный болт .desc = { "" } ent-BulletLaserHeavySpread = узкий лазерный обстрел - .desc = { "" } \ No newline at end of file + .desc = { "" } diff --git a/Resources/Locale/ru-RU/_prototypes/entities/structures/wallmounts/tear_gas_walldispenser.ftl b/Resources/Locale/ru-RU/_prototypes/entities/structures/wallmounts/tear_gas_walldispenser.ftl deleted file mode 100644 index 2b4964b361..0000000000 --- a/Resources/Locale/ru-RU/_prototypes/entities/structures/wallmounts/tear_gas_walldispenser.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-TearGasDispenser = распылитель слезоточивого газа - .desc = Настенный распылитель реагентов. diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits.ftl deleted file mode 100644 index 539d85794f..0000000000 --- a/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits.ftl +++ /dev/null @@ -1,46 +0,0 @@ -research-technology-modsuits = Ядро Р.И.Г-а - -ent-ModsuitCore = ядро Р.И.Г-а - .desc = Предназначено для активации Р.И.Г-ов. - -ent-ClothingModsuitNanoTrasenRepresentative = Р.И.Г. представителя - .desc = Роскошный Р.И.Г, созданный специально под представителя корпорации на станции. -ent-ClothingBlueShieldModsuit = Р.И.Г. офицера «Синий щит» - .desc = Крепкий и надёжный Р.И.Г, как и его владелец -ent-ClothingModsuitComMaid = Р.И.Г. горничной командования - .desc = Базовый скафандр, воплощённый в виде Р.И.Г-а и украшенный для удовлетворения эстетических нужд командования. -ent-ClothingCommonModsuit = пассажиский Р.И.Г. - .desc = Базовый скафандр, воплощённый в виде Р.И.Г-а. -ent-ClothingModsuitERTJanitor = Р.И.Г. уборщика ОБР - .desc = Р.И.Г, произведённый для обеспечения защиты как в условиях боя, так и при критической загрязнённости станции. -ent-ClothingModsuitERTSecurity = Р.И.Г. офицера ОБР - .desc = Бронированный Р.И.Г ОБР. Обеспечивает защиту от большинства угроз, что можно встретить в открытом космосею, при этом почти не ограничивая движения. -ent-ClothingModsuitERTMedical = Р.И.Г. медика ОБР - .desc = Бронированный Р.И.Г ОБР. Обеспечивает защиту от большинства угроз, что можно встретить в открытом космосею, при этом почти не ограничивая движения. -ent-ClothingModsuitERTLeader = Р.И.Г. лидера ОБР - .desc = Бронированный Р.И.Г ОБР. Обеспечивает защиту от большинства угроз, что можно встретить в открытом космосею, при этом почти не ограничивая движения. -ent-ClothingModsuitERTEngineer = Р.И.Г. инженера ОБР - .desc = Бронированный Р.И.Г ОБР. Обеспечивает защиту от большинства угроз, что можно встретить в открытом космосею, при этом почти не ограничивая движения. -ent-ClothingModsuitERTChaplain = Р.И.Г. священика ОБР - .desc = Бронированный Р.И.Г ОБР. Обеспечивает защиту от большинства угроз, что можно встретить в открытом космосею, при этом почти не ограничивая движения. - - -ent-ClothingHeadHelmetBlueshieldModsuit = шлем Р.И.Г-а офицера «Синий щит» - .desc = Синий -ent-ClothingHeadHelmetRepresentativeModsuit = шлем Р.И.Г-а представителя корпорации - .decs = Шлем, призванный своим видом являть величие и значимость представителя корпорации -ent-ClothingHeadHelmetModsuitCommaid = шлем Р.И.Г-а горничной командования - .desc = Прочный шлем горничной, предназначенный для специальных операций. -ent-ClothingHeadHelmetCommonModsuit = шлем пассажирского Р.И.Г-а - .desc = Шлем базового скафандра, воплощённый в виде Р.И.Г-а. - -ent-ClothingModsuitBlueshield = скафандр Р.И.Г-а офицера «Синий щит» - .desc = Крепкий и надёжный, как и его владелец. -ent-ClothingModsuitRepresentative = скафандр Р.И.Г-а представителя корпорации - .decs = Призван своим видом являть величие и значимость представителя корпорации -ent-ClothingModsuitCommaid = скафандр Р.И.Г-а горничной командования - .desc = Прочный скафандр горничной, предназначенный для специальных операций. -ent-ClothingModsuitCommon = скафандр пассажирского Р.И.Г-а - .desc = Базовый скафандр, воплощённый в виде Р.И.Г-а - -modsuit-equip-failure = Вам необходимо ядро для раскрытия скафандра Р.И.Г-а. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_core.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_core.ftl new file mode 100644 index 0000000000..76b5846402 --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_core.ftl @@ -0,0 +1,2 @@ +ent-ModsuitCore = ядро Р.И.Г-а + .desc = Предназначено для активации Р.И.Г-ов. diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_helmets.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_helmets.ftl new file mode 100644 index 0000000000..2410427964 --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_helmets.ftl @@ -0,0 +1,8 @@ +ent-ClothingHeadHelmetBlueshieldModsuit = шлем Р.И.Г-а офицера «Синий щит» + .desc = Синий +ent-ClothingHeadHelmetRepresentativeModsuit = шлем Р.И.Г-а представителя корпорации + .desc = Шлем, призванный своим видом являть величие и значимость представителя корпорации. +ent-ClothingHeadHelmetModsuitCommaid = шлем Р.И.Г-а горничной командования + .desc = Прочный шлем горничной, предназначенный для специальных операций. +ent-ClothingHeadHelmetCommonModsuit = шлем пассажирского Р.И.Г-а + .desc = Шлем базового скафандра, воплощённый в виде Р.И.Г-а. diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_suits.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_suits.ftl new file mode 100644 index 0000000000..59fd3d851e --- /dev/null +++ b/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_suits.ftl @@ -0,0 +1,29 @@ +ent-ClothingModsuitNanoTrasenRepresentative = Р.И.Г. представителя + .desc = Роскошный Р.И.Г, созданный специально под представителя корпорации на станции. +ent-ClothingBlueShieldModsuit = Р.И.Г. офицера «Синий щит» + .desc = Крепкий и надёжный Р.И.Г, как и его владелец. +ent-ClothingModsuitComMaid = Р.И.Г. горничной командования + .desc = Базовый скафандр, воплощённый в виде Р.И.Г-а и украшенный для удовлетворения эстетических нужд командования. +ent-ClothingCommonModsuit = Р.И.Г. пассажиский + .desc = Базовый скафандр, воплощённый в виде Р.И.Г-а. +ent-ClothingModsuitERTJanitor = Р.И.Г. ОБР + .desc = Бронированный Р.И.Г военной модели, разработанный для уборщика отряда центрального командования. Обеспечивает защиту от большинства угроз, встречающихся в открытом космосе и при выполнении оперативных задач. +ent-ClothingModsuitERTSecurity = Р.И.Г. ОБР + .desc = Бронированный Р.И.Г военной модели, разработанный для офицера отряда центрального командования. Обеспечивает защиту от большинства угроз, встречающихся в открытом космосе и при выполнении оперативных задач. +ent-ClothingModsuitERTMedical = Р.И.Г. ОБР + .desc = Бронированный Р.И.Г военной модели, разработанный для медика отряда центрального командования. Обеспечивает защиту от большинства угроз, встречающихся в открытом космосе и при выполнении оперативных задач. +ent-ClothingModsuitERTLeader = Р.И.Г. ОБР + .desc = Бронированный Р.И.Г военной модели, разработанный для лидера отряда центрального командования. Обеспечивает защиту от большинства угроз, встречающихся в открытом космосе и при выполнении оперативных задач. +ent-ClothingModsuitERTEngineer = Р.И.Г. ОБР + .desc = Бронированный Р.И.Г военной модели, разработанный для инженера отряда центрального командования. Обеспечивает защиту от большинства угроз, встречающихся в открытом космосе и при выполнении оперативных задач. +ent-ClothingModsuitERTChaplain = Р.И.Г. ОБР + .desc = Бронированный Р.И.Г военной модели, разработанный для священника отряда центрального командования. Обеспечивает защиту от большинства угроз, встречающихся в открытом космосе и при выполнении оперативных задач. + +ent-ClothingModsuitBlueshield = Р.И.Г офицера «Синий щит» + .desc = Крепкий и надёжный, как и его владелец. +ent-ClothingModsuitRepresentative = Р.И.Г представителя корпорации + .desc = Призван своим видом являть величие и значимость представителя корпорации. +ent-ClothingModsuitCommaid = Р.И.Г горничной командования + .desc = Прочный скафандр горничной, предназначенный для специальных операций. +ent-ClothingModsuitCommon = Р.И.Г пассажирский + .desc = Базовый скафандр, воплощённый в виде Р.И.Г-а. diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl index f284b43ebd..a2abdca6c0 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl @@ -8,6 +8,7 @@ research-technology-mechanized-medical-treatment = Механизированн research-technology-handcraft-nvd = Кустарные ПНВ research-technology-basic-nvd = Продвинутое ПНВ research-technology-basic-thermals = Термальные Сканеры +research-technology-modsuits = Ядра Р.И.Г-ов research-technology-extended-amunitions = Расширенные магазины research-technology-phazon = Фазон research-technology-cargo-bluespace-equipment = Блюспейс экипировка карго diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl index 9d297329fb..fda903c435 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl @@ -37,7 +37,7 @@ uplink-pistol-magnum-magazine-name = Магазин (.45 магнум SP) uplink-pistol-magnum-magazine-desc = 7-зарядный однорядный магазин для пистолета. Содержит патроны SP. Совместим с "Диглом". uplink-pistol-magnum-magazine-ap-name = Магазин (.45 магнум бронебойные) uplink-pistol-magnum-magazine-ap-desc = 7-зарядный однорядный магазин для пистолета. Содержит бронебойные патроны. Совместим с "Диглом". -uplink-pistoltec9-magazine-name = пистолетный магазин tec-9 (.20 безгильзовый) +uplink-pistoltec9-magazine-name = Tac-Tec (.20 безгильзовый) uplink-pistoltec9-magazine-desc = Кустарный пистолетный магазин под распространённый патрон, используемый агентами синдиката. @@ -93,6 +93,8 @@ uplink-clothing-backpack-syndie-aj100-desc = Включает в себя пис uplink-weapon-syndie-laser-pistol-name = SAM-300 uplink-clothing-backpack-syndie-dl6902-name = Набор DL6902 uplink-clothing-backpack-syndie-dl6902-desc = Включает в себя пулемёт DL6902 и один дополнительный короб. +uplink-power-backpack-dl6902-name = DL6902 с патронным рюкзаком +uplink-power-backpack-dl6902-desc = DL6902 переделанный под питание длинной лентой прямиком из рюкзака, рюкзак содержит 1200 патронов 7,62х39мм FMJ. uplink-clothing-backpack-syndie-siar52-name = Набор SIAR-52 uplink-clothing-backpack-syndie-siar52-desc = Включает в себя SIAR-52 что оборудован интегрированым глушителем. и два магазина безгильзовых патрон. uplink-weapon-syndie-laser-minigun-name = UVL-21 «Виверна» @@ -104,8 +106,8 @@ uplink-goldendeagle-name = Золотой Десерт Игл uplink-goldendeagle-desc = Использует патрон «магнум» 45-го калибра. Выгравировано: "Все, что у меня осталось от него в памяти — это два позолоченных Desert Eagle 45-го калибра". uplink-mini-energy-crossbow-name = Мини энерго-арбалет uplink-mini-energy-crossbow-desc = Компактное оружие скрытного действия. Выпускает маломощные кинетические болты, вызывающие паралич и малое отравление. Эффективен на близком расстоянии. -uplink-pistoltec9-name = Тек-9 тактикал -uplink-pistoltec9-desc = Очень дешёвый в производстве и очень простой в использовании, надёжный как Египесткий АК-47. +uplink-pistoltec9-name = Tac-Tec 9 +uplink-pistoltec9-desc = Очень дешёвый в производстве и очень простой в использовании, надёжный как SKM-24. ## Cyborgs diff --git a/Resources/Locale/ru-RU/_strings/clothing/components/toggleable-clothing-component.ftl b/Resources/Locale/ru-RU/_strings/clothing/components/toggleable-clothing-component.ftl index 9dbc788978..71ba88e28e 100644 --- a/Resources/Locale/ru-RU/_strings/clothing/components/toggleable-clothing-component.ftl +++ b/Resources/Locale/ru-RU/_strings/clothing/components/toggleable-clothing-component.ftl @@ -1,2 +1,3 @@ toggle-clothing-verb-text = Переключить { CAPITALIZE($entity) } toggleable-clothing-remove-first = Сперва снимите { $entity }. +modsuit-equip-failure = Вам необходимо ядро для раскрытия скафандра Р.И.Г-а. diff --git a/Resources/Maps/_Sunrise/Shuttles/dso/ert/alt_ert_big.yml b/Resources/Maps/_Sunrise/Shuttles/dso/ert/alt_ert_big.yml index 6e119fbdcd..0656b0b1ba 100644 --- a/Resources/Maps/_Sunrise/Shuttles/dso/ert/alt_ert_big.yml +++ b/Resources/Maps/_Sunrise/Shuttles/dso/ert/alt_ert_big.yml @@ -20544,15 +20544,6 @@ entities: parent: 379 - type: Physics canCollide: False -- proto: WeaponPistolViperBiocode - entities: - - uid: 1133 - components: - - type: Transform - parent: 1127 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: WeaponPulsePistol entities: - uid: 1932 diff --git a/Resources/Maps/_Sunrise/Station/bagel.yml b/Resources/Maps/_Sunrise/Station/bagel.yml index 3a378d920f..a1d715732d 100644 --- a/Resources/Maps/_Sunrise/Station/bagel.yml +++ b/Resources/Maps/_Sunrise/Station/bagel.yml @@ -25150,7 +25150,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 50000 - autoRecharge: True - uid: 4400 components: - type: Transform @@ -25385,7 +25384,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 538 components: - type: MetaData @@ -25398,7 +25396,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 539 components: - type: MetaData @@ -25411,7 +25408,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 541 components: - type: MetaData @@ -25423,7 +25419,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 543 components: - type: MetaData @@ -25438,7 +25433,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 544 components: - type: MetaData @@ -25454,7 +25448,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 545 components: - type: MetaData @@ -25469,7 +25462,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 547 components: - type: MetaData @@ -25482,7 +25474,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 548 components: - type: MetaData @@ -25495,7 +25486,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 549 components: - type: MetaData @@ -25514,7 +25504,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 553 components: - type: MetaData @@ -25526,7 +25515,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 554 components: - type: MetaData @@ -25538,7 +25526,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 555 components: - type: Transform @@ -25551,7 +25538,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 556 components: - type: MetaData @@ -25567,7 +25553,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 557 components: - type: MetaData @@ -25585,7 +25570,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 558 components: - type: Transform @@ -25605,7 +25589,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 562 components: - type: MetaData @@ -25618,7 +25601,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 563 components: - type: MetaData @@ -25631,7 +25613,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 567 components: - type: MetaData @@ -25643,7 +25624,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 568 components: - type: MetaData @@ -25655,7 +25635,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 570 components: - type: MetaData @@ -25668,7 +25647,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 571 components: - type: MetaData @@ -25680,7 +25658,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 572 components: - type: MetaData @@ -25696,7 +25673,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 574 components: - type: MetaData @@ -25708,7 +25684,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 575 components: - type: MetaData @@ -25720,7 +25695,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 576 components: - type: MetaData @@ -25732,7 +25706,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 578 components: - type: MetaData @@ -25747,7 +25720,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 579 components: - type: MetaData @@ -25759,7 +25731,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 580 components: - type: MetaData @@ -25774,7 +25745,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 581 components: - type: MetaData @@ -25786,7 +25756,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 583 components: - type: MetaData @@ -25799,7 +25768,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 584 components: - type: MetaData @@ -25811,7 +25779,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 585 components: - type: MetaData @@ -25823,7 +25790,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 586 components: - type: MetaData @@ -25835,7 +25801,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 587 components: - type: MetaData @@ -25847,7 +25812,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 588 components: - type: Transform @@ -25858,7 +25822,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 589 components: - type: MetaData @@ -25870,7 +25833,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 590 components: - type: Transform @@ -25881,7 +25843,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 591 components: - type: MetaData @@ -25894,7 +25855,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 592 components: - type: MetaData @@ -25907,7 +25867,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 593 components: - type: MetaData @@ -25919,7 +25878,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 594 components: - type: MetaData @@ -25932,7 +25890,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 595 components: - type: MetaData @@ -25945,7 +25902,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 596 components: - type: Transform @@ -25955,7 +25911,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 597 components: - type: Transform @@ -25976,7 +25931,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 648 components: - type: Transform @@ -26003,7 +25957,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 4235 components: - type: Transform @@ -26027,7 +25980,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 6818 components: - type: Transform @@ -26045,7 +25997,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 8061 components: - type: Transform @@ -26056,7 +26007,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 8243 components: - type: MetaData @@ -26093,7 +26043,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 17989 components: - type: MetaData @@ -26106,7 +26055,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 100000 - autoRecharge: True - uid: 18676 components: - type: Transform @@ -26211,7 +26159,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 200000 - autoRecharge: True - uid: 604 components: - type: MetaData @@ -26224,7 +26171,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 200000 - autoRecharge: True - uid: 605 components: - type: MetaData @@ -26237,7 +26183,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 200000 - autoRecharge: True - uid: 606 components: - type: MetaData @@ -26249,7 +26194,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 200000 - autoRecharge: True - uid: 607 components: - type: MetaData @@ -26261,7 +26205,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 200000 - autoRecharge: True - uid: 608 components: - type: MetaData @@ -26274,7 +26217,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 200000 - autoRecharge: True - uid: 13094 components: - type: Transform @@ -26295,7 +26237,6 @@ entities: fixtures: {} - type: BatterySelfRecharger autoRechargeRate: 150000 - autoRecharge: True - uid: 28694 components: - type: Transform @@ -68757,7 +68698,7 @@ entities: - type: Transform pos: -10.889593,0.11666772 parent: 2 - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo spent: True - type: EmitSoundOnCollide nextSound: -16780.9 @@ -142491,7 +142432,7 @@ entities: - [italic]Ты, наверно, думаешь, + [italic]Ты, наверно, думаешь, Что тебе выпало 18 карат невезения?[/italic] @@ -164029,7 +163970,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 16000000 - autoRecharge: True - uid: 21049 components: - type: Transform @@ -164037,7 +163977,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 16000000 - autoRecharge: True - uid: 21051 components: - type: MetaData @@ -164047,7 +163986,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 16000000 - autoRecharge: True - uid: 21052 components: - type: Transform @@ -164055,7 +163993,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 16000000 - autoRecharge: True - uid: 21054 components: - type: MetaData @@ -164065,7 +164002,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 16000000 - autoRecharge: True - uid: 21055 components: - type: MetaData @@ -164075,7 +164011,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 16000000 - autoRecharge: True - uid: 21057 components: - type: MetaData @@ -164085,7 +164020,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 16000000 - autoRecharge: True - uid: 21058 components: - type: MetaData @@ -164095,7 +164029,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 16000000 - autoRecharge: True - proto: SMESBasic entities: - uid: 6878 @@ -164117,7 +164050,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 30000000 - autoRecharge: True - uid: 21060 components: - type: Transform @@ -164125,7 +164057,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 30000000 - autoRecharge: True - uid: 21061 components: - type: Transform @@ -164133,7 +164064,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 30000000 - autoRecharge: True - uid: 21062 components: - type: Transform @@ -164141,7 +164071,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 30000000 - autoRecharge: True - uid: 21063 components: - type: Transform @@ -164149,7 +164078,6 @@ entities: parent: 2 - type: BatterySelfRecharger autoRechargeRate: 30000000 - autoRecharge: True - proto: SmokingPipeFilledTobacco entities: - uid: 21064 @@ -167512,7 +167440,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 13244 components: - type: Transform @@ -167539,7 +167466,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21684 components: - type: MetaData @@ -167550,7 +167476,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21687 components: - type: MetaData @@ -167561,7 +167486,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21689 components: - type: MetaData @@ -167572,7 +167496,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21690 components: - type: Transform @@ -167581,7 +167504,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21691 components: - type: MetaData @@ -167592,7 +167514,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21695 components: - type: MetaData @@ -167603,7 +167524,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21696 components: - type: MetaData @@ -167614,7 +167534,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21697 components: - type: MetaData @@ -167625,7 +167544,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21699 components: - type: MetaData @@ -167636,7 +167554,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21701 components: - type: Transform @@ -167645,7 +167562,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21702 components: - type: MetaData @@ -167656,7 +167572,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21703 components: - type: MetaData @@ -167667,7 +167582,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21704 components: - type: MetaData @@ -167678,7 +167592,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21705 components: - type: MetaData @@ -167689,7 +167602,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21706 components: - type: MetaData @@ -167700,7 +167612,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 21707 components: - type: Transform @@ -167709,7 +167620,6 @@ entities: - type: CMExplosionEffect - type: BatterySelfRecharger autoRechargeRate: 7500000 - autoRecharge: True - uid: 22074 components: - type: Transform diff --git a/Resources/Maps/_Sunrise/Station/delta.yml b/Resources/Maps/_Sunrise/Station/delta.yml index 53ff1c931e..0c86ea33e6 100644 --- a/Resources/Maps/_Sunrise/Station/delta.yml +++ b/Resources/Maps/_Sunrise/Station/delta.yml @@ -212067,13 +212067,6 @@ entities: - type: Transform pos: -123.5,36.5 parent: 2 -- proto: MobCatCake - entities: - - uid: 29354 - components: - - type: Transform - pos: -57.5018,-50.305336 - parent: 2 - proto: ModularGrenade entities: - uid: 29355 diff --git a/Resources/Maps/_Sunrise/event/hatle_prib_final_1.yml b/Resources/Maps/_Sunrise/event/hatle_prib_final_1.yml index 9bbd25b6ac..1a7f0d7a46 100644 --- a/Resources/Maps/_Sunrise/event/hatle_prib_final_1.yml +++ b/Resources/Maps/_Sunrise/event/hatle_prib_final_1.yml @@ -3698,7 +3698,6 @@ entities: parent: 1 - type: BatterySelfRecharger autoRechargeRate: 50000 - autoRecharge: True - uid: 285 components: - type: Transform @@ -3707,7 +3706,6 @@ entities: parent: 1 - type: BatterySelfRecharger autoRechargeRate: 50000 - autoRecharge: True - uid: 286 components: - type: Transform @@ -3715,7 +3713,6 @@ entities: parent: 1 - type: BatterySelfRecharger autoRechargeRate: 50000 - autoRecharge: True - uid: 287 components: - type: Transform diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 6373487853..66278d60a2 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -14,8 +14,8 @@ - id: Cautery - id: Retractor - id: Scalpel - - id: BoneGel - - id: BoneSetter + - id: BoneGel + - id: BoneSetter - type: entity parent: ClothingBackpackDuffelSyndicateMedicalBundle @@ -35,8 +35,8 @@ - id: ScalpelAdvanced - id: ClothingHandsGlovesNitrile - id: EmergencyRollerBedSpawnFolded - - id: BoneGel - - id: BoneSetterAdvanced + - id: BoneGel + - id: BoneSetterAdvanced - type: entity parent: ClothingBackpackDuffelSyndicateBundle @@ -49,9 +49,9 @@ storagebase: !type:AllSelector children: - id: WeaponShotgunBulldogBiocode # Sunrise-edit - - id: MagazineShotgun - amount: 3 - - id: MagazineShotgunSlug + - id: MagazineShotgun + amount: 3 + - id: MagazineShotgunSlug - id: ClothingEyesGlassesThermalSyndie # Sunrise-edit - type: entity @@ -67,9 +67,9 @@ - id: WeaponSubMachineGunC20rBiocode # Sunrise-edit - id: MagazinePistolSubMachineGun amount: 2 - - id: MagazinePistolSubMachineGunFMJ # Sunrise-edit - amount: 2 - - id: MagazinePistolSubMachineGunHP # Sunrise-add + - id: MagazinePistolSubMachineGunFMJ # Sunrise-edit + amount: 2 + - id: MagazinePistolSubMachineGunHP # Sunrise-add # - id: SMGSuppressor - type: entity @@ -85,9 +85,9 @@ - id: WeaponRifleEstocBiocode # Sunrise-edit - id: MagazineRifle amount: 2 - - id: MagazineRifleFMJ # Sunrise-edit - amount: 2 - - id: MagazineRifleAP # Sunrise-edit + - id: MagazineRifleFMJ # Sunrise-edit + amount: 2 + - id: MagazineRifleAP # Sunrise-edit - type: entity parent: ClothingBackpackDuffelSyndicateBundle @@ -99,7 +99,7 @@ containers: storagebase: !type:AllSelector children: - - id: WeaponRevolverPythonAPBiocode # Sunrise-edit + - id: WeaponRevolverPythonAP - id: SpeedLoaderMagnumAP amount: 2 @@ -115,8 +115,8 @@ children: - id: WeaponLightMachineGunL6Biocode # Sunrise-edit - id: MagazineRifleBoxSP - amount: 2 #Sunrise-add - - id: MagazineRifleBoxFMJ #Sunrise-add + amount: 2 #Sunrise-add + - id: MagazineRifleBoxFMJ #Sunrise-add - type: entity parent: ClothingBackpackDuffelSyndicateBundle @@ -129,18 +129,18 @@ storagebase: !type:AllSelector children: - id: WeaponLauncherChinaLakeBiocode # Sunrise-edit - - id: GrenadeBlastContact # Sunrise-edit - amount: 1 - - id: GrenadeFragContact # Sunrise-edit - amount: 1 - - id: GrenadeEMPContact # Sunrise-edit - amount: 1 - - id: GrenadeBlastTimer - amount: 2 - - id: GrenadeFragTimer - amount: 2 - - id: GrenadeEMPTimer - amount: 2 + - id: GrenadeBlast + amount: 1 + - id: GrenadeFrag + amount: 1 + - id: GrenadeEMP + amount: 1 + - id: GrenadeBlastTimer + amount: 2 + - id: GrenadeFragTimer + amount: 2 + - id: GrenadeEMPTimer + amount: 2 # Sunrise-start - type: entity @@ -152,11 +152,11 @@ - type: StorageFill contents: - id: WeaponLauncherM79Biocode # Sunrise-edit - - id: GrenadeBlastContact # Sunrise-edit + - id: GrenadeBlast amount: 1 - - id: GrenadeFragContact # Sunrise-edit + - id: GrenadeFrag amount: 1 - - id: GrenadeEMPContact # Sunrise-edit + - id: GrenadeEMP amount: 1 - id: GrenadeBlastTimer amount: 2 @@ -174,11 +174,11 @@ - type: StorageFill contents: - id: WeaponGrenadeLauncherGL70Biocode # Sunrise-edit - - id: GrenadeBlastContact # Sunrise-edit + - id: GrenadeBlast amount: 1 - - id: GrenadeFragContact # Sunrise-edit + - id: GrenadeFrag amount: 1 - - id: GrenadeEMPContact # Sunrise-edit + - id: GrenadeEMP amount: 1 - id: GrenadeBlastTimer amount: 2 @@ -196,10 +196,10 @@ - type: StorageFill contents: - id: WeaponSubMachineGunC40rBiocode - - id: MagazinePistol40SubMachineGunSP - amount: 2 - - id: MagazinePistol40SubMachineGunFMJ - amount: 2 + - id: MagazinePistol40SubMachineGunSP + amount: 2 + - id: MagazinePistol40SubMachineGunFMJ + amount: 2 - id: MagazinePistol40SubMachineGunHP # Sunrise-end @@ -218,7 +218,7 @@ amount: 2 - id: GrenadeBlastTimer # Sunrise-edit amount: 2 - - id: GrenadeFlashContact # Sunrise-edit + - id: GrenadeFlash # Sunrise-edit amount: 2 - id: GrenadeFragTimer # Sunrise-edit amount: 2 @@ -412,7 +412,7 @@ storagebase: !type:AllSelector children: - id: SyringeRomerol - - id: WeaponRevolverPythonBiocode # Sunrise-edit + - id: WeaponRevolverPython - id: MagazineBoxMagnumIncendiary - id: PillAmbuzolPlus - id: PillAmbuzol diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index b07473bc81..0389d0d501 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -44,15 +44,16 @@ components: - type: EntityTableContainerFill containers: - storagebase: - id: MagazineLightRifleSP - amount: 1 - - id: MagazineLightRifleHP - amount: 1 - - id: MagazineLightRifleFMJ - amount: 1 - - id: MagazineLightRifleAP - amount: 1 + storagebase: !type:AllSelector + children: + - id: MagazineLightRifleSP + amount: 1 + - id: MagazineLightRifleHP + amount: 1 + - id: MagazineLightRifleFMJ + amount: 1 + - id: MagazineLightRifleAP + amount: 1 - type: entity name: box of .30 rifle (practice) magazines diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index f475814e54..65127d7566 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -12,17 +12,8 @@ - id: ClothingMaskBreath - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: Sprite @@ -42,17 +33,8 @@ - id: ClothingMaskBreath - id: EmergencyNitrogenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: Sprite @@ -76,17 +58,8 @@ - id: ClothingMaskBreath - id: ExtendedEmergencyOxygenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: Sprite @@ -106,17 +79,8 @@ - id: ClothingMaskBreath - id: ExtendedEmergencyNitrogenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: Sprite @@ -127,7 +91,8 @@ currentLabel: reagent-name-nitrogen - type: entity - parent: BoxSurvivalBase # Sunrise-Edit + + parent: BoxSurvivalBase # sunrise-edit id: BoxSurvivalSecurity name: survival box description: It's a box with basic internals inside. @@ -140,17 +105,8 @@ - id: ClothingMaskGasSecurity - id: ExtendedEmergencyOxygenTankFilled #Sunrise-Edit - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: Sprite @@ -168,19 +124,10 @@ storagebase: !type:AllSelector children: - id: ClothingMaskGasSecurity - - id: ExtendedEmergencyNitrogenTankFilled #Sunrise-Edit + - id: EmergencyNitrogenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: Sprite @@ -191,7 +138,8 @@ currentLabel: reagent-name-nitrogen - type: entity - parent: BoxSurvivalBase # Sunrise-Edit + + parent: BoxSurvivalBase # sunrise-edit id: BoxSurvivalMedical name: survival box description: It's a box with basic internals inside. @@ -204,17 +152,8 @@ - id: ClothingMaskBreathMedical - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: Sprite @@ -234,17 +173,8 @@ - id: ClothingMaskBreathMedical - id: EmergencyNitrogenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: Sprite @@ -274,17 +204,8 @@ - id: ClothingMaskBreath - id: EmergencyFunnyOxygenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: Tag @@ -304,17 +225,8 @@ - id: ClothingMaskBreath - id: EmergencyNitrogenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodSnackNutribrick - id: DrinkWaterBottleFull - type: Label @@ -332,17 +244,8 @@ - id: ClothingMaskBreath - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodBreadNutriBatard - id: DrinkWaterBottleFull @@ -358,17 +261,8 @@ - id: ClothingMaskBreath - id: EmergencyNitrogenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodBreadNutriBatard - id: DrinkWaterBottleFull - type: Sprite @@ -390,17 +284,8 @@ - id: ClothingMaskBreath - id: EmergencyOxygenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodBreadCottonNutriBatard - id: DrinkWaterBottleFull @@ -418,17 +303,8 @@ - id: ClothingMaskGasSyndicate - id: ExtendedEmergencyOxygenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End + + - id: Flare - id: FoodSnackNutribrick - type: Sprite layers: @@ -447,6 +323,7 @@ - id: ClothingMaskGasSyndicate - id: ExtendedEmergencyNitrogenTankFilled - id: EmergencyMedipen + - id: Flare - id: FoodSnackNutribrick - type: Sprite @@ -458,19 +335,16 @@ - type: entity - parent: BoxCardboard + parent: BoxCardboardSmall # Cannot fit 3x3 boxes into already-filled ERT backpacks. id: BoxSurvivalMilitaryDouble suffix: Military O2 description: It's a box with basic internals inside. This one is labelled to contain an double extended-capacity tank. components: - type: StorageFill contents: - - id: ClothingMaskBreath - id: DoubleEmergencyOxygenTankFilled - id: EmergencyMedipen - id: Flare - - id: FoodSnackNutribrick - - id: DrinkWaterBottleFull - type: Sprite layers: - state: internals @@ -483,22 +357,9 @@ components: - type: StorageFill contents: - - id: ClothingMaskBreath - id: DoubleEmergencyNitrogenTankFilled - id: EmergencyMedipen - # Sunrise-Start - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - # Sunrise-End - - id: FoodSnackNutribrick - - id: DrinkWaterBottleFull + - id: Flare - type: Sprite layers: - state: internals diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index a08e1d07c0..19286e3ad9 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -65,7 +65,7 @@ - type: Storage maxItemSize: Small grid: - - 0,0,2,3 + - 0,0,2,2 - type: entity name: mousetrap box diff --git a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml index 7b12a66361..9d9c4f0b0d 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml @@ -210,4 +210,16 @@ - id: ClothingOuterEVASuitPirate - id: DoubleEmergencyNitrogenTankFilled - id: DoubleEmergencyOxygenTankFilled -#SUNRISE-End + +- type: entity + id: CrateSyndicateSuperSurplusBundleAgent + parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] + name: Syndicate super surplus crate + description: Contains 125 telecrystals worth of completely random Syndicate items. + suffix: Agent + components: + - type: SurplusBundle + totalPrice: 125 + - type: Tag + tags: + - SyndieAgentUplink diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index f0259bd73d..437ecc4bef 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -22,8 +22,8 @@ amount: 2 - id: BungoSeeds amount: 2 - - id: LanternfruitSeeds #Sunrise-add - amount: 2 + - id: LanternfruitSeeds #Sunrise-add + amount: 2 - type: entity parent: CrateHydroSecure diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml index 63ddac00b4..4e600719c4 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml @@ -76,8 +76,8 @@ - id: Saw - id: Hemostat - id: ClothingMaskSterile - - id: BoneGel - - id: BoneSetter + - id: BoneGel + - id: BoneSetter - type: entity parent: CrateMedical id: CrateMedicalScrubs diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml index 0c722700ff..da26649aa5 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml @@ -12,7 +12,7 @@ - SyndieAgentUplink - type: entity - id: CrateSyndicateSuperSurplusBundleAgent + id: CrateSyndicateSuperSurplusBundle parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] name: Syndicate super surplus crate description: Contains 125 telecrystals worth of completely random Syndicate items. @@ -24,6 +24,22 @@ tags: - SyndieAgentUplink +- type: entity + parent: CrateSyndicate + id: CrateCybersunJuggernautBundle + name: Cybersun juggernaut bundle + suffix: Filled + description: Contains everything except a big gun to go postal. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: ClothingOuterHardsuitJuggernaut + - !type:NestedSelector + tableId: SyndicateHardsuitExtrasEntityTable + +#Sunrise-start - type: entity id: CrateSyndicateSurplusBundleNuke parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] @@ -51,31 +67,42 @@ - NukeOpsUplink - type: entity - parent: CrateSyndicate - id: CrateCybersunJuggernautBundle - name: Cybersun juggernaut bundle - suffix: Filled - description: Contains everything except a big gun to go postal. + id: CratePirateSurplusBundle + parent: [ CratePirate, StorePresetPirateUplink, BaseSyndicateContraband ] + name: pirate chest + description: Contains 125 doubloon worth of completely random pirate items. + suffix: Pirate components: - - type: EntityTableContainerFill - containers: - entity_storage: !type:AllSelector - children: - - id: ClothingOuterHardsuitJuggernaut - - !type:NestedSelector - tableId: SyndicateHardsuitExtrasEntityTable + - type: SurplusBundle + totalPrice: 125 + - type: Tag + tags: + - PirateUplink -#Sunrise-start - type: entity - parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] - id: CrateSyndicateSuperSurplusBundle - name: Syndicate super surplus crate - description: Contains 125 telecrystals worth of completely random Syndicate items. + id: CratePirateSuperSurplusBundle + parent: [ CratePirate, StorePresetPirateUplink, BaseSyndicateContraband ] + name: pirate super chest + description: Contains 250 doubloon worth of completely random pirate items. + suffix: Pirate + components: + - type: SurplusBundle + totalPrice: 250 + - type: Tag + tags: + - PirateUplink + +- type: entity + id: CrateCybersunDarkGygaxBundle + suffix: Filled + parent: CrateSyndicate + name: Cybersun gygax bundle + description: Contains a set of Cybersan light armored mechs. components: - type: StorageFill contents: - id: MechGygaxSyndieFilled - - id: ToolboxSyndicateMechRepair + - id: ToolboxSyndicateFilledRepair - id: ToyGygax - type: entity @@ -88,7 +115,7 @@ - type: StorageFill contents: - id: MechRoverSyndieFilled - - id: ToolboxSyndicateMechRepair + - id: ToolboxSyndicateFilledRepair - id: ToyDurand - type: entity @@ -101,7 +128,7 @@ - type: StorageFill contents: - id: MechMaulerSyndieFilled - - id: ToolboxSyndicateMechRepair + - id: ToolboxSyndicateFilledRepair - id: ToyMauler - id: MechPaintMaulerMeowler prob: 0.25 @@ -116,7 +143,7 @@ - type: StorageFill contents: - id: MechBigYarrkeBattery - - id: ToolboxSyndicateMechRepair + - id: ToolboxSyndicateFilledRepair - type: entity id: CratePirateMechDollHouseBundle @@ -128,7 +155,7 @@ - type: StorageFill contents: - id: MechDollHouseFilled - - id: ToolboxSyndicateMechRepair + - id: ToolboxSyndicateFilledRepair - id: MechPaintDollHouseWarboss prob: 0.25 @@ -142,6 +169,6 @@ - type: StorageFill contents: - id: MechRipley2DeathBattery - - id: ToolboxSyndicateMechRepair + - id: ToolboxSyndicateFilledRepair - id: ToyDeathRipley #sunrise-end diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index f14df6fed2..571fd492ff 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -26,7 +26,7 @@ children: - id: WeaponSniperHristovBiocode # Sunrise-edit - id: MagazineBoxAntiMateriel - - id: MagazineBauer127Penetrator # Sunrise-add + - id: MagazineBauer127Penetrator # Sunrise-add - id: ClothingNeckTieRed - id: ClothingHandsGlovesLatex - id: ClothingUniformJumpsuitArmouredBlack # Sunrise-edit diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml index de70fdd344..22d89c3554 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml @@ -12,9 +12,9 @@ - id: Ointment - id: Gauze - id: PillCanisterTricordrazine - - id: AmpulaTric # Sunrise-Edit - amount: 2 # Sunrise-Edit - # see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents + - id: AmpulaTric # Sunrise-Edit + amount: 2 # Sunrise-Edit + # see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents - type: entity id: MedkitBurnFilled @@ -29,8 +29,8 @@ amount: 2 - id: PillCanisterKelotane - id: PillCanisterDermaline - - id: AmpulaDerm # Sunrise-Edit - amount: 2 # Sunrise-Edit + - id: AmpulaDerm # Sunrise-Edit + amount: 2 # Sunrise-Edit - type: entity id: MedkitBruteFilled @@ -45,8 +45,8 @@ - id: Gauze - id: PillCanisterIron - id: PillCanisterCopper - - id: AmpulaBica # Sunrise-Edit - amount: 2 # Sunrise-Edit + - id: AmpulaBica # Sunrise-Edit + amount: 2 # Sunrise-Edit - type: entity id: MedkitToxinFilled @@ -62,9 +62,9 @@ - id: AntiPoisonMedipen - id: PillCanisterDylovene - id: PillCanisterCharcoal - - id: CoalAutoInjector - - id: AmpulaDylo # Sunrise-Edit - amount: 2 # Sunrise-Edit + - id: CoalAutoInjector + - id: AmpulaDylo # Sunrise-Edit + amount: 2 # Sunrise-Edit - type: entity id: MedkitOxygenFilled @@ -80,8 +80,8 @@ - id: EmergencyMedipen - id: SyringeInaprovaline - id: PillCanisterDexalin - - id: AmpulaDexa # Sunrise-Edit - amount: 2 # Sunrise-Edit + - id: AmpulaDexa # Sunrise-Edit + amount: 2 # Sunrise-Edit - type: entity id: MedkitRadiationFilled @@ -96,8 +96,8 @@ - id: RadAutoInjector - id: PillCanisterPotassiumIodide - id: PillCanisterHyronalin - - id: AmpulaHyro # Sunrise-Edit - amount: 2 # Sunrise-Edit + - id: AmpulaHyro # Sunrise-Edit + amount: 2 # Sunrise-Edit - type: entity id: MedkitAdvancedFilled @@ -112,10 +112,10 @@ - id: RegenerativeMesh - id: Bloodpack amount: 2 - - id: AmpulaBica # Sunrise-Edit - amount: 1 # Sunrise-Edit - - id: AmpulaDerm # Sunrise-Edit - amount: 1 # Sunrise-Edit + - id: AmpulaBica # Sunrise-Edit + amount: 1 # Sunrise-Edit + - id: AmpulaDerm # Sunrise-Edit + amount: 1 # Sunrise-Edit - type: entity id: MedkitCombatFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 4d0084eaf9..26bd1434d5 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -80,7 +80,7 @@ - id: ClothingUniformJumpsuitHosFormal - id: ClothingOuterWinterHoS - id: ClothingNeckCloakHos - - id: ClothingHoSMantleCoat + - id: ClothingHoSMantleCoat - type: entity id: DresserQuarterMasterFilled diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index 6042ca358c..4f06449e13 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -71,7 +71,6 @@ ClothingEyesHudMedical: 2 ClothingEyesEyepatchHudMedical: 2 Ampula: 5 # Sunrise-Edit - HyposprayMedical: 2 # Sunrise-Edit Dropper: 2 # Sunrise-Edit BaseChemistryEmptyVial: 2 # Sunrise-Edit PatchPack: 3 # Sunrise-Edit diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 8ad5ed1fff..7df9bd65dc 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -5,7 +5,7 @@ id: UplinkPistolViper name: uplink-pistol-viper-name description: uplink-pistol-viper-desc - productEntity: WeaponPistolViperBiocode # Sunrise-edit + productEntity: WeaponPistolViper discountCategory: rareDiscounts discountDownTo: Telecrystal: 2 @@ -18,7 +18,7 @@ id: UplinkRevolverPython name: uplink-revolver-python-name description: uplink-revolver-python-desc - productEntity: WeaponRevolverPythonAPBiocode # Sunrise-edit + productEntity: WeaponRevolverPythonAP discountCategory: rareDiscounts discountDownTo: Telecrystal: 2 @@ -32,7 +32,7 @@ id: UplinkPistolCobra name: uplink-pistol-cobra-name description: uplink-pistol-cobra-desc - productEntity: WeaponPistolCobraBiocode # Sunrise-edit + productEntity: WeaponPistolCobra discountCategory: rareDiscounts discountDownTo: Telecrystal: 2 @@ -1296,7 +1296,7 @@ id: UplinkSurplusBundle name: uplink-surplus-bundle-name description: uplink-surplus-bundle-desc - productEntity: CrateSyndicateSurplusBundleAgent + productEntity: CrateSyndicateSurplusBundle discountCategory: veryRareDiscounts discountDownTo: Telecrystal: 10 @@ -2068,6 +2068,13 @@ Telecrystal: 26 categories: - UplinkPointless + # Sunrise-start + conditions: + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle + # Sunrise-end - type: listing id: UplinkOutlawHat @@ -2148,6 +2155,13 @@ Telecrystal: 20 categories: - UplinkPointless + # Sunrise-start + conditions: + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle + # Sunrise-end - type: listing id: UplinkScarfSyndieRed diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 44ddc1be9a..331f12a958 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -261,7 +261,7 @@ - type: ThermalVision - type: PowerCellDraw drawRate: 3.5 - useRate: 20 + useCharge: 20 - type: ItemToggle predictable: false # issues between ToggleCellDraw and ItemToggleActiveSound onUse: false diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 5ba18fe3e8..0a79f918ba 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -263,7 +263,7 @@ domePrototype: EnergyDomeSmallPink - type: PowerCellDraw drawRate: 0 - useRate: 0 + useCharge: 0 - type: UseDelay delay: 10.0 diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml index f503748127..935e68da1b 100644 --- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml +++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml @@ -106,8 +106,8 @@ - type: Tag tags: - CartridgeDebug - - type: HitScanCartridgeAmmo # Sunrise-Edit - hitscan: DebugBulletTrace # Sunrise-Edit + - type: CartridgeAmmo # Sunrise-Edit + proto: DebugBulletTrace # Sunrise-Edit - type: entity name: bang stick gibber diff --git a/Resources/Prototypes/Entities/Effects/dome.yml b/Resources/Prototypes/Entities/Effects/dome.yml index c58b02e62c..d4a5d72208 100644 --- a/Resources/Prototypes/Entities/Effects/dome.yml +++ b/Resources/Prototypes/Entities/Effects/dome.yml @@ -28,13 +28,13 @@ volume: 35 range: 5 sound: - path: /Audio/Machines/energyshield_ambient.ogg + path: /Audio/_Sunrise/Machines/energyshield_ambient.ogg - type: EnergyDome - type: Tag tags: - HideContextMenu - IgnoreMelee - + # Nukeops - type: entity @@ -54,7 +54,7 @@ radius: 5 power: 2 color: "#b00000" - + - type: entity id: EnergyDomeMediumRed categories: [ HideSpawnMenu ] @@ -102,7 +102,7 @@ radius: 5 power: 2 color: "#64b9de" - + - type: entity id: EnergyDomeMediumBlue categories: [ HideSpawnMenu ] @@ -181,4 +181,4 @@ damage: types: Slash: -1.5 - Piercing: -1.5 \ No newline at end of file + Piercing: -1.5 diff --git a/Resources/Prototypes/Entities/Effects/teleport_effect.yml b/Resources/Prototypes/Entities/Effects/teleport_effect.yml index 5ead69d68a..337ec755b7 100644 --- a/Resources/Prototypes/Entities/Effects/teleport_effect.yml +++ b/Resources/Prototypes/Entities/Effects/teleport_effect.yml @@ -12,7 +12,7 @@ color: "#008DFE" - type: EmitSoundOnSpawn sound: - path: /Audio/Effects/electrical_short_circuit2.ogg + path: /Audio/_Sunrise/Effects/electrical_short_circuit2.ogg - type: TimedDespawn lifetime: 0.6 - type: EvaporationSparkle @@ -34,7 +34,7 @@ color: "#008DFE" - type: EmitSoundOnSpawn sound: - path: /Audio/Effects/electrical_short_circuit2.ogg + path: /Audio/_Sunrise/Effects/electrical_short_circuit2.ogg - type: TimedDespawn lifetime: 0.6 - type: EvaporationSparkle diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mechs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mechs.yml index 00cd0a7124..ee14fe7900 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mechs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mechs.yml @@ -48,7 +48,7 @@ - type: Sprite layers: - state: green - - sprite: Objects/Specific/Mech/mecha.rsi + - sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit state: honker - type: ConditionalSpawner prototypes: @@ -63,7 +63,7 @@ - type: Sprite layers: - state: green - - sprite: Objects/Specific/Mech/mecha.rsi + - sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit state: honker - type: ConditionalSpawner prototypes: @@ -133,7 +133,7 @@ - type: Sprite layers: - state: green - - sprite: Objects/Specific/Mech/mecha.rsi + - sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit # Sunrise-edit state: marauder - type: ConditionalSpawner prototypes: @@ -148,7 +148,7 @@ - type: Sprite layers: - state: green - - sprite: Objects/Specific/Mech/mecha.rsi + - sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit state: marauder - type: ConditionalSpawner prototypes: @@ -191,7 +191,7 @@ - type: Sprite layers: - state: green - - sprite: Objects/Specific/Mech/mecha.rsi + - sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit state: seraph - type: ConditionalSpawner prototypes: @@ -206,7 +206,7 @@ - type: Sprite layers: - state: green - - sprite: Objects/Specific/Mech/mecha.rsi + - sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit state: seraph - type: ConditionalSpawner prototypes: @@ -249,7 +249,7 @@ - type: Sprite layers: - state: green - - sprite: Objects/Specific/Mech/mecha.rsi + - sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit state: mauler - type: ConditionalSpawner prototypes: @@ -264,7 +264,7 @@ - type: Sprite layers: - state: green - - sprite: Objects/Specific/Mech/mecha.rsi + - sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit state: mauler - type: ConditionalSpawner prototypes: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 86e92f55f5..3f1f331a27 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -193,6 +193,11 @@ description: ghost-panel-antagonist-rats-description priority: 110 - type: NightVision + - type: Bloodstream + bloodReferenceSolution: + reagents: + - ReagentId: Blood + Quantity: 60 # Sunrise edit end - type: VentCrawler # Sunrise-edit - type: CombatMode @@ -211,9 +216,6 @@ 2.0 FollowRange: !type:Single 3.0 - - type: Bloodstream - bloodReagent: Blood - bloodMaxVolume: 60 - type: Reactive groups: Flammable: [Touch] @@ -355,8 +357,10 @@ - type: Bloodstream bleedReductionAmount: 1 bloodRefreshAmount: 2.5 - bloodReagent: Blood - bloodMaxVolume: 200 + bloodReferenceSolution: + reagents: + - ReagentId: Blood + Quantity: 200 - type: Reactive groups: Flammable: [Touch] @@ -409,7 +413,7 @@ - !type:GibBehavior recursive: false - type: Stamina - critThreshold: 250 + baseCritThreshold: 250 - type: MeleeSpeech - type: UserInterface interfaces: @@ -421,9 +425,9 @@ attackRate: 1.5 damage: types: - Slash: 2 # Additional claw damage + Slash: 1 # Additional claw damage Piercing: 1 # Additional claw damage - Blunt: 15 # Strong guard attack + Blunt: 13 # Strong guard attack Structural: 10 # Strong guard attack bluntStaminaDamageFactor: 1.5 soundHit: diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index a7a6279ad7..70937ae9fc 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -86,7 +86,7 @@ thresholds: 0: Alive 650: Critical # Sunrise-Edit - 700: Dead #Sunrise-Edit + 700: Dead # Sunrise-Edit - type: SlowOnDamage speedModifierThresholds: 360: 0.7 # Sunrise-Edit @@ -140,7 +140,7 @@ components: - MobState chemical: Ichor - healRate: 25.0 #Sunrise-edit + healRate: 25.0 # Sunrise-edit whitelist: components: - MobState @@ -152,7 +152,7 @@ - CannotSuicide - DoorBumpOpener - StunImmune - - CarpRiftHealTarget # Sunrise-edit + - CarpRiftHealTarget # Sunrise-edit - type: Puller needsHands: false - type: RandomMetadata @@ -177,6 +177,36 @@ - type: Damageable damageContainer: Biological damageModifierSet: Dragon + - type: Destructible + thresholds: + - trigger: + !type:DamageGroupTrigger + damageGroup: Brute + damage: 999 + behaviors: + - !type:GibBehavior { } + - trigger: + !type:DamageTypeTrigger + damageType: Heat + damage: 1500 + behaviors: + - !type:SpawnEntitiesBehavior + spawnInContainer: true + spawn: + Ash: + min: 1 + max: 1 + - !type:BurnBodyBehavior { } + - !type:PlaySoundBehavior + sound: + collection: MeatLaserImpact + - trigger: + !type:DamageTypeTrigger + damageType: Radiation + damage: 15 + behaviors: + - !type:PopupBehavior + popup: mouth-taste-metal - type: ToggleableNightVision - type: TTS voice: HearthstoneLordOfThunder @@ -232,6 +262,17 @@ id: MobDragonDungeon suffix: Dungeon components: + # Sunrise-start + - type: Sprite + scale: 0.9,0.9 + sprite: Mobs/Aliens/Carps/dragon.rsi + - type: Reflect # Чтобы били его утили в ближнем, а не своими дробовками из карго + reflects: + - NonEnergy + - Energy + reflectProb: 0.5 + spread: 280 + # Sunrise-end - type: GhostRole description: ghost-role-information-space-dragon-dungeon-description rules: ghost-role-information-space-dragon-dungeon-rules diff --git a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml index 696318d10f..fd4c75c389 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml @@ -24,7 +24,7 @@ - type: Stamina decay: 50 cooldown: 1 - critThreshold: 1000 + baseCritThreshold: 1000 # immune to space drugs, pax, temporary blindness - type: StatusEffects allowed: @@ -61,7 +61,7 @@ types: Heat: 6.0 # slightly wider thresholds - - type: Temperature + - type: TemperatureDamage heatDamageThreshold: 390 coldDamageThreshold: 240 # take terminator flesh damage diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 4bf26cd49a..29ddeca486 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -245,7 +245,7 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 25 - - type: Food + - type: Edible requiresSpecialDigestion: true - type: CognizinFix - type: InjectNeed diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index 3c0ef8ac91..37ec3aee3f 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -16,7 +16,7 @@ - type: ActivatableUI key: enum.GhostRoleRadioUiKey.Key - type: EmitSoundOnUse - sound: /Audio/Misc/emergency_meeting.ogg + sound: /Audio/_Sunrise/Misc/emergency_meeting.ogg - type: entity parent: ReinforcementRadio diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index a8c13094d6..3a72e47903 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -23,6 +23,7 @@ - state: "id_inserted" map: [ "enum.PdaVisualLayers.IdLight" ] shader: "unshaded" + visible: false - type: Icon sprite: _Sunrise/Objects/Devices/pda.rsi # Sunrise-End diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml b/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml index d5eb771a4c..ba5029f1a5 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml @@ -15,7 +15,7 @@ - id: d12Dice - id: d20Dice - id: PercentileDie - - id: hyperDice + - id: hyperDice - type: Sprite sprite: Objects/Fun/dice.rsi state: dicebag diff --git a/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml index 154693cdd9..82aa871f05 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml @@ -33,9 +33,6 @@ maxIntensity: 0.01 intensitySlope: 1 totalIntensity: 0.01 - - type: Construction - graph: SnapPopExplosiveGraph - node: snapPop #Sunrise-start - type: Construction graph: SnapPopConstruction diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 0bb18f47c5..9acf869eb0 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -18,7 +18,7 @@ # Sunrise added end # Sunrise-Start - type: Sprite - sprite: _Sunrise/Objects/Misc/id_cards.rsi # Sunrise-Edit + sprite: &id-rsi _Sunrise/Objects/Misc/id_cards.rsi # Sunrise-Edit - type: Clothing slots: - idcard @@ -67,6 +67,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: gold - state: department-side @@ -95,6 +96,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: silver - state: department-side @@ -116,6 +118,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: silver - state: department-side @@ -137,6 +140,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: silver - state: department-side @@ -158,6 +162,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: silver - state: department-side @@ -179,6 +184,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: silver - state: department-side @@ -200,6 +206,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: silver - state: department-side @@ -223,6 +230,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -241,6 +249,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -259,6 +268,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -277,6 +287,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -295,6 +306,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -313,6 +325,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -331,6 +344,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -349,6 +363,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -367,6 +382,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -385,6 +401,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -403,6 +420,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -421,6 +439,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -439,6 +458,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -476,6 +496,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -494,6 +515,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -512,6 +534,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -530,6 +553,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -550,6 +574,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -568,6 +593,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -586,6 +612,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: clown-side @@ -603,6 +630,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -621,6 +649,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -639,6 +668,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -657,6 +687,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -675,6 +706,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -693,6 +725,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -715,6 +748,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -733,6 +767,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -751,6 +786,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -769,6 +805,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -787,6 +824,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -805,6 +843,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: default - state: department-side @@ -939,6 +978,7 @@ name: visitor ID card components: - type: Sprite + sprite: *id-rsi layers: - state: default - sprite: *icon-rsi @@ -1004,6 +1044,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: black - state: department-side @@ -1026,6 +1067,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: black - state: department-side @@ -1043,6 +1085,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: black - state: department-side @@ -1059,6 +1102,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: black - state: department-side @@ -1074,6 +1118,7 @@ name: pirate ID card components: - type: Sprite + sprite: *id-rsi layers: - state: pirate - type: Item @@ -1089,6 +1134,7 @@ name: xenoborg ID card components: - type: Sprite + sprite: *id-rsi layers: - state: default - type: Access @@ -1101,6 +1147,7 @@ name: wizard ID card components: - type: Sprite + sprite: *id-rsi layers: - state: wizard - sprite: *icon-rsi @@ -1123,6 +1170,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: blue - state: department-side @@ -1144,6 +1192,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: gold - state: department-side @@ -1164,6 +1213,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: blue - state: department-side @@ -1184,6 +1234,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: blue - state: department-side @@ -1204,6 +1255,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: blue - state: department-side @@ -1224,6 +1276,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: blue - state: department-side @@ -1244,6 +1297,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: blue - state: department-side @@ -1264,6 +1318,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: blue - state: department-side @@ -1283,6 +1338,7 @@ components: # Sunrise-Start - type: Sprite + sprite: *id-rsi layers: - state: blue - state: department-side diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml index 4443821518..75a2701d27 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml @@ -61,7 +61,7 @@ - SemiAuto soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Snipers/Bauer127/bauer127_shot.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeAntiMateriel fireCost: 125 - type: Appearance @@ -143,7 +143,7 @@ path: /Audio/Effects/Lightning/lightningshock.ogg params: variation: 0.2 - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: TeslaGunBullet fireCost: 100 - type: Appearance @@ -166,7 +166,7 @@ - FullAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/taser2.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: BulletDisablerSmgSpread fireCost: 30 - type: Appearance @@ -218,7 +218,7 @@ - FullAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: ShellShotgunMech fireCost: 75 - type: Appearance @@ -241,7 +241,7 @@ - FullAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: ShellShotgunMechIncendiary fireCost: 75 - type: Appearance @@ -268,7 +268,7 @@ - Burst soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Snipers/garand/garand.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeHeavyRifleRFMJMech #CartridgeLightRifleSP fireCost: 10 - type: Appearance @@ -352,7 +352,7 @@ - FullAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeXrayBeam fireCost: 50 - type: Appearance @@ -386,7 +386,7 @@ - Burst soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: BulletWeakRocket fireCost: 100 - type: Appearance @@ -413,8 +413,8 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rpgfire.ogg - - type: ProjectileBatteryAmmoProvider - proto: GrenadeBlastContact # Sunrise-Edit + - type: BatteryAmmoProvider + proto: GrenadeBlast fireCost: 300 - type: Appearance - type: AmmoCounter @@ -435,7 +435,7 @@ state: mecha_missilerack - type: Gun fireRate: 0.75 - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeRocketFrag fireCost: 200 - type: Battery @@ -462,7 +462,7 @@ path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg soundEmpty: path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: BulletGrenadeFlashBang # Sunrise-Edit fireCost: 60 - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/debug.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/debug.yml index 3f7297eebe..6747cb15f9 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/debug.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/debug.yml @@ -25,7 +25,7 @@ soundEmpty: path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg - type: AmmoCounter - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeLightRifleSP fireCost: 9 - type: MagazineVisuals diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml index dcddd87a1b..30a24f8188 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/industrial.yml @@ -16,7 +16,7 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: BulletKineticShuttle fireCost: 25 - type: Appearance @@ -47,7 +47,7 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: BulletPlasmaSpread fireCost: 50 - type: Appearance @@ -71,7 +71,7 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: BulletPlasma fireCost: 25 - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/special.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/special.yml index ccc3146a63..7c532e4fdc 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/special.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/special.yml @@ -21,7 +21,7 @@ soundEmpty: path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg - type: AmmoCounter - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: MousetrapArmed fireCost: 100 - type: Appearance @@ -49,7 +49,7 @@ soundEmpty: path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg - type: AmmoCounter - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: TrashBananaPeel fireCost: 100 - - type: Appearance \ No newline at end of file + - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 09977e06ff..019b1af922 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -481,7 +481,7 @@ bluntStaminaDamageFactor: 1.5 - type: MovementSpeedModifier baseWalkSpeed: 2.5 - baseSprintSpeed: 4 + baseSprintSpeed: 3.75 - type: PointLight mask: /Textures/Effects/LightMasks/cone.png autoRot: true @@ -673,7 +673,7 @@ - type: Sprite drawdepth: Mobs noRot: true - sprite: Objects/Specific/Mech/mecha.rsi + sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit scale: 1.08, 1.08 layers: - map: [ "enum.MechVisualLayers.Base" ] @@ -730,7 +730,7 @@ - type: Sprite drawdepth: Mobs noRot: true - sprite: Objects/Specific/Mech/mecha.rsi + sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit scale: 1.08, 1.08 layers: - map: [ "enum.MechVisualLayers.Base" ] @@ -786,7 +786,7 @@ - type: Sprite drawdepth: Mobs noRot: true - sprite: Objects/Specific/Mech/mecha.rsi + sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit scale: 1.08, 1.08 layers: - map: [ "enum.MechVisualLayers.Base" ] @@ -1006,7 +1006,7 @@ - type: Sprite drawdepth: Mobs noRot: true - sprite: Objects/Specific/Mech/mecha.rsi + sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit scale: 1.08, 1.08 layers: - map: [ "enum.MechVisualLayers.Base" ] @@ -1163,7 +1163,7 @@ - type: Sprite drawdepth: Mobs noRot: true - sprite: Objects/Specific/Mech/mecha.rsi + sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit scale: 1.08, 1.08 layers: - map: [ "enum.MechVisualLayers.Base" ] @@ -1250,7 +1250,7 @@ - type: Sprite drawdepth: Mobs noRot: true - sprite: Objects/Specific/Mech/mecha.rsi + sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit scale: 1.08, 1.08 layers: - map: [ "enum.MechVisualLayers.Base" ] @@ -1340,7 +1340,7 @@ - type: Sprite drawdepth: Mobs noRot: true - sprite: Objects/Specific/Mech/mecha.rsi + sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit scale: 1.08, 1.08 layers: - map: [ "enum.MechVisualLayers.Base" ] @@ -1501,7 +1501,7 @@ - type: Sprite drawdepth: Mobs noRot: true - sprite: Objects/Specific/Mech/mecha.rsi + sprite: _Sunrise/Objects/Specific/Mech/mecha.rsi # Sunrise-edit scale: 1.08, 1.08 layers: - map: [ "enum.MechVisualLayers.Base" ] diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml index 09c7930d66..f9aa911741 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml @@ -126,7 +126,7 @@ disableEject: true locked: true - type: PowerCellDraw - useRate: 85 + useCharge: 85 - type: PowerDrainOnMeleeHit chargePerHit: 30 # Sunrise-End diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 6a9fb1cba0..d489187115 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -118,8 +118,6 @@ solutions: hypospray: maxVol: 3000 - - type: Hypospray - onlyAffectsMobs: false - type: UseDelay delay: 0.0 @@ -157,10 +155,10 @@ exactVolume: true - type: Injector solutionName: pen - transferAmount: 15 - onlyAffectsMobs: false - injectOnly: true - - type: Appearance + currentTransferAmount: null + activeModeProtoId: HyposprayInjectMode + allowedModes: + - HyposprayInjectMode - type: SolutionContainerVisuals maxFillLevels: 1 changeColor: false diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 0b26c6a325..4f3431a924 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -936,7 +936,6 @@ - type: ItemBorgModule hands: - item: HypoBorgMedical # Sunrise-Edit - - item: HyposprayMedical # Sunrise-Edit - item: Syringe # - item: BorgDropper # Sunrise-Edit - item: BaseChemistryEmptyVial diff --git a/Resources/Prototypes/Entities/Objects/Tools/energydome.yml b/Resources/Prototypes/Entities/Objects/Tools/energydome.yml index 90c9b11584..ae251db211 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/energydome.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/energydome.yml @@ -32,7 +32,7 @@ domePrototype: EnergyDomeSmallRed - type: PowerCellDraw drawRate: 0 - useRate: 0 + useCharge: 0 - type: UseDelay delay: 10.0 @@ -84,7 +84,7 @@ canDeviceNetworkUse: true - type: PowerCellDraw drawRate: 0 - useRate: 0 + useCharge: 0 - type: UseDelay delay: 10.0 - type: DeviceNetwork @@ -146,7 +146,6 @@ !type:CableDeviceNode nodeGroupID: MVPower - type: BatterySelfRecharger - autoRecharge: false # true only when active autoRechargeRate: -800 #<- discharge per second while active - type: Damageable damageContainer: Inorganic diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml index 468450c3a4..f3de2779ff 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimateriel.yml @@ -7,8 +7,8 @@ - type: Tag tags: - CartridgeAntiMateriel - - type: HitScanCartridgeAmmo - hitscan: AntiMaterielBulletTrace + - type: CartridgeAmmo + proto: AntiMaterielBulletTrace - type: Sprite # sunrise-start sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Casings/12.7x99.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml index fa8ddbff13..6fe89e2684 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml @@ -7,7 +7,7 @@ - type: Tag tags: - CartridgeCaselessRifle - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo deleteOnSpawn: true - type: Sprite noRot: false @@ -26,8 +26,8 @@ name: cartridge (.25 caseless) description: A small caliber utilizing caseless technology, omitting conventional brass casing in favor of hardened propellant. Standard kinetic ammunition is common and useful in most situations. components: - - type: HitScanCartridgeAmmo - hitscan: BulletCaselessRifleTrace + - type: CartridgeAmmo + proto: BulletCaselessRifle - type: entity parent: BaseCartridgeCaselessRifle @@ -35,8 +35,8 @@ name: cartridge (.25 caseless practice) description: A small caliber utilizing caseless technology, omitting conventional brass casing in favor of hardened propellant. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage. components: - - type: HitScanCartridgeAmmo - hitscan: BulletCaselessRiflePracticeTrace + - type: CartridgeAmmo + proto: BulletCaselessRiflePractice - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml index 44c2562bad..43456ef372 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml @@ -7,8 +7,8 @@ - type: Tag tags: - CartridgeHeavyRifle - - type: HitScanCartridgeAmmo - hitscan: BulletHeavyRifleTrace + - type: CartridgeAmmo + proto: BulletHeavyRifleTrace - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi layers: @@ -24,6 +24,6 @@ name: cartridge (.10 rifle) parent: BaseCartridgeHeavyRifle components: - - type: HitScanCartridgeAmmo - hitscan: BulletMinigunTrace + - type: CartridgeAmmo + proto: BulletMinigunTrace deleteOnSpawn: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index 229a547545..7dcf780586 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -21,8 +21,8 @@ name: cartridge (.30 rifle SP) parent: BaseCartridgeLightRifleSP components: - - type: HitScanCartridgeAmmo - hitscan: BulletLightRifleTraceSP + - type: CartridgeAmmo + proto: BulletLightRifleTraceSP - type: Sprite layers: - state: base @@ -36,8 +36,8 @@ name: cartridge (.30 rifle HP) parent: BaseCartridgeLightRifleSP components: - - type: HitScanCartridgeAmmo - hitscan: BulletLightRifleTraceHP + - type: CartridgeAmmo + proto: BulletLightRifleTraceHP - type: Sprite layers: - state: base @@ -51,8 +51,8 @@ name: cartridge (.30 rifle FMJ) parent: BaseCartridgeLightRifleSP components: - - type: HitScanCartridgeAmmo - hitscan: BulletLightRifleTraceFMJ + - type: CartridgeAmmo + proto: BulletLightRifleTraceFMJ - type: Sprite layers: - state: base @@ -66,8 +66,8 @@ name: cartridge (.30 rifle AP) parent: BaseCartridgeLightRifleSP components: - - type: HitScanCartridgeAmmo - hitscan: BulletLightRifleTraceAP + - type: CartridgeAmmo + proto: BulletLightRifleTraceAP - type: Sprite layers: - state: base @@ -81,8 +81,8 @@ name: cartridge (.30 rifle practice) parent: BaseCartridgeLightRifleSP components: - - type: HitScanCartridgeAmmo - hitscan: BulletLightRifleTracePractice + - type: CartridgeAmmo + proto: BulletLightRifleTracePractice - type: Sprite layers: - state: base @@ -111,8 +111,8 @@ name: cartridge (.30 rifle uranium) parent: BaseCartridgeLightRifleSP components: - - type: HitScanCartridgeAmmo - hitscan: BulletLightRifleTraceUranium + - type: CartridgeAmmo + proto: BulletLightRifleTraceUranium - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 950611f82b..d98460ac94 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -20,8 +20,8 @@ name: cartridge (.45 magnum rubber) parent: BaseCartridgeMagnum components: - - type: HitScanCartridgeAmmo - hitscan: BulletMagnumTraceRubber + - type: CartridgeAmmo + proto: BulletMagnumTraceRubber - type: Sprite layers: - state: base @@ -36,8 +36,8 @@ parent: BaseCartridgeMagnum description: Heavy magnum cartridge mostly used by revolvers. Standard kinetic ammunition is common and useful in most situations. components: - - type: HitScanCartridgeAmmo - hitscan: BulletMagnumTraceSP + - type: CartridgeAmmo + proto: BulletMagnumTraceSP - type: Sprite layers: - state: base @@ -52,8 +52,8 @@ parent: BaseCartridgeMagnum description: Heavy magnum cartridge mostly used by revolvers. Chalk ammunition is generally non-harmful, used for practice. components: - - type: HitScanCartridgeAmmo - hitscan: BulletMagnumTraceHP + - type: CartridgeAmmo + proto: BulletMagnumTraceHP - type: Sprite layers: - state: base @@ -68,8 +68,8 @@ parent: BaseCartridgeMagnum description: Heavy magnum cartridge mostly used by revolvers. Incendiary ammunition contains a self-igniting compound that sets the target ablaze. components: - - type: HitScanCartridgeAmmo - hitscan: BulletMagnumTraceFMJ + - type: CartridgeAmmo + proto: BulletMagnumTraceFMJ - type: Sprite layers: - state: base @@ -83,8 +83,8 @@ name: cartridge (.45 magnum AP) parent: BaseCartridgeMagnum components: - - type: HitScanCartridgeAmmo - hitscan: BulletMagnumTraceAP + - type: CartridgeAmmo + proto: BulletMagnumTraceAP - type: Sprite layers: - state: base @@ -98,8 +98,8 @@ name: cartridge (.45 magnum practice) parent: BaseCartridgeMagnum components: - - type: HitScanCartridgeAmmo - hitscan: BulletMagnumTracePractice + - type: CartridgeAmmo + proto: BulletMagnumTracePractice - type: Sprite layers: - state: base @@ -130,8 +130,8 @@ parent: BaseCartridgeMagnum description: Heavy magnum cartridge mostly used by revolvers. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside. components: - - type: HitScanCartridgeAmmo - hitscan: BulletMagnumTraceUranium + - type: CartridgeAmmo + proto: BulletMagnumTraceUranium - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index 8aee552fb5..8fa29d95e8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -20,8 +20,8 @@ name: cartridge (.35 auto rubber) parent: BaseCartridgePistol components: - - type: HitScanCartridgeAmmo - hitscan: BulletPistolTraceRubber + - type: CartridgeAmmo + proto: BulletPistolTraceRubber - type: Sprite layers: - state: base @@ -35,8 +35,8 @@ name: cartridge (.35 auto SP) parent: BaseCartridgePistol components: - - type: HitScanCartridgeAmmo - hitscan: BulletPistolTraceSP + - type: CartridgeAmmo + proto: BulletPistolTraceSP - type: Sprite layers: - state: base @@ -50,8 +50,8 @@ name: cartridge (.35 auto HP) parent: BaseCartridgePistol components: - - type: HitScanCartridgeAmmo - hitscan: BulletPistolTraceHP + - type: CartridgeAmmo + proto: BulletPistolTraceHP - type: Sprite layers: - state: base @@ -65,8 +65,8 @@ name: cartridge (.35 auto FMJ) parent: BaseCartridgePistol components: - - type: HitScanCartridgeAmmo - hitscan: BulletPistolTraceFMJ + - type: CartridgeAmmo + proto: BulletPistolTraceFMJ - type: Sprite layers: - state: base @@ -80,8 +80,8 @@ name: cartridge (.35 auto AP) parent: BaseCartridgePistol components: - - type: HitScanCartridgeAmmo - hitscan: BulletPistolTraceAP + - type: CartridgeAmmo + proto: BulletPistolTraceAP - type: Sprite layers: - state: base @@ -96,8 +96,8 @@ description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Chalk ammunition is generally non-harmful, used for practice. parent: BaseCartridgePistol components: - - type: HitScanCartridgeAmmo - hitscan: BulletPistolTracePractice + - type: CartridgeAmmo + proto: BulletPistolTracePractice - type: Sprite layers: - state: base @@ -128,8 +128,8 @@ description: Arguably the most popular caliber on the market, used by all manner of pistols and submachine guns. Uranium core ammunition features a load of fissile material, irradiating the target from the inside. parent: BaseCartridgePistol components: - - type: HitScanCartridgeAmmo - hitscan: BulletPistolTraceUranium + - type: CartridgeAmmo + proto: BulletPistolTraceUranium - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index fdc8d0f218..8c9f98538a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -22,8 +22,8 @@ parent: BaseCartridgeRifle description: A modern intermediate cartridge for combat rifles. Standard kinetic ammunition is common and useful in most situations. components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceSP + - type: CartridgeAmmo + proto: BulletRifleTraceSP - type: Sprite layers: - state: base @@ -37,8 +37,8 @@ name: cartridge (.20 rifle HP) parent: BaseCartridgeRifle components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHP + - type: CartridgeAmmo + proto: BulletRifleTraceHP - type: Sprite layers: - state: base @@ -52,8 +52,8 @@ name: cartridge (.20 rifle FMJ) parent: BaseCartridgeRifle components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceFMJ + - type: CartridgeAmmo + proto: BulletRifleTraceFMJ - type: Sprite layers: - state: base @@ -67,8 +67,8 @@ name: cartridge (.20 rifle AP) parent: BaseCartridgeRifle components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceAP + - type: CartridgeAmmo + proto: BulletRifleTraceAP - type: Sprite layers: - state: base @@ -83,8 +83,8 @@ parent: BaseCartridgeRifle description: A modern intermediate cartridge for combat rifles. Chalk ammunition is generally non-harmful, used for practice. components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTracePractice + - type: CartridgeAmmo + proto: BulletRifleTracePractice - type: Sprite layers: - state: base @@ -100,7 +100,7 @@ description: A modern intermediate cartridge for combat rifles. Incendiary ammunition contains a self-igniting compound that sets the target ablaze. components: - type: CartridgeAmmo - proto: BulletLightRifleIncendiary + proto: BulletRifleIncendiary - type: Sprite layers: - state: base @@ -115,8 +115,8 @@ parent: BaseCartridgeRifle description: A modern intermediate cartridge for combat rifles. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating the target from the inside. components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceUranium + - type: CartridgeAmmo + proto: BulletRifleTraceUranium - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index 9ef399d94f..4a105ec9d0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -36,10 +36,10 @@ - state: spent map: [ "enum.AmmoVisualLayers.Spent" ] visible: false - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo soundEject: collection: ShellEject - hitscan: PelletShotgunBeanbagTrace + proto: PelletShotgunBeanbagTrace - type: entity id: ShellShotgunSlug @@ -56,10 +56,10 @@ - state: spent-long map: [ "enum.AmmoVisualLayers.Spent" ] visible: false - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo soundEject: collection: ShellEject - hitscan: PelletShotgunSlugTrace + proto: PelletShotgunSlugTrace # sunrise-start - type: Tag tags: @@ -107,10 +107,10 @@ - state: spent map: [ "enum.AmmoVisualLayers.Spent" ] visible: false - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo soundEject: collection: ShellEject - hitscan: PelletShotgunSpreadTrace + proto: PelletShotgunSpreadTrace - type: entity id: ShellShotgunIncendiary @@ -146,10 +146,10 @@ - state: spent map: [ "enum.AmmoVisualLayers.Spent" ] visible: false - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo soundEject: collection: ShellEject - hitscan: PelletShotgunPracticeSpreadTrace + proto: PelletShotgunPracticeSpreadTrace - type: entity id: ShellTranquilizer @@ -206,10 +206,10 @@ # - type: Construction # graph: ImprovisedShotgunShellGraph # node: shell -# - type: HitScanCartridgeAmmo +# - type: CartridgeAmmo # soundEject: # collection: ShellEject -# hitscan: PelletShotgunImprovisedSpreadTrace +# proto: PelletShotgunImprovisedSpreadTrace - type: entity id: ShellShotgunUranium @@ -227,7 +227,7 @@ - state: spent-long map: [ "enum.AmmoVisualLayers.Spent" ] visible: false - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo soundEject: collection: ShellEject - hitscan: PelletShotgunUraniumSpreadTrace + proto: PelletShotgunUraniumSpreadTrace diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index 7dc2c71f31..74ff501b97 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -34,7 +34,7 @@ - type: Appearance # Magazines -# - type: entity # Sunrise-edtit #Moved to rifle.yml +# - type: entity # Sunrise-edtit #Moved to _sunrise/xxx/rifle.yml # id: MagazineRifleBoxSP # name: "L6 SAW magazine box (.30 rifle SP)" # parent: BaseMagazineLightRifle @@ -70,94 +70,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineLightRifleSP - name: "magazine (.30 rifle SP)" - parent: BaseMagazineLightRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifleSP - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#575EF5" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#575EF5" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#575EF5" - - -- type: entity - id: MagazineLightRifleHP - name: "magazine (.30 rifle HP)" - parent: BaseMagazineLightRifle - description: Curved 30-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition. - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifleHP - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#F5514C" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#F5514C" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#F5514C" - -- type: entity - id: MagazineLightRifleFMJ - name: "magazine (.30 rifle FMJ)" - parent: BaseMagazineLightRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifleFMJ - -- type: entity - id: MagazineLightRifleAP - name: "magazine (.30 rifle AP)" - parent: BaseMagazineLightRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifleAP - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#540000" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#540000" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#540000" - - type: entity id: MagazineLightRiflePractice name: "magazine (.30 rifle practice)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index 63013b0147..35aa5c4d43 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -50,6 +50,7 @@ id: MagazineRifle name: "magazine (.20 rifle SP)" parent: BaseMagazineRifle + categories: [ HideSpawnMenu ] # Sunrise-add # Другие MagazineRifle в _sunrise файле components: - type: BallisticAmmoProvider proto: CartridgeRifleSP @@ -72,99 +73,6 @@ - state: inhand-right-stripe color: "#575EF5" -- type: entity - id: MagazineRifleSP - name: "magazine (.20 rifle SP)" - parent: BaseMagazineRifle - description: 25-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition. - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleSP - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#575EF5" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#575EF5" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#575EF5" - -- type: entity - id: MagazineRifleHP - name: "magazine (.20 rifle HP)" - parent: BaseMagazineRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleHP - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#F5514C" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#F5514C" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#F5514C" - -- type: entity - id: MagazineRifleFMJ - name: "magazine (.20 rifle FMJ)" - parent: BaseMagazineRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleFMJ - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - -- type: entity - id: MagazineRifleAP - name: "magazine (.20 rifle AP)" - parent: BaseMagazineRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleAP - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#540000" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#540000" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#540000" - - type: entity id: MagazineRifleIncendiary name: "magazine (.20 rifle incendiary)" @@ -244,304 +152,3 @@ - state: inhand-right-mag - state: inhand-right-stripe color: "#40F57A" - -#Sunrise-start -# M-52 - -- type: entity - id: BaseMagazineRifleM52 - parent: BaseMagazineRifle - abstract: true - components: - - type: BallisticAmmoProvider - capacity: 40 - - type: Tag - tags: - - MagazineRifleM52 - - type: Sprite - sprite: _Starlight/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m-52.rsi - - type: MagazineVisuals - magState: mag - steps: 7 - zeroVisible: false - -- type: entity - id: MagazineRifleM52SP - name: "magazine (.20 rifle SP)" - parent: BaseMagazineRifleM52 - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleSP - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#575EF5" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#575EF5" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#575EF5" - -- type: entity - id: MagazineRifleM52HP - name: "magazine (.20 rifle HP)" - parent: BaseMagazineRifleM52 - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleHP - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#F5514C" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#F5514C" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#F5514C" - -- type: entity - id: MagazineRifleM52FMJ - name: "magazine (.20 rifle FMJ)" - parent: BaseMagazineRifleM52 - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleFMJ - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#080706" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#080706" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#080706" - -- type: entity - id: MagazineRifleM52AP - name: "magazine (.20 rifle AP)" - parent: BaseMagazineRifleM52 - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleAP - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#540000" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#540000" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#540000" - -- type: entity - id: MagazineRifleM52Empty - name: "magazine (.20 rifle any)" - suffix: empty - parent: BaseMagazineRifleM52 - components: - - type: BallisticAmmoProvider - proto: null - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - right: - - state: inhand-right-mag - -- type: entity - id: MagazineRifleM52Incendiary - name: "magazine (.20 rifle incendiary)" - parent: BaseMagazineRifleM52 - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleIncendiary - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#ff6e52" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#ff6e52" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#ff6e52" - -- type: entity - id: MagazineRifleM52Practice - name: "magazine (.20 rifle practice)" - parent: BaseMagazineRifleM52 - components: - - type: BallisticAmmoProvider - proto: CartridgeRiflePractice - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#dbdbdb" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#dbdbdb" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#dbdbdb" - -- type: entity - id: MagazineRifleM52Uranium - name: "magazine (.20 rifle uranium)" - parent: BaseMagazineRifleM52 - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleUranium - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#40F57A" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#40F57A" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#40F57A" - -# Magazines L6 SAW -- type: entity - id: MagazineRifleBoxSP - name: "L6 SAW magazine box (.20 rifle SP)" - parent: BaseMagazineRifle - description: Box containing a 150-round belt of linked .20 rifle rounds, used by light machine guns such as the L6. Intended to hold general-purpose kinetic ammunition. - components: - - type: Tag - tags: - - MagazineLightRifleBox - - type: BallisticAmmoProvider - proto: CartridgeRifleSP - capacity: 150 - - type: Item - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi - - type: MagazineVisuals - magState: mag - steps: 8 - zeroVisible: false - - type: Appearance - -- type: entity - id: MagazineRifleBoxEmpty - name: "L6 SAW magazine box (.20 rifle any)" - parent: MagazineRifleBoxSP - description: Box containing a 150-round belt of linked .20 rifle rounds, used by light machine guns such as the L6. - components: - - type: Tag - tags: - - MagazineLightRifleBox - - type: BallisticAmmoProvider - proto: null - - type: Item - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi - - type: MagazineVisuals - magState: mag - steps: 8 - zeroVisible: false - - type: Appearance - -- type: entity - id: MagazineRifleBoxFMJ - name: "L6 SAW magazine box (.20 rifle FMJ)" - parent: MagazineRifleBoxSP - description: Box containing a 150-round belt of linked .20 rifle rounds, used by light machine guns such as the L6. Intended to hold FMJ kinetic ammunition. - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleFMJ - -- type: entity - id: MagazineRifleBoxIncendiary - name: "L6 SAW magazine box (.20 rifle incendiary)" - parent: MagazineRifleBoxSP - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleIncendiary - - type: Sprite - layers: - - state: red - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - -- type: entity - id: MagazineRifleBoxUranium - name: "L6 SAW magazine box (.20 rifle uranium)" - parent: MagazineRifleBoxSP - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleUranium - - type: Sprite - layers: - - state: uranium - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] -#Sunrise-End diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml deleted file mode 100644 index a488b3a990..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml +++ /dev/null @@ -1,59 +0,0 @@ -- type: entity - id: BaseSpeedLoaderPistol - name: "speed loader (.35 auto)" - parent: [ BaseItem, BaseSecurityContraband ] - abstract: true - components: - - type: Tag - tags: - - SpeedLoaderPistol - - type: SpeedLoader - - type: BallisticAmmoProvider - whitelist: - tags: - - CartridgePistol - capacity: 6 - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - ents: [] - -- type: entity - id: SpeedLoaderPistol - name: "speed loader (.35 auto)" - parent: BaseSpeedLoaderPistol - components: - - type: BallisticAmmoProvider - proto: CartridgePistolSP - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: base-6 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: base - steps: 7 - zeroVisible: false - - type: Appearance - -- type: entity - id: SpeedLoaderPistolPractice - name: "speed loader (.35 auto practice)" - parent: BaseSpeedLoaderPistol - components: - - type: BallisticAmmoProvider - proto: CartridgePistolPractice - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: practice-6 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: practice - steps: 7 - zeroVisible: false - - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml index afec36a149..077ef68db9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml @@ -1,20 +1,18 @@ - type: entity + parent: [ BaseItem, BaseSecurityContraband ] id: SpeedLoaderLightRifle - name: "speed loader (.45 magnum)" # Starlight - parent: [ BaseItem, BaseMinorContraband ] + name: "speed loader (.30 rifle)" + description: 5-round 'stripper clip' for quickly reloading the Kardashev-Mosin. Intended to hold general-purpose kinetic ammunition. components: - - type: Tag - tags: - - SpeedLoaderRifle - type: SpeedLoader - type: BallisticAmmoProvider mayTransfer: true - fillDelay: 0.1 #Starlight + fillDelay: 0.1 # Sunrise-add whitelist: tags: - - CartridgeMagnum # Starlight + - CartridgeLightRifle capacity: 5 - proto: CartridgeMagnumSP # Starlight + proto: CartridgeLightRifleFMJ # Sunrise-edit - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi layers: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index 9f12d76520..8424066411 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -73,12 +73,12 @@ suffix: false - type: entity - id: GrenadeBlastContact # Sunrise-edit + id: GrenadeBlast name: contact blast grenade parent: BaseGrenade components: - type: CartridgeAmmo - proto: BulletGrenadeBlastContact # Sunrise-edit + proto: BulletGrenadeBlast - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi layers: @@ -90,12 +90,12 @@ suffix: false - type: entity - id: GrenadeFlashContact # Sunrise-edit + id: GrenadeFlash name: contact flash grenade parent: BaseGrenade components: - type: CartridgeAmmo - proto: BulletGrenadeFlashContact # Sunrise-edit + proto: BulletGrenadeFlash # Sunrise-edit - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi layers: @@ -107,12 +107,12 @@ suffix: false - type: entity - id: GrenadeFragContact # Sunrise-edit + id: GrenadeFrag name: contact frag grenade parent: BaseGrenade components: - type: CartridgeAmmo - proto: BulletGrenadeFragContact # Sunrise-edit + proto: BulletGrenadeFrag - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi layers: @@ -124,7 +124,7 @@ suffix: false - type: entity - parent: GrenadeFragContact # Sunrise-edit + parent: GrenadeFrag id: GrenadeCleanade name: cleanade grenade round components: @@ -141,12 +141,12 @@ suffix: false - type: entity - id: GrenadeEMPContact # Sunrise-edit + id: GrenadeEMP name: contact EMP grenade parent: BaseGrenade components: - type: CartridgeAmmo - proto: BulletGrenadeEMPContact # Sunrise-edit + proto: BulletGrenadeEMP # Sunrise-edit - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi layers: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index f8f1f5e2f8..102eb1677c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -507,7 +507,7 @@ - type: Gun soundGunshot: path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - - type: ProjectileBatteryAmmoProvider # Sunrise-Edit + - type: BatteryAmmoProvider # Sunrise-Edit proto: CartridgeXrayBeam # Sunrise-Edit fireCost: 100 - type: MagazineVisuals diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 89e5484fb6..439a24ba1c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -156,6 +156,5 @@ maxCharge: 10000 startingCharge: 10000 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 100 # Sunrise-Edit - type: AmmoCounter diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 3017d4cb40..55cc214a75 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -212,12 +212,12 @@ layers: - state: icon map: ["enum.GunVisualLayers.Base"] - - containers: + - type: ContainerContainer + containers: balistic-ammo: !type:Container ents: [] ballistic-ammo: !type:Container ents: [] - type: ContainerContainer - type: Clothing sprite: Objects/Weapons/Guns/Launchers/pirate_cannon.rsi - type: Gun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index c70794ca3a..9594f12e56 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -146,7 +146,6 @@ maxCharge: 1000 startingCharge: 1000 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 25 - type: AmmoCounter diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 8fb891e22d..cd82dc178b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -14,128 +14,180 @@ - type: Tag tags: - HideContextMenu - - Laser - type: AnimationPlayer -- type: hitscan - id: RedLaser - damage: - types: - Heat: 14 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_laser - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_laser +# starlight start +# split base laser hitscan into a variant with and without visual beams +# this is done so that projectiles such as disablers and tasers do not have laser travel visuals +- type: entity + id: BasicHitscan + parent: BasicHitscanNoBeam + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_laser + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_laser +# starlight end -- type: hitscan - id: RedLaserPractice - damage: - types: - Heat: 1 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_laser - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_laser - -- type: hitscan - id: RedMediumLaser - damage: - types: - Heat: 20 # Sunrise-edit - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_laser - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_laser - -- type: hitscan +- type: entity + parent: BasicHitscan id: RedLightLaser - damage: - types: - Heat: 7 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_laser - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_laser + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 7 -- type: hitscan - id: XrayLaser - damage: - types: - Heat: 10 - Radiation: 10 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_xray - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: xray - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_xray +- type: entity + parent: BasicHitscan + id: RedLaser + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 20 # Starlight -- type: hitscan +- type: entity + parent: BasicHitscan + id: RedMediumLaser + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 17 + +- type: entity + parent: BasicHitscan id: RedHeavyLaser - damage: - types: - Heat: 28 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_beam_heavy - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam_heavy - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_beam_heavy + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 28 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_beam_heavy + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_heavy + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_beam_heavy -- type: hitscan +- type: entity + parent: BasicHitscan + id: RedLaserPractice + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 1 + +- type: entity + parent: BasicHitscan + id: XrayLaser + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 10 + Radiation: 10 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_xray + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: xray + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_xray + +- type: entity + parent: BasicHitscan id: Pulse - damage: - types: - Heat: 35 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_blue - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam_blue - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_blue + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 35 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_blue + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_blue + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_blue -- type: hitscan +- type: entity + parent: BasicHitscan id: RedShuttleLaser - maxLength: 100 # Sunrise-edit - damage: - types: - Heat: 45 - Structural: 10 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_beam_heavy2 - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam_heavy2 - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_beam_heavy2 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicRaycast + maxDistance: 60.0 + - type: HitscanBasicDamage + damage: + types: + Heat: 45 + Structural: 10 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_beam_heavy2 + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_heavy2 + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_beam_heavy2 + +- type: entity + parent: BasicHitscan + id: DebugLaser + suffix: DEBUG + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 1 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_debug + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: debug + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_debug + +- type: entity + parent: DebugLaser + id: DebugLaserGib + suffix: DEBUG + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 20000 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 79d9711fec..accb42e125 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -178,6 +178,11 @@ sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi layers: - state: uranium + shader: unshaded + # - type: PointLight // Too resource intensive for what little effect it has, one day... + # enabled: true + # color: "#059919" + # radius: 2.0 - type: Projectile damage: types: @@ -234,11 +239,11 @@ sprintSpeedModifier: 0.5 - type: entity - parent: BulletTaser - id: BulletTaserSuper - categories: [ HideSpawnMenu ] name: taser bolt + id: BulletTaserSuper description: If you can see this, you've probably been stun-meta'd + parent: BulletTaser + categories: [ HideSpawnMenu ] components: - type: Sprite noRot: true @@ -375,8 +380,7 @@ # soundHit: Waiting on serv3 damage: types: - Heat: 15 - Structural: 35 # Sunrise-added + Heat: 14 # mining laser real - type: GatheringProjectile - type: Tag @@ -384,11 +388,9 @@ - EmitterBolt - type: TimedDespawn lifetime: 3 - # Sunrise-Start - type: Reflective reflective: - Energy - # Sunrise-End - type: entity name: watcher bolt @@ -552,11 +554,11 @@ impactEffect: BulletImpactEffectKinetic damage: types: - Blunt: 15 - Structural: 20 + Blunt: 25 + Structural: 30 # Short lifespan - type: TimedDespawn - lifetime: 0.22 # roughly 5.5 tiles + lifetime: 0.275 # roughly 6.5 tiles - type: GatheringProjectile - type: entity @@ -609,8 +611,8 @@ - MobState damage: types: - Blunt: 18 - Slash: 4 + Blunt: 20 + Slash: 5 - type: Projectile impactEffect: BulletImpactEffectKinetic damage: @@ -837,7 +839,7 @@ - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi layers: - - state: smallfrag + - state: frag - type: ExplodeOnTrigger - type: Explosive explosionType: Default @@ -845,7 +847,6 @@ intensitySlope: 1 totalIntensity: 4 # 60 total damage to distribute over tiles maxTileBreak: 1 - canCreateVacuum: False - type: PointLight radius: 3.5 color: orange @@ -872,7 +873,7 @@ damage: 80 - type: entity - id: BulletGrenadeBlastContact + id: BulletGrenadeBlast name: blast grenade parent: BaseBulletTrigger categories: [ HideSpawnMenu ] @@ -890,7 +891,7 @@ canCreateVacuum: false - type: entity - id: BulletGrenadeFlashContact + id: BulletGrenadeFlash name: flash grenade parent: BaseBulletTrigger categories: [ HideSpawnMenu ] @@ -906,7 +907,7 @@ - type: DeleteOnTrigger - type: entity - id: BulletGrenadeFragContact + id: BulletGrenadeFrag name: frag grenade parent: BaseBulletTrigger categories: [ HideSpawnMenu ] @@ -960,17 +961,17 @@ tileBreakScale: 0.01 - type: entity - id: BulletGrenadeEMPContact - name: contact EMP grenade + id: BulletGrenadeEMP + name: EMP rocket parent: BaseBulletTrigger categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi layers: - - state: grenade #Sunrise-edit + - state: frag - type: EmpOnTrigger - range: 10 # 5 Sunrise-edit + range: 5 energyConsumption: 50000 disableDuration: 10 - type: Ammo @@ -979,7 +980,6 @@ radius: 3.5 color: blue energy: 0.5 - - type: DeleteOnTrigger #Sunrise-edit - type: entity id: BulletCap @@ -1125,6 +1125,17 @@ - HighImpassable - type: GrapplingProjectile +- type: entity + parent: GrapplingHook + id: StickyHandPalm + name: sticky hand palm + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Launchers/sticky_hand.rsi + - type: Ammo + muzzleFlash: null + - type: entity name : disabler bolt smg id: BulletDisablerSmg @@ -1262,9 +1273,6 @@ - type: EmbeddableProjectile - type: Projectile deleteOnCollide: false - damage: - types: - Shock: 20 # Sunrise-Edit soundHit: path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg - type: LightningArcShooter @@ -1317,7 +1325,42 @@ impactEffect: BulletImpactEffectOrangeDisabler damage: types: - Heat: 13 + Heat: 20 + +- type: entity + name: destroying bolt + id: BulletLaserDestroy + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: heavylaser + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Impassable + - BulletImpassable + fly-by: *flybyfixture + - type: Ammo + - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Heat: 50 - type: entity name: wide laser barrage @@ -1401,266 +1444,43 @@ mask: - Opaque -# SUNRISE - - type: entity - id: BulletPlasma parent: BaseBullet + id: EnergyCrossbowBolt categories: [ HideSpawnMenu ] - components: - - type: Sprite - noRot: false - sprite: Objects/Weapons/Guns/Projectiles/magic.rsi - layers: - - state: arcane_barrage - shader: unshaded - - type: Projectile - impactEffect: BulletImpactEffectKinetic - damage: - types: - Heat: 14 - Slash: 14 - Structural: 35 - penetrationThreshold: 800 - penetrationDamageTypeRequirement: - - Structural - - type: Ammo - muzzleFlash: HitscanEffect - - type: TimedDespawn - lifetime: 0.35 - - type: PointLight - radius: 2.5 - color: "#dd16d395" - energy: 0.5 - - type: GatheringProjectile - -- type: entity - name: wide plasma barrage - id: BulletPlasmaSpread - categories: [ HideSpawnMenu ] - parent: BulletPlasma - components: - - type: ProjectileSpread - proto: BulletPlasma - count: 3 - spread: 25 - -- type: entity - name : syndie plasma - id: BulletSyndiPlasma - parent: BaseBullet - categories: [ HideSpawnMenu ] - components: - - type: Reflective - reflective: - - Energy - - type: FlyBySound - sound: - collection: EnergyMiss - params: - volume: 5 - - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Projectiles/red_projectile.rsi - layers: - - state: omnilaser - shader: unshaded - - type: Physics - - type: Fixtures - fixtures: - projectile: - shape: - !type:PhysShapeAabb - bounds: "-0.15,-0.3,0.15,0.3" - hard: false - mask: - - Impassable - - BulletImpassable - fly-by: *flybyfixture - - type: Ammo - - type: StaminaDamageOnCollide - damage: 1 - - type: Projectile - impactEffect: BulletImpactEffectSyndiPlasma - damage: - types: - Heat: 12 - soundHit: - collection: WeakHit - -- type: entity - name : syndie plasma - id: BulletSyndiPlasma2 - parent: BaseBullet - categories: [ HideSpawnMenu ] - components: - - type: Reflective - reflective: - - Energy - - type: FlyBySound - sound: - collection: EnergyMiss - params: - volume: 5 - - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Projectiles/red_projectile.rsi - layers: - - state: omnilaser - shader: unshaded - - type: Physics - - type: Fixtures - fixtures: - projectile: - shape: - !type:PhysShapeAabb - bounds: "-0.15,-0.3,0.15,0.3" - hard: false - mask: - - Impassable - - BulletImpassable - fly-by: *flybyfixture - - type: Ammo - - type: StaminaDamageOnCollide - damage: 1 - - type: Projectile - impactEffect: BulletImpactEffectSyndiPlasma - damage: - types: - Heat: 8 - soundHit: - collection: WeakHit - -- type: entity - name : syndie plasma - id: BulletSyndiPlasma3 - parent: BaseBullet - categories: [ HideSpawnMenu ] - components: - - type: Reflective - reflective: - - Energy - - type: FlyBySound - sound: - collection: EnergyMiss - params: - volume: 5 - - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Projectiles/big_red_projectile.rsi - layers: - - state: omnilaser - shader: unshaded - - type: Physics - - type: Fixtures - fixtures: - projectile: - shape: - !type:PhysShapeAabb - bounds: "-0.15,-0.3,0.15,0.3" - hard: false - mask: - - Impassable - - BulletImpassable - fly-by: *flybyfixture - - type: Ammo - - type: StaminaDamageOnCollide - damage: 1 - - type: Projectile - impactEffect: BulletImpactEffectSyndiPlasma - damage: - types: - Heat: 20 - soundHit: - collection: WeakHit - -- type: entity name: energy bolt - id: BulletEnergyGunLaser - parent: BaseBullet - categories: [ HideSpawnMenu ] + description: This'll hurt. components: - type: Reflective reflective: - - Energy - - type: FlyBySound - sound: - collection: EnergyMiss - params: - volume: 5 - - type: Sprite - sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi - layers: - - state: omnilaser_greyscale - shader: unshaded - color: red + - NonEnergy - type: Ammo - - type: Physics - - type: Fixtures - fixtures: - projectile: - shape: - !type:PhysShapeAabb - bounds: "-0.2,-0.2,0.2,0.2" - hard: false - mask: - - Opaque - fly-by: *flybyfixture - - type: Projectile - impactEffect: BulletImpactEffectRedDisabler - damage: - types: - Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun - soundHit: - collection: WeakHit - -- type: entity - id: BulletRocketNT - name: rocket - parent: BaseBulletTrigger - categories: [ HideSpawnMenu ] - components: + muzzleFlash: null - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi layers: - - state: frag - - type: ExplodeOnTrigger - - type: Explosive - explosionType: Default - totalIntensity: 150 - intensitySlope: 5 - maxIntensity: 10 - tileBreakScale: 0 - - type: PointLight - radius: 3.5 - color: orange - energy: 0.5 - -- type: entity - id: BaseBulletGrenade - parent: BaseItem - categories: [ HideSpawnMenu ] - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - layers: - - state: grenade + - state: crossbowbolt + shader: unshaded - type: Projectile damage: types: - Blunt: 5 - deleteOnCollide: false - - type: StartTimerOnShoot - - type: TimerTrigger - delay: 2 - - type: DeleteOnTrigger - keysIn: - - timer - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.25,-0.25,0.25,0.25" - density: 50 - mask: - - ItemMask - restitution: 0.05 - friction: 0.5 + Piercing: 2 + - type: StunOnCollide #somewhat mirror to taser stats, meant to be tot 'sidegrade' + stunAmount: 0 + knockdownAmount: 2.5 + slowdownAmount: 2.5 + walkSpeedModifier: 0.2 + sprintSpeedModifier: 0.2 + drop: false + - type: StaminaDamageOnCollide #additional stam damage to make repeated pushups less of a viable counter + damage: 45 + - type: SolutionContainerManager + solutions: + bolt: + maxVol: 1.5 + reagents: + - ReagentId: Toxin + Quantity: 1.5 + - type: SolutionInjectOnProjectileHit + transferAmount: 1.5 + solution: bolt diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index ca7cc078fe..f25490b028 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -335,4 +335,4 @@ types: Structural: 25 bluntStaminaDamageFactor: 1.5 -# Sunrise-end \ No newline at end of file +# Sunrise-end diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml index f5119f9fa8..337f60d34c 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml @@ -860,7 +860,7 @@ whitelist: tags: - PowerCage - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: TeslaGunBullet fireCost: 400 - type: BatteryWeaponFireModes @@ -930,7 +930,7 @@ whitelist: tags: - PowerCage - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: TeslaGunBulletLarge fireCost: 900 - type: BatteryWeaponFireModes diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/tear_gas_walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/tear_gas_walldispenser.yml deleted file mode 100644 index 5094c91a0c..0000000000 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/tear_gas_walldispenser.yml +++ /dev/null @@ -1,66 +0,0 @@ -- type: entity - id: TearGasDispenser - name: tear gas dispenser - description: Wallmount reagent dispenser. - placement: - mode: SnapgridCenter - snap: - - Wallmount - components: - - type: WallMount - arc: 175 - - type: Sprite - sprite: Structures/Storage/tanks.rsi - state: cleanerdispenser - - type: Appearance - - type: InteractionOutline - - type: Clickable - - type: Transform - anchored: true - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 5 - behaviors: - - !type:SolutionExplosionBehavior - solution: tank - - trigger: - !type:DamageTypeTrigger - damageType: Piercing - damage: 5 - behaviors: - - !type:SolutionExplosionBehavior - solution: tank - - trigger: - !type:DamageTrigger - damage: 10 - behaviors: - - !type:SpillBehavior - solution: tank - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:DoActsBehavior - acts: ["Destruction"] - - type: SolutionContainerManager - solutions: - tank: - reagents: - - ReagentId: TearGas - Quantity: 5000 - - type: DrainableSolution - solution: tank - - type: ReagentTank - - type: ExaminableSolution - solution: tank diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index ce70af8b8d..ed647d3932 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1949,13 +1949,6 @@ - ScientistPDA - SeniorResearcherPDA -- type: loadoutGroup - id: SecurityPDA - name: loadout-group-security-id - loadouts: - - SecurityPDA - - SeniorOfficerPDA - - type: loadoutGroup id: MedicalDoctorPDA name: loadout-group-medical-doctor-id diff --git a/Resources/Prototypes/Magic/event_spells.yml b/Resources/Prototypes/Magic/event_spells.yml index 9bf33a758d..44cdc75e99 100644 --- a/Resources/Prototypes/Magic/event_spells.yml +++ b/Resources/Prototypes/Magic/event_spells.yml @@ -54,8 +54,8 @@ orGroup: Guns - id: WeaponRifleM90GrenadeLauncher orGroup: Guns -# - id: WeaponRifleLecter -# orGroup: Guns + - id: WeaponRifleLecter + orGroup: Guns - id: WeaponShotgunBulldog orGroup: Guns - id: WeaponShotgunDoubleBarreled diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml index 1cd3373880..006866db73 100644 --- a/Resources/Prototypes/Maps/Pools/default.yml +++ b/Resources/Prototypes/Maps/Pools/default.yml @@ -1,14 +1,14 @@ -- type: gameMapPool - id: DefaultMapPool - maps: - - Bagel - - Box - - Elkridge - - Fland - - Marathon - - Oasis - - Packed - - Plasma - - Reach - - Exo - - Snowball +#- type: gameMapPool # Sunrise-edit +# id: DefaultMapPool +# maps: +# - Bagel +# - Box +# - Elkridge +# - Fland +# - Marathon +# - Oasis +# - Packed +# - Plasma +# - Reach +# - Exo +# - Snowball diff --git a/Resources/Prototypes/Maps/debug.yml b/Resources/Prototypes/Maps/debug.yml index 63929d99e5..8d4cc550a2 100644 --- a/Resources/Prototypes/Maps/debug.yml +++ b/Resources/Prototypes/Maps/debug.yml @@ -16,7 +16,7 @@ - type: gameMap id: Dev mapName: Dev - mapPath: /Maps/_Sunrise/Test/dev_map.yml #/Maps/Test/dev_map.yml # Sunrise-edit + mapPath: /Maps/Test/dev_map.yml minPlayers: 0 stations: Dev: diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml index 4956c4bda1..bcb1e4211d 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml @@ -47,14 +47,14 @@ - !type:ModifyBleed amount: -0.25 - !type:SatiateHunger #Numbers are balanced with this in mind + it helps limit how much healing you can get from fo -#sunrise-start - Medicine: - effects: - - !type:HealthChange - damage: - types: - Mangleness: -0.5 -#sunrise-end + #sunrise-start + Medicine: + effects: + - !type:HealthChange + damage: + types: + Mangleness: -0.5 + #sunrise-end # Lets plants benefit too plantMetabolism: - !type:PlantAdjustNutrition @@ -82,15 +82,15 @@ - !type:ModifyBloodLevel amount: 1 # weaker than iron but pretty good all things considered - !type:SatiateHunger - pricePerUnit: 3 -#sunrise-start + #sunrise-start Medicine: effects: - !type:HealthChange damage: types: Mangleness: -0.2 -#sunrise-end + #sunrise-end + pricePerUnit: 3 - type: reagent id: Sugar #Candy and grains @@ -110,14 +110,14 @@ reagent: Nutriment min: 0.1 factor: 1 -#sunrise-start + #sunrise-start Medicine: effects: - !type:HealthChange damage: types: Mangleness: -0.3 -#sunrise-end + #sunrise-end plantMetabolism: - !type:PlantAdjustNutrition amount: 0.1 diff --git a/Resources/Prototypes/Roles/Antags/xenoborgs.yml b/Resources/Prototypes/Roles/Antags/xenoborgs.yml index 4e1989be8d..477fad2786 100644 --- a/Resources/Prototypes/Roles/Antags/xenoborgs.yml +++ b/Resources/Prototypes/Roles/Antags/xenoborgs.yml @@ -3,6 +3,7 @@ name: roles-antag-mothership-core-name antagonist: true setPreference: true + playTimeTracker: MothershipCore # Sunrise objective: roles-antag-mothership-core-objective requirements: - !type:RoleTimeRequirement @@ -15,6 +16,7 @@ name: roles-antag-xenoborg-name antagonist: true setPreference: true + playTimeTracker: Xenoborg # Sunrise objective: roles-antag-xenoborg-objective requirements: - !type:RoleTimeRequirement diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index f050ac3c94..94bb633ca9 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -15,7 +15,8 @@ access: - Security - Brig - - Maintenance +# - Maintenance #Sunrise-Edit + - Service - Detective - Cryogenics - External diff --git a/Resources/Prototypes/SoundCollections/broken_device.yml b/Resources/Prototypes/SoundCollections/broken_device.yml index 813a318063..d0edb38f3b 100644 --- a/Resources/Prototypes/SoundCollections/broken_device.yml +++ b/Resources/Prototypes/SoundCollections/broken_device.yml @@ -1,15 +1,14 @@ - type: soundCollection id: BrokenDevice files: - - /Audio/Effects/electrical_short_circuit.ogg + - /Audio/_Sunrise/Effects/electrical_short_circuit.ogg - type: soundCollection id: ShortCircuit files: - - /Audio/Effects/electrical_short_circuit2.ogg + - /Audio/_Sunrise/Effects/electrical_short_circuit2.ogg - type: soundCollection id: Alarm files: - - /Audio/Effects/beeps.ogg - + - /Audio/_Sunrise/Effects/beeps.ogg diff --git a/Resources/Prototypes/SoundCollections/traits.yml b/Resources/Prototypes/SoundCollections/traits.yml index e0d7206c63..38c80e1062 100644 --- a/Resources/Prototypes/SoundCollections/traits.yml +++ b/Resources/Prototypes/SoundCollections/traits.yml @@ -3,7 +3,7 @@ files: #- /Audio/Effects/adminhelp.ogg #- /Audio/Machines/Nuke/nuke_alarm.ogg - #- /Audio/Misc/emergency_meeting.ogg + #- /Audio/_Sunrise/Misc/emergency_meeting.ogg - /Audio/Effects/countdown.ogg - /Audio/Effects/explosion1.ogg - /Audio/Effects/explosion2.ogg diff --git a/Resources/Prototypes/SoundCollections/troll.yml b/Resources/Prototypes/SoundCollections/troll.yml index 9983f11078..87b000a58e 100644 --- a/Resources/Prototypes/SoundCollections/troll.yml +++ b/Resources/Prototypes/SoundCollections/troll.yml @@ -40,4 +40,4 @@ - type: soundCollection id: TrollMeeting files: - - /Audio/Misc/emergency_meeting.ogg + - /Audio/_Sunrise/Misc/emergency_meeting.ogg diff --git a/Resources/Prototypes/Store/currency.yml b/Resources/Prototypes/Store/currency.yml index 1efe874cd6..0730bea697 100644 --- a/Resources/Prototypes/Store/currency.yml +++ b/Resources/Prototypes/Store/currency.yml @@ -5,34 +5,6 @@ 1: Telecrystal1 canWithdraw: true -- type: currency - id: Bluecrystal - displayName: store-currency-display-bluecrystal - cash: - 1: Bluecrystal1 - canWithdraw: true - -- type: currency - id: Crystallite - displayName: store-currency-display-crystallite - cash: - 1: Crystallite1 - canWithdraw: true - -- type: currency - id: Doubloon - displayName: store-currency-display-doubloon - cash: - 1: Doubloon1 - canWithdraw: true - -- type: currency - id: Credit - displayName: store-currency-display-credit - cash: - 1: SpaceCash - canWithdraw: true - - type: currency id: StolenEssence displayName: store-currency-display-stolen-essence diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Shields/cyberlimb.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Shields/cyberlimb.yml index 5384fff91a..68f16c37d6 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Shields/cyberlimb.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Shields/cyberlimb.yml @@ -84,8 +84,6 @@ damageContainer: Shield - type: BatterySelfRecharger autoRechargeRate: 75 - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 5 - type: EnergyShield - type: ExaminableBattery @@ -93,7 +91,7 @@ maxCharge: 1500 startingCharge: 1500 - type: PowerCellDraw - useRate: 2.5 + useCharge: 2.5 # - type: Destructible # thresholds: # - trigger: diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml index 8cc8b90791..54d4bc8a26 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Mechs/Weapons/Gun/Ammunition.yml @@ -13,7 +13,7 @@ id: ShellShotgunMech parent: [ShellShotgun, MechCartridge] components: - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo deleteOnSpawn: true @@ -21,5 +21,5 @@ id: CartridgeHeavyRifleRFMJMech parent: [CartridgeHeavyRifleRFMJ, MechCartridge] components: - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo deleteOnSpawn: true diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/bandaid.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/bandaid.yml index 146a69c1c1..e6d9db8f7a 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/bandaid.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/bandaid.yml @@ -100,21 +100,6 @@ - ReagentId: TranexamicAcid #Sunrise-Edit Quantity: 3 #Sunrise-Edit -- type: entity - id: PatchViagra - name: Viarga patch - parent: BasePatch - components: - - type: Sprite - state: bandaid-clown - - type: SolutionContainerManager - solutions: - patch: - maxVol: 20 - reagents: - - ReagentId: Aphrodisiac - Quantity: 10 - - type: entity id: PatchMedical diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/medical.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/medical.yml index f3338145ca..a246a96489 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/medical.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/medical.yml @@ -490,7 +490,6 @@ - Ointment - PillCanister components: - - Hypospray - Injector - Pill grid: diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/battery.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/battery.yml index 0f375ad85a..1289dc5126 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/battery.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/battery.yml @@ -8,8 +8,8 @@ tags: - Cartridge - CartridgeBattery - - type: HitScanCartridgeAmmo - hitscan: RedLaserBeam + - type: CartridgeAmmo + proto: RedLaserBeam - type: Sprite sprite: _Starlight/Objects/Weapons/Guns/Ammunition/Casings/laser_casing.rsi scale: 0.80, 0.80 @@ -27,5 +27,5 @@ name: cartridge (laser) parent: BaseCartridgeBattery components: - - type: HitScanCartridgeAmmo - hitscan: RedLaserBeam + - type: CartridgeAmmo + proto: RedLaserBeam diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index 3608bd7b4f..8bc76326b5 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -4,8 +4,8 @@ description: A handmade rifle bullet, uses phosphorus as a propellent instead of gunpowder which makes it much less effective. parent: [BaseCartridgeLightRifleSP, BaseMinorContraband] components: - - type: HitScanCartridgeAmmo - hitscan: BulletLightRifleTraceImprovised + - type: CartridgeAmmo + proto: BulletLightRifleTraceImprovised - type: Sprite sprite: _Starlight/Objects/Weapons/Guns/Ammunition/Casings/improvised_lightrifle.rsi layers: diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 70f4e8aa3c..897401d1be 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -4,8 +4,8 @@ description: A handmade revolver bullet, stuffed to the brim with phosphorus for extra 'oomph'. Still not as good as a normal magnum bullet. parent: [BaseCartridgePistol, BaseMinorContraband] components: - - type: HitScanCartridgeAmmo - hitscan: BulletMagnumTraceImprovised + - type: CartridgeAmmo + proto: BulletMagnumTraceImprovised - type: Sprite sprite: _Starlight/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi layers: diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index b611cb422f..1e4fc390bc 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -3,8 +3,8 @@ name: cartridge (.40 SP) parent: BaseCartridgePistol components: - - type: HitScanCartridgeAmmo - hitscan: BulletPistolTrace40SP + - type: CartridgeAmmo + proto: BulletPistolTrace40SP - type: Sprite layers: - state: base @@ -22,8 +22,8 @@ name: cartridge (.40 HP) parent: CartridgePistol40SP components: - - type: HitScanCartridgeAmmo - hitscan: BulletPistolTrace40HP + - type: CartridgeAmmo + proto: BulletPistolTrace40HP - type: Sprite layers: - state: base @@ -37,8 +37,8 @@ name: cartridge (.40 FMJ) parent: CartridgePistol40SP components: - - type: HitScanCartridgeAmmo - hitscan: BulletPistolTrace40FMJ + - type: CartridgeAmmo + proto: BulletPistolTrace40FMJ - type: Sprite layers: - state: base @@ -52,8 +52,8 @@ name: cartridge (.40 AP) parent: CartridgePistol40SP components: - - type: HitScanCartridgeAmmo - hitscan: BulletPistolTrace40AP + - type: CartridgeAmmo + proto: BulletPistolTrace40AP - type: Sprite layers: - state: base @@ -68,8 +68,8 @@ description: A handmade pistol bullet, uses phosphorus as a propellent instead of gunpowder which makes it much less effective. parent: [BaseCartridgePistol, BaseMinorContraband] components: - - type: HitScanCartridgeAmmo - hitscan: BulletPistolTraceImprovised + - type: CartridgeAmmo + proto: BulletPistolTraceImprovised - type: Sprite sprite: _Starlight/Objects/Weapons/Guns/Ammunition/Casings/improvised_casing.rsi layers: diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Basic/crossbow.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Basic/crossbow.yml index 78d0b625fe..d79bb0dd76 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Basic/crossbow.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Basic/crossbow.yml @@ -1,73 +1,9 @@ - type: entity name: energy crossbow - id: WeaponEnergyCrossbowBase - parent: [ BaseItem, BaseSecurityContraband ] - abstract: true - description: Fires low-damage kinetic bolts at a short range. - components: - - type: Sprite - sprite: _Starlight/Objects/Weapons/Guns/Basic/large_crossbow.rsi - layers: - - state: icon - map: [ "icon" ] - - state: animation-icon - visible: false - map: [ "empty-icon" ] - - type: Item - sprite: _Starlight/Objects/Weapons/Guns/Basic/large_crossbow.rsi - size: Huge - - type: Gun - fireRate: 0.5 - selectedMode: SemiAuto - angleDecay: 45 - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg - - type: AmmoCounter - - type: Appearance - - type: GenericVisualizer - visuals: - enum.AmmoVisuals.HasAmmo: - empty-icon: - True: { visible: False } - False: { visible: True } - icon: - True: { visible: True } - False: { visible: False } - - type: RechargeBasicEntityAmmo - rechargeCooldown: 2 - rechargeSound: - path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg - - type: BasicEntityAmmoProvider - proto: BulletEnergyCrossbow - capacity: 1 - count: 1 - - type: UseDelay - delay: 1 - -- type: entity - name: mini energy crossbow - id: WeaponMiniEnergyCrossbow + id: WeaponEnergyCrossbowLarge parent: [ WeaponEnergyCrossbowBase, BaseSyndicateContraband ] description: Fires low-damage kinetic bolts at a short range. components: - - type: Sprite - sprite: _Starlight/Objects/Weapons/Guns/Basic/mini_crossbow.rsi - - type: Item - sprite: _Starlight/Objects/Weapons/Guns/Basic/mini_crossbow.rsi - size: Normal - - type: BasicEntityAmmoProvider - proto: BulletMiniEnergyCrossbow - capacity: 1 - count: 1 - -- type: entity - name: energy crossbow - id: WeaponEnergyCrossbow - parent: [ WeaponEnergyCrossbowBase, BaseSecurityContraband ] - description: Fires low-damage kinetic bolts at a short range. - components: - type: Clothing sprite: _Starlight/Objects/Weapons/Guns/Basic/large_crossbow.rsi quickEquip: false @@ -84,3 +20,5 @@ maxOffset: 2 pvsIncrease: 0.2 - type: Gun + - type: StaticPrice + price: 2000 diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 4da2a288c0..845c58ea5e 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -75,9 +75,7 @@ - type: Item storedOffset: 1,-5 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 15 - autoRechargePause: true autoRechargePauseTime: 10 - type: BatteryAmmoProvider proto: DisablerBolt @@ -191,9 +189,7 @@ maxCharge: 1500 startingCharge: 1500 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 12 - autoRechargePause: true autoRechargePauseTime: 30 - type: Tag tags: @@ -228,9 +224,7 @@ - type: Gun fireRate: 0.5 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 2 - autoRechargePause: true autoRechargePauseTime: 60 - type: BatteryAmmoProvider proto: EmpPulse @@ -267,9 +261,7 @@ - type: Gun fireRate: 0.6 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 2 - autoRechargePause: true autoRechargePauseTime: 60 - type: BatteryAmmoProvider proto: EmpPulse @@ -349,7 +341,6 @@ shape: - 0, 0, 1, 1 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 200 - type: MagazineVisuals magState: stun @@ -432,7 +423,7 @@ slots: - Back - type: Gun - fireRate: 0.1 + fireRate: 0.2 - type: BatteryAmmoProvider proto: SniperBolt fireCost: 100 @@ -444,8 +435,8 @@ - type: GunRequiresWield - type: CursorOffsetRequiresWield - type: EyeCursorOffset - maxOffset: 5 - pvsIncrease: 0.5 + maxOffset: 8 + pvsIncrease: 0.8 - type: entity name: ANNIHILATOR @@ -479,7 +470,6 @@ maxCharge: 2000 startingCharge: 2000 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 500 - type: entity @@ -498,13 +488,11 @@ - state: mag-unshaded-4 map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: ProjectilePolyboltJohnToe fireCost: 200 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 40 #every 5 seconds another becomes toe. - autoRechargePause: false - type: MagazineVisuals magState: mag steps: 5 diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/effects.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/effects.yml new file mode 100644 index 0000000000..b48b47f23f --- /dev/null +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/effects.yml @@ -0,0 +1,24 @@ +- type: entity + id: ImpactEffect + categories: [ HideSpawnMenu ] + components: + - type: TimedDespawn + lifetime: 0.6 + - type: Sprite + drawdepth: Effects + layers: + - map: ["unshaded"] + #shader: unshaded + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu + - type: AnimationPlayer + +- type: displacementEffect + id: displacementEffect + displacement: + sizeMaps: + 32: + sprite: _Starlight/Effects/impact.rsi + state: impact diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 5b32d90989..9c4e76148c 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -1,1149 +1,1449 @@ - type: entity - id: ImpactEffect + id: BulletTrace + parent: BasicHitscan + abstract: true categories: [ HideSpawnMenu ] components: - - type: TimedDespawn - lifetime: 0.6 - - type: Sprite - drawdepth: Effects - layers: - - map: ["unshaded"] - #shader: unshaded - - type: EffectVisuals - - type: Tag - tags: - - HideContextMenu - - type: AnimationPlayer - -- type: displacementEffect - id: displacementEffect - displacement: - sizeMaps: - 32: - sprite: _Starlight/Effects/impact.rsi - state: impact - -- type: hitscan - id: BulletTrace - abstract: true - muzzleFlash: - sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle - travelFlash: - sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: trace - impactFlash: - sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: bullet - collisionMask: 64 #BulletImpassable - reflective: NonEnergy + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: bullet + - type: HitscanBasicRaycast + collisionMask: BulletImpassable + - type: HitscanReflect + reflectiveType: NonEnergy #### -- type: hitscan +- type: entity id: PracticeBulletTrace parent: BulletTrace - damage: - types: - Blunt: 2 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 2 -- type: hitscan +- type: entity id: AntiMaterielBulletTrace parent: BulletTrace - damage: - types: - Piercing: 75 - Structural: 50 - staminaDamage: 50 - armorPenetration: 0.5 - pierceChance: 0.99 - pierceLevel: Rock - ricochetChance: 0.2 - steps: 30 - derivation: 0.005 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.35 + damage: + types: + Piercing: 75 + Structural: 226 + - type: HitscanStaminaDamage + staminaDamage: 35 + - type: HitscanPierce + chance: 0.95 + pierceLevel: Rock + deviation: 0.005 + - type: HitscanRicochet + chance: 0.95 + - type: HitscanReflect + reflectiveType: NonEnergy + maxReflections: 20 # This is the recursion depth for reflect, ricochet, and pierce -- type: hitscan +- type: entity id: DebugBulletTrace parent: BulletTrace - damage: - types: - Blunt: 20000 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 20000 -- type: hitscan +- type: entity id: RubberBulletTrace parent: BulletTrace - damage: - types: - Blunt: 1 - staminaDamage: 12 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: rubber + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 1 + - type: HitscanStaminaDamage + staminaDamage: 12 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: rubber ### magnum -- type: hitscan +- type: entity id: BulletMagnumTraceSP parent: BulletTrace - damage: - types: - Piercing: 35 - armorPenetration: -0.13 - pierceChance: 0.40 - derivation: 0.05 - ricochetChance: 0.30 - staminaDamage: 4 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: sp + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -0.13 + damage: + types: + Piercing: 35 + - type: HitscanStaminaDamage + staminaDamage: 4 + - type: HitscanPierce + chance: 0.40 + deviation: 0.05 + - type: HitscanRicochet + chance: 0.30 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: sp -- type: hitscan +- type: entity id: BulletMagnumTraceImprovised parent: BulletTrace - damage: - types: - Piercing: 15 - Blunt: 15 - armorPenetration: -0.35 - pierceChance: 0.25 - derivation: 0.05 - ricochetChance: 0.30 - staminaDamage: 5 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: sp + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -0.35 + damage: + types: + Piercing: 15 + Blunt: 15 + - type: HitscanPierce + chance: 0.25 + deviation: 0.05 + - type: HitscanRicochet + chance: 0.30 + - type: HitscanStaminaDamage + staminaDamage: 5 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: sp -- type: hitscan +- type: entity id: BulletMagnumTraceHP parent: BulletTrace - damage: - types: - Blunt: 35 - Piercing: 10 # +30% - staminaDamage: 10 - armorPenetration: -0.7 - pierceChance: 0.03 - derivation: 0.05 - ricochetChance: 0.15 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -1.00 + damage: + types: + Piercing: 45 # +30% + - type: HitscanStaminaDamage + staminaDamage: 10 + - type: HitscanPierce + chance: 0.03 + deviation: 0.05 + - type: HitscanRicochet + chance: 0.15 -- type: hitscan +- type: entity id: BulletMagnumTraceFMJ parent: BulletTrace - damage: - types: - Piercing: 25 #- 30% - armorPenetration: 0.25 - pierceChance: 0.69 - derivation: 0.05 - ricochetChance: 0.80 - pierceLevel: Metal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: fmj + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.25 + damage: + types: + Piercing: 25 #- 30% + - type: HitscanPierce + chance: 0.69 + deviation: 0.05 + pierceLevel: Metal + - type: HitscanRicochet + chance: 0.80 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: fmj -- type: hitscan +- type: entity id: BulletMagnumTracePractice parent: BulletTrace - damage: - types: - Blunt: 2 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: practice - pierceChance: 0.69 - derivation: 0.05 - ricochetChance: 0.48 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 2 + - type: HitscanPierce + chance: 0.69 + deviation: 0.05 + - type: HitscanRicochet + chance: 0.48 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: practice -- type: hitscan +- type: entity id: BulletMagnumTraceIncendiary parent: BulletTrace - igniteOnCollision: true - damage: - types: - Blunt: 3 - Heat: 32 - pierceChance: 0.03 - derivation: 0.05 - ricochetChance: 0.48 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: incendiary + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 3 + Heat: 32 + - type: HitscanPierce + chance: 0.69 + deviation: 0.05 + - type: HitscanRicochet + chance: 0.48 + - type: HitscanIgniteEffect + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: incendiary -- type: hitscan +- type: entity id: BulletMagnumTraceUranium parent: BulletTrace - damage: - types: - Radiation: 15 - Piercing: 20 - pierceChance: 0.69 - derivation: 0.05 - ricochetChance: 0.80 - pierceLevel: HardenedMetal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: uranium + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Radiation: 15 + Piercing: 20 + - type: HitscanPierce + chance: 0.69 + deviation: 0.05 + pierceLevel: HardenedMetal + - type: HitscanRicochet + chance: 0.80 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: uranium -- type: hitscan +- type: entity id: BulletMagnumTraceAP parent: BulletTrace - damage: - types: - Piercing: 25 #- 30% - armorPenetration: 0.69 - pierceChance: 0.81 - derivation: 0.05 - ricochetChance: 0.48 - pierceLevel: HardenedMetal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: piercing + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.69 + damage: + types: + Piercing: 25 #- 30% + - type: HitscanPierce + chance: 0.81 + deviation: 0.05 + pierceLevel: HardenedMetal + - type: HitscanRicochet + chance: 0.48 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: ap ### pistol -- type: hitscan +- type: entity id: BulletPistolTraceSP - name: ".35 SP" parent: BulletTrace - damage: - types: - Piercing: 16 - armorPenetration: -0.13 - pierceChance: 0.40 - derivation: 0.2 - ricochetChance: 0.30 - staminaDamage: 2 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: sp + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -0.13 + damage: + types: + Piercing: 16 + - type: HitscanStaminaDamage + staminaDamage: 2 + - type: HitscanPierce + chance: 0.40 + deviation: 0.2 + - type: HitscanRicochet + chance: 0.30 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: sp -- type: hitscan +- type: entity id: BulletPistolTraceImprovised parent: BulletTrace - damage: - types: - Piercing: 7 - Blunt: 7 - armorPenetration: -0.30 - pierceChance: 0.25 - derivation: 0.2 - ricochetChance: 0.10 - staminaDamage: 3 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: sp + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -0.30 + damage: + types: + Piercing: 7 + Blunt: 7 + - type: HitscanStaminaDamage + staminaDamage: 3 + - type: HitscanPierce + chance: 0.25 + deviation: 0.2 + - type: HitscanRicochet + chance: 0.10 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: sp -- type: hitscan +- type: entity id: BulletPistolTraceHP - name: ".35 HP" parent: BulletTrace - damage: - types: - Blunt: 16 - Piercing: 5 # +30% - armorPenetration: -0.7 - staminaDamage: 5 - pierceChance: 0.03 - derivation: 0.2 - ricochetChance: 0.15 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -1.00 + damage: + types: + Piercing: 21 # +30% + - type: HitscanStaminaDamage + staminaDamage: 5 + - type: HitscanPierce + chance: 0.03 + deviation: 0.2 + - type: HitscanRicochet + chance: 0.15 -- type: hitscan +- type: entity id: BulletPistolTraceFMJ - name: ".35 FMJ" parent: BulletTrace - damage: - types: - Piercing: 11 #- 30% - armorPenetration: 0.25 - pierceChance: 0.69 - derivation: 0.2 - ricochetChance: 0.80 - pierceLevel: Wood - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: fmj + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.25 + damage: + types: + Piercing: 11 #- 30% + - type: HitscanPierce + chance: 0.69 + deviation: 0.2 + pierceLevel: Wood + - type: HitscanRicochet + chance: 0.80 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: fmj -- type: hitscan +- type: entity id: BulletPistolTracePractice parent: BulletTrace - damage: - types: - Blunt: 2 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: practice - pierceChance: 0.69 - derivation: 0.2 - ricochetChance: 0.48 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 2 + - type: HitscanPierce + chance: 0.69 + deviation: 0.2 + - type: HitscanRicochet + chance: 0.48 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: practice -- type: hitscan +- type: entity id: BulletPistolTraceIncendiary parent: BulletTrace - igniteOnCollision: true - damage: - types: - Blunt: 2 - Heat: 14 - pierceChance: 0.03 - derivation: 0.2 - ricochetChance: 0.48 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: incendiary + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 2 + Heat: 14 + - type: HitscanIgniteEffect + - type: HitscanPierce + chance: 0.69 + deviation: 0.2 + - type: HitscanRicochet + chance: 0.48 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: incendiary -- type: hitscan +- type: entity id: BulletPistolTraceUranium parent: BulletTrace - damage: - types: - Radiation: 6 - Piercing: 10 - pierceChance: 0.69 - derivation: 0.2 - ricochetChance: 0.80 - pierceLevel: HardenedMetal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: uranium + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Radiation: 6 + Piercing: 10 + - type: HitscanPierce + chance: 0.69 + deviation: 0.2 + pierceLevel: HardenedMetal + - type: HitscanRicochet + chance: 0.80 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: uranium -- type: hitscan +- type: entity id: BulletPistolTraceAP parent: BulletTrace - damage: - types: - Piercing: 11 #- 30% - armorPenetration: 0.45 - pierceChance: 0.81 - derivation: 0.2 - ricochetChance: 0.48 - pierceLevel: Metal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: piercing + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.69 + damage: + types: + Piercing: 11 #- 30% + - type: HitscanPierce + chance: 0.81 + deviation: 0.2 + pierceLevel: Metal + - type: HitscanRicochet + chance: 0.48 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: ap -- type: hitscan +- type: entity id: BulletPistolTrace40SP parent: BulletTrace - staminaDamage: 15 - damage: - types: - Piercing: 20 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: sp - armorPenetration: -0.5 - pierceChance: 0.30 - derivation: 0.15 - ricochetChance: 0.20 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -0.5 + damage: + types: + Piercing: 20 + - type: HitscanStaminaDamage + staminaDamage: 15 + - type: HitscanPierce + chance: 0.30 + deviation: 0.15 + - type: HitscanRicochet + chance: 0.20 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: sp -- type: hitscan +- type: entity id: BulletPistolTrace40HP parent: BulletTrace - staminaDamage: 20 - damage: - types: - Blunt: 20 - Piercing: 6 # +30% - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: bullet - armorPenetration: -0.7 - pierceChance: 0.02 - derivation: 0.15 - ricochetChance: 0.10 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -1.00 + damage: + types: + Piercing: 26 # +30% + - type: HitscanStaminaDamage + staminaDamage: 20 + - type: HitscanPierce + chance: 0.02 + deviation: 0.15 + - type: HitscanRicochet + chance: 0.10 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: bullet -- type: hitscan +- type: entity id: BulletPistolTrace40FMJ parent: BulletTrace - staminaDamage: 13 - damage: - types: - Piercing: 16 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: fmj - armorPenetration: 0.15 - pierceChance: 0.55 - derivation: 0.15 - ricochetChance: 0.70 - pierceLevel: Wood + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.15 + damage: + types: + Piercing: 16 + - type: HitscanStaminaDamage + staminaDamage: 13 + - type: HitscanPierce + chance: 0.55 + deviation: 0.15 + pierceLevel: Wood + - type: HitscanRicochet + chance: 0.70 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: fmj -- type: hitscan +- type: entity id: BulletPistolTrace40AP parent: BulletTrace - staminaDamage: 10 - damage: - types: - Piercing: 14 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: piercing - armorPenetration: 0.50 - pierceChance: 0.63 - derivation: 0.15 - ricochetChance: 0.35 - pierceLevel: Metal + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.50 + damage: + types: + Piercing: 14 + - type: HitscanStaminaDamage + staminaDamage: 10 + - type: HitscanPierce + chance: 0.63 + deviation: 0.15 + pierceLevel: Metal + - type: HitscanRicochet + chance: 0.35 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: ap ### caseless rifle <<<<<<<<<<<<<<< -- type: hitscan +- type: entity id: BulletCaselessRifleTrace parent: BulletTrace - damage: - types: - Piercing: 19 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Piercing: 19 -- type: hitscan +- type: entity id: BulletCaselessRiflePracticeTrace parent: BulletTrace - damage: - types: - Blunt: 2 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 2 ### heavy rifle <<<<<<<<<<<<<<<<<< -- type: hitscan +- type: entity id: BulletHeavyRifleTrace parent: BulletTrace - damage: - types: - Piercing: 19 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Piercing: 19 -- type: hitscan +- type: entity id: BulletMinigunTrace parent: BulletTrace - damage: - types: - Piercing: 5 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Piercing: 5 ### light rifle -- type: hitscan +- type: entity id: BulletLightRifleTraceSP parent: BulletTrace - damage: - types: - Piercing: 19 - armorPenetration: -0.13 - staminaDamage: 2 - pierceChance: 0.40 - derivation: 0.05 - ricochetChance: 0.30 - pierceLevel: Metal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: sp + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -0.13 + damage: + types: + Piercing: 19 + - type: HitscanStaminaDamage + staminaDamage: 2 + - type: HitscanPierce + chance: 0.40 + deviation: 0.05 + pierceLevel: Metal + - type: HitscanRicochet + chance: 0.30 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: sp -- type: hitscan +- type: entity id: BulletLightRifleTraceImprovised parent: BulletTrace - damage: - types: - Piercing: 8 - Blunt: 8 - armorPenetration: -0.15 - staminaDamage: 3 - pierceChance: 0.20 - derivation: 0.05 - ricochetChance: 0.30 - pierceLevel: Metal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: sp + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -0.35 + damage: + types: + Piercing: 7 + Blunt: 7 + - type: HitscanStaminaDamage + staminaDamage: 3 + - type: HitscanPierce + chance: 0.20 + deviation: 0.05 + pierceLevel: Metal + - type: HitscanRicochet + chance: 0.30 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: sp -- type: hitscan +- type: entity id: BulletLightRifleTraceHP parent: BulletTrace - damage: - types: - Blunt: 19 - Piercing: 6 # +30% - pierceLevel: Wood - armorPenetration: -0.7 - staminaDamage: 6 - pierceChance: 0.03 - derivation: 0.05 - ricochetChance: 0.15 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -1.00 + damage: + types: + Piercing: 25 # +30% + - type: HitscanStaminaDamage + staminaDamage: 6 + - type: HitscanPierce + chance: 0.03 + deviation: 0.05 + pierceLevel: Wood + - type: HitscanRicochet + chance: 0.15 -- type: hitscan +- type: entity id: BulletLightRifleTraceFMJ parent: BulletTrace - damage: - types: - Piercing: 13 #- 40% - armorPenetration: 0.25 - pierceChance: 0.69 - derivation: 0.05 - ricochetChance: 0.80 - pierceLevel: Metal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: fmj + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.25 + damage: + types: + Piercing: 13 #- 40% + - type: HitscanPierce + chance: 0.69 + deviation: 0.05 + pierceLevel: Metal + - type: HitscanRicochet + chance: 0.80 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: fmj -- type: hitscan +- type: entity id: BulletLightRifleTraceAP parent: BulletTrace - damage: - types: - Piercing: 13 #- 40% - armorPenetration: 0.50 - pierceChance: 0.81 - derivation: 0.05 - ricochetChance: 0.48 - pierceLevel: HardenedMetal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: piercing + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.69 + damage: + types: + Piercing: 13 #- 40% + - type: HitscanPierce + chance: 0.81 + deviation: 0.05 + pierceLevel: HardenedMetal + - type: HitscanRicochet + chance: 0.48 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: ap -- type: hitscan +- type: entity id: BulletLightRifleTracePractice parent: BulletTrace - damage: - types: - Blunt: 2 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: practice - pierceChance: 0.69 - derivation: 0.05 - ricochetChance: 0.48 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 2 + - type: HitscanPierce + chance: 0.69 + deviation: 0.05 + - type: HitscanRicochet + chance: 0.48 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: practice -- type: hitscan +- type: entity id: BulletLightRifleTraceIncendiary parent: BulletTrace - igniteOnCollision: true - damage: - types: - Blunt: 3 - Heat: 16 - pierceChance: 0.03 - derivation: 0.05 - ricochetChance: 0.48 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: incendiary + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 3 + Heat: 16 + - type: HitscanIgniteEffect + - type: HitscanPierce + chance: 0.69 + deviation: 0.05 + - type: HitscanRicochet + chance: 0.48 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: incendiary -- type: hitscan +- type: entity id: BulletLightRifleTraceUranium parent: BulletTrace - damage: - types: - Radiation: 9 - Piercing: 10 - pierceChance: 0.69 - derivation: 0.05 - ricochetChance: 0.80 - pierceLevel: HardenedMetal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: uranium + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Radiation: 9 + Piercing: 10 + - type: HitscanPierce + chance: 0.69 + deviation: 0.05 + pierceLevel: HardenedMetal + - type: HitscanRicochet + chance: 0.80 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: uranium ### rifle -- type: hitscan +- type: entity id: BulletRifleTraceSP - name: "5.56 SP" parent: BulletTrace - damage: - types: - Piercing: 17 - armorPenetration: -0.13 - pierceChance: 0.40 - ricochetChance: 0.30 - staminaDamage: 2 - pierceLevel: Wood - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: sp + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -0.13 + damage: + types: + Piercing: 17 + - type: HitscanStaminaDamage + staminaDamage: 2 + - type: HitscanPierce + chance: 0.40 + pierceLevel: Wood + - type: HitscanRicochet + chance: 0.30 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: sp -- type: hitscan +- type: entity id: BulletRifleTraceHP - name: "5.56 HP" parent: BulletTrace - damage: - types: - Blunt: 17 - Piercing: 6 # +30% - armorPenetration: -0.7 - staminaDamage: 5 - pierceChance: 0.03 - ricochetChance: 0.15 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -1.00 + damage: + types: + Piercing: 23 # +30% + - type: HitscanStaminaDamage + staminaDamage: 5 + - type: HitscanPierce + chance: 0.03 + - type: HitscanRicochet + chance: 0.15 -- type: hitscan +- type: entity id: BulletRifleTraceFMJ - name: "5.56 FMJ" parent: BulletTrace - damage: - types: - Piercing: 12 #- 30% - armorPenetration: 0.25 - pierceChance: 0.69 - ricochetChance: 0.80 - pierceLevel: Metal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: fmj + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.25 + damage: + types: + Piercing: 12 #- 30% + - type: HitscanPierce + chance: 0.69 + pierceLevel: Metal + - type: HitscanRicochet + chance: 0.80 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: fmj -- type: hitscan +- type: entity id: BulletRifleTraceAP parent: BulletTrace - damage: - types: - Piercing: 12 #- 30% - armorPenetration: 0.50 - pierceChance: 0.81 - ricochetChance: 0.48 - pierceLevel: HardenedMetal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: piercing + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.69 + damage: + types: + Piercing: 12 #- 30% + - type: HitscanPierce + chance: 0.81 + pierceLevel: HardenedMetal + - type: HitscanRicochet + chance: 0.48 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: ap -- type: hitscan +- type: entity id: BulletRifleTracePractice parent: BulletTrace - damage: - types: - Blunt: 2 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: practice - pierceChance: 0.69 - ricochetChance: 0.48 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 2 + - type: HitscanPierce + chance: 0.69 + - type: HitscanRicochet + chance: 0.48 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: practice -- type: hitscan +- type: entity id: BulletRifleTraceIncendiary parent: BulletTrace - igniteOnCollision: true - damage: - types: - Blunt: 2 - Heat: 15 - pierceChance: 0.03 - ricochetChance: 0.48 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: incendiary + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 2 + Heat: 15 + - type: HitscanIgniteEffect + - type: HitscanPierce + chance: 0.69 + - type: HitscanRicochet + chance: 0.48 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: incendiary -- type: hitscan +- type: entity id: BulletRifleTraceUranium parent: BulletTrace - damage: - types: - Radiation: 7 - Piercing: 8 - pierceChance: 0.69 - ricochetChance: 0.80 - pierceLevel: HardenedMetal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: uranium + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Radiation: 7 + Piercing: 8 + - type: HitscanPierce + chance: 0.69 + pierceLevel: HardenedMetal + - type: HitscanRicochet + chance: 0.80 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: uranium ### shotgun -- type: hitscan +- type: entity id: PelletShotgunBeanbagTrace parent: BulletTrace - damage: - types: - Blunt: 10 - staminaDamage: 40 - pierceChance: 0 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: buckshot + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 10 + - type: HitscanStaminaDamage + staminaDamage: 40 + - type: HitscanPierce + chance: 0 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: buckshot -- type: hitscan +- type: entity id: PelletShotgunSlugTrace parent: BulletTrace - damage: - types: - Piercing: 28 - Structural: 25 - armorPenetration: 0.35 - staminaDamage: 15 - pierceChance: 0.08 - ricochetChance: 0.15 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: slug + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Piercing: 40 + Structural: 15 + - type: HitscanPierce + chance: 0.08 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: slug -- type: hitscan +- type: entity + id: PelletShotgunFlareTrace + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Piercing: 28 + - type: HitscanPierce + chance: 0.08 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: slug + +- type: entity + id: PelletShotgunTrace + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Piercing: 5 + Structural: 5 + - type: HitscanPierce + chance: 0.03 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: buckshot + +- type: entity id: PelletShotgunSpreadTrace - parent: BulletTrace - damage: - types: - Piercing: 5 - Structural: 5 - armorPenetration: -0.2 - staminaDamage: 2 - pierceChance: 0.03 - count: 12 - spread: 15 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: buckshot + parent: PelletShotgunTrace + categories: [ HideSpawnMenu ] + components: + - type: ProjectileSpread + proto: PelletShotgunTrace + count: 12 + spread: 15 -- type: hitscan - id: ShellShotgunIncendiaryTrace +- type: entity + id: PelletShotgunIncendiaryTrace parent: BulletTrace - damage: - types: - Blunt: 2 - Heat: 3 - pierceChance: 0.02 - igniteOnCollision: true - count: 12 - spread: 15 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: buckshot-flare + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 2 + Heat: 3 + - type: HitscanPierce + chance: 0.02 + - type: HitscanIgniteEffect + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: buckshot-flare -- type: hitscan +- type: entity + id: PelletShotgunIncendiarySpreadTrace + parent: PelletShotgunIncendiaryTrace + categories: [ HideSpawnMenu ] + components: + - type: ProjectileSpread + proto: PelletShotgunIncendiaryTrace + count: 12 + spread: 15 + +- type: entity + id: PelletShotgunPracticeTrace + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 1 + - type: HitscanPierce + chance: 0 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: buckshot + +- type: entity id: PelletShotgunPracticeSpreadTrace - parent: BulletTrace - damage: - types: - Blunt: 1 - pierceChance: 0 - count: 12 - spread: 15 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: buckshot + parent: PelletShotgunPracticeTrace + categories: [ HideSpawnMenu ] + components: + - type: ProjectileSpread + proto: PelletShotgunPracticeTrace + count: 12 + spread: 15 -- type: hitscan +- type: entity + id: PelletShotgunImprovisedTrace + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Piercing: 2 + Slash: 2 + - type: HitscanPierce + chance: 0 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: shard + +- type: entity id: PelletShotgunImprovisedSpreadTrace - parent: BulletTrace - damage: - types: - Piercing: 2 - Slash: 2 - Structural: 3 - pierceChance: 0.01 - ricochetChance: 0.05 - staminaDamage: 3 - count: 18 - spread: 45 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: shard + parent: PelletShotgunImprovisedTrace + categories: [ HideSpawnMenu ] + components: + - type: ProjectileSpread + proto: PelletShotgunImprovisedTrace + count: 14 + spread: 45 -- type: hitscan - id: PelletShotgunImprovisedSpreadTraceLarge +- type: entity + id: PelletShotgunUraniumTrace parent: BulletTrace - damage: - types: - Piercing: 2 - Slash: 2 - Structural: 3 - pierceChance: 0.01 - ricochetChance: 0.5 - staminaDamage: 3 - count: 36 - spread: 45 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: shard + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Radiation: 2 + Piercing: 3 + - type: HitscanPierce + chance: 0.05 + pierceLevel: HardenedMetal + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: depleted-uranium -- type: hitscan +- type: entity id: PelletShotgunUraniumSpreadTrace - parent: BulletTrace - damage: - types: - Radiation: 2 - Piercing: 3 - pierceChance: 0.05 - pierceLevel: HardenedMetal - count: 10 - spread: 6 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: depleted-uranium + parent: PelletShotgunUraniumTrace + categories: [ HideSpawnMenu ] + components: + - type: ProjectileSpread + proto: PelletShotgunUraniumTrace + count: 10 + spread: 6 -#### shotgun improvised Sunrise -- type: hitscan - id: PelletShotgunImprovisedIncendiarySpreadTrace +- type: entity + id: PelletShotgunBreachTrace parent: BulletTrace - damage: - types: - Piercing: 1 - Slash: 1 - Heat: 3 - staminaDamage: 3 - pierceChance: 0.02 - ricochetChance: 0.05 - igniteOnCollision: true - count: 16 - spread: 45 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - scale: 0.85,0.85 - state: buckshot-flare + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Piercing: 5 + Structural: 20 + - type: HitscanPierce + chance: 0.03 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: piercing -- type: hitscan - id: PelletShotgunImprovisedUraniumSpreadTrace - parent: BulletTrace - damage: - types: - Piercing: 1 - Slash: 1 - Radiation: 2 - staminaDamage: 3 - pierceChance: 0.05 - ricochetChance: 0.05 - pierceLevel: HardenedMetal - count: 14 - spread: 45 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: depleted-uranium - -- type: hitscan - id: PelletShotgunCoinSpreadTrace - parent: BulletTrace - damage: - types: - Piercing: 20 - staminaDamage: 8 - pierceChance: 0.15 - armorPenetration: 0.35 - ricochetChance: 0.25 - pierceLevel: Metal - count: 2 - spread: 8 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: coinstack +- type: entity + id: PelletShotgunBreachSpreadTrace + parent: PelletShotgunBreachTrace + categories: [ HideSpawnMenu ] + components: + - type: ProjectileSpread + proto: PelletShotgunBreachTrace + count: 12 + spread: 50 ## energy -- type: hitscan +- type: entity + id: BasicHitscanNoBeam + categories: [ HideSpawnMenu ] + components: + - type: HitscanAmmo + - type: HitscanBasicRaycast + - type: HitscanReflect + - type: HitscanBasicEffects + +- type: entity id: EnergyTrace + parent: BasicHitscan + categories: [ HideSpawnMenu ] abstract: true - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi - state: heavylaser - collisionMask: 64 #BulletImpassable - reflective: Energy + components: + - type: HitscanBasicRaycast + collisionMask: BulletImpassable + - type: HitscanReflect + reflectiveType: Energy + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + state: heavylaser -- type: hitscan +- type: entity + parent: BasicHitscan id: LaserTrace + categories: [ HideSpawnMenu ] abstract: true - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_laser - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_laser - reflective: Energy -- type: hitscan - name: wide laser barrage - id: LaserTraceSpread - parent: LaserTrace - damage: - types: - Heat: 13 - count: 5 - spread: 30 - -- type: hitscan - name: narrow laser barrage - id: LaserTraceSpreadNarrow - parent: LaserTrace - damage: - types: - Heat: 13 - count: 4 - spread: 10 - -- type: hitscan +- type: entity id: RedLaserBeam name: laser beam parent: LaserTrace - damage: - types: - Heat: 20 - -- type: hitscan - id: PulseBeam - name: pulse beam - parent: LaserTrace - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_omni - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam_omni - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_omni - damage: - types: - Heat: 30 - Structural: 10 - -- type: hitscan - id: DestroyBeam - name: destroying beam - parent: LaserTrace - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_blue - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam_blue - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_blue - damage: - types: - Heat: 50 - Structural: 25 - -# X-ray laser beam -- type: hitscan - id: XrayLaserBeam - damage: - types: - Heat: 15 - Radiation: 10 - pierceChance: 0.99 - pierceLevel: Rock - steps: 20 - derivation: 0.005 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_xray - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: xray - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_xray - reflective: Energy - -# X-ray laser beam cartridge # Костыль зато работает -- type: entity - parent: BaseCartridge - id: CartridgeXrayBeam categories: [ HideSpawnMenu ] components: - - type: Tag - tags: - - Cartridge - - type: HitScanCartridgeAmmo - deleteOnSpawn: true - hitscan: XrayLaserBeam - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi - layers: - - state: base - map: ["enum.AmmoVisualLayers.Base"] - - type: Appearance -### + - type: HitscanBasicDamage + damage: + types: + Heat: 20 -- type: hitscan +- type: entity + parent: BasicHitscan + id: IgnitionRedLaser + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 15 + - type: HitscanIgniteEffect + +- type: entity + id: DestroyBeam + name: destroying beam + parent: BasicHitscanNoBeam + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 60 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_blue + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_blue + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_blue + +- type: entity + id: DeleteBeam + name: erasing beam + parent: BasicHitscanNoBeam + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 10 + Blunt: 40 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_blue + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam_blue + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_blue + +- type: entity id: DisablerBoltPractice name: disabler bolt practice - parent: EnergyTrace - collisionMask: 64 #BulletImpassable - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi - state: omnilaser + parent: BasicHitscanNoBeam + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicRaycast + collisionMask: BulletImpassable + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + state: omnilaser + - type: HitscanBasicEffects + hitColor: blue -- type: hitscan +- type: entity id: DisablerBolt name: disabler bolt parent: DisablerBoltPractice - staminaDamage: 25 + categories: [ HideSpawnMenu ] + components: + - type: HitscanStaminaDamage + staminaDamage: 25 -- type: hitscan +- type: entity id: DisablerBoltSmg name: disabler bolt smg parent: DisablerBolt - staminaDamage: 15 + categories: [ HideSpawnMenu ] + components: + - type: HitscanStaminaDamage + staminaDamage: 15 -- type: hitscan - id: AdvancedDisablerBolt - parent: DisablerBolt - staminaDamage: 35 - -- type: hitscan - id: DisablerBoltSmgSpreadTrace - parent: DisablerBoltSmg - staminaDamage: 15 - count: 3 - spread: 9 - -- type: hitscan +- type: entity id: TaserBolt name: taser bolt - parent: EnergyTrace - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: spark - color: "#ffff33" - staminaDamage: 33 - knockdownAmount: 0.5 - maxLength: 5 - damage: - types: - Heat: 0 + parent: BasicHitscanNoBeam + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 0 + - type: HitscanStaminaDamage + staminaDamage: 33 + - type: HitscanCrawlerTargetEffects + knockdownDuration: 0.5s + - type: HitscanBasicRaycast + maxDistance: 5 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: spark + color: "#ffff33" -- type: hitscan +- type: entity id: TaserBoltExtreme name: taser bolt parent: EnergyTrace - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: spark - color: "#ffff33" - staminaDamage: 100 - #knockdownAmount: 0.5 - #maxLength: 5 - damage: - types: - Heat: 0 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 0 + - type: HitscanStaminaDamage + staminaDamage: 100 + #knockdownAmount: 0.5 + #maxLength: 5 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: spark + color: "#ffff33" -- type: hitscan +- type: entity id: AdvancedTaserBolt name: taser bolt parent: EnergyTrace - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: spark - color: "#ffff33" - staminaDamage: 33 - knockdownAmount: 3 - maxLength: 7 - damage: - types: - Shock: 5 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 5 + - type: HitscanStaminaDamage + staminaDamage: 33 + - type: HitscanCrawlerTargetEffects + knockdownDuration: 3s + - type: HitscanBasicRaycast + maxDistance: 7 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: spark + color: "#ffff33" -- type: hitscan +- type: entity id: EmpPulse name: EMP impulse parent: EnergyTrace - bullet: - sprite: - sprite: Effects/emp.rsi - state: emp_pulse - emp: - range: 0.75 - energyConsumption: 30000 - disableDuration: 10 - damage: - types: - Shock: 10 + components: + - type: HitscanEmpEffect + emp: + range: 2 + energyConsumption: 30000 + disableDuration: 10 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Effects/emp.rsi + state: emp_pulse -- type: hitscan +- type: entity id: DecloneBolt name: declone bolt parent: EnergyTrace - bullet: - sprite: - sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: declone - damage: - types: - Radiation: 10 - Cellular: 20 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Radiation: 10 + Cellular: 20 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: declone -- type: hitscan +- type: entity id: SniperBolt name: sniper bolt parent: EnergyTrace - bullet: - sprite: - sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: sniperlaser - knockdownAmount: 3 - staminaDamage: 40 - damage: - types: - Heat: 60 - -- type: hitscan - id: EnergyCrossbowBolt - name: crossbow bolt - bullet: - sprite: - sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: cbbolt - collisionMask: 64 #BulletImpassable - reflective: NonEnergy - knockdownAmount: 1 - staminaDamage: 30 - maxLength: 10 - damage: - types: - Poison: 20 - -- type: hitscan - id: MiniEnergyCrossbowBolt - name: crossbow bolt - parent: EnergyCrossbowBolt - knockdownAmount: 2 - staminaDamage: 40 - damage: - types: - Poison: 10 + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Heat: 60 + - type: HitscanCrawlerTargetEffects + knockdownDuration: 3 + - type: HitscanStaminaDamage + staminaDamage: 40 + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: sniperlaser - type: entity id: ProjectilePolyboltJohnToe @@ -1161,142 +1461,41 @@ components: - Body -### rifle heavy #Sunrise - -- type: hitscan - id: BulletRifleTraceHeavySP - parent: BulletTrace - damage: - types: - Piercing: 26 - Structural: 10 - armorPenetration: -0.1 - pierceChance: 0.40 - ricochetChance: 0.30 - staminaDamage: 5 - pierceLevel: Metal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: sp - -- type: hitscan - id: BulletRifleTraceHeavyHP - parent: BulletTrace - damage: - types: - Piercing: 28 #+ 30% - Structural: 5 - armorPenetration: -0.7 - staminaDamage: 10 - pierceChance: 0.05 - ricochetChance: 0.15 - -- type: hitscan - id: BulletRifleTraceHeavyFMJ - parent: BulletTrace - damage: - types: - Piercing: 20 #- 30% - Structural: 5 - armorPenetration: 0.35 - pierceChance: 0.8 - ricochetChance: 0.80 - staminaDamage: 3 - pierceLevel: HardenedMetal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: fmj - -- type: hitscan - id: BulletRifleTraceHeavyAP - parent: BulletTrace - damage: - types: - Piercing: 20 #- 30% - Structural: 2 - armorPenetration: 0.5 - pierceChance: 0.9 - ricochetChance: 0.50 - staminaDamage: 1 - pierceLevel: Rock - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: piercing - -- type: hitscan - id: BulletRifleTraceHeavyPractice - parent: BulletTrace - damage: - types: - Blunt: 5 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: practice - pierceChance: 0.30 - ricochetChance: 0.40 - - type: entity - id: BulletRifleTraceHeavyIncendiary - parent: BaseBulletIncendiary + id: PointDefenseBeam + name: Point Defense beam + parent: BasicHitscanNoBeam categories: [ HideSpawnMenu ] components: - - type: Projectile + - type: HitscanBasicRaycast + maxDistance: 25 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: pd_muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: pd_trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: pd_impact + +# Xeno + +- type: entity + id: BulletAcidHitscan + parent: BasicHitscan + name: acid spit + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage damage: types: - Piercing: 20 - Heat: 3 - -- type: hitscan - id: BulletRifleTraceHeavyUranium - parent: BulletTrace - damage: - types: - Radiation: 10 - Piercing: 12 - Structural: 5 - pierceChance: 0.85 - ricochetChance: 0.80 - pierceLevel: HardenedMetal - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: uranium - -# Rubber bullets - -- type: hitscan - id: BulletMagnumTraceRubber - parent: BulletTrace - damage: - types: - Blunt: 2 - ricochetChance: 0.75 - staminaDamage: 20 - armorPenetration: -0.95 - pierceChance: 0.01 - derivation: 0.05 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: rubber - -- type: hitscan - id: BulletPistolTraceRubber - name: ".35 Rubber" - parent: BulletTrace - damage: - types: - Blunt: 1 - ricochetChance: 0.5 - staminaDamage: 13 - armorPenetration: -0.95 - pierceChance: 0.01 - derivation: 0.05 - bullet: - sprite: - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: rubber + Caustic: 8 + - type: HitscanBasicRaycast + collisionMask: BulletImpassable + - type: HitscanBasicVisuals + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi + state: xeno_toxic diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index f3cdd1de5e..6104013b3f 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -110,41 +110,44 @@ damage: 12 # 9 hits to stun sounds reasonable - type: entity - id: BulletEnergyCrossbow - parent: BaseBullet + name : laser bolt + id: BulletEnergySMGLaser + parent: BulletEnergyTurretBase categories: [ HideSpawnMenu ] components: - - type: Reflective - reflective: - - NonEnergy + - type: Ammo + muzzleFlash: MuzzleFlashEffectHeavyLaser - type: Sprite - sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi layers: - - state: cbbolt - - type: StaminaDamageOnCollide - damage: 30 - - type: StunOnCollide - knockdownAmount: 1 + - state: heavylaser + shader: unshaded - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler damage: types: - Poison: 20 - - type: TimedDespawn - lifetime: 0.5 - - type: GatheringProjectile - + Heat: 10 + - type: entity - id: BulletMiniEnergyCrossbow - parent: BulletEnergyCrossbow + name : disabler bolt + id: BulletEnergySMGDisabler + parent: BulletEnergyTurretBase categories: [ HideSpawnMenu ] components: + - type: Ammo + muzzleFlash: MuzzleFlashEffectOmnilaser + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: omnilaser + shader: unshaded - type: StaminaDamageOnCollide - damage: 40 - - type: StunOnCollide - knockdownAmount: 2 + damage: 15 - type: Projectile + impactEffect: BulletImpactEffectDisabler damage: types: - Poison: 10 - - type: TimedDespawn - lifetime: 0.4 + Heat: 0 + soundHit: + collection: WeakHit + forceSound: true diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Melee/cyberlimb.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Melee/cyberlimb.yml index a8e0d4a425..dba4aae65a 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Melee/cyberlimb.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Melee/cyberlimb.yml @@ -153,7 +153,7 @@ path: "/Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg" - type: CorePoweredThrower - type: MeleeThrowOnHit - unanchorOnHit: true + unanchorOnHit: Unanchorable - type: ItemSlots slots: core_slot: @@ -208,7 +208,7 @@ soundHit: path: "/Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg" - type: MeleeThrowOnHit - unanchorOnHit: true + unanchorOnHit: Unanchorable stunTime: 1.5 - type: Tool qualities: @@ -251,7 +251,7 @@ soundGunshot: path: /Audio/Weapons/Guns/Gunshots/taser2.ogg bigTrigger: true - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: AnomalousParticleDeltaStrong fireCost: 100 - type: BatteryWeaponFireModes @@ -265,7 +265,6 @@ - proto: AnomalousParticleSigmaStrong fireCost: 100 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 25 autoRechargePauseTime: 1 @@ -323,7 +322,6 @@ proto: RedLightLaser fireCost: 75 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 120 autoRechargePauseTime: 8 - type: MagazineVisuals @@ -371,7 +369,7 @@ slots: gun_chamber: name: Chamber - startingItem: GrenadeFlashContact + startingItem: GrenadeFlash priority: 1 whitelist: tags: @@ -414,7 +412,7 @@ path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg projectileSpeed: 15 bigTrigger: true - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: AirGrenade fireCost: 130 - type: BatteryWeaponFireModes @@ -427,7 +425,6 @@ maxCharge: 500 startingCharge: 500 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 10 - type: KnockbackByUserTag doestContain: diff --git a/Resources/Prototypes/_Sunrise/Actions/vampire.yml b/Resources/Prototypes/_Sunrise/Actions/vampire.yml index 372af69260..008174054e 100644 --- a/Resources/Prototypes/_Sunrise/Actions/vampire.yml +++ b/Resources/Prototypes/_Sunrise/Actions/vampire.yml @@ -52,7 +52,7 @@ sprite: Interface/Actions/actions_vampire.rsi state: glare sound: !type:SoundPathSpecifier - path: /Audio/Effects/Vampire/glare.ogg + path: /Audio/_Sunrise/Effects/Vampire/glare.ogg - type: EntityTargetAction whitelist: components: @@ -102,7 +102,7 @@ sprite: Interface/Actions/actions_vampire.rsi state: screech sound: !type:SoundPathSpecifier - path: /Audio/Effects/Vampire/screech_tone.ogg + path: /Audio/_Sunrise/Effects/Vampire/screech_tone.ogg - type: InstantAction event: !type:VampireScreechEvent diff --git a/Resources/Prototypes/_Sunrise/Atmospherics/gases.yml b/Resources/Prototypes/_Sunrise/Atmospherics/gases.yml index 700d5c6142..8a0159dc38 100644 --- a/Resources/Prototypes/_Sunrise/Atmospherics/gases.yml +++ b/Resources/Prototypes/_Sunrise/Atmospherics/gases.yml @@ -1,5 +1,5 @@ - type: gas - id: 9 + id: BZ name: gases-bz specificHeat: 20 heatCapacityRatio: 1.4 @@ -11,7 +11,7 @@ gasOverlayState: bz - type: gas - id: 10 + id: Healium name: gases-healium specificHeat: 20 heatCapacityRatio: 1.4 @@ -23,7 +23,7 @@ gasOverlayState: healium - type: gas - id: 11 + id: Nitrium name: gases-nitrium specificHeat: 20 heatCapacityRatio: 1.4 diff --git a/Resources/Prototypes/_Sunrise/BloodCult/Entities/Items/clothing.yml b/Resources/Prototypes/_Sunrise/BloodCult/Entities/Items/clothing.yml index a5e3e5ecc5..6d9b0aac68 100644 --- a/Resources/Prototypes/_Sunrise/BloodCult/Entities/Items/clothing.yml +++ b/Resources/Prototypes/_Sunrise/BloodCult/Entities/Items/clothing.yml @@ -20,9 +20,7 @@ maxCharge: 50 startingCharge: 50 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 50 - autoRechargePause: true autoRechargePauseTime: 9 - type: EnergyDomeGenerator damageEnergyDraw: 1 diff --git a/Resources/Prototypes/_Sunrise/Body/Organs/abductor.yml b/Resources/Prototypes/_Sunrise/Body/Organs/abductor.yml index 02c32948c6..5e804ca2f0 100644 --- a/Resources/Prototypes/_Sunrise/Body/Organs/abductor.yml +++ b/Resources/Prototypes/_Sunrise/Body/Organs/abductor.yml @@ -6,7 +6,6 @@ - type: Sprite sprite: _Sunrise/Abductor/Mobs/Species/Abductor/organs.rsi - type: Organ - - type: Food - type: Extractable grindableSolutionName: organ - type: SolutionContainerManager diff --git a/Resources/Prototypes/_Sunrise/Body/Organs/humanoid_xeno.yml b/Resources/Prototypes/_Sunrise/Body/Organs/humanoid_xeno.yml index 8ddf7076fe..8bd20462c2 100644 --- a/Resources/Prototypes/_Sunrise/Body/Organs/humanoid_xeno.yml +++ b/Resources/Prototypes/_Sunrise/Body/Organs/humanoid_xeno.yml @@ -7,7 +7,6 @@ - type: Sprite sprite: _Sunrise/Mobs/Species/HumanoidXeno/organs.rsi - type: Organ - - type: Food - type: Extractable grindableSolutionName: organ - type: SolutionContainerManager diff --git a/Resources/Prototypes/_Sunrise/Body/Organs/predator.yml b/Resources/Prototypes/_Sunrise/Body/Organs/predator.yml index e889e8a810..904635c9fd 100644 --- a/Resources/Prototypes/_Sunrise/Body/Organs/predator.yml +++ b/Resources/Prototypes/_Sunrise/Body/Organs/predator.yml @@ -7,7 +7,6 @@ - type: Sprite sprite: _Sunrise/Mobs/Species/Predator/organs.rsi - type: Organ - - type: Food - type: Extractable grindableSolutionName: organ - type: SolutionContainerManager diff --git a/Resources/Prototypes/_Sunrise/Body/Parts/demon.yml b/Resources/Prototypes/_Sunrise/Body/Parts/demon.yml index b18bd782f6..91076eef0c 100644 --- a/Resources/Prototypes/_Sunrise/Body/Parts/demon.yml +++ b/Resources/Prototypes/_Sunrise/Body/Parts/demon.yml @@ -2,20 +2,10 @@ # TODO BODY: Part damage - type: entity id: PartDemon - parent: BaseItem + parent: [BaseItem, BasePart] name: "demon body part" abstract: true - components: - - type: Damageable - damageContainer: Biological - - type: BodyPart - - type: ContainerContainer - containers: - bodypart: !type:Container - ents: [] - - type: Tag - tags: - - Trash + - type: entity id: TorsoDemon @@ -35,7 +25,7 @@ - type: entity id: HeadDemon name: "demon head" - parent: PartDemon + parent: [PartDemon, BaseHead] components: - type: Sprite netsync: false @@ -44,19 +34,6 @@ - type: Icon sprite: _Sunrise/Mobs/Species/Demon/parts.rsi state: "head_m" - - type: BodyPart - partType: Head - vital: true - - type: Input - context: "ghost" - - type: MovementSpeedModifier - baseWalkSpeed: 0 - baseSprintSpeed: 0 - - type: InputMover - - type: GhostOnMove - - type: Tag - tags: - - Head - type: entity id: LeftArmDemon diff --git a/Resources/Prototypes/_Sunrise/Boss/effects.yml b/Resources/Prototypes/_Sunrise/Boss/effects.yml index b26c081cf5..bfecde9df3 100644 --- a/Resources/Prototypes/_Sunrise/Boss/effects.yml +++ b/Resources/Prototypes/_Sunrise/Boss/effects.yml @@ -24,10 +24,7 @@ - Hellspawn - GlassBeaker - DrinkBottle - - DrinkGlass - DrinkCan - - DrinkCup - - DrinkSpaceGlue - type: Fixtures fixtures: fix: @@ -71,10 +68,6 @@ - Hellspawn - GlassBeaker - DrinkBottle - - DrinkGlass - - DrinkCan - - DrinkCup - - DrinkSpaceGlue - type: Fixtures fixtures: fix: diff --git a/Resources/Prototypes/_Sunrise/Boss/ents.yml b/Resources/Prototypes/_Sunrise/Boss/ents.yml index fece6b5939..59cde3946c 100644 --- a/Resources/Prototypes/_Sunrise/Boss/ents.yml +++ b/Resources/Prototypes/_Sunrise/Boss/ents.yml @@ -82,7 +82,7 @@ 0: Alive 750: Dead - type: Stamina - critThreshold: 450 + baseCritThreshold: 450 stunTime: 2 - type: AmbientSound sound: /Audio/Ambience/ambiodd.ogg @@ -108,10 +108,7 @@ - Hellspawn - GlassBeaker - DrinkBottle - - DrinkGlass - DrinkCan - - DrinkCup - - DrinkSpaceGlue - type: HellSpawnInvincibility - type: HellSpawn - type: HellSpawnTentacle diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml index f15ef0e2d6..b5c447ac4f 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -30,5 +30,5 @@ - type: StorageFill contents: - id: WeaponSIAR52Biocode - - id: MagazinePistolSubMachineGunSIAR52 + - id: MagazinePistolSubMachineGunCaselessExtended amount: 2 diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/emergency.yml index e9037899ef..4bc38798f3 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/emergency.yml @@ -1,21 +1,15 @@ - type: entity name: survival box - parent: BoxSurvivalBase + parent: BoxCardboardSmall id: BoxRepairSynth description: It's a box with basic internals inside. components: - - type: StorageFill - contents: - - id: Welder - - id: CableApcStack - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: Welder + - id: CableApcStack - type: Sprite layers: - state: box_science @@ -23,7 +17,7 @@ - type: entity name: survival box - parent: BoxSurvivalBase + parent: BoxCardboardSmall id: BoxHugSynth description: It's a box with basic internals inside. components: @@ -36,18 +30,12 @@ - type: Tag tags: - BoxHug - - type: StorageFill - contents: - - id: Welder - - id: CableApcStack - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: Welder + - id: CableApcStack - type: entity name: survival box @@ -55,19 +43,14 @@ id: BoxRepairSecurity description: It's a box with basic internals inside. components: - - type: StorageFill - contents: - - id: ClothingMaskGasSecurity - - id: Welder - - id: CableApcStack - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: ClothingMaskGasSecurity + - id: Welder + - id: CableApcStack + - id: Flare - type: Sprite layers: - state: box_science @@ -79,20 +62,14 @@ id: BoxRepairSyndicate description: It's a box with basic internals inside. components: - - type: StorageFill - contents: - - id: ClothingMaskGasSyndicate - - id: Welder - - id: CableApcStack - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: ClothingMaskGasSecurity + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: ClothingMaskGasSyndicate + - id: Welder + - id: CableApcStack + - id: Flare - type: Sprite layers: - state: box_science @@ -105,20 +82,14 @@ id: BoxSurvivalWithoutGas suffix: Standard withoutGas components: - - type: StorageFill - contents: - - id: EmergencyMedipen - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: FoodSnackNutribrick - - id: DrinkWaterBottleFull + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: EmergencyMedipen + - id: Flare + - id: FoodSnackNutribrick + - id: DrinkWaterBottleFull - type: Label currentLabel: без балона @@ -135,20 +106,14 @@ - state: heart - type: Item heldPrefix: hug - - type: StorageFill - contents: - - id: EmergencyMedipen - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: FoodSnackNutribrick - - id: DrinkWaterBottleFull + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: EmergencyMedipen + - id: Flare + - id: FoodSnackNutribrick + - id: DrinkWaterBottleFull - type: Tag tags: - BoxHug @@ -158,20 +123,14 @@ id: BoxMimeWithoutGas suffix: Mime, Emergency, Without gas components: - - type: StorageFill - contents: - - id: EmergencyMedipen - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: FoodBreadBaguette - - id: DrinkBeerBottleFull + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: EmergencyMedipen + - id: Flare + - id: FoodBreadBaguette + - id: DrinkWaterBottleFull - type: entity parent: BoxSurvivalBase @@ -180,21 +139,15 @@ description: It's a box with basic internals inside. suffix: Security components: - - type: StorageFill - contents: - - id: ClothingMaskGasSecurity - - id: EmergencyMedipen - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: FoodSnackNutribrick - - id: DrinkWaterBottleFull + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: EmergencyMedipen + - id: Flare + - id: FoodSnackNutribrick + - id: DrinkWaterBottleFull + - id: ClothingMaskGasSecurity - type: Sprite layers: - state: internals @@ -207,21 +160,15 @@ description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. suffix: Syndicate components: - - type: StorageFill - contents: - - id: ClothingMaskGasSyndicate - - id: EmergencyMedipen - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: FoodSnackNutribrick - - id: DrinkWaterBottleFull + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: EmergencyMedipen + - id: Flare + - id: FoodSnackNutribrick + - id: DrinkWaterBottleFull + - id: ClothingMaskGasSyndicate - type: Sprite layers: - state: internals @@ -235,20 +182,16 @@ name: survival box suffix: With beer components: - - type: StorageFill - contents: - - id: EmergencyMedipen - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: FoodSnackNutribrick - - id: DrinkBeerBottleFull + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: ClothingMaskBreath + - id: EmergencyOxygenTankFilled + - id: FoodSnackNutribrick + - id: DrinkBeerBottleFull + - id: Flare + - id: EmergencyMedipen - type: Label currentLabel: без балона @@ -259,22 +202,16 @@ description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. suffix: Extended, With beer components: - - type: StorageFill - contents: - - id: ClothingMaskBreath - - id: ExtendedEmergencyOxygenTankFilled - - id: EmergencyMedipen - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: FoodSnackNutribrick - - id: DrinkBeerBottleFull + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: ClothingMaskBreath + - id: ExtendedEmergencyOxygenTankFilled + - id: FoodSnackNutribrick + - id: DrinkBeerBottleFull + - id: Flare + - id: EmergencyMedipen - type: Sprite layers: - state: internals @@ -288,22 +225,16 @@ description: It's a box with basic internals inside. suffix: Medical, With beer components: - - type: StorageFill - contents: - - id: ClothingMaskBreathMedical - - id: EmergencyOxygenTankFilled - - id: EmergencyMedipen - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: FoodSnackNutribrick - - id: DrinkBeerBottleFull + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: ClothingMaskBreathMedical + - id: EmergencyOxygenTankFilled + - id: FoodSnackNutribrick + - id: DrinkBeerBottleFull + - id: Flare + - id: EmergencyMedipen - type: Sprite layers: - state: internals @@ -322,20 +253,16 @@ - state: heart - type: Item heldPrefix: hug - - type: StorageFill - contents: - - id: EmergencyMedipen - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: FoodSnackNutribrick - - id: DrinkBeerBottleFull + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: ClothingMaskBreath + - id: EmergencyOxygenTankFilled + - id: FoodSnackNutribrick + - id: DrinkBeerBottleFull + - id: Flare + - id: EmergencyMedipen - type: Tag tags: - BoxHug @@ -345,22 +272,16 @@ id: BoxMimeWithBeer suffix: Mime, Emergency, With beer components: - - type: StorageFill - contents: - - id: ClothingMaskBreath - - id: EmergencyOxygenTankFilled - - id: EmergencyMedipen - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: FoodBreadBaguette - - id: DrinkBeerBottleFull + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: ClothingMaskBreath + - id: EmergencyOxygenTankFilled + - id: FoodBreadNutriBatard + - id: DrinkBeerBottleFull + - id: Flare + - id: EmergencyMedipen - type: entity parent: BoxSurvivalBase @@ -369,21 +290,16 @@ description: It's a box with basic internals inside. suffix: Security, With beer components: - - type: StorageFill - contents: - - id: ClothingMaskGasSecurity - - id: EmergencyMedipen - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: FoodSnackNutribrick - - id: DrinkBeerBottleFull + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: ClothingMaskGasSecurity + - id: ExtendedEmergencyOxygenTankFilled + - id: FoodSnackNutribrick + - id: DrinkBeerBottleFull + - id: Flare + - id: EmergencyMedipen - type: Sprite layers: - state: internals @@ -396,21 +312,15 @@ description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. suffix: Syndicate, With beer components: - - type: StorageFill - contents: - - id: ClothingMaskGasSyndicate - - id: EmergencyMedipen - - id: SpaceMedipen - - id: GlowstickRed - orGroup: Glowstick - - id: GlowstickPurple - orGroup: Glowstick - - id: GlowstickYellow - orGroup: Glowstick - - id: GlowstickBlue - orGroup: Glowstick - - id: FoodSnackNutribrick - - id: DrinkBeerBottleFull + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: ClothingMaskGasSyndicate + - id: DoubleEmergencyOxygenTankFilled + - id: FoodSnackNutribrick + - id: DrinkBeerBottleFull + - id: EmergencyMedipen - type: Sprite layers: - state: internals diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml index 16a0108c68..cc66c14434 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml @@ -110,10 +110,10 @@ - 0,0,1,3 - type: StorageFill contents: - - id: MagazinePistolSubMachineGunSIAR52 - - id: MagazinePistolSubMachineGunSIAR52 - - id: MagazinePistolSubMachineGunSIAR52 - - id: MagazinePistolSubMachineGunSIAR52 + - id: MagazinePistolSubMachineGunCaselessExtended + - id: MagazinePistolSubMachineGunCaselessExtended + - id: MagazinePistolSubMachineGunCaselessExtended + - id: MagazinePistolSubMachineGunCaselessExtended - type: Sprite layers: - state: box_of_doom diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/toolboxes.yml index 83a2aa09a8..07121598de 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/toolboxes.yml @@ -3,10 +3,41 @@ id: ToolboxSyndicateFilledCoreExtraction suffix: Filled, Core Extraction components: - - type: StorageFill - contents: - - id: Crowbar - - id: Welder - - id: Wrench - - id: ThinTippedScrewdriver - - id: NukeCoreContainer + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: Crowbar + - id: Welder + - id: Wrench + - id: ThinTippedScrewdriver + - id: NukeCoreContainer + - type: StaticPrice + price: 1500 + +- type: entity + parent: ToolboxSyndicate + id: ToolboxSyndicateFilledRepair + suffix: Filled, Repair + components: + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: Crowbar + - id: Screwdriver + - id: Wirecutter + - id: WelderIndustrial + - id: Multitool + - id: ClothingHandsGlovesCombatCQC + - id: ClothingMaskGasSyndicate + - id: HandheldMechAnalyzer + - id: CableApcStack + amount: 3 + - id: PowerCellSyndicate + - id: Nanopaste + amount: 2 + - id: DoubleEmergencyOxygenTankFilled + - id: DoubleEmergencyNitrogenTankFilled + - type: StaticPrice + price: 1500 diff --git a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/liberation.yml b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/liberation.yml index 4929d2ef1e..1f9d53a9c0 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/liberation.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/VendingMachines/Inventories/liberation.yml @@ -39,7 +39,6 @@ WeaponRifleG36: 3 WeaponRifleSKM28: 3 WeaponRifleSKM24: 3 - WeaponRifleScarH: 3 WeaponRifleLecterMk2: 3 WeaponRifleFoam: 3 WeaponRifleARG: 3 @@ -161,7 +160,7 @@ WeaponANNIHILATOR: 3 WeaponToecloner: 3 WeaponDecloner: 3 - WeaponMiniEnergyCrossbow: 3 + WeaponEnergyCrossbowLarge: 3 WeaponEnergyCrossbow: 3 WeaponLaserLNT620: 3 WeaponEnergyGun: 3 @@ -342,7 +341,6 @@ MagazineBoxHeavyRiflePractice: 3 MagazineBoxHeavyRifleIncendiary: 3 MagazineBoxHeavyRifleUranium: 3 - MagazineScarH: 5 MagazineBR64: 5 MagazineDragunov: 5 MagazineBauer127: 5 diff --git a/Resources/Prototypes/_Sunrise/Catalog/pirate_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/pirate_uplink_catalog.yml index 1e41457062..1dcc97a9e0 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/pirate_uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/pirate_uplink_catalog.yml @@ -433,7 +433,7 @@ id: UplinkPirateMiniEnergyCrossbow name: uplink-mini-energy-crossbow-name description: uplink-mini-energy-crossbow-desc - productEntity: WeaponMiniEnergyCrossbowBiocode + productEntity: WeaponEnergyCrossbowBiocode discountCategory: rarePirateDiscounts discountDownTo: Doubloon: 34 @@ -448,12 +448,12 @@ - type: listing id: UplinkPirateEnergyCrossbow - productEntity: WeaponEnergyCrossbow + productEntity: WeaponEnergyCrossbowLarge discountCategory: rarePirateDiscounts discountDownTo: - Doubloon: 38 + Doubloon: 35 cost: - Doubloon: 45 + Doubloon: 40 restockTime: 2700 categories: - UplinkPirateWeaponry @@ -1285,11 +1285,11 @@ - UplinkPirateExplosives - type: listing - id: UplinkPirateGrenadeFragContact + id: UplinkPirateGrenadeFrag name: uplink-grenade-frag-contact-name description: uplink-grenade-frag-contact-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: frag } - productEntity: GrenadeFragContact + productEntity: GrenadeFrag discountCategory: usualPirateDiscounts discountDownTo: Doubloon: 2 @@ -1300,11 +1300,11 @@ - type: listing - id: UplinkPirateGrenadeBlastContact + id: UplinkPirateGrenadeBlast name: uplink-grenade-blast-contact-name description: uplink-grenade-blast-contact-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: blast } - productEntity: GrenadeBlastContact + productEntity: GrenadeBlast discountCategory: usualPirateDiscounts discountDownTo: Doubloon: 2 @@ -1315,11 +1315,11 @@ - type: listing - id: UplinkPirateGrenadeEMPContact + id: UplinkPirateGrenadeEMP name: uplink-grenade-emp-contact-name description: uplink-grenade-emp-contact-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: emp } - productEntity: GrenadeEMPContact + productEntity: GrenadeEMP discountCategory: usualPirateDiscounts discountDownTo: Doubloon: 2 diff --git a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml index de2afbfd86..dcd296bd9b 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/uplink_catalog.yml @@ -2,7 +2,7 @@ id: UplinkSyndieNVD name: uplink-syndie-nvd-name description: uplink-syndie-nvd-desc - icon: { sprite: /Textures/_Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi, state: icon } + icon: { sprite: _Sunrise/Clothing/Eyes/Glasses/syndie_nvd.rsi, state: icon } productEntity: ClothingEyesNVDSyndicate cost: Telecrystal: 2 @@ -32,7 +32,7 @@ id: UplinkClothingEyesGlassesThermalSyndie name: uplink-syndie-thermal-name description: uplink-syndie-thermal-desc - icon: { sprite: /Textures/_Sunrise/Clothing/Eyes/Glasses/synd_thermal.rsi, state: icon } + icon: { sprite: _Sunrise/Clothing/Eyes/Glasses/synd_thermal.rsi, state: icon } productEntity: ClothingEyesGlassesThermalSyndieBiocode discountCategory: veryRareDiscounts discountDownTo: @@ -44,7 +44,7 @@ - type: listing id: UplinkAmmoPouch - icon: { sprite: /Textures/_RMC14/Objects/Clothing/Pouches/large_ammo_mag.rsi, state: icon } + icon: { sprite: _RMC14/Objects/Clothing/Pouches/large_ammo_mag.rsi, state: icon } productEntity: PouchAmmo discountCategory: veryRareDiscounts discountDownTo: @@ -62,7 +62,7 @@ - type: listing id: UplinkPouchExplosive - icon: { sprite: /Textures/_RMC14/Objects/Clothing/Pouches/large_explosive.rsi, state: icon } + icon: { sprite: _RMC14/Objects/Clothing/Pouches/large_explosive.rsi, state: icon } productEntity: PouchExplosive discountCategory: veryRareDiscounts discountDownTo: @@ -82,7 +82,7 @@ id: UplinkClothingEyesHudSyndicateMech name: uplink-syndie-diagnostic-hud-name description: uplink-syndie-diagnostic-hud-desc - icon: { sprite: /Textures/_Sunrise/Clothing/Eyes/Hud/syndmech.rsi, state: icon } + icon: { sprite: _Sunrise/Clothing/Eyes/Hud/syndmech.rsi, state: icon } productEntity: ClothingEyesHudSyndicateMech discountCategory: rareDiscounts discountDownTo: @@ -173,7 +173,7 @@ - type: listing id: UplinkPistol9mmMagazineFMJ description: uplink-pistol-magazine-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon } + icon: { sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon } productEntity: MagazinePistolHighCapacityFMJ cost: Telecrystal: 1 @@ -183,7 +183,7 @@ - type: listing id: UplinkPistol9mmMagazineHP description: uplink-pistol-magazine-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon } + icon: { sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon } productEntity: MagazinePistolHighCapacityHP cost: Telecrystal: 1 @@ -194,7 +194,7 @@ - type: listing id: UplinkMagazineLightRifleBox description: uplink-magazine-lmg-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: icon } + icon: { sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: icon } productEntity: MagazineRifleBoxSP discountCategory: usualDiscounts discountDownTo: @@ -212,11 +212,11 @@ # For the SIAR52 - type: listing - id: UplinkMagazinePistolSubMachineGunSIAR52 + id: UplinkMagazinePistolSubMachineGunCaselessExtended name: uplink-magazine-siar52-name description: uplink-magazine-siar52-desc icon: { sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/IAR-52mag.rsi, state: base } - productEntity: MagazinePistolSubMachineGunSIAR52 + productEntity: MagazinePistolSubMachineGunCaselessExtended discountCategory: usualDiscounts discountDownTo: Telecrystal: 1 @@ -494,7 +494,7 @@ id: UplinkGrenadeFragTimer name: uplink-grenade-frag-timer-name description: uplink-grenade-frag-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: frag } + icon: { sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: frag } productEntity: GrenadeFragTimer discountCategory: usualDiscounts discountDownTo: @@ -514,7 +514,7 @@ id: UplinkGrenadeBlastTimer name: uplink-grenade-blast-timer-name description: uplink-grenade-blast-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: blast } + icon: { sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: blast } productEntity: GrenadeBlastTimer discountCategory: usualDiscounts discountDownTo: @@ -534,7 +534,7 @@ id: UplinkGrenadeEMPTimer name: uplink-grenade-emp-timer-name description: uplink-grenade-emp-timer-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: emp } + icon: { sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: emp } productEntity: GrenadeEMPTimer discountCategory: usualDiscounts discountDownTo: @@ -551,11 +551,11 @@ - LoneOpsUplink - type: listing - id: UplinkGrenadeFragContact + id: UplinkGrenadeFrag name: uplink-grenade-frag-contact-name description: uplink-grenade-frag-contact-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: frag } - productEntity: GrenadeFragContact + icon: { sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: frag } + productEntity: GrenadeFrag discountCategory: usualDiscounts discountDownTo: Telecrystal: 2 @@ -571,11 +571,11 @@ - LoneOpsUplink - type: listing - id: UplinkGrenadeBlastContact + id: UplinkGrenadeBlast name: uplink-grenade-blast-contact-name description: uplink-grenade-blast-contact-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: blast } - productEntity: GrenadeBlastContact + icon: { sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: blast } + productEntity: GrenadeBlast discountCategory: usualDiscounts discountDownTo: Telecrystal: 2 @@ -591,11 +591,11 @@ - LoneOpsUplink - type: listing - id: UplinkGrenadeEMPContact + id: UplinkGrenadeEMP name: uplink-grenade-emp-contact-name description: uplink-grenade-emp-contact-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: emp } - productEntity: GrenadeEMPContact + icon: { sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: emp } + productEntity: GrenadeEMP discountCategory: usualDiscounts discountDownTo: Telecrystal: 2 @@ -698,7 +698,7 @@ id: UplinkC40RBundle name: uplink-c40r-bundle-name description: uplink-c40r-bundle-desc - icon: { sprite: /Textures/_Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi, state: icon } + icon: { sprite: _Sunrise/Objects/Weapons/Guns/SMGs/c40r.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledSMG40 discountCategory: veryRareDiscounts discountDownTo: @@ -735,6 +735,25 @@ - NukeOpsUplink - LoneOpsUplink +- type: listing + id: UplinkPowerpackDL6902 + name: uplink-power-backpack-dl6902-name + productEntity: PowerpackDL6902 + description: uplink-power-backpack-dl6902-desc + discountCategory: veryRareDiscounts + discountDownTo: + Telecrystal: 22 + cost: + Telecrystal: 38 + categories: + - UplinkWeaponry + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - NukeOpsUplink + - LoneOpsUplink + - type: listing id: UplinkClothingBackpackSyndieSIAR52Filled name: uplink-clothing-backpack-syndie-siar52-name @@ -828,7 +847,7 @@ id: UplinkHardsuitSyndieCommander name: uplink-hardsuit-syndie-commander-name description: uplink-hardsuit-syndie-commander-desc - icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi, state: icon } + icon: { sprite: Clothing/OuterClothing/Hardsuits/syndiecommander.rsi, state: icon } productEntity: ClothingOuterHardsuitSyndieCommanderBiocode cost: Telecrystal: 12 @@ -850,7 +869,7 @@ id: UplinkHardsuitInfiltrationNukie name: uplink-hardsuit-infiltration-name description: uplink-hardsuit-infiltration-desc - icon: { sprite: /Textures/_Starlight/Objects/Clothing/OuterClothing/Hardsuits/infiltrationsyndie.rsi, state: icon } + icon: { sprite: _Starlight/Objects/Clothing/OuterClothing/Hardsuits/infiltrationsyndie.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledInfiltration discountCategory: veryRareDiscounts discountDownTo: @@ -871,7 +890,7 @@ id: UplinkHardsuitInfiltration name: uplink-hardsuit-infiltration-name description: uplink-hardsuit-infiltration-desc - icon: { sprite: /Textures/_Starlight/Objects/Clothing/OuterClothing/Hardsuits/infiltrationsyndie.rsi, state: icon } + icon: { sprite: _Starlight/Objects/Clothing/OuterClothing/Hardsuits/infiltrationsyndie.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledInfiltration discountCategory: rareDiscounts discountDownTo: @@ -892,7 +911,7 @@ id: UplinkHardsuitSyndieMedic name: uplink-hardsuit-syndie-medic-name description: uplink-hardsuit-syndie-medic-desc - icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi, state: icon } + icon: { sprite: Clothing/OuterClothing/Hardsuits/syndiemedic.rsi, state: icon } productEntity: ClothingOuterHardsuitSyndieMedicBiocode cost: Telecrystal: 9 @@ -1059,7 +1078,7 @@ id: UplinkHandcuffs name: uplink-handcuffs-name description: uplink-handcuffs-desc - icon: { sprite: /Textures/Objects/Misc/handcuffs.rsi, state: handcuff } + icon: { sprite: Objects/Misc/handcuffs.rsi, state: handcuff } productEntity: Handcuffs discountCategory: rareDiscounts discountDownTo: @@ -1200,7 +1219,7 @@ id: UplinkEswordNuke name: uplink-esword-name description: uplink-esword-desc - icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword.rsi, state: icon } + icon: { sprite: Objects/Weapons/Melee/e_sword.rsi, state: icon } discountCategory: veryRareDiscounts discountDownTo: Telecrystal: 5 @@ -1305,7 +1324,7 @@ id: UplinkDarkGygax name: uplink-mech-teleporter-assault-name description: uplink-mech-teleporter-assault-desc - icon: { sprite: /Textures/Objects/Specific/Mech/gygax.rsi, state: darkgygax } + icon: { sprite: Objects/Specific/Mech/gygax.rsi, state: darkgygax } productEntity: CrateCybersunDarkGygaxBundle discountCategory: veryRareDiscounts discountDownTo: @@ -1330,7 +1349,7 @@ id: UplinkDarkDurand name: uplink-mech-teleporter-medium-name description: uplink-mech-teleporter-medium-desc - icon: { sprite: /Textures/Objects/Specific/Mech/durand.rsi, state: darkdurand } + icon: { sprite: Objects/Specific/Mech/durand.rsi, state: darkdurand } productEntity: CrateCybersunRoverBundle discountCategory: veryRareDiscounts discountDownTo: @@ -1355,7 +1374,7 @@ id: UplinkMauler name: uplink-mech-teleporter-heavy-name description: uplink-mech-teleporter-heavy-desc - icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: mauler } + icon: { sprite: Objects/Specific/Mech/mecha.rsi, state: mauler } productEntity: CrateCybersunMaulerBundle discountCategory: rareDiscounts discountDownTo: @@ -1382,7 +1401,7 @@ id: UplinkMechImmolationGun name: uplink-mech-equipment-immolation-gun-name description: uplink-mech-equipment-immolation-gun-desc - icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_laser } + icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_laser } productEntity: WeaponMechCombatImmolationGun discountCategory: rareDiscounts discountDownTo: @@ -1402,7 +1421,7 @@ id: UplinkMechTeslaCannon name: uplink-mech-equipment-tesla-cannon-name description: uplink-mech-equipment-tesla-cannon-desc - icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_wholegen } + icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_wholegen } productEntity: WeaponMechCombatTeslaCannon discountCategory: rareDiscounts discountDownTo: @@ -1422,7 +1441,7 @@ id: UplinkMechShotgun name: uplink-mech-equipment-shotgun-name description: uplink-mech-equipment-shotgun-desc - icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_scatter } + icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_scatter } productEntity: WeaponMechCombatShotgun discountCategory: rareDiscounts discountDownTo: @@ -1442,7 +1461,7 @@ id: UplinkMechShotgunIncendiary name: uplink-mech-equipment-shotgun-incendiary-name description: uplink-mech-equipment-shotgun-incendiary-desc - icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_carbine } + icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_carbine } productEntity: WeaponMechCombatShotgunIncendiary discountCategory: rareDiscounts discountDownTo: @@ -1462,7 +1481,7 @@ # id: UplinkMechUltraRifle # name: uplink-mech-equipment-ultra-rifle-name # description: uplink-mech-equipment-ultra-rifle-desc -# icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_uac2 } +# icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_uac2 } # productEntity: WeaponMechCombatUltraRifle # discountCategory: rareDiscounts # discountDownTo: @@ -1482,7 +1501,7 @@ id: UplinkMechIon name: uplink-mech-equipment-ion-name description: uplink-mech-equipment-ion-desc - icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_ion } + icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_ion } productEntity: WeaponMechCombatIon discountCategory: rareDiscounts discountDownTo: @@ -1500,7 +1519,7 @@ - type: listing id: UplinkMechChainSword - icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_chainsword } + icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_chainsword } productEntity: WeaponMechChainSword discountCategory: rareDiscounts discountDownTo: @@ -1520,7 +1539,7 @@ id: UplinkMechAMLG90 name: uplink-mech-equipment-amlg90-name description: uplink-mech-equipment-amlg90-desc - icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_amlg90 } + icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_amlg90 } productEntity: WeaponMechCombatAMLG90 discountCategory: rareDiscounts discountDownTo: @@ -1540,7 +1559,7 @@ id: UplinkMechVindictor name: uplink-mech-equipment-vindictor-name description: uplink-mech-equipment-vindictor-desc - icon: { sprite: /Textures/_Sunrise/Objects/Specific/Mech/mecha_vindictor.rsi, state: mecha_vindictor } + icon: { sprite: _Sunrise/Objects/Specific/Mech/mecha_vindictor.rsi, state: mecha_vindictor } productEntity: WeaponMechCombatVindictor discountCategory: rareDiscounts discountDownTo: @@ -1604,7 +1623,7 @@ id: UplinkMechUVM31 name: uplink-mech-equipment-uvm31-name description: uplink-mech-equipment-uvm31-desc - icon: { sprite: /Textures/_Sunrise/Objects/Specific/Mech/mecha_uvm31.rsi, state: mecha_uvm31 } + icon: { sprite: _Sunrise/Objects/Specific/Mech/mecha_uvm31.rsi, state: mecha_uvm31 } productEntity: WeaponMechCombatUVM31 discountCategory: rareDiscounts discountDownTo: @@ -1812,26 +1831,26 @@ whitelist: - AtmosphericTechnician -- type: listing - id: UplinkMedHyposprayNoFilter - name: uplink-med-hypospray-name - description: uplink-med-hypospray-desc - productEntity: HyposprayMedicalNoFilterBox - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 2 - cost: - Telecrystal: 4 - categories: - - UplinkJob - conditions: - - !type:BuyerJobCondition - whitelist: - - MedicalDoctor - - Chemist - - Paramedic - - SeniorPhysician - - MedicalIntern +# - type: listing +# id: UplinkMedHyposprayNoFilter # Sunrise-todo: change to jet injector +# name: uplink-med-hypospray-name +# description: uplink-med-hypospray-desc +# productEntity: HyposprayMedicalNoFilterBox +# discountCategory: rareDiscounts +# discountDownTo: +# Telecrystal: 2 +# cost: +# Telecrystal: 4 +# categories: +# - UplinkJob +# conditions: +# - !type:BuyerJobCondition +# whitelist: +# - MedicalDoctor +# - Chemist +# - Paramedic +# - SeniorPhysician +# - MedicalIntern - type: listing id: UplinkSyringePistol @@ -1909,7 +1928,7 @@ name: uplink-syndicate-martyr-module-name description: uplink-syndicate-martyr-module-desc productEntity: BorgModuleMartyr - icon: { sprite: /Textures/Objects/Specific/Robotics/borgmodule.rsi, state: syndicateborgbomb } + icon: { sprite: Objects/Specific/Robotics/borgmodule.rsi, state: syndicateborgbomb } discountCategory: veryRareDiscounts discountDownTo: Telecrystal: 1 @@ -1970,7 +1989,7 @@ - type: listing id: UplinkMechChainSwordRoboticist - icon: { sprite: /Textures/Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_chainsword } + icon: { sprite: Objects/Specific/Mech/mecha_equipment.rsi, state: mecha_chainsword } productEntity: WeaponMechChainSword discountCategory: rareDiscounts discountDownTo: @@ -1994,7 +2013,7 @@ id: UplinkDeathRipley name: uplink-mech-teleporter-heavy-name description: uplink-mech-teleporter-death-desc - icon: { sprite: /Textures/Objects/Specific/Mech/ripley.rsi, state: death } + icon: { sprite: Objects/Specific/Mech/ripley.rsi, state: death } productEntity: CrateCybersunRipleyBundle discountCategory: veryRareDiscounts discountDownTo: @@ -2019,7 +2038,7 @@ id: UplinkDarkGygaxRoboticist name: uplink-mech-teleporter-assault-name description: uplink-mech-teleporter-assault-desc - icon: { sprite: /Textures/Objects/Specific/Mech/gygax.rsi, state: darkgygax } + icon: { sprite: Objects/Specific/Mech/gygax.rsi, state: darkgygax } productEntity: CrateCybersunDarkGygaxBundle discountCategory: rareDiscounts discountDownTo: @@ -2081,7 +2100,7 @@ id: UplinkEshieldNukies name: uplink-eshield-name description: uplink-eshield-desc - icon: { sprite: /Textures/Objects/Weapons/Melee/e_shield.rsi, state: eshield-on } + icon: { sprite: Objects/Weapons/Melee/e_shield.rsi, state: eshield-on } productEntity: EnergyShieldBiocode discountCategory: veryRareDiscounts discountDownTo: @@ -2102,7 +2121,7 @@ id: uplinkWeaponMiniEnergyCrossbow name: uplink-mini-energy-crossbow-name description: uplink-mini-energy-crossbow-desc - productEntity: WeaponMiniEnergyCrossbow + productEntity: WeaponEnergyCrossbow discountCategory: rareDiscounts discountDownTo: Telecrystal: 8 @@ -2125,7 +2144,7 @@ productEntity: ClothingBackpackDuffelSyndicateFilledMinotaurShotgun icon: { - sprite: /Textures/_Starlight/Objects/Weapons/Guns/Shotguns/minotaur.rsi, + sprite: _Starlight/Objects/Weapons/Guns/Shotguns/minotaur.rsi, state: icon, } discountCategory: rareDiscounts @@ -2171,7 +2190,7 @@ id: UplinkGrenadeLauncherM79 name: uplink-grenade-launcher-m79-name description: uplink-grenade-launcher-m79-desc - icon: { sprite: /Textures/_RMC14/Objects/Weapons/Guns/Launchers/m79/big.rsi, state: base } + icon: { sprite: _RMC14/Objects/Weapons/Guns/Launchers/m79/big.rsi, state: base } productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncherM79 discountCategory: veryRareDiscounts discountDownTo: @@ -2191,7 +2210,7 @@ id: UplinkGrenadeLauncherGL70 name: uplink-grenade-launcher-gl70-name description: uplink-grenade-launcher-gl70-desc - icon: { sprite: /Textures/_Sunrise/Objects/Weapons/Guns/HMGs/gl-64/big.rsi, state: icon } + icon: { sprite: _Sunrise/Objects/Weapons/Guns/HMGs/gl-64/big.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncherGL70 discountCategory: veryRareDiscounts discountDownTo: @@ -2215,7 +2234,7 @@ description: uplink-nightvision-eyes-desc icon: { - sprite: /Textures/_Starlight/Objects/Specific/Medical/implants.rsi, + sprite: _Starlight/Objects/Specific/Medical/implants.rsi, state: eyes_night, } productEntity: CyberEyeNightVisionBox @@ -2232,7 +2251,7 @@ description: uplink-thermalvision-eyes-desc icon: { - sprite: /Textures/_Starlight/Objects/Specific/Medical/implants.rsi, + sprite: _Starlight/Objects/Specific/Medical/implants.rsi, state: eyes_thermal, } productEntity: CyberEyeThermalBox @@ -2249,7 +2268,7 @@ description: uplink-mantis-blade-arms-desc icon: { - sprite: /Textures/_Starlight/Objects/Weapons/Melee/cybermantisblade.rsi, + sprite: _Starlight/Objects/Weapons/Melee/cybermantisblade.rsi, state: cybermantisblade, } productEntity: MantisBladeArmsKit @@ -2355,7 +2374,7 @@ id: UplinkDeathAcidifierImplanterAgent name: uplink-death-acidifier-implant-name description: uplink-death-acidifier-implant-desc - icon: { sprite: /Textures/Objects/Magic/magicactions.rsi, state: gib } + icon: { sprite: Objects/Magic/magicactions.rsi, state: gib } productEntity: DeathAcidifierImplanter categories: - UplinkImplants @@ -2428,7 +2447,7 @@ - type: listing id: UplinkHeadsetEncryptionKeyMaster - icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: crypt_red2 } + icon: { sprite: Objects/Devices/encryption_keys.rsi, state: crypt_red2 } productEntity: EncryptionKeySyndieMaster discountCategory: usualDiscounts discountDownTo: @@ -2448,7 +2467,7 @@ - type: listing id: UplinkHeadsetEncryptionKeyMasterNukie - icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: crypt_red2 } + icon: { sprite: Objects/Devices/encryption_keys.rsi, state: crypt_red2 } productEntity: EncryptionKeySyndieMaster discountCategory: usualDiscounts discountDownTo: @@ -2460,8 +2479,7 @@ conditions: - !type:StoreWhitelistCondition whitelist: - - Science - tags: + tags: - NukeOpsUplink - LoneOpsUplink - AssaultOpsUplink @@ -2520,7 +2538,11 @@ Telecrystal: 20 categories: - UplinkPointless - + conditions: + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle - type: listing id: Uplink50blessingset @@ -2537,7 +2559,7 @@ id: UplinkPistolTec9Magazine name: uplink-pistoltec9-magazine-name description: uplink-pistoltec9-magazine-desc - productEntity: BaseMagazinePistolCaselessRifleTec9 + productEntity: MagazinePistolSubMachineGunCaseless cost: Telecrystal: 2 categories: @@ -2547,11 +2569,11 @@ id: uplinkWeaponPistolTec9 name: uplink-pistoltec9-name description: uplink-pistoltec9-desc - productEntity: WeaponPistolTec9Biocode + productEntity: WeaponPistolTec9 discountCategory: rareDiscounts discountDownTo: - Telecrystal: 4 + Telecrystal: 3 cost: - Telecrystal: 8 + Telecrystal: 5 categories: - UplinkWeaponry diff --git a/Resources/Prototypes/_Sunrise/Chemistry/medicine.yml b/Resources/Prototypes/_Sunrise/Chemistry/medicine.yml index f181d22b33..98e6106ed4 100644 --- a/Resources/Prototypes/_Sunrise/Chemistry/medicine.yml +++ b/Resources/Prototypes/_Sunrise/Chemistry/medicine.yml @@ -48,9 +48,8 @@ effects: - !type:ModifyStatusEffect effectProto: StatusEffectSeeingRainbow - type: Add + type: Update time: 4 - refresh: false - type: reagent id: BarozinePlus @@ -70,15 +69,17 @@ Heat: 0.4 - !type:HealthChange conditions: - - !type:ReagentThreshold + - !type:ReagentCondition + reagent: BarozinePlus min: 50 damage: types: Poison: 1 - - !type:ChemVomit + - !type:Vomit probability: 0.1 conditions: - - !type:ReagentThreshold + - !type:ReagentCondition + reagent: BarozinePlus min: 30 - !type:GenericStatusEffect key: PressureImmunity diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml index cec96e6512..d7b645b62e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml @@ -103,7 +103,7 @@ - type: ToggleCellDraw - type: PowerCellDraw drawRate: 3.5 - useRate: 20 + useCharge: 20 - type: ComponentToggler parent: true components: @@ -173,7 +173,7 @@ - type: ShowSyndicateIcons - type: PowerCellDraw drawRate: 2 - useRate: 15 + useCharge: 15 - type: ToggleCellDraw - type: PowerCellSlot cellSlotId: cell_slot diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/night_vision_device.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/night_vision_device.yml index b746e3a0fd..212a1f21a5 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/night_vision_device.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/night_vision_device.yml @@ -41,7 +41,7 @@ slots: [ Eyes ] - type: PowerCellDraw drawRate: 3.5 - useRate: 20 + useCharge: 20 - type: ItemToggle predictable: false # issues between ToggleCellDraw and ItemToggleActiveSound onUse: false @@ -121,7 +121,7 @@ map: [ "light" ] - type: PowerCellDraw drawRate: 2 - useRate: 10 + useCharge: 10 - type: ShowSyndicateIcons - type: ComponentToggler parent: true @@ -146,7 +146,7 @@ map: [ "light" ] - type: PowerCellDraw drawRate: 5 - useRate: 50 + useCharge: 50 - type: ComponentToggler parent: true components: diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/eva-helmets.yml index 6798d1ef7a..ba329a6e0c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/eva-helmets.yml @@ -81,7 +81,7 @@ effect: EffectNightVisionPirate - type: PowerCellDraw drawRate: 2 - useRate: 20 + useCharge: 20 - type: ItemToggle predictable: false onUse: false diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml index 7353a5d250..efc9ef78a7 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml @@ -435,14 +435,12 @@ effect: EffectNightVisionSyndie - type: PowerCellDraw drawRate: 2 - useRate: 20 + useCharge: 20 - type: Battery maxCharge: 600 startingCharge: 600 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 6 - autoRechargePause: true autoRechargePauseTime: 1 - type: ItemToggle predictable: false diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml index ef0f4bb3d3..30dae4d781 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml @@ -180,7 +180,6 @@ maxCharge: 600 startingCharge: 600 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 2 - type: entity diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml index c878e8c63a..cd2aa1dc94 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml @@ -560,15 +560,12 @@ shader: unshaded - state: equipped-OUTERCLOTHING-unshaded shader: shaded - - type: Construction - graph: NavalJacketCraft - node: NavalJacket - type: Reflect reflectProb: 0.02 reflects: - Energy reflectingInHands: false - + - type: entity parent: ClothingOuterCoatDetectiveLoadout id: ClothingOuterDiscoAssBlazerDetective diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml index 9ecceac418..36b6c80a1c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -179,7 +179,7 @@ domePrototype: EnergyDomeSmallRed - type: PowerCellDraw drawRate: 0 - useRate: 0 + useCharge: 0 - type: UseDelay delay: 10.0 @@ -576,6 +576,9 @@ - type: ToggleClothing action: ActionTogglePhaseCloak disableOnUnequip: true + targetSlot: outerClothing + - type: ItemToggle + canActivateInhand: false - type: ComponentToggler parent: true components: diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots-naval.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots-naval.yml index f57270e55e..7c178f4023 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots-naval.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots-naval.yml @@ -10,6 +10,3 @@ sprite: _Sunrise/Clothing/Shoes/Boots/naval-boots.rsi - type: Item sprite: _Sunrise/Clothing/Shoes/Boots/naval-boots.rsi - - type: Construction - graph: NavalBootsCraft - node: NavalBoots diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml index d05d6903ae..0d10d02791 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/magboots.yml @@ -72,14 +72,3 @@ whitelist: components: - PowerCell - -- type: entity - parent: [BaseCentcommContraband, ClothingShoesBootsMagSyndie] # port WZ #37855 - id: ClothingShoesBootsMagERT - name: ERT magboots - description: Upgraded magnetic boots utilized by Nanotrasen's Emergency Response Teams, they have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas. - components: - - type: Sprite - sprite: Clothing/Shoes/Boots/magboots-ert.rsi - - type: Clothing - sprite: Clothing/Shoes/Boots/magboots-ert.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Aliens/clowns.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Aliens/clowns.yml index 90018797f2..e893bc5caf 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Aliens/clowns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Aliens/clowns.yml @@ -88,8 +88,10 @@ types: Blunt: 0.1 - type: Bloodstream - bloodMaxVolume: 50 - bloodReagent: Honk + bloodReferenceSolution: + reagents: + - ReagentId: Honk + Quantity: 50 - type: FootstepModifier footstepSoundCollection: collection: FootstepClown diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/carp_queen.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/carp_queen.yml index d4bf440233..94d859de04 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/carp_queen.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/carp_queen.yml @@ -30,8 +30,6 @@ MobCarpServantRainbow: 80 MobCarpServantHolo: 10 MobCarpServantDungeon: 10 - - type: ReplacementAccent - remove: true - type: Accentless removes: - type: ReplacementAccent diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/carp_servants.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/carp_servants.yml index faef41c35a..e94348e1be 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/carp_servants.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/carp_servants.yml @@ -36,10 +36,6 @@ - type: entity id: MobCarpServantRainbow parent: [ BaseMobCarpServant, MobCarpRainbow ] - components: - # Remove RgbLightController to allow fixed color from liquid - - type: RgbLightController - remove: true - type: entity id: MobCarpServantDragon diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/snowman.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/snowman.yml index 989d339d69..92af007aed 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/snowman.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/NPCs/snowman.yml @@ -14,8 +14,10 @@ state: state sprite: _Sunrise/Mobs/Elemental/snowman.rsi - type: Bloodstream - bloodMaxVolume: 100 - bloodReagent: SnowWhite + bloodReferenceSolution: + reagents: + - ReagentId: SnowWhite + Quantity: 100 - type: PressureImmunity - type: NoSlip - type: MovementSpeedModifier @@ -85,14 +87,13 @@ - type: ContainerContainer containers: ballistic-ammo: !type:Container - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: BulletSnowBall fireCost: 49 - type: Battery maxCharge: 100 startingCharge: 100 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 100 - type: AmmoCounter - type: Gun diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Pets/pets.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Pets/pets.yml index d667c5e15c..8e8d4c532a 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Pets/pets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Pets/pets.yml @@ -676,8 +676,10 @@ types: Blunt: 0.1 - type: Bloodstream - bloodMaxVolume: 50 - bloodReagent: Honk + bloodReferenceSolution: + reagents: + - ReagentId: Honk + Quantity: 50 - type: FootstepModifier footstepSoundCollection: collection: FootstepClown diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/abductor.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/abductor.yml index 843e13e08c..f89e7a76d2 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/abductor.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/abductor.yml @@ -45,7 +45,10 @@ groups: Brute: -0.14 - type: Bloodstream - bloodReagent: AbductorBlood + bloodReferenceSolution: + reagents: + - ReagentId: AbductorBlood + Quantity: 300 - type: CollectiveMind minds: - Abductor diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/demon.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/demon.yml index 35ef3ea186..f780b4d10d 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/demon.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/demon.yml @@ -43,10 +43,11 @@ types: Piercing: 5 - type: Temperature - heatDamageThreshold: 400 - coldDamageThreshold: 193 #starting temperature damage treshold currentTemperature: 310.15 specificHeat: 46 + - type: TemperatureDamage + heatDamageThreshold: 400 + coldDamageThreshold: 193 #starting temperature damage treshold coldDamage: types: Cold : 0.1 #per second, scales with temperature & other constants diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml index d8034d39ba..fac92928a2 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml @@ -468,7 +468,7 @@ types: Slash: 3 - type: Stamina - critThreshold: 100 + baseCritThreshold: 100 - type: FootprintEmitter - type: Vocal sounds: diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml index b0f9fdab46..ce1919417c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml @@ -24,9 +24,10 @@ - type: TypingIndicator proto: alien - type: Temperature + currentTemperature: 310.15 + - type: TemperatureDamage heatDamageThreshold: 360 coldDamageThreshold: -150 - currentTemperature: 310.15 - type: Speech speechVerb: LargeMob - type: MeleeWeapon @@ -41,7 +42,10 @@ Blunt: 5 Slash: 10 - type: Bloodstream - bloodReagent: FluorosulfuricAcidHumanoidXeno + bloodReferenceSolution: + reagents: + - ReagentId: FluorosulfuricAcidHumanoidXeno + Quantity: 300 - type: Damageable damageContainer: Biological damageModifierSet: Xenomorph diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml index 1fdad9f704..aea27f1e4a 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/predator.yml @@ -47,7 +47,10 @@ - FootstepSound - DoorBumpOpener - type: Bloodstream - bloodReagent: FluorosulfuricAcidPredator + bloodReferenceSolution: + reagents: + - ReagentId: FluorosulfuricAcidPredator + Quantity: 300 - type: DamageVisuals damageOverlayGroups: Brute: diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/resomi.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/resomi.yml index c608dbc3c9..269d07e536 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/resomi.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/resomi.yml @@ -75,10 +75,11 @@ types: Slash: 5 - type: Temperature - heatDamageThreshold: 313 - coldDamageThreshold: 230 currentTemperature: 310.15 specificHeat: 42 + - type: TemperatureDamage + heatDamageThreshold: 313 + coldDamageThreshold: 230 coldDamage: types: Cold : 0.1 #per second, scales with temperature & other constants diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml index 3ea8dc8166..13a4d3436a 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml @@ -34,7 +34,7 @@ 100: Critical 200: Dead - type: Stamina - critThreshold: 100 + baseCritThreshold: 100 - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml index c1584a3f50..987f05445c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml @@ -44,10 +44,11 @@ Female: FemaleTajaran Unsexed: MaleTajaran - type: Temperature - heatDamageThreshold: 400 - coldDamageThreshold: 200 currentTemperature: 310.15 specificHeat: 46 + - type: TemperatureDamage + heatDamageThreshold: 400 + coldDamageThreshold: 200 coldDamage: types: Cold : 0.2 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/bun.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/bun.yml index d043b5b9a7..9c721da791 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/bun.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/bun.yml @@ -7,7 +7,7 @@ - type: FlavorProfile flavors: - sweet - - type: Food + - type: Edible utensil: - Spoon - Fork diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/produce.yml index b1231912db..8c3572676e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/produce.yml @@ -331,7 +331,7 @@ - type: FlavorProfile flavors: - corn - - type: Food + - type: Edible trash: - FoodCornTrash - type: SolutionContainerManager diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/soup.yml index ef9931929c..56f1959246 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Consumable/Food/soup.yml @@ -7,7 +7,7 @@ - type: FlavorProfile flavors: - meaty - - type: Food + - type: Edible trash: - FoodBowlBig utensil: diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/handheld.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/handheld.yml index 052cb025c4..b4d2a5c64f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/handheld.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/handheld.yml @@ -40,13 +40,6 @@ transmitFrequencyId: SurveillanceCamera - type: WiredNetworkConnection - type: Appearance - - type: GenericVisualizer - visuals: - enum.PowerCellSlotVisuals.Enabled: - enum.PowerDeviceVisualLayers.Powered: - True: { visible: true } - False: { visible: false } - - type: entity id: PortableSurveillanceCameraMonitor parent: @@ -112,13 +105,6 @@ guides: - CriminalRecords - type: Appearance - - type: GenericVisualizer - visuals: - enum.PowerCellSlotVisuals.Enabled: - enum.PowerDeviceVisualLayers.Powered: - True: { visible: true } - False: { visible: false } - - type: entity id: HandheldCriminalRecordsMonitor parent: @@ -179,19 +165,10 @@ - type: HealthAnalyzer scanningEndSound: path: "/Audio/Items/Medical/healthscanner.ogg" - damageContainers: - - Synth - - Silicon - type: Tag tags: - DiscreteHealthAnalyzer - type: Appearance - - type: GenericVisualizer - visuals: - enum.PowerCellSlotVisuals.Enabled: - enum.PowerDeviceVisualLayers.Powered: - True: { visible: true } - False: { visible: false } - type: GuideHelp guides: - Robotics @@ -256,20 +233,13 @@ path: "/Audio/Items/Medical/healthscanner.ogg" damageContainers: - Mech + - type: GuideHelp + guides: + - Robotics - type: Tag tags: - DiscreteHealthAnalyzer - type: Appearance - - type: GenericVisualizer - visuals: - enum.PowerCellSlotVisuals.Enabled: - enum.PowerDeviceVisualLayers.Powered: - True: { visible: true } - False: { visible: false } - - type: GuideHelp - guides: - - Robotics - - type: entity id: HandheldMechAnalyzer parent: @@ -384,13 +354,6 @@ range: 500 - type: StationLimitedNetwork - type: Appearance - - type: GenericVisualizer - visuals: - enum.PowerCellSlotVisuals.Enabled: - enum.PowerDeviceVisualLayers.Powered: - True: { visible: true } - False: { visible: false } - - type: entity id: AtmosAlertsMonitor parent: @@ -461,13 +424,6 @@ range: 500 - type: StationLimitedNetwork - type: Appearance - - type: GenericVisualizer - visuals: - enum.PowerCellSlotVisuals.Enabled: - enum.PowerDeviceVisualLayers.Powered: - True: { visible: true } - False: { visible: false } - - type: entity id: EngiAlertsMonitor parent: diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml index b481533cd5..dbedcc7bfb 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Fun/toys.yml @@ -1398,14 +1398,14 @@ - NECK - type: ItemToggle soundActivate: - path: /Audio/Machines/energyshield_up.ogg + path: /Audio/_Sunrise/Machines/energyshield_up.ogg soundDeactivate: - path: /Audio/Machines/energyshield_down.ogg + path: /Audio/_Sunrise/Machines/energyshield_down.ogg params: volume: -2 - type: ItemToggleActiveSound activeSound: - path: /Audio/Machines/energyshield_ambient.ogg + path: /Audio/_Sunrise/Machines/energyshield_ambient.ogg params: volume: -2 - type: RandomMetadata diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/cube.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/cube.yml index 4893c8742c..59daca986b 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/cube.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/cube.yml @@ -4,18 +4,20 @@ id: VariantCubeBoxSunrise description: Both kobold, mothroach, pig, slime, chiken cubes and monkey cubes. Just add water! components: - - type: StorageFill - contents: - - id: KoboldCubeWrapped - amount: 2 - - id: MonkeyCubeWrapped - amount: 2 - - id: SlimeCubeWrapped - amount: 2 - - id: InferiorVulpkaninCubeWrapped - amount: 2 - - id: FelinidCubeWrapped - amount: 2 + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: KoboldCubeWrapped + amount: 2 + - id: MonkeyCubeWrapped + amount: 2 + - id: SlimeCubeWrapped + amount: 2 + - id: InferiorVulpkaninCubeWrapped + amount: 2 + - id: FelinidCubeWrapped + amount: 2 - type: Sprite sprite: Objects/Misc/monkeycube.rsi state: box_variant @@ -118,4 +120,4 @@ path: /Audio/Effects/unwrap.ogg - type: Sprite sprite: _Sunrise/Objects/Misc/cube.rsi - state: wrapper_mothroach \ No newline at end of file + state: wrapper_mothroach diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml index be38eaabd6..cf40fa72ad 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/identification_cards.yml @@ -360,7 +360,7 @@ layers: - state: default - state: department-side - color: *color-service + color: "#639137" - sprite: *sunrise-icon-rsi offset: *icon-offset state: Barber @@ -380,7 +380,7 @@ layers: - state: silver - state: department-side - color: *color-command + color: "#1b67a5" - sprite: *icon-rsi offset: *icon-offset state: Adjutant @@ -399,7 +399,7 @@ layers: - state: default - state: department-side - color: *color-medical + color: "#68aed6" - sprite: *sunrise-icon-rsi offset: *icon-offset state: Pathologist diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml index f06927f7f0..587ec751bc 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Power/powercells.yml @@ -70,8 +70,6 @@ startingCharge: 300 - type: BatterySelfRecharger autoRechargeRate: 4.5 - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 25 - type: entity @@ -146,5 +144,4 @@ maxCharge: 1080 startingCharge: 1080 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 10 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Hydroponics/leaves.yml index e7b983fc96..a03970d914 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Hydroponics/leaves.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Hydroponics/leaves.yml @@ -8,7 +8,7 @@ sprite: _Sunrise/Objects/Specific/Hydroponics/cannabis_vita.rsi - type: Produce seedId: CannabisVita - - type: Food + - type: Edible - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml index bfa680d2a6..4658fb91d3 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml @@ -16,7 +16,7 @@ - FullAuto soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/HMGs/minigun_shot.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeRifleSP fireCost: 5 - type: Appearance @@ -43,7 +43,7 @@ - FullAuto soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/SMGs/mp38/mp38_shot.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeHeavyRifleRFMJ fireCost: 8 - type: Appearance @@ -74,7 +74,7 @@ path: /Audio/_Sunrise/Weapons/Guns/LMGs/shot.ogg params: volume: -3 - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeRifleHeavyFMJ fireCost: 8 - type: Appearance @@ -101,7 +101,7 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mateba.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CannonBall fireCost: 150 - type: Appearance @@ -128,7 +128,7 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mateba.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CannonBallGrapeshot fireCost: 75 - type: Appearance @@ -155,7 +155,7 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mateba.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CannonBallGrapeshotMini fireCost: 25 - type: Appearance @@ -182,7 +182,7 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mateba.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CannonBallGlassshot fireCost: 75 - type: Appearance @@ -238,7 +238,7 @@ - FullAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ship_duster.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: GrenadeFragTimer fireCost: 250 - type: Appearance diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/misc.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/misc.yml index 7df3d29539..bec6725d4b 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/misc.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/misc.yml @@ -15,7 +15,7 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ship_perforator.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: BulletKineticTrash fireCost: 30 - type: Appearance diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml index f890e72b35..ab67508f10 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml @@ -66,7 +66,7 @@ - type: Clickable - type: WiresPanel - type: Physics - bodyType: Dynamic + bodyType: KinematicController #Dynamic - type: MobState allowedStates: - Alive diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml index 6be4434bb9..bfb78490ab 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml @@ -5,7 +5,7 @@ id: MedipenCombatInjector components: - type: Sprite - sprite: Objects/Specific/Medical/hypospray.rsi + sprite: _Sunrise/Objects/Specific/Medical/hypospray.rsi state: combat_minihypo - type: Item sprite: Objects/Specific/Medical/hypospray.rsi @@ -13,25 +13,26 @@ - type: SolutionContainerManager solutions: pen: - maxVol: 100 + maxVol: 80 reagents: - ReagentId: Epinephrine - Quantity: 10 + Quantity: 15 - ReagentId: Omnizine - Quantity: 20 + Quantity: 15 - ReagentId: Saline + Quantity: 15 + - ReagentId: Rororium Quantity: 20 - - ReagentId: Puncturase - Quantity: 25 - ReagentId: Dermaline - Quantity: 25 + Quantity: 15 - type: ExaminableSolution solution: pen - - type: Hypospray + - type: Injector solutionName: pen - transferAmount: 25 - onlyAffectsMobs: true - injectOnly: true + activeModeProtoId: HyposprayInjectMode + allowedModes: + - HyposprayInjectMode + currentTransferAmount: 20 - type: UseDelay delay: 45 - type: Appearance @@ -49,7 +50,7 @@ - type: entity name: ERT hypospray - parent: [BaseItem, BaseGrandTheftContraband] + parent: [Hypospray, BaseCentcommContraband] description: A sterile injector for rapid administration of drugs to patients. id: HyposprayERT components: @@ -62,74 +63,27 @@ solutions: hypospray: maxVol: 20 - - type: RefillableSolution - solution: hypospray - - type: ExaminableSolution - solution: hypospray - - type: Hypospray - onlyAffectsMobs: true - type: UseDelay - delay: 0.5 + delay: 0.15 - type: StaticPrice - price: 750 - - type: Tag - tags: - - HighRiskItem - - type: StealTarget - stealGroup: Hypospray + price: 1500 -- type: entity - name: medical hypospray - parent: BaseItem - description: A sterile injector for rapid administration of drugs to patients. It contains an internal Toxin filter. - id: HyposprayMedicalNoFilter - components: - - type: Sprite - sprite: _Sunrise/Objects/Specific/Medical/hypospray.rsi - state: med-hypospray - - type: Item - sprite: Objects/Specific/Medical/hypospray.rsi - - type: SolutionContainerManager - solutions: - hypospray: - maxVol: 10 - - type: ExaminableSolution - solution: hypospray - - type: Hypospray - onlyAffectsMobs: true - doAfterTime: 0.5 - transferAmount: 5 - - type: UseDelay - delay: 3 - - type: StaticPrice - price: 300 - -- type: entity - name: medical hypospray - parent: HyposprayMedicalNoFilter - description: A sterile injector for rapid administration of drugs to patients. It contains an internal Toxin filter. - id: HyposprayMedical - components: - - type: Hypospray - filterReagentGroups: - - Medicine - -- type: entity - parent: [ BaseItem, BaseSyndicateContraband ] - id: HyposprayMedicalNoFilterBox - name: hacked medical hypospray - description: A box containing a sterile injector for rapid administration of drugs to patients. The internal toxin filter was removed during hacking. The packaging disintegrates upon opening, leaving no residue. - components: - - type: Item - size: Small - - type: Sprite - sprite: _Sunrise/Objects/Storage/boxicons.rsi - state: medhypo - - type: SpawnItemsOnUse - items: - - id: HyposprayMedicalNoFilter - sound: - path: /Audio/Effects/unwrap.ogg +# - type: entity # Sunrise-todo: change to jet injector +# parent: [ BaseItem, BaseSyndicateContraband ] +# id: HyposprayMedicalNoFilterBox +# name: hacked medical hypospray +# description: A box containing a sterile injector for rapid administration of drugs to patients. The internal toxin filter was removed during hacking. The packaging disintegrates upon opening, leaving no residue. +# components: +# - type: Item +# size: Small +# - type: Sprite +# sprite: _Sunrise/Objects/Storage/boxicons.rsi +# state: medhypo +# - type: SpawnItemsOnUse +# items: +# - id: HyposprayMedicalNoFilter +# sound: +# path: /Audio/Effects/unwrap.ogg # Medipens - type: entity @@ -160,23 +114,25 @@ - type: SolutionContainerManager solutions: pen: - maxVol: 30 + maxVol: 35 reagents: - ReagentId: Ephedrine - Quantity: 16 + Quantity: 15 - ReagentId: Epinephrine - Quantity: 8 + Quantity: 10 - ReagentId: Tricordrazine - Quantity: 6 + Quantity: 10 - type: SolutionContainerVisuals maxFillLevels: 1 changeColor: false emptySpriteName: stimpen_empty - - type: Hypospray + - type: Injector solutionName: pen - transferAmount: 30 - onlyAffectsMobs: true - injectOnly: true + currentTransferAmount: 35 + activeModeProtoId: HyposprayInjectMode + allowedModes: + - HyposprayInjectMode + ignoreClosed: false - type: StaticPrice price: 950 @@ -208,19 +164,23 @@ - type: SolutionContainerManager solutions: pen: - maxVol: 15 + maxVol: 20 reagents: - ReagentId: Ephedrine Quantity: 15 + - ReagentId: Tricordrazine + Quantity: 5 - type: SolutionContainerVisuals maxFillLevels: 1 changeColor: false emptySpriteName: microstimpen_empty - - type: Hypospray + - type: Injector solutionName: pen - transferAmount: 15 #Sunrise-Edit - onlyAffectsMobs: false - injectOnly: true + currentTransferAmount: 20 + activeModeProtoId: HyposprayInjectMode + allowedModes: + - HyposprayInjectMode + ignoreClosed: false - type: StaticPrice price: 250 @@ -326,11 +286,13 @@ reagents: - ReagentId: PolypyryliumOligomers Quantity: 20 - - type: Hypospray + - type: Injector solutionName: pen - transferAmount: 20 - onlyAffectsMobs: false - injectOnly: true + currentTransferAmount: 20 + activeModeProtoId: HyposprayInjectMode + allowedModes: + - HyposprayInjectMode + ignoreClosed: false - type: entity name: stellibinin auto-injector @@ -421,8 +383,10 @@ reagents: - ReagentId: Charcoal Quantity: 15 - - type: Hypospray + - type: Injector solutionName: pen - transferAmount: 15 - onlyAffectsMobs: false - injectOnly: true + currentTransferAmount: 15 + activeModeProtoId: HyposprayInjectMode + allowedModes: + - HyposprayInjectMode + ignoreClosed: false diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/viruses.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/viruses.yml index b546288fc4..175b7026cd 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/viruses.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/viruses.yml @@ -5,13 +5,14 @@ - type: SolutionContainerManager solutions: injector: - maxVol: 15 + maxVol: 10 reagents: - ReagentId: Romerol - Quantity: 5 + Quantity: 10 - type: Injector - injectOnly: false - toggleState: Inject + activeModeProtoId: SyringeInjectMode + allowedModes: + - SyringeInjectMode - type: entity parent: BaseSyringe @@ -20,10 +21,11 @@ - type: SolutionContainerManager solutions: injector: - maxVol: 15 + maxVol: 10 reagents: - ReagentId: Carol - Quantity: 5 + Quantity: 10 - type: Injector - injectOnly: false - toggleState: Inject + activeModeProtoId: SyringeInjectMode + allowedModes: + - SyringeInjectMode diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml index 96d6947d18..245eeb681e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml @@ -174,7 +174,6 @@ - type: Tag tags: - NTUplink - - Debug - ERTRed - ERTGamma - ERTEpsilon diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Pirate/reinforcement_teleporter.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Pirate/reinforcement_teleporter.yml index 597706bd87..2b208e8cfd 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Pirate/reinforcement_teleporter.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Pirate/reinforcement_teleporter.yml @@ -16,7 +16,7 @@ color: "#FF0000" - type: EmitSoundOnSpawn sound: - path: /Audio/Effects/electrical_short_circuit2.ogg + path: /Audio/_Sunrise/Effects/electrical_short_circuit2.ogg - type: TimedDespawn lifetime: 90 - type: EvaporationSparkle @@ -30,7 +30,7 @@ - type: ActivatableUI key: enum.GhostRoleRadioUiKey.Key - type: EmitSoundOnUse - sound: /Audio/Misc/emergency_meeting.ogg + sound: /Audio/_Sunrise/Misc/emergency_meeting.ogg - type: entity parent: ReinforcementTeleport diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml index fb0daa5822..b6b555ab1f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_tools.yml @@ -6,7 +6,6 @@ categories: [ HideSpawnMenu ] components: - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 4 - type: entity @@ -17,7 +16,6 @@ categories: [ HideSpawnMenu ] components: - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 10 - type: entity @@ -28,7 +26,6 @@ categories: [ HideSpawnMenu ] components: - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 10 - type: entity @@ -85,7 +82,6 @@ - delta - epsilon - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 20 - type: MagazineVisuals magState: laser_cyborg @@ -138,10 +134,12 @@ reagents: - ReagentId: Epinephrine Quantity: 0.4 - - type: Hypospray - onlyAffectsMobs: true - injectOnly: true - transferAmount: 5 #Sunrise-End + - type: Injector + solutionName: hypospray + activeModeProtoId: HyposprayInjectMode + allowedModes: + - HyposprayInjectMode + currentTransferAmount: 5 #Sunrise-End - type: UseDelay delay: 1 @@ -168,9 +166,6 @@ Quantity: 0.1 - ReagentId: ChloralHydrate Quantity: 2 - - type: Hypospray - onlyAffectsMobs: true - injectOnly: true - type: entity parent: HypoBorgStandard @@ -202,9 +197,6 @@ - ReagentId: Dermaline Quantity: 1 keepSolution: false - - type: Hypospray - onlyAffectsMobs: true - injectOnly: true - type: BorgHypospray - type: entity @@ -257,9 +249,6 @@ - ReagentId: Phalanximine Quantity: 0.5 keepSolution: false - - type: Hypospray - onlyAffectsMobs: true - injectOnly: true - type: BorgHypospray - type: entity @@ -317,9 +306,7 @@ Quantity: 2 - ReagentId: DexalinPlus Quantity: 2 - - type: Hypospray - onlyAffectsMobs: true - injectOnly: true + - type: BorgHypospray - type: entity name: gorlax robot hypospray @@ -347,64 +334,7 @@ Quantity: 0.1 - type: ExaminableSolution solution: hypospray - - type: Hypospray - onlyAffectsMobs: true - doAfterTime: 0.1 #Sunrise-Edit - injectOnly: true - -- type: entity - name: robot china lake - parent: WeaponLauncherChinaLake - id: WeaponLauncherChinaLakeBorg - description: PLOOP - categories: [ HideSpawnMenu ] - components: - - type: Gun - fireRate: 1 - selectedMode: FullAuto - availableModes: - - FullAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg - - type: Appearance - - type: ProjectileBatteryAmmoProvider - proto: GrenadeFragTimer - fireCost: 1000 - - type: Battery - maxCharge: 10000 - startingCharge: 10000 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 25 - - type: AmmoCounter - -- type: entity - id: FireExtinguisherBorg - name: fire extinguisher borg - description: fire extinguisher borg - parent: FireExtinguisher - categories: [ HideSpawnMenu ] - components: - - type: SolutionRegeneration - solution: spray - generated: - reagents: - - ReagentId: Water - Quantity: 2 - -- type: entity - id: SprayBottleSpaceCleanerBorg - name: space cleaner - description: BLAM!-brand non-foaming space cleaner! - parent: SprayBottleSpaceCleaner - categories: [ HideSpawnMenu ] - components: - - type: SolutionRegeneration - solution: spray - generated: - reagents: - - ReagentId: SpaceCleaner - Quantity: 2 + - type: BorgHypospray - type: entity name: borg crowbar @@ -542,7 +472,6 @@ id: WeaponDisablerSMGBorg components: - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 30 - type: entity @@ -575,7 +504,6 @@ maxCharge: 5000 startingCharge: 5000 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 30 - type: entity @@ -607,13 +535,12 @@ availableModes: - FullAuto - type: BatteryAmmoProvider - proto: RedLaser # Sunrise-TODO: Нужен товый прототип для данной пушки + proto: RedLaser # Sunrise-TODO: ????? ????? ???????? ??? ?????? ????? fireCost: 50 - type: Battery maxCharge: 10000 startingCharge: 10000 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 30 - type: AmmoCounter @@ -653,9 +580,7 @@ maxCharge: 10000 startingCharge: 10000 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 250 - autoRechargePause: true autoRechargePauseTime: 10 - type: entity @@ -675,16 +600,14 @@ - FullAuto soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Snipers/Bauer127/bauer127_shot.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeAntiMateriel fireCost: 500 - type: Battery maxCharge: 4000 startingCharge: 4000 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 250 - autoRechargePause: true autoRechargePauseTime: 20 - type: AmmoCounter @@ -714,16 +637,14 @@ burstCooldown: 1.15 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/ship_duster.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: GrenadeFragTimer fireCost: 250 - type: Battery maxCharge: 1500 startingCharge: 1500 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 125 - autoRechargePause: true autoRechargePauseTime: 20 - type: AmmoCounter @@ -763,7 +684,6 @@ maxCharge: 5000 startingCharge: 5000 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 25 - type: AmmoCounter @@ -790,9 +710,11 @@ Quantity: 0.2 - type: ExaminableSolution solution: hypospray - - type: Hypospray - onlyAffectsMobs: true - injectOnly: true + - type: Injector + solutionName: hypospray + activeModeProtoId: HyposprayInjectMode + allowedModes: + - HyposprayInjectMode - type: entity parent: HandheldCrewMonitor @@ -880,9 +802,6 @@ Quantity: 0.1 - type: ExaminableSolution solution: hypospray - - type: Hypospray - onlyAffectsMobs: true - injectOnly: true - type: entity name: Borg heavy laser cannon @@ -908,7 +827,6 @@ maxCharge: 1000 startingCharge: 1000 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 25 # 40 seconds full recharge. - type: MagazineVisuals magState: laser_cyborg @@ -988,9 +906,7 @@ maxCharge: 1600 startingCharge: 1600 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 50 # 32 seconds full recharge. - autoRechargePause: true autoRechargePauseTime: 5 - type: AmmoCounter @@ -1034,9 +950,7 @@ maxCharge: 2600 startingCharge: 2600 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 65 # 40 seconds full recharge. - autoRechargePause: true autoRechargePauseTime: 5 - type: AmmoCounter @@ -1180,3 +1094,17 @@ examinableWhileClosed: true - type: SolutionItemStatus solution: drink + +- type: entity + id: FireExtinguisherBorg + name: fire extinguisher borg + description: fire extinguisher borg + parent: FireExtinguisher + categories: [ HideSpawnMenu ] + components: + - type: SolutionRegeneration + solution: spray + generated: + reagents: + - ReagentId: Water + Quantity: 2 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Science/radiaton_emitter.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Science/radiaton_emitter.yml index 50e5a903b9..7b0c0eb236 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Science/radiaton_emitter.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Science/radiaton_emitter.yml @@ -25,7 +25,7 @@ fireRate: 0.5 soundGunshot: path: /Audio/Weapons/Guns/Gunshots/taser2.ogg - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: RadiationBullet fireCost: 100 - type: Construction diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml index fe316b517a..c7502ab834 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Tools/energydome.yml @@ -33,7 +33,7 @@ domePrototype: EnergyDomeMediumRed - type: PowerCellDraw drawRate: 0 - useRate: 0 + useCharge: 0 - type: UseDelay delay: 10.0 - type: Biocode @@ -75,7 +75,7 @@ domePrototype: EnergyDomeMediumBlue - type: PowerCellDraw drawRate: 0 - useRate: 0 + useCharge: 0 - type: UseDelay delay: 10.0 @@ -113,6 +113,6 @@ domePrototype: EnergyDomeSmallBlue - type: PowerCellDraw drawRate: 0 - useRate: 0 + useCharge: 0 - type: UseDelay delay: 10.0 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/heavy_rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/heavy_rifle.yml index cc10478d5e..8b2324b98c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/heavy_rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/heavy_rifle.yml @@ -6,7 +6,6 @@ components: - type: Tag tags: - - Cartridge - CartridgeHeavyRifle - type: Sprite sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Casings/7.62x51.rsi @@ -28,7 +27,6 @@ components: - type: Tag tags: - - Cartridge - CartridgeHeavyRifleR - type: Sprite sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Casings/7.62x54.rsi @@ -74,8 +72,8 @@ name: cartridge (.308 SP) parent: BaseCartridgeRifleHeavy components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHeavySP + - type: CartridgeAmmo + proto: BulletRifleTraceHeavySP - type: Sprite layers: - state: base @@ -89,8 +87,8 @@ name: cartridge (.308 HP) parent: BaseCartridgeRifleHeavy components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHeavyHP + - type: CartridgeAmmo + proto: BulletRifleTraceHeavyHP - type: Sprite layers: - state: base @@ -104,8 +102,8 @@ name: cartridge (.308 FMJ) parent: BaseCartridgeRifleHeavy components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHeavyFMJ + - type: CartridgeAmmo + proto: BulletRifleTraceHeavyFMJ - type: Sprite layers: - state: base @@ -119,8 +117,8 @@ name: cartridge (.308 AP) parent: BaseCartridgeRifleHeavy components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHeavyAP + - type: CartridgeAmmo + proto: BulletRifleTraceHeavyAP - type: Sprite layers: - state: base @@ -134,8 +132,8 @@ name: cartridge (.308 practice) parent: BaseCartridgeRifleHeavy components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHeavyPractice + - type: CartridgeAmmo + proto: BulletRifleTraceHeavyPractice - type: Sprite layers: - state: base @@ -150,7 +148,7 @@ parent: BaseCartridgeRifleHeavy components: - type: CartridgeAmmo - proto: BulletRifleTraceHeavyIncendiary + proto: BulletRifleHeavyIncendiary - type: Sprite layers: - state: base @@ -164,8 +162,8 @@ name: cartridge (.308 uranium) parent: BaseCartridgeRifleHeavy components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHeavyUranium + - type: CartridgeAmmo + proto: BulletRifleTraceHeavyUranium - type: Sprite layers: - state: base @@ -180,8 +178,8 @@ name: cartridge (7.62mmR SP) parent: BaseCartridgeHeavyRifleR components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHeavySP + - type: CartridgeAmmo + proto: BulletRifleTraceHeavySP - type: Sprite layers: - state: base @@ -195,8 +193,8 @@ name: cartridge (7.62mmR HP) parent: BaseCartridgeHeavyRifleR components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHeavyHP + - type: CartridgeAmmo + proto: BulletRifleTraceHeavyHP - type: Sprite layers: - state: base @@ -210,8 +208,8 @@ name: cartridge (7.62mmR FMJ) parent: BaseCartridgeHeavyRifleR components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHeavyFMJ + - type: CartridgeAmmo + proto: BulletRifleTraceHeavyFMJ - type: Sprite layers: - state: base @@ -225,8 +223,8 @@ name: cartridge (7.62mmR AP) parent: BaseCartridgeHeavyRifleR components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHeavyAP + - type: CartridgeAmmo + proto: BulletRifleTraceHeavyAP - type: Sprite layers: - state: base @@ -240,8 +238,8 @@ name: cartridge (7.62mmR practice) parent: BaseCartridgeHeavyRifleR components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHeavyPractice + - type: CartridgeAmmo + proto: BulletRifleTraceHeavyPractice - type: Sprite layers: - state: base @@ -256,7 +254,7 @@ parent: BaseCartridgeHeavyRifleR components: - type: CartridgeAmmo - proto: BulletRifleTraceHeavyIncendiary + proto: BulletRifleHeavyIncendiary - type: Sprite layers: - state: base @@ -270,8 +268,8 @@ name: cartridge (7.62mmR uranium) parent: BaseCartridgeHeavyRifleR components: - - type: HitScanCartridgeAmmo - hitscan: BulletRifleTraceHeavyUranium + - type: CartridgeAmmo + proto: BulletRifleTraceHeavyUranium - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/lasers.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/lasers.yml new file mode 100644 index 0000000000..7ab49b010a --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/lasers.yml @@ -0,0 +1,17 @@ +- type: entity + parent: BaseCartridge + id: CartridgeXrayBeam + categories: [ HideSpawnMenu ] + components: + - type: Tag + tags: + - Cartridge + - type: CartridgeAmmo + deleteOnSpawn: true + proto: XrayLaserBeam + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/shotguns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/shotguns.yml index 4a391d7b20..8afc77d0e0 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/shotguns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Catrtidges/shotguns.yml @@ -63,10 +63,10 @@ - type: Construction graph: ImprovisedShotgunShellGraph node: shell - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo soundEject: collection: ShellEject - hitscan: PelletShotgunImprovisedSpreadTrace + proto: PelletShotgunImprovisedSpreadTrace - type: SpentAmmoVisuals state: "improvised" @@ -88,10 +88,10 @@ - type: Construction graph: ImprovisedIncendiaryShotgunShellGraph node: shell - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo soundEject: collection: ShellEject - hitscan: PelletShotgunImprovisedIncendiarySpreadTrace + proto: PelletShotgunImprovisedIncendiarySpread - type: SpentAmmoVisuals state: "improvised-incendiary" revealSpent: false @@ -115,10 +115,10 @@ - type: Construction graph: ImprovisedUraniumShotgunShellGraph node: shell - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo soundEject: collection: ShellEject - hitscan: PelletShotgunImprovisedUraniumSpreadTrace + proto: PelletShotgunImprovisedUraniumSpread - type: SpentAmmoVisuals state: "improvised-uranium" revealSpent: false @@ -142,10 +142,10 @@ - type: Construction graph: CoinShotgunShellGraph node: shell - - type: HitScanCartridgeAmmo + - type: CartridgeAmmo soundEject: collection: ShellEject - hitscan: PelletShotgunCoinSpreadTrace + proto: PelletShotgunCoinSpread - type: SpentAmmoVisuals state: "coinshot" revealSpent: false diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index 0b6a401828..f119e0e74f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -7,7 +7,7 @@ - type: entity parent: BaseMagazinePistolCaselessRifleExtended - id: BaseMagazinePistolCaselessRifleTec9 + id: MagazinePistolSubMachineGunCaseless name: Tec9Magazine components: - type: Sprite @@ -23,3 +23,27 @@ steps: 2 zeroVisible: false - type: Appearance + +- type: entity + id: MagazinePistolSubMachineGunCaselessExtended + name: extended magazine (caseless) + parent: BaseMagazineLightRifle + components: + - type: Tag + tags: + - MagazineCaselessRifle + - type: BallisticAmmoProvider + proto: CartridgeCaselessRifle + mayTransfer: true + whitelist: + tags: + - CartridgeCaselessRifle + capacity: 35 + - type: Item + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/IAR-52mag.rsi + - type: MagazineVisuals + magState: mag + steps: 8 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index 6b86f225ff..d16e904d7d 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -1,66 +1,136 @@ +# region Light Rifle - type: entity - id: MagazineScorpion - name: Scorpion magazine - parent: BaseItem + id: MagazineLightRifleSP + name: "magazine (.30 rifle SP)" + parent: BaseMagazineLightRifle components: - - type: Tag - tags: - - MagazineScorpion - type: BallisticAmmoProvider - mayTransfer: true - proto: CartridgePistolSP - whitelist: - tags: - - CartridgePistol - capacity: 20 - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container + proto: CartridgeLightRifleSP - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/scorpion.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance + - state: stripe + color: "#575EF5" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#575EF5" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#575EF5" - type: entity - id: MagazineNewVector - name: New Vector magazine - parent: BaseItem + id: MagazineLightRifleHP + name: "magazine (.30 rifle HP)" + parent: BaseMagazineLightRifle + description: Curved 30-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition. components: - - type: Tag - tags: - - MagazineNewVector - type: BallisticAmmoProvider - mayTransfer: true - proto: CartridgeLightRifleSP - whitelist: - tags: - - CartridgeLightRifle - capacity: 45 - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container + proto: CartridgeLightRifleHP - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/new_vector.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#F5514C" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#F5514C" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#F5514C" + +- type: entity + id: MagazineLightRifleFMJ + name: "magazine (.30 rifle FMJ)" + parent: BaseMagazineLightRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleFMJ + +- type: entity + id: MagazineLightRifleAP + name: "magazine (.30 rifle AP)" + parent: BaseMagazineLightRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleAP + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#540000" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#540000" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#540000" + +- type: entity + id: MagazineLightRifleImprovised + name: "magazine (.30 rifle improvised)" + parent: BaseMagazineLightRifle + description: Curved 30-round double stack magazine for combat rifles. Intended to hold improvised ammunition. + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleImprovised + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#000000a3" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#000000a3" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#000000a3" + +# region Light LMG +- type: entity + id: MagazineDl6902 + name: box-magazine DL6902 + parent: BaseMagazineLightRifle + components: + - type: Tag + tags: + - MagazineDl6902 + - type: BallisticAmmoProvider + proto: CartridgeLightRifleSP + capacity: 200 + - type: Item + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Dl6902mag.rsi - type: MagazineVisuals magState: mag - steps: 2 + steps: 8 zeroVisible: false - type: Appearance @@ -85,6 +155,7 @@ zeroVisible: false - type: Appearance +# region Heavy LMG - type: entity id: MagazineMachineGunMG42 name: MG42 magazine @@ -151,6 +222,73 @@ zeroVisible: false - type: Appearance +# region Other +- type: entity + id: MagazineScorpion + name: Scorpion magazine + parent: BaseItem + components: + - type: Tag + tags: + - MagazineScorpion + - type: BallisticAmmoProvider + mayTransfer: true + proto: CartridgePistolSP + whitelist: + tags: + - CartridgePistol + capacity: 20 + - type: Item + size: Small + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/scorpion.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazineNewVector + name: New Vector magazine + parent: BaseItem + components: + - type: Tag + tags: + - MagazineNewVector + - type: BallisticAmmoProvider + mayTransfer: true + proto: CartridgeLightRifleSP + whitelist: + tags: + - CartridgeLightRifle + capacity: 45 + - type: Item + size: Small + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/new_vector.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + - type: entity id: MagazineVP78 name: VP70 magazine @@ -249,104 +387,3 @@ steps: 6 zeroVisible: false - type: Appearance - -- type: entity - id: MagazineDl6902 - name: box-magazine DL6902 - parent: BaseMagazineLightRifle - components: - - type: Tag - tags: - - MagazineDl6902 - - type: BallisticAmmoProvider - proto: CartridgeLightRifleSP - capacity: 200 - - type: Item - - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/Dl6902mag.rsi - - type: MagazineVisuals - magState: mag - steps: 8 - zeroVisible: false - - type: Appearance - -- type: entity - id: MagazinePistolSubMachineGunSIAR52 - name: extended magazine (caseless) - parent: BaseMagazineLightRifle - components: - - type: Tag - tags: - - MagazineCaselessRifle - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifle - mayTransfer: true - whitelist: - tags: - - CartridgeCaselessRifle - capacity: 35 - - type: Item - - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/IAR-52mag.rsi - - type: MagazineVisuals - magState: mag - steps: 8 - zeroVisible: false - - type: Appearance - -- type: entity - id: MagazineScarH - name: scar-h magazine - parent: BaseItem - components: - - type: BallisticAmmoProvider - mayTransfer: true - whitelist: - tags: - - CartridgeHeavyRifle - proto: CartridgeRifleHeavySP - capacity: 30 - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/scarh.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance - -- type: entity - id: MagazineLightRifleImprovised - name: "magazine (.30 rifle improvised)" - parent: BaseMagazineLightRifle - description: Curved 30-round double stack magazine for combat rifles. Intended to hold improvised ammunition. - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifleImprovised - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: stripe - color: "#000000a3" - - type: Item - inhandVisuals: - left: - - state: inhand-left-mag - - state: inhand-left-stripe - color: "#000000a3" - right: - - state: inhand-right-mag - - state: inhand-right-stripe - color: "#000000a3" diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index e69de29bb2..581f770b96 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -0,0 +1,391 @@ +# region Rifle +- type: entity + id: MagazineRifleSP + name: "magazine (.20 rifle SP)" + parent: BaseMagazineRifle + description: 25-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition. + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleSP + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#575EF5" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#575EF5" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#575EF5" + +- type: entity + id: MagazineRifleHP + name: "magazine (.20 rifle HP)" + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleHP + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#F5514C" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#F5514C" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#F5514C" + +- type: entity + id: MagazineRifleFMJ + name: "magazine (.20 rifle FMJ)" + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleFMJ + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineRifleAP + name: "magazine (.20 rifle AP)" + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleAP + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#540000" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#540000" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#540000" + +# region M-52 +- type: entity + id: BaseMagazineRifleM52 + parent: BaseMagazineRifle + abstract: true + components: + - type: BallisticAmmoProvider + capacity: 40 + - type: Tag + tags: + - MagazineRifleM52 + - type: Sprite + sprite: _Starlight/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/m-52.rsi + - type: MagazineVisuals + magState: mag + steps: 7 + zeroVisible: false + +- type: entity + id: MagazineRifleM52SP + name: "magazine (.20 rifle SP)" + parent: BaseMagazineRifleM52 + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleSP + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#575EF5" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#575EF5" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#575EF5" + +- type: entity + id: MagazineRifleM52HP + name: "magazine (.20 rifle HP)" + parent: BaseMagazineRifleM52 + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleHP + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#F5514C" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#F5514C" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#F5514C" + +- type: entity + id: MagazineRifleM52FMJ + name: "magazine (.20 rifle FMJ)" + parent: BaseMagazineRifleM52 + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleFMJ + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#080706" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#080706" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#080706" + +- type: entity + id: MagazineRifleM52AP + name: "magazine (.20 rifle AP)" + parent: BaseMagazineRifleM52 + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleAP + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#540000" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#540000" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#540000" + +- type: entity + id: MagazineRifleM52Empty + name: "magazine (.20 rifle any)" + suffix: empty + parent: BaseMagazineRifleM52 + components: + - type: BallisticAmmoProvider + proto: null + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + right: + - state: inhand-right-mag + +- type: entity + id: MagazineRifleM52Incendiary + name: "magazine (.20 rifle incendiary)" + parent: BaseMagazineRifleM52 + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleIncendiary + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#ff6e52" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#ff6e52" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#ff6e52" + +- type: entity + id: MagazineRifleM52Practice + name: "magazine (.20 rifle practice)" + parent: BaseMagazineRifleM52 + components: + - type: BallisticAmmoProvider + proto: CartridgeRiflePractice + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#dbdbdb" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#dbdbdb" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#dbdbdb" + +- type: entity + id: MagazineRifleM52Uranium + name: "magazine (.20 rifle uranium)" + parent: BaseMagazineRifleM52 + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleUranium + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#40F57A" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#40F57A" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#40F57A" + +# region LMG L6 SAW +- type: entity + id: MagazineRifleBoxSP + name: "L6 SAW magazine box (.20 rifle SP)" + parent: BaseMagazineRifle + description: Box containing a 150-round belt of linked .20 rifle rounds, used by light machine guns such as the L6. Intended to hold general-purpose kinetic ammunition. + components: + - type: Tag + tags: + - MagazineLightRifleBox + - type: BallisticAmmoProvider + proto: CartridgeRifleSP + capacity: 150 + - type: Item + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi + - type: MagazineVisuals + magState: mag + steps: 8 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazineRifleBoxEmpty + name: "L6 SAW magazine box (.20 rifle any)" + parent: MagazineRifleBoxSP + description: Box containing a 150-round belt of linked .20 rifle rounds, used by light machine guns such as the L6. + components: + - type: Tag + tags: + - MagazineLightRifleBox + - type: BallisticAmmoProvider + proto: null + - type: Item + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi + - type: MagazineVisuals + magState: mag + steps: 8 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazineRifleBoxFMJ + name: "L6 SAW magazine box (.20 rifle FMJ)" + parent: MagazineRifleBoxSP + description: Box containing a 150-round belt of linked .20 rifle rounds, used by light machine guns such as the L6. Intended to hold FMJ kinetic ammunition. + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleFMJ + +- type: entity + id: MagazineRifleBoxIncendiary + name: "L6 SAW magazine box (.20 rifle incendiary)" + parent: MagazineRifleBoxSP + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleIncendiary + - type: Sprite + layers: + - state: red + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineRifleBoxUranium + name: "L6 SAW magazine box (.20 rifle uranium)" + parent: MagazineRifleBoxSP + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleUranium + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/projectiles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/projectiles.yml new file mode 100644 index 0000000000..2585f12756 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/projectiles.yml @@ -0,0 +1,100 @@ +- type: entity + parent: BaseBulletIncendiary + id: BulletRifleHeavyIncendiary + categories: [ HideSpawnMenu ] + name: bullet (.308 incendiary) + components: + - type: Projectile + damage: + types: + Piercing: 20 + Heat: 5 + +- type: entity + id: PelletShotgunImprovisedIncendiary + name: improvised incendiary pellet + categories: [ HideSpawnMenu ] + parent: BaseBulletIncendiary + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: shard + layers: + - state: shard + shader: unshaded + color: "#d15b00" + - type: Projectile + damage: + types: + Piercing: 1.5 + Slash: 1.5 + Heat: 7 + - type: IgnitionSource + ignited: true + +- type: entity + id: PelletShotgunImprovisedIncendiarySpread + categories: [ HideSpawnMenu ] + parent: PelletShotgunImprovisedIncendiary + components: + - type: ProjectileSpread + proto: PelletShotgunImprovisedIncendiary + count: 6 + spread: 45 + +- type: entity + id: PelletShotgunImprovisedUranium + name: improvised uranium pellet + categories: [ HideSpawnMenu ] + parent: BaseBullet + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: shard + layers: + - state: shard + shader: unshaded + color: "#8eff7a" + - type: Projectile + damage: + types: + Piercing: 1.25 + Slash: 1.25 + Radiation: 2.5 + +- type: entity + id: PelletShotgunImprovisedUraniumSpread + categories: [ HideSpawnMenu ] + parent: PelletShotgunImprovisedUranium + components: + - type: ProjectileSpread + proto: PelletShotgunImprovisedUranium + count: 10 + spread: 45 + +- type: entity + id: PelletShotgunCoin + name: pellet (coin slug) + categories: [ HideSpawnMenu ] + parent: BaseBullet + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: coinstack + layers: + - state: coinstack + shader: unshaded + - type: Projectile + damage: + types: + Piercing: 14 + +- type: entity + id: PelletShotgunCoinSpread + categories: [ HideSpawnMenu ] + parent: PelletShotgunCoin + components: + - type: ProjectileSpread + proto: PelletShotgunCoin + count: 2 + spread: 8 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index 63a7618f07..cacf9630a7 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -21,7 +21,7 @@ parent: BaseArtilleryShell components: - type: CartridgeAmmo - proto: BulletGrenadeFragContact + proto: BulletGrenadeFrag - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi scale: 0.8, 1.15 @@ -57,7 +57,7 @@ parent: BaseArtilleryShell components: - type: CartridgeAmmo - proto: BulletGrenadeBlastContact + proto: BulletGrenadeBlast - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi scale: 0.8, 1.15 @@ -75,7 +75,7 @@ parent: BaseArtilleryShell components: - type: CartridgeAmmo - proto: BulletGrenadeFlashContact + proto: BulletGrenadeFlash - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi scale: 0.8, 1.15 @@ -93,7 +93,7 @@ parent: BaseArtilleryShell components: - type: CartridgeAmmo - proto: BulletGrenadeEMPContact + proto: BulletGrenadeEMP - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi scale: 1.2, 1.4 @@ -157,8 +157,8 @@ suffix: Pirate parent: BaseCartridge components: - - type: HitScanCartridgeAmmo - hitscan: PelletShotgunImprovisedSpreadTraceLarge + - type: CartridgeAmmo + proto: PelletShotgunImprovisedSpreadTraceLarge deleteOnSpawn: true - type: Sprite scale: 0.75,0.75 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 1446a45b03..4096df0c25 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -166,9 +166,7 @@ maxCharge: 720 startingCharge: 720 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 60 - autoRechargePause: true autoRechargePauseTime: 6 - type: BatteryAmmoProvider proto: DisablerBolt @@ -411,9 +409,7 @@ maxCharge: 1500 startingCharge: 1500 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 14 # ~2 minute - autoRechargePause: true autoRechargePauseTime: 30 - type: BatteryAmmoProvider proto: DisablerBolt @@ -800,9 +796,7 @@ proto: RedLaserBeam # Sunrise-TODO: Нужен товый прототип для данной пушки fireCost: 50 - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 10 - autoRechargePause: true autoRechargePauseTime: 10 - type: StaticPrice price: 7500 @@ -1153,10 +1147,8 @@ proto: RedLightLaser fireCost: 33 - type: BatterySelfRecharger - autoRecharge: true autoRechargePauseTime: 1 autoRechargeRate: 250 - autoRechargePause: true - type: MagazineVisuals magState: mag steps: 5 @@ -1179,7 +1171,7 @@ - type: Gun soundGunshot: path: /Audio/Weapons/Guns/Gunshots/laser3.ogg - - type: ProjectileBatteryAmmoProvider # Sunrise-Edit + - type: BatteryAmmoProvider # Sunrise-Edit proto: CartridgeXrayBeam # Sunrise-Edit fireCost: 100 - type: MagazineVisuals @@ -1188,5 +1180,4 @@ zeroVisible: true - type: Appearance - type: BatterySelfRecharger - autoRecharge: true autoRechargeRate: 30 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Biocode/biocode.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Biocode/biocode.yml index 272e148b77..e0a1c39c29 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Biocode/biocode.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Biocode/biocode.yml @@ -1,17 +1,7 @@ - type: entity parent: WeaponRevolverPythonAP id: WeaponRevolverPythonAPBiocode - suffix: BIOCODE - components: - - type: FactionWeaponBlocker - factions: - - Syndicate - alertText: Данное оружие биокодировано. Вы не можете его использовать. - -- type: entity - parent: WeaponRevolverPython - id: WeaponRevolverPythonBiocode - suffix: BIOCODE + suffix: BIOCODE, AP components: - type: FactionWeaponBlocker factions: @@ -88,26 +78,6 @@ - Syndicate alertText: Данное оружие биокодировано. Вы не можете его использовать. -- type: entity - parent: WeaponPistolCobra - id: WeaponPistolCobraBiocode - suffix: BIOCODE - components: - - type: FactionWeaponBlocker - factions: - - Syndicate - alertText: Данное оружие биокодировано. Вы не можете его использовать. - -- type: entity - parent: WeaponPistolViper - id: WeaponPistolViperBiocode - suffix: BIOCODE - components: - - type: FactionWeaponBlocker - factions: - - Syndicate - alertText: Данное оружие биокодировано. Вы не можете его использовать. - - type: entity parent: WeaponPistolDeagle id: WeaponPistolDeagleBiocode @@ -229,8 +199,8 @@ alertText: Данное оружие биокодировано. Вы не можете его использовать. - type: entity - parent: WeaponMiniEnergyCrossbow - id: WeaponMiniEnergyCrossbowBiocode + parent: WeaponEnergyCrossbow + id: WeaponEnergyCrossbowBiocode suffix: BIOCODE components: - type: FactionWeaponBlocker @@ -257,13 +227,3 @@ factions: - Syndicate alertText: Данное оружие биокодировано. Вы не можете его использовать. - -- type: entity - parent: WeaponPistolTec9 - id: WeaponPistolTec9Biocode - suffix: BIOCODE - components: - - type: FactionWeaponBlocker - factions: - - Syndicate - alertText: Данное оружие биокодировано. Вы не можете его использовать. diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml index dc4e34bafd..5cf0ba09c7 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml @@ -120,9 +120,9 @@ - 0,0,6,4 - type: Gun minAngle: 5 - maxAngle: 90 - angleIncrease: 2.5 - angleDecay: 30 + maxAngle: 80 + angleIncrease: 1.5 + angleDecay: 40 fireRate: 8 selectedMode: FullAuto availableModes: @@ -177,8 +177,8 @@ whitelist: tags: - CartridgeLightRifle - proto: CartridgeLightRifleSP - capacity: 1000 + proto: CartridgeLightRifleFMJ + capacity: 1200 - type: ClothingSpeedModifier walkModifier: 0.85 sprintModifier: 0.85 @@ -188,6 +188,9 @@ - 0,0,6,4 - type: ExplosionResistance damageCoefficient: 0.1 + - type: StorageFill + contents: + - id: CrazyGlue - type: ItemSlots slots: weapon_slot: diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 548cb643c1..88c7e99e7d 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -290,7 +290,7 @@ maxAngle: 16 angleIncrease: 2.75 angleDecay: 15 - fireRate: 4.25 + fireRate: 4 availableModes: - SemiAuto soundGunshot: @@ -523,9 +523,8 @@ - type: Item sprite: _Sunrise/Objects/Weapons/Guns/Pistols/goldDeagle/tiny.rsi - - type: entity - name: Tec-9 Tactical + name: Tac-Tec parent: BaseWeaponPistolSunrise id: WeaponPistolTec9 components: @@ -546,13 +545,14 @@ slots: gun_magazine: name: Magazine - startingItem: BaseMagazinePistolCaselessRifleTec9 + startingItem: MagazinePistolSubMachineGunCaseless insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg priority: 1 whitelist: tags: - MagazinePistolCaselessRifle + - MagazineCaselessRifle gun_chamber: name: Chamber startingItem: CartridgeCaselessRifle diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 20dcfccd44..8058e3946c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -1,32 +1,322 @@ -- type: hitscan +- type: entity id: RedShuttleMediumLaser - maxLength: 80 - damage: - types: - Heat: 17 - Structural: 13 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_laser - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_laser + parent: BasicHitscan + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicRaycast + maxDistance: 80.0 + - type: HitscanBasicDamage + damage: + types: + Heat: 20 + Structural: 13 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_laser + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: beam + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_laser -- type: hitscan - id: IgnitionRedLaser - igniteOnCollision: true - damage: - types: - Heat: 14 - muzzleFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: muzzle_laser - travelFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: beam - impactFlash: - sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi - state: impact_laser +# region Heavy Rifle +- type: entity + id: BulletRifleTraceHeavySP + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -0.13 + damage: + types: + Piercing: 25 + Structural: 10 + - type: HitscanStaminaDamage + staminaDamage: 5 + - type: HitscanPierce + chance: 0.40 + deviation: 0.05 + pierceLevel: Metal + - type: HitscanRicochet + chance: 0.30 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: sp + +- type: entity + id: BulletRifleTraceHeavyHP + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: -0.90 + damage: + types: + Piercing: 30 # +30% + - type: HitscanStaminaDamage + staminaDamage: 10 + - type: HitscanPierce + chance: 0.05 + deviation: 0.05 + - type: HitscanRicochet + chance: 0.15 + +- type: entity + id: BulletRifleTraceHeavyFMJ + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.25 + damage: + types: + Piercing: 20 #- 30% + Structural: 5 + - type: HitscanStaminaDamage + staminaDamage: 3 + - type: HitscanPierce + chance: 0.8 + deviation: 0.05 + pierceLevel: Metal + - type: HitscanRicochet + chance: 0.80 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: fmj + +- type: entity + id: BulletRifleTraceHeavyPractice + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Blunt: 5 + - type: HitscanPierce + chance: 0.5 + deviation: 0.05 + - type: HitscanRicochet + chance: 0.8 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: practice + +- type: entity + id: BulletRifleTraceHeavyAP + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + armorPenetration: 0.69 + damage: + types: + Piercing: 20 #- 30% + Structural: 2 + - type: HitscanStaminaDamage + staminaDamage: 2 + - type: HitscanPierce + chance: 0.9 + deviation: 0.05 + pierceLevel: HardenedMetal + - type: HitscanRicochet + chance: 0.3 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: ap + +- type: entity + id: BulletRifleTraceHeavyUranium + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanBasicDamage + damage: + types: + Radiation: 10 + Piercing: 12 + - type: HitscanPierce + chance: 0.95 + deviation: 0.05 + pierceLevel: HardenedMetal + - type: HitscanRicochet + chance: 0.80 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: uranium + +# Rubber bullets +- type: entity + id: BulletMagnumTraceRubber + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanStaminaDamage + staminaDamage: 20 + - type: HitscanBasicDamage + armorPenetration: -0.99 + damage: + types: + Blunt: 5 + - type: HitscanPierce + chance: 0.05 + deviation: 0.05 + pierceLevel: Wood + - type: HitscanRicochet + chance: 0.99 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: rubber + +- type: entity + id: BulletPistolTraceRubber + parent: BulletTrace + categories: [ HideSpawnMenu ] + components: + - type: HitscanStaminaDamage + staminaDamage: 15 + - type: HitscanBasicDamage + armorPenetration: -0.99 + damage: + types: + Blunt: 2 + - type: HitscanPierce + chance: 0.05 + deviation: 0.05 + pierceLevel: Wood + - type: HitscanRicochet + chance: 0.99 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle + travelFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: trace + impactFlash: + sprite: _Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact + bullet: + sprite: + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + state: rubber + +- type: entity + parent: BulletTrace + id: XrayLaserBeam + components: + - type: HitscanPierce + chance: 0.99 + deviation: 0.005 + pierceLevel: Rock + - type: HitscanBasicDamage + damage: + types: + Heat: 15 + Radiation: 10 + - type: HitscanBasicVisuals + muzzleFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: muzzle_xray + travelFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: xray + impactFlash: + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + state: impact_xray + +- type: entity + id: AdvancedDisablerBolt + parent: DisablerBolt + components: + - type: HitscanStaminaDamage + staminaDamage: 35 + +- type: entity + id: PelletShotgunImprovisedSpreadTraceLarge + parent: PelletShotgunImprovisedTrace + components: + - type: HitscanBasicDamage + damage: + types: + Piercing: 2 + Slash: 2 + Structural: 3 + - type: HitscanPierce + chance: 0.01 + - type: HitscanRicochet + chance: 0.5 + - type: HitscanStaminaDamage + staminaDamage: 3 + - type: ProjectileSpread + proto: PelletShotgunImprovisedSpreadTraceLarge + count: 36 + spread: 45 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 15a626c03b..34ad966bd4 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1,3 +1,34 @@ +# region Base Bullets +- type: entity + id: BaseBulletGrenade + parent: BaseItem + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: grenade + - type: Projectile + damage: + types: + Blunt: 5 + deleteOnCollide: false + - type: StartTimerOnShoot + - type: TimerTrigger + delay: 2 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + density: 50 + mask: + - ItemMask + restitution: 0.05 + friction: 0.5 +# region end + - type: entity id: BulletAcid2 name: acid spit @@ -838,3 +869,45 @@ damage: types: Shock: 15 + +- type: entity + id: BulletPlasma + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/magic.rsi + layers: + - state: arcane_barrage + shader: unshaded + - type: Projectile + impactEffect: BulletImpactEffectKinetic + damage: + types: + Heat: 14 + Slash: 14 + Structural: 35 + penetrationThreshold: 800 + penetrationDamageTypeRequirement: + - Structural + - type: Ammo + muzzleFlash: HitscanEffect + - type: TimedDespawn + lifetime: 0.35 + - type: PointLight + radius: 2.5 + color: "#dd16d395" + energy: 0.5 + - type: GatheringProjectile + +- type: entity + name: wide plasma barrage + id: BulletPlasmaSpread + categories: [ HideSpawnMenu ] + parent: BulletPlasma + components: + - type: ProjectileSpread + proto: BulletPlasma + count: 3 + spread: 25 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index db2e56dc91..959e1a03f5 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -469,66 +469,6 @@ - type: UseDelay delay: 0.35 -- type: entity - name: scar-h - parent: BaseWeaponRifle - id: WeaponRifleScarH - components: - - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: _Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi - - type: Item - size: Huge - shape: - - 0,0,3,2 - sprite: _Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi - - type: Gun - minAngle: 1 - maxAngle: 18 - angleIncrease: 1.25 - angleDecay: 12 - fireRate: 5 - soundGunshot: - path: /Audio/_Sunrise/Weapons/Guns/Rifles/ar18/ar18_shot.ogg - params: - volume: -1 - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineScarH - insertSound: /Audio/_Sunrise/Weapons/Guns/Rifles/m28/m28_reload.ogg - ejectSound: /Audio/_Sunrise/Weapons/Guns/Rifles/m28/m28_unload.ogg - priority: 3 - gun_chamber: - name: Chamber - startingItem: CartridgeRifleHeavySP - priority: 1 - whitelist: - tags: - - CartridgeHeavyRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - - type: Wieldable - - type: UseDelay - delay: 0.65 - - type: ChamberMagazineAmmoProvider - soundRack: - path: /Audio/_Sunrise/Weapons/Guns/SMGs/mp5/mp5_cocked.ogg - - type: entity name: Lecter Mk2 parent: [WeaponRifleLecter, GunLight] diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 0a72fada09..bd7f73810f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -507,7 +507,7 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistolSubMachineGunSIAR52 + startingItem: MagazinePistolSubMachineGunCaselessExtended insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg priority: 2 @@ -573,7 +573,7 @@ slots: gun_magazine: name: Magazine - startingItem: MagazinePistolSubMachineGunSIAR52 + startingItem: MagazinePistolSubMachineGunCaselessExtended insertSound: /Audio/Weapons/Guns/MagIn/lmg_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/lmg_magout.ogg priority: 2 diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/airlocks.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/airlocks.yml index 8e8cd458dd..8905325aae 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/airlocks.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/Glass/airlocks.yml @@ -16,7 +16,7 @@ soundGroups: Brute: path: - "/Audio/Effects/glass_hit.ogg" + "/Audio/_Sunrise/Effects/glass_hit.ogg" - type: Sprite sprite: _Sunrise/Structures/Doors/Airlocks/Glass/double_glass_airlock.rsi snapCardinals: false @@ -45,7 +45,7 @@ soundGroups: Brute: path: - "/Audio/Effects/glass_hit.ogg" + "/Audio/_Sunrise/Effects/glass_hit.ogg" - type: Sprite sprite: _Sunrise/Structures/Doors/Airlocks/Glass/triple_glass.rsi snapCardinals: false diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/shelfs.yml index d83ced5068..225d69b2df 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/shelfs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/shelfs.yml @@ -64,7 +64,6 @@ maxItemSize: Normal whitelist: tags: - - DrinkGlass - DrinkBottle - DrinkCan - Beer @@ -139,8 +138,6 @@ tags: - DrinkBottle - DrinkCan - - DrinkCup - - DrinkGlass - Cake - MonkeyCube - Enzyme @@ -150,7 +147,6 @@ - Knife - KitchenKnife - Burger - - Ingredient - Trash - Plastic - FoodSnack diff --git a/Resources/Prototypes/_Sunrise/FleshCult/flesh_tile.yml b/Resources/Prototypes/_Sunrise/FleshCult/flesh_tile.yml index 07dbb25ae0..8adc09a92b 100644 --- a/Resources/Prototypes/_Sunrise/FleshCult/flesh_tile.yml +++ b/Resources/Prototypes/_Sunrise/FleshCult/flesh_tile.yml @@ -45,11 +45,10 @@ behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - - type: Temperature + - type: TemperatureDamage heatDamage: types: Heat: 5 - coldDamage: {} - type: Flammable fireSpread: true damage: diff --git a/Resources/Prototypes/_Sunrise/FleshCult/flesh_walls.yml b/Resources/Prototypes/_Sunrise/FleshCult/flesh_walls.yml index 7ba6bea6c2..717a8147b0 100644 --- a/Resources/Prototypes/_Sunrise/FleshCult/flesh_walls.yml +++ b/Resources/Prototypes/_Sunrise/FleshCult/flesh_walls.yml @@ -26,11 +26,10 @@ - Flesh - Wall - Window - - type: Temperature + - type: TemperatureDamage heatDamage: types: Heat: 5 - coldDamage: {} - type: Flammable fireSpread: true damage: diff --git a/Resources/Prototypes/_Sunrise/FleshCult/mobs.yml b/Resources/Prototypes/_Sunrise/FleshCult/mobs.yml index 4a10eaf1a0..b27906126a 100644 --- a/Resources/Prototypes/_Sunrise/FleshCult/mobs.yml +++ b/Resources/Prototypes/_Sunrise/FleshCult/mobs.yml @@ -102,8 +102,10 @@ 0: Alive 150: Dead - type: Bloodstream - bloodMaxVolume: 300 - bloodReagent: Blood + bloodReferenceSolution: + reagents: + - ReagentId: Blood + Quantity: 300 - type: MovementSpeedModifier baseWalkSpeed: 4.5 baseSprintSpeed: 5 @@ -197,8 +199,10 @@ Dead: Base: dead - type: Bloodstream - bloodMaxVolume: 500 - bloodReagent: Blood + bloodReferenceSolution: + reagents: + - ReagentId: Blood + Quantity: 500 - type: InputMover - type: MobMover - type: Physics @@ -355,8 +359,10 @@ Dead: Base: bat_dead - type: Bloodstream - bloodMaxVolume: 50 - bloodReagent: Blood + bloodReferenceSolution: + reagents: + - ReagentId: Blood + Quantity: 50 - type: Vocal sounds: Unsexed: FleshWormEmote @@ -455,8 +461,10 @@ - SmallMobLayer - type: Speech - type: Bloodstream - bloodMaxVolume: 10 - bloodReagent: Blood + bloodReferenceSolution: + reagents: + - ReagentId: Blood + Quantity: 10 - type: GhostRole allowMovement: true allowSpeech: true @@ -529,8 +537,10 @@ - SmallMobLayer - type: Speech - type: Bloodstream - bloodMaxVolume: 10 - bloodReagent: Blood + bloodReferenceSolution: + reagents: + - ReagentId: Blood + Quantity: 10 - type: MeleeWeapon hidden: true soundHit: diff --git a/Resources/Prototypes/_Sunrise/Guidebook/antagonist.yml b/Resources/Prototypes/_Sunrise/Guidebook/antagonist.yml index d92e190ef2..4fadf6d8ad 100644 --- a/Resources/Prototypes/_Sunrise/Guidebook/antagonist.yml +++ b/Resources/Prototypes/_Sunrise/Guidebook/antagonist.yml @@ -1,9 +1,9 @@ - type: guideEntry id: Disease name: guide-entry-disease - text: "/ServerInfo/Guidebook/Antagonist/Disease.xml" + text: "/ServerInfo/Guidebook/_Sunrise/Antagonist/Disease.xml" - type: guideEntry id: Changelings name: guide-entry-changelings - text: "/ServerInfo/Guidebook/Antagonist/Changelings.xml" + text: "/ServerInfo/Guidebook/_Sunrise/Antagonist/Changelings.xml" diff --git a/Resources/Prototypes/_Sunrise/Guidebook/rulesSunrise.yml b/Resources/Prototypes/_Sunrise/Guidebook/rulesSunrise.yml index f60df3dfbe..b3d833a1a3 100644 --- a/Resources/Prototypes/_Sunrise/Guidebook/rulesSunrise.yml +++ b/Resources/Prototypes/_Sunrise/Guidebook/rulesSunrise.yml @@ -2,84 +2,84 @@ id: SunriseRuleset name: guide-entry-sr-rules ruleEntry: true - text: "/ServerInfo/Guidebook/ServerRules/SunriseRules.xml" + text: "/ServerInfo/Guidebook/_Sunrise/ServerRules/SunriseRules.xml" - type: guideEntry id: RuleSR0 name: guide-entry-sr-rule-0 ruleEntry: true priority: 0 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/CoreRules/RuleSR0DBAD.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR0DBAD.xml" - type: guideEntry id: RuleSR1 name: guide-entry-sr-rule-1 ruleEntry: true priority: 1 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/CoreRules/RuleSR1Decay.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR1Decay.xml" - type: guideEntry id: RuleSR2 name: guide-entry-sr-rule-2 ruleEntry: true priority: 2 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/CoreRules/RuleSR2Kill.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR2Kill.xml" - type: guideEntry id: RuleSR3 name: guide-entry-sr-rule-3 ruleEntry: true priority: 3 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/CoreRules/RuleSR3VGA.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR3VGA.xml" - type: guideEntry id: RuleSR4 name: guide-entry-sr-rule-4 ruleEntry: true priority: 4 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/CoreRules/RuleSR4LC.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR4LC.xml" - type: guideEntry id: RuleSR5 name: guide-entry-sr-rule-5 ruleEntry: true priority: 5 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/CoreRules/RuleSR5.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR5.xml" - type: guideEntry id: RuleSR6 name: guide-entry-sr-rule-6 ruleEntry: true priority: 6 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/CoreRules/RuleSR6RPA.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR6RPA.xml" - type: guideEntry id: RuleSR7 name: guide-entry-sr-rule-7 ruleEntry: true priority: 7 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/CoreRules/RuleSR7SA.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR7SA.xml" - type: guideEntry id: RuleSR8 name: guide-entry-sr-rule-8 ruleEntry: true priority: 8 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/CoreRules/RuleSR8VH.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR8VH.xml" - type: guideEntry id: RuleSR9 name: guide-entry-sr-rule-9 ruleEntry: true priority: 9 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/CoreRules/RuleSR9ERP.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR9ERP.xml" - type: guideEntry id: RuleSR10 name: guide-entry-sr-rule-10 ruleEntry: true priority: 10 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/CoreRules/RuleSR10Exploit.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR10Exploit.xml" ### Подпункты к 3 правилу @@ -89,14 +89,14 @@ name: guide-entry-sr-rule-3-1 ruleEntry: true priority: 1 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP1PG.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP1PG.xml" - type: guideEntry id: RuleSRRP2 name: guide-entry-sr-rule-3-2 ruleEntry: true priority: 2 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP2MG.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP2MG.xml" - type: guideEntry @@ -104,21 +104,21 @@ name: guide-entry-sr-rule-3-3 ruleEntry: true priority: 3 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP3MK.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP3MK.xml" - type: guideEntry id: RuleSRRP4 name: guide-entry-sr-rule-3-4 ruleEntry: true priority: 4 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP4ICinOOC.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP4ICinOOC.xml" - type: guideEntry id: RuleSRRP5 name: guide-entry-sr-rule-3-5 ruleEntry: true priority: 5 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP5Multikey.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP5Multikey.xml" - type: guideEntry @@ -126,14 +126,14 @@ name: guide-entry-sr-rule-3-6 ruleEntry: true priority: 6 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP6SK.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP6SK.xml" - type: guideEntry id: RuleSRRP7 name: guide-entry-sr-rule-3-7 ruleEntry: true priority: 7 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP7ORL.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP7ORL.xml" - type: guideEntry @@ -141,14 +141,14 @@ name: guide-entry-sr-rule-3-8 ruleEntry: true priority: 8 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP8DH.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP8DH.xml" - type: guideEntry id: RuleSRRP9 name: guide-entry-sr-rule-3-9 ruleEntry: true priority: 9 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP9RE.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP9RE.xml" ### Прецеденты/исключения @@ -157,123 +157,123 @@ name: guide-entry-sr-rule-excep-0 ruleEntry: true priority: 1 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER0.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER0.xml" - type: guideEntry id: PER1 name: guide-entry-sr-rule-excep-1 ruleEntry: true priority: 2 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER1.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER1.xml" - type: guideEntry id: PER2 name: guide-entry-sr-rule-excep-2 ruleEntry: true priority: 3 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER2.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER2.xml" - type: guideEntry id: PER3 name: guide-entry-sr-rule-excep-3 ruleEntry: true priority: 4 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER4.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER4.xml" - type: guideEntry id: PER3_1 name: guide-entry-sr-rule-excep-3-1 ruleEntry: true priority: 5 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER3.1.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.1.xml" - type: guideEntry id: PER3_2 name: guide-entry-sr-rule-excep-3-2 ruleEntry: true priority: 6 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER3.2.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.2.xml" - type: guideEntry id: PER3_3 name: guide-entry-sr-rule-excep-3-3 ruleEntry: true priority: 6 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER3.3.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.3.xml" - type: guideEntry id: PER3_4 name: guide-entry-sr-rule-excep-3-4 ruleEntry: true priority: 6 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER3.4.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.4.xml" - type: guideEntry id: PER3_6 name: guide-entry-sr-rule-excep-3-6 ruleEntry: true priority: 7 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER3.6.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.6.xml" - type: guideEntry id: PER3_7 name: guide-entry-sr-rule-excep-3-7 ruleEntry: true priority: 7 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER3.7.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.7.xml" - type: guideEntry id: PER4 name: guide-entry-sr-rule-excep-4 ruleEntry: true priority: 8 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER4.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER4.xml" - type: guideEntry id: PER6 name: guide-entry-sr-rule-excep-6 ruleEntry: true priority: 9 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER6.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER6.xml" - type: guideEntry id: PER7 name: guide-entry-sr-rule-excep-7 ruleEntry: true priority: 10 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER7.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER7.xml" - type: guideEntry id: PER8 name: guide-entry-sr-rule-excep-8 ruleEntry: true priority: 11 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER8.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER8.xml" - type: guideEntry id: PER10 name: guide-entry-sr-rule-excep-10 ruleEntry: true priority: 12 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER10.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER10.xml" - type: guideEntry id: CEP name: guide-entry-sr-rule-cep ruleEntry: true priority: 1 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/AdditionalRules/CEP.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/AdditionalRules/CEP.xml" - type: guideEntry id: CCP name: guide-entry-sr-rule-ccp ruleEntry: true priority: 2 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/AdditionalRules/CCP.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/AdditionalRules/CCP.xml" - type: guideEntry id: PANA name: guide-entry-sr-rule-pana ruleEntry: true priority: 3 - text: "/ServerInfo/Guidebook/ServerRules/RulesSR/AdditionalRules/PANA.xml" + text: "/ServerInfo/Guidebook/_Sunrise/RulesSR/AdditionalRules/PANA.xml" diff --git a/Resources/Prototypes/_Sunrise/Lobby/arts.yml b/Resources/Prototypes/_Sunrise/Lobby/arts.yml index 0e32243e9f..b46edd5ade 100644 --- a/Resources/Prototypes/_Sunrise/Lobby/arts.yml +++ b/Resources/Prototypes/_Sunrise/Lobby/arts.yml @@ -188,4 +188,4 @@ - type: lobbyBackground id: Prostchitalsanogde - background: /Textures/_Sunrise/LobbyScreens/prostchitalsanogde.webp + background: /Textures/_Sunrise/Lobby/Arts/prostchitalsanogde.webp diff --git a/Resources/Prototypes/_Sunrise/Maps/angle.yml b/Resources/Prototypes/_Sunrise/Maps/angle.yml index b6f68df164..50178fd22f 100644 --- a/Resources/Prototypes/_Sunrise/Maps/angle.yml +++ b/Resources/Prototypes/_Sunrise/Maps/angle.yml @@ -19,7 +19,6 @@ Passenger: [ -1, -1 ] Bartender: [ 1, 2 ] Botanist: [ 2, 3 ] - Boxer: [ 2, 2 ] Chef: [ 1, 2 ] Clown: [ 1, 1 ] Janitor: [ 1, 3 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/bagel.yml b/Resources/Prototypes/_Sunrise/Maps/bagel.yml index 6cc3d81cc3..cef27ca6de 100644 --- a/Resources/Prototypes/_Sunrise/Maps/bagel.yml +++ b/Resources/Prototypes/_Sunrise/Maps/bagel.yml @@ -33,7 +33,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 5, 5 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/barratry.yml b/Resources/Prototypes/_Sunrise/Maps/barratry.yml index 797413b619..26194caf90 100644 --- a/Resources/Prototypes/_Sunrise/Maps/barratry.yml +++ b/Resources/Prototypes/_Sunrise/Maps/barratry.yml @@ -33,7 +33,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 5, 5 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/box.yml b/Resources/Prototypes/_Sunrise/Maps/box.yml index bbf7d65cf7..930a0c2e47 100644 --- a/Resources/Prototypes/_Sunrise/Maps/box.yml +++ b/Resources/Prototypes/_Sunrise/Maps/box.yml @@ -45,7 +45,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 5, 5 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/convex.yml b/Resources/Prototypes/_Sunrise/Maps/convex.yml index ecc087179c..0ef91ce927 100644 --- a/Resources/Prototypes/_Sunrise/Maps/convex.yml +++ b/Resources/Prototypes/_Sunrise/Maps/convex.yml @@ -36,7 +36,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 2, 5 ] Reporter: [ 2, 3 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #blueshield BlueShieldOfficer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/delta.yml b/Resources/Prototypes/_Sunrise/Maps/delta.yml index a5f74278d0..d4ffd5683d 100644 --- a/Resources/Prototypes/_Sunrise/Maps/delta.yml +++ b/Resources/Prototypes/_Sunrise/Maps/delta.yml @@ -45,7 +45,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 5, 5 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/fland.yml b/Resources/Prototypes/_Sunrise/Maps/fland.yml index 7ccc641a7e..db43030e13 100644 --- a/Resources/Prototypes/_Sunrise/Maps/fland.yml +++ b/Resources/Prototypes/_Sunrise/Maps/fland.yml @@ -33,7 +33,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 5, 5 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/glacier.yml b/Resources/Prototypes/_Sunrise/Maps/glacier.yml index a0b3ef71b7..13c99b1167 100644 --- a/Resources/Prototypes/_Sunrise/Maps/glacier.yml +++ b/Resources/Prototypes/_Sunrise/Maps/glacier.yml @@ -40,7 +40,6 @@ SalvageSpecialist: [ 2, 3 ] Musician: [ 1, 2 ] AtmosphericTechnician: [ 1, 2 ] - Boxer: [ 1, 2 ] CargoTechnician: [ 2, 2 ] Reporter: [ 1, 2 ] ServiceWorker: [ 2, 3 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/hammurabi.yml b/Resources/Prototypes/_Sunrise/Maps/hammurabi.yml index 9b601118b2..8b85acc6a1 100644 --- a/Resources/Prototypes/_Sunrise/Maps/hammurabi.yml +++ b/Resources/Prototypes/_Sunrise/Maps/hammurabi.yml @@ -19,7 +19,6 @@ Passenger: [ -1, -1 ] Bartender: [ 1, 2 ] Botanist: [ 1, 2 ] - Boxer: [ 1, 1 ] Chef: [ 2, 3 ] Clown: [ 1, 1 ] Janitor: [ 1, 2 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/kettle.yml b/Resources/Prototypes/_Sunrise/Maps/kettle.yml index 07afe968fe..8a987a50fc 100644 --- a/Resources/Prototypes/_Sunrise/Maps/kettle.yml +++ b/Resources/Prototypes/_Sunrise/Maps/kettle.yml @@ -26,7 +26,6 @@ Chaplain: [ 1, 2 ] Librarian: [ 1, 2 ] Lawyer: [ 2, 3 ] - Zookeeper: [ 1, 1 ] ServiceWorker: [ 4, 4 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/lighthouse.yml b/Resources/Prototypes/_Sunrise/Maps/lighthouse.yml index 98456dc9a1..726b402f1a 100644 --- a/Resources/Prototypes/_Sunrise/Maps/lighthouse.yml +++ b/Resources/Prototypes/_Sunrise/Maps/lighthouse.yml @@ -19,7 +19,6 @@ Passenger: [ -1, -1 ] Bartender: [ 1, 2 ] Botanist: [ 2, 2 ] - Boxer: [ 2, 2 ] Chef: [ 1, 2 ] Clown: [ 1, 1 ] Janitor: [ 1, 2 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/marathon.yml b/Resources/Prototypes/_Sunrise/Maps/marathon.yml index 0c5d022c06..37c515b283 100644 --- a/Resources/Prototypes/_Sunrise/Maps/marathon.yml +++ b/Resources/Prototypes/_Sunrise/Maps/marathon.yml @@ -33,7 +33,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 5, 5 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/oasis.yml b/Resources/Prototypes/_Sunrise/Maps/oasis.yml index 65f6505b49..ac1fec4c1c 100644 --- a/Resources/Prototypes/_Sunrise/Maps/oasis.yml +++ b/Resources/Prototypes/_Sunrise/Maps/oasis.yml @@ -31,7 +31,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 5, 5 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/packed.yml b/Resources/Prototypes/_Sunrise/Maps/packed.yml index eea89475f6..016c22286c 100644 --- a/Resources/Prototypes/_Sunrise/Maps/packed.yml +++ b/Resources/Prototypes/_Sunrise/Maps/packed.yml @@ -31,7 +31,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 3, 3 ] Reporter: [ 2, 2 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/plasma.yml b/Resources/Prototypes/_Sunrise/Maps/plasma.yml index 62316d65c5..63e749af82 100644 --- a/Resources/Prototypes/_Sunrise/Maps/plasma.yml +++ b/Resources/Prototypes/_Sunrise/Maps/plasma.yml @@ -36,7 +36,6 @@ Librarian: [ 1, 1 ] ServiceWorker: [ 2, 2 ] Reporter: [ 2, 3 ] - Zookeeper: [ 1, 1 ] Barber: [ 1, 1 ] #blueshield BlueShieldOfficer: [ 1, 1 ] diff --git a/Resources/Prototypes/_Sunrise/Maps/tortuga.yml b/Resources/Prototypes/_Sunrise/Maps/tortuga.yml index 35260b1331..7b610a2d08 100644 --- a/Resources/Prototypes/_Sunrise/Maps/tortuga.yml +++ b/Resources/Prototypes/_Sunrise/Maps/tortuga.yml @@ -19,7 +19,6 @@ Passenger: [ -1, -1 ] Bartender: [ 2, 2 ] Botanist: [ 2, 3 ] - Boxer: [ 2, 2 ] Chef: [ 3, 4 ] Clown: [ 1, 1 ] Janitor: [ 2, 2 ] diff --git a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/gloves_weapon_npcs.yml b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/gloves_weapon_npcs.yml index 354db91f83..29384d992f 100644 --- a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/gloves_weapon_npcs.yml +++ b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/gloves_weapon_npcs.yml @@ -803,7 +803,7 @@ soundHit: path: "/Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg" - type: MeleeThrowOnHit - unanchorOnHit: true + unanchorOnHit: Unanchorable stunTime: 0.25 - type: entity diff --git a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mob_hostile_base.yml b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mob_hostile_base.yml index 26343917cb..3ca8b3a596 100644 --- a/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mob_hostile_base.yml +++ b/Resources/Prototypes/_Sunrise/NPCs/PirateNPC/mob_hostile_base.yml @@ -3,14 +3,15 @@ abstract: true components: - type: Temperature + currentTemperature: 310.15 + specificHeat: 42 + - type: TemperatureDamage heatDamageThreshold: 2000 # Should prevent mobs from taking damage on planets with extreme heat coldDamageThreshold: -250 # Should make mobs immune to cold planets - currentTemperature: 310.15 - coldDamage: #per second, scales with temperature & other constants + coldDamage: types: Cold: 0.1 - specificHeat: 42 - heatDamage: #per second, scales with temperature & other constants + heatDamage: types: Heat: 1.5 - type: ThermalRegulator @@ -165,21 +166,21 @@ abstract: true components: - type: Stamina - critThreshold: 80 + baseCritThreshold: 80 - type: entity id: MobStaminaSpecial abstract: true components: - type: Stamina - critThreshold: 200 + baseCritThreshold: 200 - type: entity id: MobStaminaBoss abstract: true components: - type: Stamina - critThreshold: 500 + baseCritThreshold: 500 #endregion #region Dungeon boss @@ -195,7 +196,7 @@ - type: Hands - type: Puller - type: Stamina - critThreshold: 999 + baseCritThreshold: 999 - type: Tag tags: - CanPilot diff --git a/Resources/Prototypes/_Sunrise/NPCs/pirates.yml b/Resources/Prototypes/_Sunrise/NPCs/pirates.yml index f278709f6f..337d002a85 100644 --- a/Resources/Prototypes/_Sunrise/NPCs/pirates.yml +++ b/Resources/Prototypes/_Sunrise/NPCs/pirates.yml @@ -19,7 +19,7 @@ 120: Critical 140: Dead - type: Stamina - critThreshold: 125 + baseCritThreshold: 125 - type: DamageStateVisuals - type: RotationVisuals defaultRotation: 90 @@ -65,7 +65,7 @@ 80: Critical 100: Dead - type: Stamina - critThreshold: 100 + baseCritThreshold: 100 - type: Butcherable butcheringType: Spike spawned: @@ -853,12 +853,10 @@ shader: unshaded - sprite: Objects/Tanks/oxygen.rsi state: equipped-SUITSTORAGE - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeLightRifleImprovised fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 3 autoRechargeRate: 99 - type: Battery @@ -908,12 +906,10 @@ state: up-equipped-HELMET - sprite: _Sunrise/Clothing/Neck/Misc/pins.rsi state: comm-equipped - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgePistolSP fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 2 autoRechargeRate: 99 - type: Battery @@ -1138,8 +1134,10 @@ Dead: Base: bigbrother-broken - type: Bloodstream - bloodReagent: WeldingFuel - bloodMaxVolume: 200 + bloodReferenceSolution: + reagents: + - ReagentId: WeldingFuel + Quantity: 200 - type: MobThresholds thresholds: 0: Alive @@ -1155,7 +1153,7 @@ 400: 1.5 450: 1.6 - type: Stamina - critThreshold: 800 + baseCritThreshold: 800 - type: MovementSpeedModifier baseWalkSpeed: 2 baseSprintSpeed: 2.75 @@ -1238,7 +1236,7 @@ 215: 1.8 225: 2 - type: Stamina - critThreshold: 500 + baseCritThreshold: 500 - type: HellSpawnInvincibility - type: MovementSpeedModifier baseWalkSpeed: 2 @@ -1324,12 +1322,10 @@ state: equipped-OUTERCLOTHING - sprite: _Sunrise/Clothing/Head/Helmets/pirate_eva_old.rsi state: equipped-HELMET - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeMagnumHP fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 4 autoRechargeRate: 999 - type: Battery @@ -1440,12 +1436,10 @@ shader: unshaded - sprite: Clothing/Belt/assault.rsi state: equipped-BELT - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeMagnumImprovised fireCost: 10 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 2 autoRechargeRate: 999 - type: Battery @@ -1487,12 +1481,10 @@ shader: unshaded - sprite: Clothing/Belt/assault.rsi state: equipped-BELT - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeMagnumAP fireCost: 10 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 6 autoRechargeRate: 999 - type: Battery @@ -1660,12 +1652,10 @@ state: equipped-BELT - type: MovementSpeedModifier baseSprintSpeed: 2.75 - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CannonBallMini fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 1.75 autoRechargeRate: 999 - type: Battery @@ -1783,12 +1773,10 @@ shader: unshaded - sprite: Objects/Tanks/oxygen.rsi state: equipped-SUITSTORAGE - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgePistolSP fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 6 autoRechargeRate: 999 - type: Battery @@ -1828,12 +1816,10 @@ shader: unshaded - sprite: Objects/Tanks/oxygen.rsi state: equipped-SUITSTORAGE - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgePistolSP fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 6 autoRechargeRate: 999 - type: Battery @@ -1874,12 +1860,10 @@ shader: unshaded - sprite: Objects/Tanks/oxygen.rsi state: equipped-SUITSTORAGE - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeRifleHeavySP fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 0.8 autoRechargeRate: 999 - type: Battery @@ -1931,12 +1915,10 @@ - sprite: _Starlight/Objects/Clothing/Head/Hardsuits/infiltrationsyndie.rsi state: on-equipped-HELMET shader: unshaded - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeRifleHeavyFMJ fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 0.2 autoRechargeRate: 999 - type: Battery @@ -1991,12 +1973,10 @@ shader: unshaded - sprite: Objects/Tanks/oxygen.rsi state: equipped-SUITSTORAGE - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeLightRifleSP fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 3 autoRechargeRate: 99 - type: Battery @@ -2072,12 +2052,10 @@ shader: unshaded - type: MovementSpeedModifier baseSprintSpeed: 3.25 - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeRifleSP fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 2 autoRechargeRate: 999 - type: Battery @@ -2127,7 +2105,7 @@ shader: unshaded - sprite: Objects/Tanks/oxygen.rsi state: equipped-SUITSTORAGE - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgePistol40SP - type: BatterySelfRecharger autoRechargePauseTime: 0.5 @@ -2164,7 +2142,7 @@ shader: unshaded - sprite: Objects/Tanks/oxygen.rsi state: equipped-SUITSTORAGE - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeHeavyRifleRAP - type: BatterySelfRecharger autoRechargePauseTime: 1.25 @@ -2208,12 +2186,10 @@ state: equipped-SUITSTORAGE - type: MovementSpeedModifier baseSprintSpeed: 2.75 - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeLightRifleSP fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 1 autoRechargeRate: 999 - type: Battery @@ -2257,8 +2233,6 @@ proto: RedLightLaser fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 2 autoRechargeRate: 999 - type: Battery @@ -2301,8 +2275,6 @@ proto: RedHeavyLaser fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 30 autoRechargeRate: 999 - type: Battery @@ -2347,7 +2319,7 @@ state: on-equipped-HELMET shader: unshaded - type: BasicEntityAmmoProvider - proto: GrenadeFragContact + proto: GrenadeFrag capacity: 1 count: 1 - type: Gun @@ -2382,12 +2354,10 @@ shader: unshaded - sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi state: equipped-HELMET - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgePistol40SP fireCost: 10 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 5 autoRechargeRate: 999 - type: Battery @@ -2482,12 +2452,10 @@ - sprite: _Sunrise/Clothing/Head/Hardsuits/piratecaptainhelm.rsi state: on-equipped-HELMET shader: unshaded - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgePistol40FMJ fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 6 autoRechargeRate: 999 - type: Battery @@ -2536,8 +2504,10 @@ Dead: Base: warboss-broken - type: Bloodstream - bloodReagent: WeldingFuel - bloodMaxVolume: 300 + bloodReferenceSolution: + reagents: + - ReagentId: WeldingFuel + Quantity: 300 - type: MobThresholds thresholds: 0: Alive @@ -2550,7 +2520,7 @@ 400: 0.7 550: 0.6 - type: Stamina - critThreshold: 9999 + baseCritThreshold: 9999 - type: MovementSpeedModifier baseWalkSpeed: 1.5 baseSprintSpeed: 2.25 @@ -2559,12 +2529,10 @@ - type: Repairable fuelCost: 25 doAfterDelay: 10 - - type: ProjectileBatteryAmmoProvider + - type: BatteryAmmoProvider proto: CartridgeHeavyRifleRSP fireCost: 1 - type: BatterySelfRecharger - autoRecharge: true - autoRechargePause: true autoRechargePauseTime: 5 autoRechargeRate: 999 - type: Battery diff --git a/Resources/Prototypes/_Sunrise/Objectives/abductor.yml b/Resources/Prototypes/_Sunrise/Objectives/abductor.yml index 79c68d085a..9cf7ba3986 100644 --- a/Resources/Prototypes/_Sunrise/Objectives/abductor.yml +++ b/Resources/Prototypes/_Sunrise/Objectives/abductor.yml @@ -117,7 +117,8 @@ id: AbductorVictimTechnologyDiskStealCollectionObjective components: - type: NotJobRequirement - job: Scientist + jobs: + - Scientist - type: StealCondition stealGroup: TechnologyDisk minCollectionSize: 5 @@ -131,7 +132,8 @@ id: AbductorVictimMailStealCollectionObjective components: - type: NotJobRequirement - job: CargoTechnician + jobs: + - CargoTechnician - type: StealCondition stealGroup: Mail minCollectionSize: 4 @@ -174,7 +176,8 @@ id: AbductorVictimMedicalTechFabCircuitboardStealObjective components: - type: NotJobRequirement - job: MedicalDoctor + jobs: + - MedicalDoctor - type: StealCondition stealGroup: MedicalTechFabCircuitboard - type: Objective @@ -185,7 +188,8 @@ id: AbductorVictimClothingHeadsetAltMedicalStealObjective components: - type: NotJobRequirement - job: ChiefMedicalOfficer + jobs: + - ChiefMedicalOfficer - type: StealCondition stealGroup: ClothingHeadsetAltMedical - type: Objective @@ -196,7 +200,8 @@ id: AbductorVictimFireAxeStealObjective components: - type: NotJobRequirement - job: AtmosphericTechnician + jobs: + - AtmosphericTechnician - type: StealCondition stealGroup: FireAxe - type: Objective @@ -207,7 +212,8 @@ id: AbductorVictimClothingEyesHudBeerStealObjective components: - type: NotJobRequirement - job: Bartender + jobs: + - Bartender - type: StealCondition stealGroup: ClothingEyesHudBeer - type: Objective @@ -218,7 +224,8 @@ id: AbductorVictimBibleStealObjective components: - type: NotJobRequirement - job: Chaplain + jobs: + - Chaplain - type: StealCondition stealGroup: Bible - type: Objective @@ -231,7 +238,8 @@ id: AbductorVictimXenoArtifactStealObjective components: - type: NotJobRequirement - job: Scientist + jobs: + - Scientist - type: StealCondition stealGroup: XenoArtifact - type: Objective @@ -242,7 +250,8 @@ id: AbductorVictimFreezerHeaterStealObjective components: - type: NotJobRequirement - job: AtmosphericTechnician + jobs: + - AtmosphericTechnician - type: StealCondition stealGroup: FreezerHeater - type: Objective @@ -253,7 +262,8 @@ id: AbductorVictimBoozeDispenserStealObjective components: - type: NotJobRequirement - job: Bartender + jobs: + - Bartender - type: StealCondition stealGroup: BoozeDispenser - type: Objective @@ -264,7 +274,8 @@ id: AbductorVictimAltarNanotrasenStealObjective components: - type: NotJobRequirement - job: Chaplain + jobs: + - Chaplain - type: StealCondition stealGroup: AltarNanotrasen - type: Objective @@ -277,7 +288,8 @@ id: AbductorVictimIanStealObjective components: - type: NotJobRequirement - job: HeadOfPersonnel + jobs: + - HeadOfPersonnel - type: StealCondition stealGroup: AnimalIan - type: Objective @@ -297,7 +309,8 @@ id: AbductorVictimMcGriffStealObjective components: - type: NotJobRequirement - job: Detective + jobs: + - Detective - type: StealCondition stealGroup: AnimalMcGriff - type: Objective @@ -308,7 +321,8 @@ id: AbductorVictimWalterStealObjective components: - type: NotJobRequirement - job: Chemist + jobs: + - Chemist - type: StealCondition stealGroup: AnimalWalter - type: Objective @@ -328,7 +342,8 @@ id: AbductorVictimRenaultStealObjective components: - type: NotJobRequirement - job: Captain + jobs: + - Captain - type: StealCondition stealGroup: AnimalRenault - type: Objective @@ -339,7 +354,8 @@ id: AbductorVictimShivaStealObjective components: - type: NotJobRequirement - job: SecurityOfficer + jobs: + - SecurityOfficer - type: StealCondition stealGroup: AnimalShiva - type: Objective @@ -350,7 +366,8 @@ id: AbductorVictimTropicoStealObjective components: - type: NotJobRequirement - job: AtmosphericTechnician + jobs: + - AtmosphericTechnician - type: StealCondition stealGroup: AnimalTropico - type: Objective diff --git a/Resources/Prototypes/_Sunrise/Objectives/traitorObjectives.yml b/Resources/Prototypes/_Sunrise/Objectives/traitorObjectives.yml index bba054e92d..e4a07707a6 100644 --- a/Resources/Prototypes/_Sunrise/Objectives/traitorObjectives.yml +++ b/Resources/Prototypes/_Sunrise/Objectives/traitorObjectives.yml @@ -5,7 +5,8 @@ - type: Objective difficulty: 3 - type: NotJobRequirement - job: BlueShieldOfficer + jobs: + - BlueShieldOfficer - type: StealCondition stealGroup: WeaponEnergyGunMultiphase owner: офицер «Синий щит» @@ -40,7 +41,8 @@ - type: Objective difficulty: 1.5 - type: NotJobRequirement - job: NanoTrasenRepresentative + jobs: + - NanoTrasenRepresentative - type: StealCondition stealGroup: HandheldFax owner: job-name-ntrep diff --git a/Resources/Prototypes/_Sunrise/Objectives/vampire.yml b/Resources/Prototypes/_Sunrise/Objectives/vampire.yml index 1f7a862ff8..74a9410d1b 100644 --- a/Resources/Prototypes/_Sunrise/Objectives/vampire.yml +++ b/Resources/Prototypes/_Sunrise/Objectives/vampire.yml @@ -31,7 +31,8 @@ id: CMOHyposprayVampireStealObjective components: - type: NotJobRequirement - job: ChiefMedicalOfficer + jobs: + - ChiefMedicalOfficer - type: StealCondition owner: job-name-cmo stealGroup: Hypospray @@ -41,7 +42,8 @@ id: RDHardsuitVampireStealObjective components: - type: NotJobRequirement - job: ResearchDirector + jobs: + - ResearchDirector - type: StealCondition owner: job-name-rd stealGroup: ClothingOuterHardsuitRd @@ -53,7 +55,8 @@ id: MagbootsVampireStealObjective components: - type: NotJobRequirement - job: ChiefEngineer + jobs: + - ChiefEngineer - type: StealCondition stealGroup: ClothingShoesBootsMagAdv owner: job-name-ce @@ -63,7 +66,8 @@ id: ClipboardVampireStealObjective components: - type: NotJobRequirement - job: Quartermaster + jobs: + - Quartermaster - type: StealCondition stealGroup: BoxFolderQmClipboard owner: job-name-qm @@ -76,7 +80,8 @@ - type: Objective difficulty: 2.5 - type: NotJobRequirement - job: Captain + jobs: + - Captain - type: entity parent: BaseCaptainVampireObjective diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml index 26d597d621..ae6fc039e1 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml @@ -18,7 +18,6 @@ - BluespaceBeaker - SyringeBluespace - SyringeCryostasis - - HyposprayMedical - AutoMenderBurn - AutoMenderBrute - HandheldCrewMonitor diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml index 99c8001702..5899651364 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/ammo.yml @@ -1068,15 +1068,6 @@ materials: Steel: 800 -- type: latheRecipe - id: MagazineACP14 - result: MagazineACP14 - categories: - - Ammo - completetime: 5 - materials: - Steel: 250 - - type: latheRecipe id: MagazineGlock22 result: MagazineGlock22 diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml index 7ab39f54f7..864f096211 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/medical.yml @@ -79,18 +79,6 @@ materials: Steel: 200 -- type: latheRecipe - id: HyposprayMedical - result: HyposprayMedical - categories: - - Tools - completetime: 3 - materials: - Plastic: 100 - Steel: 300 - Plasma: 100 - Glass: 100 - - type: latheRecipe id: BlankMediPen result: BlankMediPen diff --git a/Resources/Prototypes/_Sunrise/Research/medical.yml b/Resources/Prototypes/_Sunrise/Research/medical.yml index 19d0695b6e..4cd7f9c87a 100644 --- a/Resources/Prototypes/_Sunrise/Research/medical.yml +++ b/Resources/Prototypes/_Sunrise/Research/medical.yml @@ -34,18 +34,6 @@ - LeftFootCyber # Tier 2 -- type: technology - id: MedicalHyposprays - name: research-technology-medical-hyposprays - icon: - sprite: _Sunrise/Objects/Specific/Medical/hypospray.rsi - state: med-hypospray - discipline: Biochemical - tier: 2 - cost: 6500 - recipeUnlocks: - - HyposprayMedical - - type: technology id: MedicalAssembler name: research-technology-medical-assembler @@ -58,8 +46,8 @@ recipeUnlocks: - MedicalAssemblerMachineCircuitboard - BlankMediPen - technologyPrerequisites: - - MedicalHyposprays + # technologyPrerequisites: # Sunrise-todo Привязать JetInjectors + # - MedicalHyposprays - type: technology id: SurgeryTechAdvanced @@ -250,8 +238,8 @@ recipeUnlocks: - AutoMenderBrute - AutoMenderBurn - technologyPrerequisites: - - MedicalHyposprays + # technologyPrerequisites: # Sunrise-todo Привязать JetInjectors + # - MedicalHyposprays radioChannels: - Medical diff --git a/Resources/Prototypes/_Sunrise/Roles/Antags/xenoborgs.yml b/Resources/Prototypes/_Sunrise/Roles/Antags/xenoborgs.yml new file mode 100644 index 0000000000..5eb462fb92 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Roles/Antags/xenoborgs.yml @@ -0,0 +1,5 @@ +- type: playTimeTracker + id: Xenoborg + +- type: playTimeTracker + id: MothershipCore diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml index ded6c0b610..cd725d4484 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/brigmedic.yml @@ -19,9 +19,10 @@ - Medical - Security - Brig - - Maintenance - External - Cryogenics + - GenpopEnter + - GenpopLeave special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/security_pilot.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/security_pilot.yml index b19bbee97a..712592e733 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/security_pilot.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Security/security_pilot.yml @@ -18,6 +18,8 @@ - Service - External - Cryogenics + - GenpopEnter + - GenpopLeave special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] diff --git a/Resources/Prototypes/_Sunrise/SoundCollections/squee.yml b/Resources/Prototypes/_Sunrise/SoundCollections/squee.yml index 066682ec73..fe851974b9 100644 --- a/Resources/Prototypes/_Sunrise/SoundCollections/squee.yml +++ b/Resources/Prototypes/_Sunrise/SoundCollections/squee.yml @@ -1,6 +1,6 @@ - type: soundCollection id: SQUEE files: - - /Audio/Items/Toys/squee1.ogg - - /Audio/Items/Toys/squee2.ogg - - /Audio/Items/Toys/squee3.ogg + - /Audio/_Sunrise/Items/Toys/squee1.ogg + - /Audio/_Sunrise/Items/Toys/squee2.ogg + - /Audio/_Sunrise/Items/Toys/squee3.ogg diff --git a/Resources/Prototypes/_Sunrise/Store/currency.yml b/Resources/Prototypes/_Sunrise/Store/currency.yml index 66bdc241ff..37ccc80d8f 100644 --- a/Resources/Prototypes/_Sunrise/Store/currency.yml +++ b/Resources/Prototypes/_Sunrise/Store/currency.yml @@ -4,3 +4,31 @@ cash: 1: Suntick1 canWithdraw: false + +- type: currency + id: Bluecrystal + displayName: store-currency-display-bluecrystal + cash: + 1: Bluecrystal1 + canWithdraw: true + +- type: currency + id: Crystallite + displayName: store-currency-display-crystallite + cash: + 1: Crystallite1 + canWithdraw: true + +- type: currency + id: Doubloon + displayName: store-currency-display-doubloon + cash: + 1: Doubloon1 + canWithdraw: true + +- type: currency + id: Credit + displayName: store-currency-display-credit + cash: + 1: SpaceCash + canWithdraw: true diff --git a/Resources/Prototypes/_Sunrise/Store/presets.yml b/Resources/Prototypes/_Sunrise/Store/presets.yml new file mode 100644 index 0000000000..0f60cd1463 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Store/presets.yml @@ -0,0 +1,61 @@ +- type: entity + id: StorePresetNTUplink + abstract: true + components: + - type: Store + name: store-preset-name-ntuplink + categories: + - NTAutoGun + - NTLasers + - NTPistols + - NTAmmo + - NTMedicine + - NTAdditional + - NTexplosive + - NTMechs + - NTSanitary + - NTEngineering + #- NTCBURN + - NTEquipment + currencyWhitelist: + - Bluecrystal + - Crystallite + balance: + Telecrystal: 0 + +- type: entity + id: StorePresetPirateUplink + abstract: true + components: + - type: Store + name: store-preset-name-blackmarket + categories: + - UplinkPirateWeaponry + - UplinkPirateAmmo + - UplinkPirateExplosives + - UplinkPirateChemicals + - UplinkPirateDeception + - UplinkPirateDisruption + - UplinkPirateImplants + - UplinkPirateCybernetics + - UplinkPirateAllies + - UplinkPirateWearables + - UplinkPiratePointless + - UplinkPirateMechs + currencyWhitelist: + - Doubloon + balance: + Doubloon: 0 + +- type: entity + id: StorePresetPirateExchanger + abstract: true + components: + - type: Store + name: store-preset-name-exchanger + categories: + - UplinkPirateExchanger + currencyWhitelist: + - Credit + balance: + Credit: 0 diff --git a/Resources/Prototypes/_Sunrise/backpackmodsuit.yml b/Resources/Prototypes/_Sunrise/backpackmodsuit.yml index fd34259a98..6d9e5c8926 100644 --- a/Resources/Prototypes/_Sunrise/backpackmodsuit.yml +++ b/Resources/Prototypes/_Sunrise/backpackmodsuit.yml @@ -16,9 +16,9 @@ quickEquip: false slots: - back - - type: Storage + - type: Storage # Basic Backpack size grid: - - 0,0,6,5 + - 0,0,6,3 maxItemSize: Huge - type: ContainerContainer containers: @@ -223,4 +223,4 @@ - type: ToggleableClothing clothingPrototype: ClothingOuterHardsuitERTChaplain requiredSlot: back - slot: outerClothing \ No newline at end of file + slot: outerClothing diff --git a/Resources/Prototypes/_Sunrise/radio_channels.yml b/Resources/Prototypes/_Sunrise/radio_channels.yml index ad0b358c21..097ca105e1 100644 --- a/Resources/Prototypes/_Sunrise/radio_channels.yml +++ b/Resources/Prototypes/_Sunrise/radio_channels.yml @@ -24,7 +24,7 @@ - type: radioChannel id: USSPSec name: chat-radio-ussp-sec - keycode: 'ч' + keycode: 'в' frequency: 1984 color: "#B00000" longRange: false diff --git a/Resources/Prototypes/_Sunrise/tags.yml b/Resources/Prototypes/_Sunrise/tags.yml index 7a8955eeb9..de7f38712f 100644 --- a/Resources/Prototypes/_Sunrise/tags.yml +++ b/Resources/Prototypes/_Sunrise/tags.yml @@ -52,6 +52,9 @@ - type: Tag id: NVDHandcrafted +- type: Tag + id: PlantAnalyzer + # Uplinks - type: Tag id: NTUplink @@ -167,14 +170,17 @@ id: WeaponPistolTec9 # Magazines: -# - type: Tag -# id: MagazineCaselessRifle # Sunrise-todo Uncomite with upstream https://forum.spacestation14.com/t/remove-unused-tags-tied-to-unused-entities/25626 +- type: Tag + id: MagazineCaselessRifle -# - type: Tag -# id: MagazineHeavyRifle +- type: Tag + id: MagazineHeavyRifle -# - type: Tag -# id: SpeedLoaderRifle +- type: Tag + id: SpeedLoaderRifle + +- type: Tag + id: MagazineLightRiflePan - type: Tag id: MagazineCannonBallMini diff --git a/Resources/Prototypes/explosion.yml b/Resources/Prototypes/explosion.yml index eed5a7225f..21b0bc128d 100644 --- a/Resources/Prototypes/explosion.yml +++ b/Resources/Prototypes/explosion.yml @@ -136,3 +136,15 @@ fireStates: 3 fireStacks: 2 temperature: 1500 + +# Sunrose-start +- type: explosion # Увы, все из-за любителей абуза с РСУ # Sunrise-TODO: Удалить это когда проблема абуза будет решена + id: JustStructuralCharge + damagePerIntensity: + types: + Heat: 1 + Structural: 25 + lightColor: Red + fireColor: Red + texturePath: /Textures/Effects/fire_greyscale.rsi +# Sunrose-end diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/Antagonist/Changelings.xml b/Resources/ServerInfo/Guidebook/_Sunrise/Antagonist/Changelings.xml new file mode 100644 index 0000000000..7973227003 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/Antagonist/Changelings.xml @@ -0,0 +1,63 @@ + + # Генокрад + + + + Генокрад — это разумное инопланетное существо, способное принимать человеческий облик. Генокрады - это инопланетяне в форме головной слизи, но до начала смены они либо превращаются в кого-то, когда они находятся вне станции, либо они каким-то образом убивают кого-то и превращаются в генокрада неизвестным образом. + Главным оружием генокрада является его способность внутренне синтезировать опасные химические вещества, превращаться в других существ, которых он поглотил, и сливаться с людьми. + + Генокрад может быть любым из тех, кого он поглотил, он может мгновенно менять личность, только процесс поглощения требует времени и покоя. В отличие от предателя, единственная цель генокрада — выжить до прибытия шаттла и сбежать на нем, приняв чей-то другой облик. + + Помните, что генокрады не обязаны работать в команде, и некоторые из них могут действовать в одиночку/стать одиночками, в зависимости от их предпочтений. + \n + + ## Я превратился в самого себя, что делать? + \n + + ## Химикаты + Химикаты — это источник ваших способностей. Без них вы не сможете использовать свои силы. + Они медленно восстанавливаются со временем, а поглощение увеличит их максимальную емкость. + + ## Биомасса + Ваша биомасса — это ваше здоровье. В начале у вас есть 30 единиц биомассы. Вы тратите 1 единицу биомассы каждую минуту, а поглощение полностью восстанавливает её. + Когда уровень вашей биомассы становится слишком низким, последствия вашего разложения станут заметны для экипажа, такие как: + - Рвота кровью + - Сильная дрожь + - Смерть. + Вы не можете умереть обычным способом, например, от тупой травмы, но ваша биомасса медленно истощается, и если вы не успеете поглотить кого-то до того, как она закончится, игра будет окончена. + + ## Поглощение ДНК + Ваше главное оружие — это обман. Превращайтесь в других гуманоидных существ, чтобы запутать экипаж. + Для этого необходимо взять ЛЮБОГО человека, живого или мёртвого (даже выброшенные тела из клонирования), и поглотить его, используя способность "Absorb" или "DNA Extraction Sting". + Вы можете иметь максимум 5 нитей ДНК одновременно и должны трансформироваться, чтобы получить больше. + + Поглощение ДНК требует, чтобы жертва была недееспособной, находилась в критическом состоянии или была мертва. Просто наденьте наручники, доведите до критического состояния или убейте, если необходимо поглотить жертву. + + - Поглощение кого-либо занимает много времени, так что подготовьте безопасное место или сделайте это там, где как можно меньше ушей. + - Поглощение жертвы полностью восстанавливает вашу биомассу, увеличивает максимальную ёмкость химикатов и даёт бонусные очки эволюции для покупки новых способностей. + - Поглощение другого генокрада, помимо прочего, увеличивает максимальную ёмкость биомассы, позволяя вам дольше оставаться в живых, а также даёт вам ещё больше химикатов и очков эволюции. + - [color=red]Поглощенные жертвы не могут быть клонированы.[/color] С другой стороны, их всё ещё можно превратить в киборгов. + + ## Вы восклицаете: "Я здесь единственный!" + Генокрады ограничены тем, сколько ДНК они могут поглотить одновременно! Если генокрад имеет 5 сохранённых нитей ДНК и пытается получить ещё одну, он должен избавиться от старой ДНК путём трансформации. В конце концов, любой генокрад будет вынужден стать двойником кого-то ещё на станции, живого или мёртвого. + Генокрад может изменить свою внешность, заставляя его выглядеть и звучать точно так же, как жертва, которую он поглотил. Это может быть огромной угрозой для безопасности, особенно если командный состав поглощён, и генокрад способен их имитировать. + Генокрады также могут, используя способность "Lesser Form", превратиться в обезьян и заниматься обезьяньими делами. + + + ## Регенерация + Также известная как "Регенеративная стазис", генокрады обладают способностью "убить" себя и выглядеть мёртвыми. Через неопределённое время генокрад может воскреснуть по своему желанию, полностью излечив все раны и болезни. + Вход в стазис истощает все химикаты генокрада, а выход стоит 60. Химикаты будут продолжать восстанавливаться, пока генокрад мёртв, что означает, что он всегда может войти в стазис, если его уровень биомассы не является критическим. + + Генокрады также могут выбрать возрождение с помощью дефибриллятора, что делает их ещё труднее распознать. + + Это делает их почти неуязвимыми, так как они могут полностью регенерироваться даже из состояния смерти, если у них достаточно химикатов. Выброшенные в космос генокрады также могут вернуться на станцию, если им дать достаточно времени. Лучший способ навсегда избавиться от генокрада — это заставить его умереть от голода, отправив его на шахты или в одиночное заключение. + + ## Действовать в одиночку или в команде + Как и предатели, генокрады действуют индивидуально и не обязаны помогать друг другу. Генокрадам не требуется даже раскрывать свою личность друг другу, так как не редкость, когда генокрады предают друг друга, чтобы устранить конкуренцию. + Тем не менее, [color=red]согласованная группа генокрадов — это настоящая угроза[/color]. + + # Идентификация генокрада + У генокрадов отличается группа крови. Даже если генокрад притворяется дионой, воксом или мотыльком, у него есть одна группа крови. + Также при помещении в центрифугу кровь генокрада реагирует бурно. + Вы не можете идентифицировать генокрада никаким другим способом, если только он не начинает вести себя явно подозрительно. + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/Antagonist/Disease.xml b/Resources/ServerInfo/Guidebook/_Sunrise/Antagonist/Disease.xml new file mode 100644 index 0000000000..973718657b --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/Antagonist/Disease.xml @@ -0,0 +1,87 @@ + + # Разумная болезнь + + + [color=#999999][italic]"Ты просто простудился... или они уже думают за тебя?"[/italic][/color] + + + + + + Разумная болезнь — это антагонист, способный заражать всех существ, а так-же передаваться, она имеет свойство "мутировать", у нее появляються разные симптомы, увеличиваеться летальность, заразность и устойчивость к лекартсвам. она легко распростроняеться если не принять необходимые меры. + + ## Основные симптомы + + Первыми отличимыми симптомами которые есть у каждой болезни, это головная боль и головокружение, так-же основной переносный симптом - кашель и чих. + + ## Передача + + Передача вируса происходит при кашле и чихе, если рядом с вами находиться зараженный и имеет упомянутые симптомы, вы имеете вероятность заразиться. Эта вероятность уменьшаеться при ношении защитных костюмов, масок и прочих средств. + + Однако, у болезни есть возможность заразить вас игнорируя упомянутые средства защиты, при этом она использует очки эволюции, что означает что вы в любом случае можете заболеть. + + ## Возможные симптомы + + Так-же кроме основных симптомов, у болезни есть перечень других, таких как: + + - Непроизвольные слёзы(10 ОЭ) + + [color=#999999][italic]У заражённых активно слезяться глаза, из-за чего кажется, что они плачут.[/italic][/color] + + + - Изнеможение(15 ОЭ) + + [color=#999999][italic]Вирус вызывает разрушение мышечных волокон, приводящее к атрофие и сопровождающееся слабостью. Снижает общую мобильность[/italic][/color] + + + - Сонливость(20 ОЭ) + + [color=#999999][italic]У заражённых появляется постоянное желание спать, с которым они иногда не могут справиться.[/italic][/color] + + + - Судороги(20 ОЭ) + + [color=#999999][italic]Длительная болезнь вызывает гиперстимуляцию двигательных нейронов, в результате чего больные могут испытывать перенапряжение мышц, приводящие к судорогам.[/italic][/color] + + + - Немота(25 ОЭ) + + [color=#999999][italic]Мутация вызывает повреждение подъязычного нерва, приводя к параличу мышц языка, из-за чего больные теряют возможность нормально говорить.[/italic][/color] + + + - Тошнота(25 ОЭ) + + [color=#999999][italic]Заражённых начинает тоншить, вызывая рвоту.[/italic][/color] + + + - Кровопотеря(30 ОЭ) + + [color=#999999][italic]Вирус вызывает денатурацию гемоглобина крови, из-за чего у всех носителей появляется тяжелая степень анемии.[/italic][/color] + + + - Слепота(40 ОЭ) + + [color=#999999][italic]Длительная болезнь приводит к отмиранию зрительного нерва, что приводит к практически полной слепоте больного.[/italic][/color] + + + ## Базовые противодействия + + Если вы заметили что у вас появились какие-то из симптом, не стоит сразу бежать в вирусологию, но стоит принять минимальные меры, носить маску, избегать контакта с персоналом. + + Если же у вас обноружилось 2 и более семптома, например кашель, головная боль и изнеможение, немедленно отправьтесь в медецинский отдел а так-же оповестите врача о том что вы вероятно заражены. + + ## Вакцина + + Для создания вакцины необходима пробирка, шприц, здоровый человек, заражённый человек и вакцинатор, делаем всё строго в последовательности: + + - Набираем кровь заражённого человека в пробирку + + - Вставляем пробирку в вакцинатор + + - Получаем бумажку, с указаниями для создания вакцины. + + - Делаем всё как указано на листочке. + + Готово, вы получили вакцину. + + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/AdditionalRules/CCP.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/AdditionalRules/CCP.xml new file mode 100644 index 0000000000..a09c23b237 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/AdditionalRules/CCP.xml @@ -0,0 +1,7 @@ + + - 1. Ваш персонаж — сотрудник передовой космической станции. Имена и фамилии должны соответствовать контексту и стандартам РП. Клоуну и миму предоставляется более широкое поле для «мемных» имён, чем капитану. + - 2. Имя вашего персонажа должно соответствовать его расе. Необходимо прочесть и иметь представление о лоре вашей расы. Вы можете нажать кнопку «Randomize» напротив имени персонажа, чтобы получить представление о том, какие имена характерны для той или иной расы. Никаких сокращений (Морган Дж.) и кличек (Морган «Грифитти» Джеймс). + - 3. Подойдите всерьёз к созданию своего персонажа. Запрещены имена и фамилии знаменитостей, актёров, персонажей из фильмов, сериалов, аниме, игр и т. д., а также схожие имена и фамилии. Равным образом запрещены нелепые имена (напр. Moon Luck). В связи с этим администрация может попросить сменить имя, но, если же вы его не смените, к вам могут быть применены меры. + - 4. При создании персонажа выбирайте голос, который бы соответствовал его внешности. Не создавайте персонажа с роботизированным голосом, если он является органиком. Также не берите женский тонкий голос взрослому бородатому мужчине. + - 5. Запрещено копирование имен персонажей, за которого вы или кто-то играл до своей смерти или крио. Более серьёзное наказание будет, если этот персонаж занимал ответственную роль и остался в списке экипажа. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/AdditionalRules/CEP.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/AdditionalRules/CEP.xml new file mode 100644 index 0000000000..57dab942ce --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/AdditionalRules/CEP.xml @@ -0,0 +1,7 @@ + + Вы можете начать IC-конфликт с другим игроком, если это не мешает ему выполнять свою работу. Хотя вам разрешено обострять конфликты, если это приведет к насилию и у вас будут плохие IC-обоснования для его разжигания, вы можете столкнуться с административными мерами. + + Убийство члена экипажа - это серьезная реакция, требующая серьезного обоснования, как, например, в прецедентах [textlink="Правила 2" link="PER2"] или [textlink="Правила 4" link="PER4"]. + + Критически раненые персонажи должны быть вылечены или доставлены в медблок стоящей стороной, если это разумно, и принятие ненужных мер в отношении раненого игрока открывает вам возможность для репрессий. Если вы оказались недееспособны в бою и вас вылечили, или конфликт был прерван иным значимым образом, ожидается, что для его возобновления вам потребуется IC-причина, выходящая за рамки "уязвленного самолюбия". + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/AdditionalRules/PANA.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/AdditionalRules/PANA.xml new file mode 100644 index 0000000000..14940c4dad --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/AdditionalRules/PANA.xml @@ -0,0 +1,7 @@ + + Неантагонисты не должны сопротивляться или мстить за правомерный арест, но и не обязаны просто сдаваться и позволять аресту произойти. В духе игры они могут сбежать или избежать офицера, не причиняя ему вреда. + + Если арест явно правомерен, то он должен следовать [textlink="политике эскалации конфликтов" link="CEP"]. Сопротивление или месть за арест без веских причин может нарушить политику эскалации и повлечь за собой действия со стороны Администрации. Если игрок-неантагонист верит, что не сделал ничего такого, за что его можно было бы арестовать, ему следует воспользоваться Ahelp. + + При сопротивлении аресту неантагонисты не должны грабить офицеров и не должны задерживать или выводить из строя офицеров дольше, чем это необходимо для побега или объяснения. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR0DBAD.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR0DBAD.xml new file mode 100644 index 0000000000..f3dc5a2579 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR0DBAD.xml @@ -0,0 +1,6 @@ + + # Правило 0 - Не будь мудаком. + Правила не могут покрыть все возможные ситуации. Администраторы должны иметь возможность решать ситуации, которые упущены в правилах. + + [textlink="Прецеденты\исключения" link="PER0"] + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR10Exploit.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR10Exploit.xml new file mode 100644 index 0000000000..c29c815173 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR10Exploit.xml @@ -0,0 +1,6 @@ + + # Правило 10 - Нечестная игра. + Использование программного обеспечения и недочетов игры для получения преимущества в игровом процессе запрещено. + + [textlink="Прецеденты\исключения" link="PER10"] + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR1Decay.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR1Decay.xml new file mode 100644 index 0000000000..a230f18a21 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR1Decay.xml @@ -0,0 +1,6 @@ + + # Правило 1 - Гриф. + Умышленная порча игрового процесса другим игрокам запрещена. Выпуск сингулярности является поводом для перманентного бана. В случае, если вы антагонист, действуйте строго в рамках ваших задач. + + [textlink="Прецеденты\исключения" link="PER1"] + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR2Kill.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR2Kill.xml new file mode 100644 index 0000000000..c815a09d6c --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR2Kill.xml @@ -0,0 +1,6 @@ + + # Правило 2 - Убийство. + Неоправданные действия, направленные на причинение серьезного вреда здоровью или убийство другого человека запрещены. Помните, что для убийства должна быть очень веская РП причина. Если вы сомневаетесь, спросите в АХелп. Вы имеете право на самооборону, однако она не должна перерастать в убийство. Иными словами, вы имеете право ответить обидчику на удар, но, когда он уже упал, вам не следует его добивать. + + [textlink="Прецеденты\исключения" link="PER2"] + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR3VGA.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR3VGA.xml new file mode 100644 index 0000000000..4e55779b03 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR3VGA.xml @@ -0,0 +1,16 @@ + + # Правило 3 - Нарушение игровой атмосферы. + Вы - не ваш персонаж! Отход от отыгрыша роли своего персонажа, нарушающий общую игровую атмосферу и сеттинг. Помните, что это медиум-РП сервер. + Подпункты к этому правилу: + - [textlink="3.1. Повергейм" link="RuleSRRP1"] + - [textlink="3.2. Метагейм" link="RuleSRRP2"] + - [textlink="3.3. Метазнания" link="RuleSRRP3"] + - [textlink="3.4. IC в OOC" link="RuleSRRP4"] + - [textlink="3.5. Мультиаккаунт" link="RuleSRRP5"] + - [textlink="3.6. Самоубийство" link="RuleSRRP6"] + - [textlink="3.7. Безграмотность" link="RuleSRRP7"] + - [textlink="3.8. Поддержка уважительной обстановки" link="RuleSRRP8"] + - [textlink="3.9. Окончание раунда" link="RuleSRRP9"] + + [textlink="Прецеденты\исключения" link="PER3"] + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR4LC.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR4LC.xml new file mode 100644 index 0000000000..9a28abcc14 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR4LC.xml @@ -0,0 +1,8 @@ + + # Правило 4 - Логика персонажа. + Ваш персонаж - сотрудник передовой космической станции, верный идеалам Корпорации и своему начальству. + Имена и фамилии должны соответствовать контексту и стандартам РП. Запрещены имена и фамилии знаменитостей, актеров, персонажей из фильмов, сериалов, аниме, игр и т.д., а также схожие имена и фамилии. + СРП и КЗ являются внутриигровыми порядками, но их злостное нарушение из раунда в раунд может быть наказуемым. + + [textlink="Прецеденты\исключения" link="PER4"] + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR5.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR5.xml new file mode 100644 index 0000000000..9389f12d53 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR5.xml @@ -0,0 +1,12 @@ + + # Правило 5 - Взаимодействие с игроками, вышедшими из игры и получившими статус SSD + Игроки в ССД — это игроки, которые отсоединились из игры. При осмотре таких игроков пишется, что «Он рассеянно смотрит в пустоту и ни на что не реагирует. Он может скоро прийти в себя» + + Причиной этому могут быть проблемы с соединением или другие технические неполадки. Быть убитым или ограбленным из-за этого мало кому понравится. Цель на убийство у антагонистов по задумке должна быть трудной и интересной. Убивать игрока в ССД не интересно ни для убийцы, ни для жертвы. В случае если ваша цель ССД, то не бойтесь спрашивать помощи у администраторов в Ahelp. + + - Запрещено трогать или взаимодействовать с ССД игроками, кроме как в следующих случаях: относить их в крио, оказывать медицинскую помощь или спасать их от непосредственной опасности (например, выносить из пожара). + - Аналогично, если на игроке с ССД висит статус «Разыскивается», его нельзя задерживать без разрешения администратора. + - Если игрок вышел в ССД во время или сразу после задержания, то разрешается продолжать задержание и арест. + - Аналогично, если вы антагонист, и если ваша цель вышла в ССД сразу после того, как вы её атаковали, вы можете продолжать. + - Если вам кажется, что ситуация вынуждает к взаимодействию с игроком в ССД (например, чтобы забрать важное снаряжение с капитана), сначала воспользуйтесь Ahelp. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR6RPA.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR6RPA.xml new file mode 100644 index 0000000000..337d745beb --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR6RPA.xml @@ -0,0 +1,7 @@ + + # Правило 6 - Ответственная игра за антагониста. + Цель антагониста - сделать раунд интересным, захватывающим и опасным, но в разумных пределах. Антагонистам запрещается поджидать только появившихся игроков, выпускать плазму, сингулярность и в целом заниматься действиями, которые можно классифицировать как гриф. + Помните, что “мелкие” антагонисты - скрытны и незаметны. Для открытых столкновений и громких операций есть другие, “крупные” антагонисты. + + [textlink="Прецеденты\исключения" link="PER6"] + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR7SA.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR7SA.xml new file mode 100644 index 0000000000..ed958f315e --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR7SA.xml @@ -0,0 +1,6 @@ + + # Правило 7 - Самоантагонизм. + Проявление действий, присущих антагонистам, без наличия соответствующей роли запрещены. Вызволять кого-то из брига без причины, мешать работе сб и т.д является нарушением этого правила. Утверждения, что ваш персонаж "неуравновешен", "псих" и т.д, не отменяют ни одно из правил и не являются оправданием. + + [textlink="Прецеденты\исключения" link="PER7"] + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR8VH.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR8VH.xml new file mode 100644 index 0000000000..69451652a3 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR8VH.xml @@ -0,0 +1,7 @@ + + # Правило 8 - Валидхант. + Организация и ведение охоты на антагонистов, не будучи сотрудником службы безопасности запрещена. Останавливать антагонистов - работа офицеров Службы Безопасности. + Данное правило не распространяется на крупных антагонистов. + + [textlink="Прецеденты\исключения" link="PER8"] + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR9ERP.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR9ERP.xml new file mode 100644 index 0000000000..e4fd27e647 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/CoreRules/RuleSR9ERP.xml @@ -0,0 +1,4 @@ + + # Правило 9 - ЕРП. + Эротическая ролевая игра (Erotic Role Play) запрещена. Всё, что заходит дальше поцелуев и объятий, карается. Даже если вы и другой игрок состоите в отношениях в реальной жизни. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER0.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER0.xml new file mode 100644 index 0000000000..7ac26e0f0e --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER0.xml @@ -0,0 +1,4 @@ + + 1. Правило 0 должно применяться администраторами только в тех случаях, когда это отвечает интересам сервера. + 2. Администраторы могут "отзеркаливать" баны с других серверов по своему усмотрению. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER1.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER1.xml new file mode 100644 index 0000000000..0d444a967f --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER1.xml @@ -0,0 +1,3 @@ + + 1. Проникновение в отделы с целью захвата ресурсов или складирование припасов на станции без особых IC обоснований может нанести вред опыту игры других игроков. Если вы хотите получить что-то, к чему у вас нет доступа, сначала сообщите об этом. Игроки имеют право защищать свои рабочие места от нарушителей, которые наносят ущерб или крадут имущество без должной эскалации конфликтов. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER10.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER10.xml new file mode 100644 index 0000000000..402136b3bb --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER10.xml @@ -0,0 +1,4 @@ + + - 1. Нельзя копировать, сохранять, распространять персонажей других игроков без их ведома и одобрения. Также это относится к умышленному подражанию имени и внешности чужих персонажей. + - 2. Создание и хранение чрезмерно большого количества продукции (плоды, таблетки и т.д.), создающей значительную нагрузку на сервер, является нарушением данного правила. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER2.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER2.xml new file mode 100644 index 0000000000..7348f48d6d --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER2.xml @@ -0,0 +1,3 @@ + + 1. Запрещено автоматизировать убийства ради плохого IC обоснования. Распространение бомб или иных разрушительных предметов оставляет на вас ответственность за то, как они используются, если не было согласовано с администратором. Каждое необоснованное убийство обычно сопровождается минимум 24-часовым баном. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.1.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.1.xml new file mode 100644 index 0000000000..ed63319e3d --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.1.xml @@ -0,0 +1,4 @@ + + - 1. Намеренное нападение на опасных существ с помощью подручных средств (лом, отвертка, баллон, топорик и т.д.) явное нарушение данного правила. Адекватная реакция на такую угрозу - сбежать от нее, либо хотя бы наблюдать издалека. В случае нападения такого существа на вас и невозможности побега, вы можете применять подручные средства для самозащиты. + - 2. Взведенные бомбы - явно не то, с чем стоит взаимодействовать обычным членам экипажа, адекватной реакцией при виде бомбы будет побег. Обезвреживанием бомб должны заниматься сотрудники СБ, как первые защитники станции, либо инженеры и учёные, как специалисты в технике, но только с использованием взрывостойкого снаряжения. Обезвреживание бомб обычными членами экипажа и без защитных средств допускается лишь в случаях прямой угрозы жизни, когда побег невозможен. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.2.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.2.xml new file mode 100644 index 0000000000..058b69b43b --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.2.xml @@ -0,0 +1,3 @@ + + + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.3.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.3.xml new file mode 100644 index 0000000000..34c9526fde --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.3.xml @@ -0,0 +1,4 @@ + + - 1. В случае, если на смене нет специалистов в необходимой области, ваш персонаж может получить необходимые навыки. Например капитан, находящийся на станции один, может построить и запустить ДАМ для нормального функционирования энергопитания станции + - 2. На станциях имеется большое количество тайников и секретных мест, о расположении которых обычные члены экипажа никак не могут знать, исколючением можно считать антагонистов. Узнать о таких тайниках можно в ходе удачного стечения обстоятельств, либо проявив свою наблюдательность в ходе изучения станции. Однако если вы побежите "изучать" какую-нибудь стену без логичных обоснований, то вам следует приготовиться к диалогу с администрацией. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.4.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.4.xml new file mode 100644 index 0000000000..00bf5f08ad --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.4.xml @@ -0,0 +1,4 @@ + + - 1. Это так же касается конференций, форумов и иных способов общения и распространения информации. + - 2. Вне игры разрешено обсуждать все, что можно увидеть из лобби, не заходя в игру. Это автоматические предупреждения о различных угрозах, а также список должностей. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.6.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.6.xml new file mode 100644 index 0000000000..68709582a7 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.6.xml @@ -0,0 +1,3 @@ + + - 1. Самоубийство об антага с целью подрыва последнего о заранее заготовленную бомбу из вашего рюкзака. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.7.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.7.xml new file mode 100644 index 0000000000..058b69b43b --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.7.xml @@ -0,0 +1,3 @@ + + + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.xml new file mode 100644 index 0000000000..477e673f7c --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER3.xml @@ -0,0 +1,3 @@ + + - 1. Отыгрыш семейных отношений без уведомления администрации недопустим. Однако даже при получении соответствующего одобрения ваш персонаж не должен ставить личные отношения превыше своих обязанностей и предоставлять какие-либо преимущества другим персонажам. Будучи ГСБ защищать свою супругу, которая оказалось агентом синдиката - не ок. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER4.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER4.xml new file mode 100644 index 0000000000..d1682a0d7d --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER4.xml @@ -0,0 +1,3 @@ + + - 1. Это правило будет применяться в случае нарушения [textlink="политики создания персонажей" link="CCP"]. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER6.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER6.xml new file mode 100644 index 0000000000..16acfe24cc --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER6.xml @@ -0,0 +1,5 @@ + + - 1. Сотрудников СБ можно ликвидировать, будучи антагонистом, если они являются активной угрозой для вас, но убийство Сотрудников СБ «на всякий случай» к этому не относится. + - 2. Если вы не хотите играть за антагониста или если вам нужно внезапно уйти посреди раунда, воспользуйтесь Ahelp(F1), чтобы кто-то другой мог быть назначен на вашу роль. + - 3. Если вы используете взрывчатку для достижения вашей цели, то используйте бомбы по необходимости: если вы взорвете бомбу синдиката для пробития одной стены, то, помимо взорванного отсека, вы получите ещё и бан. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER7.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER7.xml new file mode 100644 index 0000000000..1de99ec4d6 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER7.xml @@ -0,0 +1,4 @@ + + - 1. Вызволять кого-либо из отдела СБ (брига), будучи неантагонистом, можно только, если урон станции при этом будет незначительный. Выпускать кого-либо из камеры пожизненного заключения (пермабрига) можно только с разрешения Администратора. + - 2. В некоторой степени помощь антагонистам разрешена, но это должна быть скорее "пассивная" помощь, и для этого нужны веские причины. Открыть для антагониста шлюз или закрыть глаза на подозрительную деятельность - нормально. Дать им бомбу - нет. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER8.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER8.xml new file mode 100644 index 0000000000..b78002b302 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/PrecedentExceptionRules/PER8.xml @@ -0,0 +1,3 @@ + + - 1. Капитан или глава персонала не могут создать специальную "роль" и отменить это правило. Например, создать роль "Охотник на вампиров" и набрать в неё людей, не являющихся сотрудниками СБ. Если кто-то хочет действовать как СБ, то он должен вступить в СБ. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP1PG.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP1PG.xml new file mode 100644 index 0000000000..75a0a48e5e --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP1PG.xml @@ -0,0 +1,7 @@ + + # Правило 3.1. - Повергейм. + Проявление действий, которые выходят за рамки физических и психологических возможностей вашего персонажа. Ваш персонаж обычный человек, которому свойственно бояться и испытывать боль, не забывайте об этом. Вы также не должны прятать вещи “на всякий случай” и болтировать двери, будучи главой отдела, если вас до этого не взламывали в этом же раунде. + Данное правило не распространяется на крупных антагонистов. + + [textlink="Прецеденты\исключения" link="PER3_1"] + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP2MG.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP2MG.xml new file mode 100644 index 0000000000..5b3e598301 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP2MG.xml @@ -0,0 +1,6 @@ + + # Правило 3.2. - Метагейминг. + Использование и распространение игровой информации посредством сторонних средств связи. КООП запрещен. В случае, если вы обучаете друга, вы обязаны сообщить об этом в АХ. + + [textlink="Прецеденты\исключения" link="PER3_2"] + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP3MK.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP3MK.xml new file mode 100644 index 0000000000..7ddafdfe46 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP3MK.xml @@ -0,0 +1,7 @@ + + # Правило 3.3. - Метазнания. + Использование знаний, не присущих вашему персонажу по должности. Для полного понимания рамок вашей должности зайдите в раздел “таблица навыков” на нашей вики. + + [textlink="Прецеденты\исключения" link="PER3_3"] + + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP4ICinOOC.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP4ICinOOC.xml new file mode 100644 index 0000000000..98e55d9dc3 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP4ICinOOC.xml @@ -0,0 +1,6 @@ + + # Правило 3.4. - IC в OOC. + Злоупотребление ООС и LOOC чатами. Обсуждение или упоминание событий текущего раунда в канале OOC запрещено. Особенно наказуемы сообщения в духе "X меня убил" или "клонируйте меня". + + [textlink="Прецеденты\исключения" link="PER3_4"] + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP5Multikey.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP5Multikey.xml new file mode 100644 index 0000000000..63394b8a7d --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP5Multikey.xml @@ -0,0 +1,4 @@ + + # Правило 3.5. - Мультиаккаунт. + Использование нескольких аккаунтов SS14 для получения выгоды или каких-либо других целей. Запрещено в любом виде. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP6SK.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP6SK.xml new file mode 100644 index 0000000000..21d56a91d3 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP6SK.xml @@ -0,0 +1,6 @@ + + # Правило 3.6 - Самоубийство. + Злоупотребление возможностью суицида или его совершение без веских причин. Даже если вас раскрыли и поймали. + + [textlink="Прецеденты\исключения" link="PER3_6"] + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP7ORL.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP7ORL.xml new file mode 100644 index 0000000000..323cc7d4a2 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP7ORL.xml @@ -0,0 +1,6 @@ + + # Правило 3.7 - Безграмотность. + Чистота речи и соблюдение грамматических норм русского языка. + + [textlink="Прецеденты\исключения" link="PER3_7"] + diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP8DH.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP8DH.xml new file mode 100644 index 0000000000..f4e12162ed --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP8DH.xml @@ -0,0 +1,4 @@ + + # Правило 3.8. - Поддержание уважительной обстановки. + Простое человеческое взаимное уважение игроков между друг другом. Оскорбления в ООС и LOOC чатах караются, как и несоблюдение субординации в АХ. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP9RE.xml b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP9RE.xml new file mode 100644 index 0000000000..8d32bec25c --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/RulesSR/RolePlayRules/RuleSRRP9RE.xml @@ -0,0 +1,4 @@ + + # Правило 3.9. - Окончание раунда. + Все правила работают после окончания раунда/манифеста/гринтекста (окна с информацией в конце раунда). Это значит, что все так же запрещен ДМ (Deathmatch), разрушение структуры станции или ЦК. + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/_Sunrise/ServerRules/SunriseRules.xml b/Resources/ServerInfo/Guidebook/_Sunrise/ServerRules/SunriseRules.xml new file mode 100644 index 0000000000..d10a12dcd3 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/_Sunrise/ServerRules/SunriseRules.xml @@ -0,0 +1,16 @@ + + # Правила сервера + Правила - ряд обязательств, которые должен соблюдать каждый игрок нашего огромного сообщества, заходя на сервер вы автоматически соглашаетесь со всеми правилами и обязуетесь их соблюдать. Нарушение этих правил может повлечь за собой наказание. + # Основные правила + + - [textlink="0. Не будь мудаком." link="RuleSR0"] + - [textlink="1. Гриф" link="RuleSR1"] + - [textlink="2. Убийство" link="RuleSR2"] + - [textlink="3. Нарушение игровой атмосферы" link="RuleSR3"] + - [textlink="4. Логика персонажа" link="RuleSR4"] + - [textlink="6. Ответственная игра за антагониста" link="RuleSR6"] + - [textlink="7. Самоантагонизм" link="RuleSR7"] + - [textlink="8. Валидхант" link="RuleSR8"] + - [textlink="9. ERP" link="RuleSR9"] + - [textlink="10. Нечестная игра" link="RuleSR10"] + diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke-broken.png new file mode 100644 index 0000000000..068697b3f8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke-open.png new file mode 100644 index 0000000000..c6cd664ee1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke.png new file mode 100644 index 0000000000..f5fd8b1a22 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/clarke.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png index 9d3594b924..9b39c48b3b 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png index 6ad718e57f..eadf7ffd93 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png index 665f09da0b..6a65735f3f 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/darkgygax.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-broken.png new file mode 100644 index 0000000000..879ceef9c4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-open.png new file mode 100644 index 0000000000..7db78ab187 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley.png new file mode 100644 index 0000000000..f8f544ba22 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/deathripley.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-broken.png new file mode 100644 index 0000000000..e65af10f1d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-open.png new file mode 100644 index 0000000000..7a186b0651 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand.png new file mode 100644 index 0000000000..8f1424bb24 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/durand.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter-broken.png new file mode 100644 index 0000000000..c10bbc9657 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter-open.png new file mode 100644 index 0000000000..a3c1ad5645 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png new file mode 100644 index 0000000000..2e45633ee2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/firefighter.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-broken.png new file mode 100644 index 0000000000..ab4f2ae316 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-open.png new file mode 100644 index 0000000000..044eaa62df Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax.png new file mode 100644 index 0000000000..ab355dada5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/gygax.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-broken.png new file mode 100644 index 0000000000..2496061ab4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-empty.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-empty.png new file mode 100644 index 0000000000..0562436f8b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-empty.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-open.png new file mode 100644 index 0000000000..f2b08e5607 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler.png new file mode 100644 index 0000000000..7e81fe2a3e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/hauler.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png index 5cc54dda03..b926a6b2da 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png index 47873f5d78..594eaa993e 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png index 6b5e02e9e8..8f51c76b20 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/marauder.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png index fec1da9023..b024f6d9b4 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png index 7acc487e68..70252e39ba 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png index 7695cab3be..fe3c934016 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/mauler.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken-old.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken-old.png new file mode 100644 index 0000000000..1e0357f677 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken-old.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-full-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-full-open.png new file mode 100644 index 0000000000..ef0c66b44e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-full-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-full.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-full.png new file mode 100644 index 0000000000..41faa001a7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-full.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-open.png new file mode 100644 index 0000000000..fdb9c09458 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g.png new file mode 100644 index 0000000000..a01defab94 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-g.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-old.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-old.png new file mode 100644 index 0000000000..dddcf1e729 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-old.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-broken.png new file mode 100644 index 0000000000..1e0357f677 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-open.png new file mode 100644 index 0000000000..85e7a8518f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii.png new file mode 100644 index 0000000000..33e77e3a23 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripleymkii.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-broken.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-broken.png index 5cb3bf7a9b..4fc3f79776 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-broken.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-broken.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-open.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-open.png index 06f76dfed1..b5abfd86cb 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-open.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph-open.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph.png b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph.png index c8e6c64eb3..798e49c8df 100644 Binary files a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph.png and b/Resources/Textures/Objects/Specific/Mech/mecha.rsi/seraph.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png index a25fc81604..749353867e 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png index cd3f42f561..af840c3e7c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png differ diff --git a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png index c61af49f2f..d59b072790 100644 Binary files a/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png and b/Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png differ diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/energy_sniper.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/energy_sniper.rsi/meta.json index aea9fa4a06..ea1533c110 100644 --- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/energy_sniper.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/energy_sniper.rsi/meta.json @@ -45,6 +45,14 @@ { "name": "equipped-BACKPACK", "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/energy_sniper.rsi/wielded-inhand-left.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/energy_sniper.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..6979273d53 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/energy_sniper.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/energy_sniper.rsi/wielded-inhand-right.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/energy_sniper.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..8ac81ac34c Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/energy_sniper.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json index 66e72b208a..cfcfa76256 100644 --- a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json +++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json @@ -67,6 +67,15 @@ 0.006250002 ] ] + }, + { + "name": "pd_impact" + }, + { + "name": "pd_trace" + }, + { + "name": "pd_muzzle" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/pd_impact.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/pd_impact.png new file mode 100644 index 0000000000..ed17917218 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/pd_impact.png differ diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/pd_muzzle.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/pd_muzzle.png new file mode 100644 index 0000000000..cc098130a8 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/pd_muzzle.png differ diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/pd_trace.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/pd_trace.png new file mode 100644 index 0000000000..d5db763e28 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Projectiles/projectiles.rsi/pd_trace.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Devices/pda.rsi/pda-space-prison-boss.png b/Resources/Textures/_Sunrise/Objects/Devices/pda.rsi/pda-space-prison-boss.png index 9bf972e5dc..39229f4dc3 100644 Binary files a/Resources/Textures/_Sunrise/Objects/Devices/pda.rsi/pda-space-prison-boss.png and b/Resources/Textures/_Sunrise/Objects/Devices/pda.rsi/pda-space-prison-boss.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Devices/pda.rsi/pda-space-prison-inspector.png b/Resources/Textures/_Sunrise/Objects/Devices/pda.rsi/pda-space-prison-inspector.png index ea087379e6..aba3c97f6b 100644 Binary files a/Resources/Textures/_Sunrise/Objects/Devices/pda.rsi/pda-space-prison-inspector.png and b/Resources/Textures/_Sunrise/Objects/Devices/pda.rsi/pda-space-prison-inspector.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json index 57d2d181ce..384f4ef58f 100644 --- a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json @@ -1,142 +1,158 @@ { - "version": 1, - "license": "CLA", - "copyright": "© SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt, made for Space Sunrise by gardsnake (Github)", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CLA", + "copyright": "© SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt, made for Space Sunrise by gardsnake (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "default" }, - "states": [ - { - "name": "default" - }, - { - "name": "default-inhand-left", - "directions": 4 - }, - { - "name": "default-inhand-right", - "directions": 4 - }, - { - "name": "silver" - }, - { - "name": "silver-inhand-left", - "directions": 4 - }, - { - "name": "silver-inhand-right", - "directions": 4 - }, - { - "name": "gold" - }, - { - "name": "gold-inhand-left", - "directions": 4 - }, - { - "name": "gold-inhand-right", - "directions": 4 - }, - { - "name": "blue" - }, - { - "name": "blue-inhand-left", - "directions": 4 - }, - { - "name": "blue-inhand-right", - "directions": 4 - }, - { - "name": "black" - }, - { - "name": "black-inhand-left", - "directions": 4 - }, - { - "name": "black-inhand-right", - "directions": 4 - }, - { - "name": "orange" - }, - { - "name": "orange-inhand-left", - "directions": 4 - }, - { - "name": "orange-inhand-right", - "directions": 4 - }, - { - - "name": "orange-space-prison" - }, - { - "name": "dark-orange-space-prison" - }, - { - "name": "dark-orange-space-prison" - }, - { - "name": "ntr-operator" - }, - { - "name": "ntr-captain" - }, - { - "name": "green" - }, - { - "name": "green-inhand-left", - "directions": 4 - }, - { - "name": "green-inhand-right", - "directions": 4 - }, - { - "name": "space-prison" - }, - { - "name": "space-prison-inhand-left", - "directions": 4 - }, - { - "name": "space-prison-inhand-right", - "directions": 4 - }, - { - "name": "icon-captain" - }, - { - "name": "wizard" - }, - { - "name": "pirate" - }, - { - "name": "ussp" - }, - { - "name": "abductor" - }, - { - "name": "clown-side" - }, - { - "name": "department-side" - }, - { - "name": "department-side-extra-gold" - }, - { - "name": "department-side-extra-gold-ussp" - } - ] + { + "name": "default-inhand-left", + "directions": 4 + }, + { + "name": "default-inhand-right", + "directions": 4 + }, + { + "name": "silver" + }, + { + "name": "silver-inhand-left", + "directions": 4 + }, + { + "name": "silver-inhand-right", + "directions": 4 + }, + { + "name": "gold" + }, + { + "name": "gold-inhand-left", + "directions": 4 + }, + { + "name": "gold-inhand-right", + "directions": 4 + }, + { + "name": "blue" + }, + { + "name": "blue-inhand-left", + "directions": 4 + }, + { + "name": "blue-inhand-right", + "directions": 4 + }, + { + "name": "black" + }, + { + "name": "black-inhand-left", + "directions": 4 + }, + { + "name": "black-inhand-right", + "directions": 4 + }, + { + "name": "orange" + }, + { + "name": "orange-inhand-left", + "directions": 4 + }, + { + "name": "orange-inhand-right", + "directions": 4 + }, + { + "name": "orange-space-prison" + }, + { + "name": "dark-orange-space-prison" + }, + { + "name": "idinspector-space-prison" + }, + { + "name": "prisoner-space-prison" + }, + { + "name": "stripe_top" + }, + { + "name": "stripe_bottom" + }, + { + "name": "admin" + }, + { + "name": "admin-inhand-left", + "directions": 4 + }, + { + "name": "admin-inhand-right", + "directions": 4 + }, + { + "name": "green" + }, + { + "name": "green-inhand-left", + "directions": 4 + }, + { + "name": "green-inhand-right", + "directions": 4 + }, + { + "name": "space-prison" + }, + { + "name": "space-prison-inhand-left", + "directions": 4 + }, + { + "name": "space-prison-inhand-right", + "directions": 4 + }, + { + "name": "icon-captain" + }, + { + "name": "wizard" + }, + { + "name": "pirate" + }, + { + "name": "ussp" + }, + { + "name": "abductor" + }, + { + "name": "clown-side" + }, + { + "name": "department-side" + }, + { + "name": "department-side-extra" + }, + { + "name": "department-side-extra-gold" + }, + { + "name": "department-side-extra-gold-ussp" + } + ] } diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/stripe_bottom.png b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/stripe_bottom.png new file mode 100644 index 0000000000..e932dc60b0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/stripe_bottom.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/stripe_top.png b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/stripe_top.png new file mode 100644 index 0000000000..138fcbf636 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/stripe_top.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png new file mode 100644 index 0000000000..9d3594b924 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkgygax-broken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png new file mode 100644 index 0000000000..6ad718e57f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkgygax-open.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkgygax.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkgygax.png new file mode 100644 index 0000000000..665f09da0b Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkgygax.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkhonker-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkhonker-broken.png new file mode 100644 index 0000000000..eef046a3c6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkhonker-broken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkhonker-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkhonker-open.png new file mode 100644 index 0000000000..87c1595029 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkhonker-open.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkhonker.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkhonker.png new file mode 100644 index 0000000000..bf1a52a193 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/darkhonker.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/hamtr-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/hamtr-broken.png new file mode 100644 index 0000000000..3a1f75d90a Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/hamtr-broken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/hamtr-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/hamtr-open.png new file mode 100644 index 0000000000..70b8b673d1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/hamtr-open.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/hamtr.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/hamtr.png new file mode 100644 index 0000000000..bb2b1ab21c Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/hamtr.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/honker-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/honker-broken.png new file mode 100644 index 0000000000..689f53123a Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/honker-broken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/honker-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/honker-open.png new file mode 100644 index 0000000000..bb5bf3a2ce Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/honker-open.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/honker.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/honker.png new file mode 100644 index 0000000000..2b44d325ef Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/honker.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/marauder-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/marauder-broken.png new file mode 100644 index 0000000000..5cc54dda03 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/marauder-broken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/marauder-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/marauder-open.png new file mode 100644 index 0000000000..47873f5d78 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/marauder-open.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/marauder.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/marauder.png new file mode 100644 index 0000000000..6b5e02e9e8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/marauder.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/mauler-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/mauler-broken.png new file mode 100644 index 0000000000..fec1da9023 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/mauler-broken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/mauler-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/mauler-open.png new file mode 100644 index 0000000000..7acc487e68 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/mauler-open.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/mauler.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/mauler.png new file mode 100644 index 0000000000..7695cab3be Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/mauler.png differ diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/meowler-broken.png similarity index 100% rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-broken.png rename to Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/meowler-broken.png diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/meowler-open.png similarity index 100% rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler-open.png rename to Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/meowler-open.png diff --git a/Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/meowler.png similarity index 100% rename from Resources/Textures/Objects/Specific/Mech/mecha.rsi/meowler.png rename to Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/meowler.png diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/meta.json new file mode 100644 index 0000000000..613336dac0 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/meta.json @@ -0,0 +1,298 @@ +{ + "copyright" : "Taken from https://github.com/tgstation/tgstation at at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, hamtr made by brainfood1183 (github)", + "license" : "CC-BY-SA-3.0", + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "honker", + "directions": 4, + "delays": [ + [ + 1, + 1 + ], + [ + 1, + 1 + ], + [ + 1, + 1 + ], + [ + 1, + 1 + ] + ] + }, + { + "name": "honker-open" + }, + { + "name": "honker-broken" + }, + { + "name": "reticence", + "directions": 4 + }, + { + "name": "reticence-open" + }, + { + "name": "reticence-broken" + }, + { + "name": "marauder", + "directions": 4 + }, + { + "name": "marauder-open" + }, + { + "name": "marauder-broken" + }, + { + "name": "darkgygax", + "directions": 4 + }, + { + "name": "darkgygax-open", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "darkgygax-broken" + }, + { + "name": "seraph", + "directions": 4 + }, + { + "name": "seraph-open" + }, + { + "name": "seraph-broken" + }, + { + "name": "phazon", + "directions": 4 + }, + { + "name": "phazon-open" + }, + { + "name": "phazon-phase", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "phazon-broken" + }, + { + "name": "mauler", + "directions": 4 + }, + { + "name": "mauler-open" + }, + { + "name": "mauler-broken" + }, +{ + "name": "meowler", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "meowler-open", + "delays": [ + [ + 0.5, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "meowler-broken" + }, + { + "name": "odysseus", + "directions": 4 + }, + { + "name": "odysseus-open" + }, + { + "name": "odysseus-broken" + }, + { + "name": "hamtr", + "directions": 4 + }, + { + "name": "hamtr-open" + }, + { + "name": "hamtr-broken" + }, + { + "name": "darkhonker", + "directions": 4, + "delays": [ + [ + 1, + 1 + ], + [ + 1, + 1 + ], + [ + 1, + 1 + ], + [ + 1, + 1 + ] + ] + }, + { + "name": "darkhonker-open" + }, + { + "name": "darkhonker-broken" + }, + { + "name": "vim", + "directions": 4 + }, + { + "name": "vim-open", + "directions": 4 + }, + { + "name": "vim-broken", + "directions": 4 + } + ] +} + diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/odysseus-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/odysseus-broken.png new file mode 100644 index 0000000000..12a01c8a66 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/odysseus-broken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/odysseus-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/odysseus-open.png new file mode 100644 index 0000000000..cdc13c60b9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/odysseus-open.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/odysseus.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/odysseus.png new file mode 100644 index 0000000000..0daa691044 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/odysseus.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/phazon-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/phazon-broken.png new file mode 100644 index 0000000000..cde4774f08 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/phazon-broken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/phazon-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/phazon-open.png new file mode 100644 index 0000000000..804bd8a910 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/phazon-open.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/phazon-phase.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/phazon-phase.png new file mode 100644 index 0000000000..17c15ae1af Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/phazon-phase.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/phazon.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/phazon.png new file mode 100644 index 0000000000..558d23c224 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/phazon.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/reticence-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/reticence-broken.png new file mode 100644 index 0000000000..b5ce0dc73f Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/reticence-broken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/reticence-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/reticence-open.png new file mode 100644 index 0000000000..e72dc3f51a Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/reticence-open.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/reticence.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/reticence.png new file mode 100644 index 0000000000..d5fa5a8707 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/reticence.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/ripley-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/ripley-broken.png new file mode 100644 index 0000000000..f3bd7f29f3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/ripley-broken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/ripley-empty.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/ripley-empty.png new file mode 100644 index 0000000000..8eb1279c3c Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/ripley-empty.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/ripley-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/ripley-open.png new file mode 100644 index 0000000000..337aa225c7 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/ripley-open.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/ripley.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/ripley.png new file mode 100644 index 0000000000..76ae779f56 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/ripley.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/seraph-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/seraph-broken.png new file mode 100644 index 0000000000..5cb3bf7a9b Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/seraph-broken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/seraph-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/seraph-open.png new file mode 100644 index 0000000000..06f76dfed1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/seraph-open.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/seraph.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/seraph.png new file mode 100644 index 0000000000..c8e6c64eb3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/seraph.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/vim-broken.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/vim-broken.png new file mode 100644 index 0000000000..d3155b93b0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/vim-broken.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/vim-open.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/vim-open.png new file mode 100644 index 0000000000..a70fa69cbd Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/vim-open.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/vim.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/vim.png new file mode 100644 index 0000000000..85e830caf5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha.rsi/vim.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/combat_minihypo.png b/Resources/Textures/_Sunrise/Objects/Specific/Medical/hypospray.rsi/combat_minihypo.png similarity index 100% rename from Resources/Textures/Objects/Specific/Medical/hypospray.rsi/combat_minihypo.png rename to Resources/Textures/_Sunrise/Objects/Specific/Medical/hypospray.rsi/combat_minihypo.png diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Medical/hypospray.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Specific/Medical/hypospray.rsi/meta.json index b815803d5d..80a7ab716c 100644 --- a/Resources/Textures/_Sunrise/Objects/Specific/Medical/hypospray.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Specific/Medical/hypospray.rsi/meta.json @@ -7,6 +7,9 @@ "y": 32 }, "states": [ + { + "name": "combat_minihypo" + }, { "name": "med-hypospray" } diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/scarh.rsi/base.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/scarh.rsi/base.png deleted file mode 100644 index 4c849f6e48..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/scarh.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/scarh.rsi/mag-1.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/scarh.rsi/mag-1.png deleted file mode 100644 index 55967e6b22..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/scarh.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/scarh.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/scarh.rsi/meta.json deleted file mode 100644 index 1c4ef19aef..0000000000 --- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Ammunition/Magazines/scarh.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "I made it, Oleg the Almighty. Fear me! Discord: simply_oleg", - "states": [ - { - "name": "base" - }, - { - "name": "mag-1" - } - - ] -} diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/base.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/base.png deleted file mode 100644 index bbad8136cc..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/bolt-open.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/bolt-open.png deleted file mode 100644 index fde84c1775..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/bolt-open.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/icon.png deleted file mode 100644 index c97546de1f..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/mag-0.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/mag-0.png deleted file mode 100644 index 2cec036634..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/mag-0.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/meta.json deleted file mode 100644 index 203befd5a4..0000000000 --- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/big.rsi/meta.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Fedor the Unbeatable", - "size": { - "x": 48, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "bolt-open" - }, - { - "name": "base" - }, - { - "name": "mag-0" - } - ] -} diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/equipped-BACKPACK.png deleted file mode 100644 index fbd69cafa2..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/equipped-BACKPACK.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/equipped-SUITSTORAGE.png deleted file mode 100644 index 11c728ea07..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/equipped-SUITSTORAGE.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/inhand-left.png deleted file mode 100644 index 77adc8ae04..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/inhand-right.png deleted file mode 100644 index 9bdd2ace60..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/meta.json deleted file mode 100644 index e85285a336..0000000000 --- a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Fedor the Unbeatable", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - }, - { - "name": "equipped-SUITSTORAGE", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/wielded-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/wielded-inhand-left.png deleted file mode 100644 index e0c4e13871..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/wielded-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/wielded-inhand-right.png deleted file mode 100644 index 958924db93..0000000000 Binary files a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Rifles/scarh/tiny.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index 88a41d24ad..9e4934b0f8 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -1,4 +1,4 @@ -version: 1 # Not used right now, whatever. +version: 1 # Not used right now, whatever. binds: - function: UIClick type: State diff --git a/Resources/manifest.yml b/Resources/manifest.yml index 5d4b22a48f..05b659e15b 100644 --- a/Resources/manifest.yml +++ b/Resources/manifest.yml @@ -1,4 +1,4 @@ -defaultWindowTitle: Sunrise Station # Sunrise-Edit +defaultWindowTitle: Sunrise Station # Sunrise-Edit windowIconSet: /Textures/Logo/icon-ru # Sunrise-Edit splashLogo: /Textures/_Sunrise/Logo/logo-sunrise-splash.png # Sunrise-Edit diff --git a/Resources/migration.yml b/Resources/migration.yml index 0d72bcf550..47b6ce5a44 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -885,9 +885,6 @@ WeaponShotgunZauer: null HandheldCamera: null # Не надо маппить, оно есть в автоматах GrenadeBlast: GrenadeBlastTimer GrenadeEMP: GrenadeEMPTimer -GrenadeFlash: GrenadeFlashContact -GrenadeFlashTimer: GrenadeFlashContact -GrenadeFrag: GrenadeFragContact WeaponEnergyGunMini: WeaponMiniEnergyGun GunSafeCombineSmallArms: SpawnerSafeSmallArms AphrodisiacChemistryBottle: null @@ -905,6 +902,9 @@ SupermatterFlatpack: SupermatterFlatpackAnchored SupermatterCrystal: SupermatterFlatpackAnchored WeaponRifleM28: WeaponRifleSKM28 WeaponRifleAR18: null +MagazineScarH: null +WeaponRifleScarH: null +MagazinePistolSubMachineGunSIAR52: MagazinePistolSubMachineGunCaselessExtended # SL HITSCAN START BoxMagazineRifle: BoxMagazineRifleSP MagazineBoxLightRifle: MagazineBoxLightRifleSP