diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d08ae135020..16cb5017d6a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -41,10 +41,21 @@ jobs: - name: Package client run: dotnet run --project Content.Packaging client --no-wipe-release + - name: Upload build artifact + id: artifact-upload-step + uses: actions/upload-artifact@v4 + with: + name: build + path: release/*.zip + compression-level: 0 + retention-days: 0 + - name: Publish version - run: Tools/publish_multi_request.py + run: Tools/publish_github_artifact.py env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }} + ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }} GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }} - name: Publish changelog (Discord) @@ -57,3 +68,8 @@ jobs: run: Tools/actions_changelog_rss.py env: CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }} + + - uses: geekyeggo/delete-artifact@v5 + if: always() + with: + name: build diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs index b36b0031091..889447eba59 100644 --- a/Content.Client/Actions/ActionsSystem.cs +++ b/Content.Client/Actions/ActionsSystem.cs @@ -301,7 +301,7 @@ public void LoadActionAssignments(string path, bool userData) continue; var action = _serialization.Read(actionNode, notNullableOverride: true); - var actionId = Spawn(); + var actionId = Spawn(null); AddComp(actionId, action); AddActionDirect(user, actionId); diff --git a/Content.Client/Actions/UI/ActionAlertTooltip.cs b/Content.Client/Actions/UI/ActionAlertTooltip.cs index 2425cdefb91..f805f6643d2 100644 --- a/Content.Client/Actions/UI/ActionAlertTooltip.cs +++ b/Content.Client/Actions/UI/ActionAlertTooltip.cs @@ -101,7 +101,7 @@ protected override void FrameUpdate(FrameEventArgs args) { var duration = Cooldown.Value.End - Cooldown.Value.Start; - if (!FormattedMessage.TryFromMarkup(Loc.GetString("ui-actionslot-duration", ("duration", (int)duration.TotalSeconds), ("timeLeft", (int)timeLeft.TotalSeconds + 1)), out var markup)) + if (!FormattedMessage.TryFromMarkup($"[color=#a10505]{(int) duration.TotalSeconds} sec cooldown ({(int) timeLeft.TotalSeconds + 1} sec remaining)[/color]", out var markup)) return; _cooldownLabel.SetMessage(markup); diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs index 615f1434df2..7cb32b43df5 100644 --- a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs +++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs @@ -1,13 +1,14 @@ -using System.Linq; using System.Numerics; using Content.Client.UserInterface.Controls; -using Content.Shared.Preferences.Loadouts; using Content.Shared.Roles; using Robust.Client.AutoGenerated; using Robust.Client.Console; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; +using Robust.Shared.GameObjects; +using Robust.Shared.IoC; +using Robust.Shared.Localization; using Robust.Shared.Prototypes; namespace Content.Client.Administration.UI.SetOutfit @@ -64,18 +65,9 @@ private void SearchBarOnOnTextChanged(LineEdit.LineEditEventArgs obj) PopulateByFilter(SearchBar.Text); } - private IEnumerable GetPrototypes() - { - // Filter out any StartingGearPrototypes that belong to loadouts - var loadouts = _prototypeManager.EnumeratePrototypes(); - var loadoutGears = loadouts.Select(l => l.StartingGear); - return _prototypeManager.EnumeratePrototypes() - .Where(p => !loadoutGears.Contains(p.ID)); - } - private void PopulateList() { - foreach (var gear in GetPrototypes()) + foreach (var gear in _prototypeManager.EnumeratePrototypes()) { OutfitList.Add(GetItem(gear, OutfitList)); } @@ -84,7 +76,7 @@ private void PopulateList() private void PopulateByFilter(string filter) { OutfitList.Clear(); - foreach (var gear in GetPrototypes()) + foreach (var gear in _prototypeManager.EnumeratePrototypes()) { if (!string.IsNullOrEmpty(filter) && gear.ID.ToLowerInvariant().Contains(filter.Trim().ToLowerInvariant())) diff --git a/Content.Client/Anomaly/AnomalySystem.cs b/Content.Client/Anomaly/AnomalySystem.cs index 28c015f3021..c93f0ce9490 100644 --- a/Content.Client/Anomaly/AnomalySystem.cs +++ b/Content.Client/Anomaly/AnomalySystem.cs @@ -20,9 +20,8 @@ public override void Initialize() SubscribeLocalEvent(OnAppearanceChanged); SubscribeLocalEvent(OnStartup); SubscribeLocalEvent(OnAnimationComplete); - - SubscribeLocalEvent(OnShutdown); } + private void OnStartup(EntityUid uid, AnomalyComponent component, ComponentStartup args) { _floating.FloatAnimation(uid, component.FloatingOffset, component.AnimationKey, component.AnimationTime); @@ -76,13 +75,4 @@ public override void Update(float frameTime) } } } - - private void OnShutdown(Entity ent, ref ComponentShutdown args) - { - if (!TryComp(ent, out var sprite)) - return; - - sprite.Scale = Vector2.One; - sprite.Color = sprite.Color.WithAlpha(1f); - } } diff --git a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs deleted file mode 100644 index efb1a8d46e8..00000000000 --- a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Content.Shared.Anomaly.Components; -using Content.Shared.Anomaly.Effects; -using Content.Shared.Body.Components; -using Robust.Client.GameObjects; - -namespace Content.Client.Anomaly.Effects; - -public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem -{ - public override void Initialize() - { - SubscribeLocalEvent(OnAfterHandleState); - SubscribeLocalEvent(OnCompShutdown); - } - - private void OnAfterHandleState(Entity ent, ref AfterAutoHandleStateEvent args) - { - if (!TryComp(ent, out var sprite)) - return; - - if (ent.Comp.FallbackSprite is null) - return; - - if (!sprite.LayerMapTryGet(ent.Comp.LayerMap, out var index)) - index = sprite.LayerMapReserveBlank(ent.Comp.LayerMap); - - if (TryComp(ent, out var body) && - body.Prototype is not null && - ent.Comp.SpeciesSprites.TryGetValue(body.Prototype.Value, out var speciesSprite)) - { - sprite.LayerSetSprite(index, speciesSprite); - } - else - { - sprite.LayerSetSprite(index, ent.Comp.FallbackSprite); - } - - sprite.LayerSetVisible(index, true); - sprite.LayerSetShader(index, "unshaded"); - } - - private void OnCompShutdown(Entity ent, ref ComponentShutdown args) - { - if (!TryComp(ent, out var sprite)) - return; - - var index = sprite.LayerMapGet(ent.Comp.LayerMap); - sprite.LayerSetVisible(index, false); - } -} diff --git a/Content.Client/Audio/AmbientSoundSystem.cs b/Content.Client/Audio/AmbientSoundSystem.cs index b525747aa9c..ca6336b91b8 100644 --- a/Content.Client/Audio/AmbientSoundSystem.cs +++ b/Content.Client/Audio/AmbientSoundSystem.cs @@ -306,9 +306,6 @@ private void ProcessNearbyAmbience(TransformComponent playerXform) .WithMaxDistance(comp.Range); var stream = _audio.PlayEntity(comp.Sound, Filter.Local(), uid, false, audioParams); - if (stream == null) - continue; - _playingSounds[sourceEntity] = (stream.Value.Entity, comp.Sound, key); playingCount++; diff --git a/Content.Client/Audio/ClientGlobalSoundSystem.cs b/Content.Client/Audio/ClientGlobalSoundSystem.cs index 50c3971d95a..7c77865f741 100644 --- a/Content.Client/Audio/ClientGlobalSoundSystem.cs +++ b/Content.Client/Audio/ClientGlobalSoundSystem.cs @@ -67,7 +67,7 @@ private void PlayAdminSound(AdminSoundEvent soundEvent) if(!_adminAudioEnabled) return; var stream = _audio.PlayGlobal(soundEvent.Filename, Filter.Local(), false, soundEvent.AudioParams); - _adminAudio.Add(stream?.Entity); + _adminAudio.Add(stream.Value.Entity); } private void PlayStationEventMusic(StationEventMusicEvent soundEvent) @@ -76,7 +76,7 @@ private void PlayStationEventMusic(StationEventMusicEvent soundEvent) if(!_eventAudioEnabled || _eventAudio.ContainsKey(soundEvent.Type)) return; var stream = _audio.PlayGlobal(soundEvent.Filename, Filter.Local(), false, soundEvent.AudioParams); - _eventAudio.Add(soundEvent.Type, stream?.Entity); + _eventAudio.Add(soundEvent.Type, stream.Value.Entity); } private void PlayGameSound(GameGlobalSoundEvent soundEvent) diff --git a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs index bf7ab26cba2..d60c978ccf5 100644 --- a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs +++ b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs @@ -213,9 +213,9 @@ private void UpdateAmbientMusic() false, AudioParams.Default.WithVolume(_musicProto.Sound.Params.Volume + _volumeSlider)); - _ambientMusicStream = strim?.Entity; + _ambientMusicStream = strim.Value.Entity; - if (_musicProto.FadeIn && strim != null) + if (_musicProto.FadeIn) { FadeIn(_ambientMusicStream, strim.Value.Component, AmbientMusicFadeTime); } diff --git a/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs b/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs index 9864dbcb2a9..92c5b7a4191 100644 --- a/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs +++ b/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs @@ -185,7 +185,7 @@ private void PlaySoundtrack(string soundtrackFilename) false, _lobbySoundtrackParams.WithVolume(_lobbySoundtrackParams.Volume + SharedAudioSystem.GainToVolume(_configManager.GetCVar(CCVars.LobbyMusicVolume))) ); - if (playResult == null) + if (playResult.Value.Entity == default) { _sawmill.Warning( $"Tried to play lobby soundtrack '{{Filename}}' using {nameof(SharedAudioSystem)}.{nameof(SharedAudioSystem.PlayGlobal)} but it returned default value of EntityUid!", diff --git a/Content.Client/Commands/ActionsCommands.cs b/Content.Client/Commands/ActionsCommands.cs index c155c7a9dea..dd489fd4d65 100644 --- a/Content.Client/Commands/ActionsCommands.cs +++ b/Content.Client/Commands/ActionsCommands.cs @@ -1,6 +1,10 @@ -using Content.Client.Actions; +using System.IO; +using Content.Client.Actions; +using Content.Client.Mapping; using Content.Shared.Administration; +using Robust.Client.UserInterface; using Robust.Shared.Console; +using YamlDotNet.RepresentationModel; namespace Content.Client.Commands; @@ -46,7 +50,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 1) { - shell.WriteLine(Help); + LoadActs(); // DeltaV - Load from a file dialogue instead return; } @@ -59,4 +63,48 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) shell.WriteError(LocalizationManager.GetString($"cmd-{Command}-error")); } } + + /// + /// DeltaV - Load actions from a file stream instead + /// + private static async void LoadActs() + { + var fileMan = IoCManager.Resolve(); + var actMan = IoCManager.Resolve().GetEntitySystem(); + + var stream = await fileMan.OpenFile(new FileDialogFilters(new FileDialogFilters.Group("yml"))); + if (stream is null) + return; + + var reader = new StreamReader(stream); + var yamlStream = new YamlStream(); + yamlStream.Load(reader); + + actMan.LoadActionAssignments(yamlStream); + reader.Close(); + } +} + +[AnyCommand] +public sealed class LoadMappingActionsCommand : LocalizedCommands +{ + [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; + + public const string CommandName = "loadmapacts"; + + public override string Command => CommandName; + + public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command)); + + public override void Execute(IConsoleShell shell, string argStr, string[] args) + { + try + { + _entitySystemManager.GetEntitySystem().LoadMappingActions(); + } + catch + { + shell.WriteError(LocalizationManager.GetString($"cmd-{Command}-error")); + } + } } diff --git a/Content.Client/Commands/MappingClientSideSetupCommand.cs b/Content.Client/Commands/MappingClientSideSetupCommand.cs index eb2d13c9540..39268c62847 100644 --- a/Content.Client/Commands/MappingClientSideSetupCommand.cs +++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs @@ -1,8 +1,6 @@ -using Content.Client.Mapping; using Content.Client.Markers; using JetBrains.Annotations; using Robust.Client.Graphics; -using Robust.Client.State; using Robust.Shared.Console; namespace Content.Client.Commands; @@ -12,7 +10,6 @@ internal sealed class MappingClientSideSetupCommand : LocalizedCommands { [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; [Dependency] private readonly ILightManager _lightManager = default!; - [Dependency] private readonly IStateManager _stateManager = default!; public override string Command => "mappingclientsidesetup"; @@ -24,8 +21,8 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) { _entitySystemManager.GetEntitySystem().MarkersVisible = true; _lightManager.Enabled = false; - shell.ExecuteCommand("showsubfloorforever"); - _stateManager.RequestStateChange(); + shell.ExecuteCommand(ShowSubFloorForever.CommandName); + shell.ExecuteCommand(LoadMappingActionsCommand.CommandName); } } } diff --git a/Content.Client/ContextMenu/UI/ContextMenuUIController.cs b/Content.Client/ContextMenu/UI/ContextMenuUIController.cs index 2d94034bb9c..5b156644a73 100644 --- a/Content.Client/ContextMenu/UI/ContextMenuUIController.cs +++ b/Content.Client/ContextMenu/UI/ContextMenuUIController.cs @@ -2,7 +2,6 @@ using System.Threading; using Content.Client.CombatMode; using Content.Client.Gameplay; -using Content.Client.Mapping; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controllers; using Timer = Robust.Shared.Timing.Timer; @@ -17,7 +16,7 @@ namespace Content.Client.ContextMenu.UI /// /// This largely involves setting up timers to open and close sub-menus when hovering over other menu elements. /// - public sealed class ContextMenuUIController : UIController, IOnStateEntered, IOnStateExited, IOnSystemChanged, IOnStateEntered, IOnStateExited + public sealed class ContextMenuUIController : UIController, IOnStateEntered, IOnStateExited, IOnSystemChanged { public static readonly TimeSpan HoverDelay = TimeSpan.FromSeconds(0.2); @@ -43,51 +42,18 @@ public sealed class ContextMenuUIController : UIController, IOnStateEntered? OnSubMenuOpened; public Action? OnContextKeyEvent; - private bool _setup; - public void OnStateEntered(GameplayState state) { - Setup(); - } - - public void OnStateExited(GameplayState state) - { - Shutdown(); - } - - public void OnStateEntered(MappingState state) - { - Setup(); - } - - public void OnStateExited(MappingState state) - { - Shutdown(); - } - - public void Setup() - { - if (_setup) - return; - - _setup = true; - RootMenu = new(this, null); RootMenu.OnPopupHide += Close; Menus.Push(RootMenu); } - public void Shutdown() + public void OnStateExited(GameplayState state) { - if (!_setup) - return; - - _setup = false; - Close(); RootMenu.OnPopupHide -= Close; RootMenu.Dispose(); - RootMenu = default!; } /// diff --git a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs index 07b6f57bdb9..845bd7c03d2 100644 --- a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs +++ b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs @@ -4,7 +4,6 @@ using Robust.Client.Input; using Robust.Shared.Enums; using Robust.Shared.Map; -using Robust.Shared.Prototypes; namespace Content.Client.Decals.Overlays; @@ -17,7 +16,7 @@ public sealed class DecalPlacementOverlay : Overlay private readonly SharedTransformSystem _transform; private readonly SpriteSystem _sprite; - public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities; + public override OverlaySpace Space => OverlaySpace.WorldSpace; public DecalPlacementOverlay(DecalPlacementSystem placement, SharedTransformSystem transform, SpriteSystem sprite) { @@ -25,7 +24,6 @@ public DecalPlacementOverlay(DecalPlacementSystem placement, SharedTransformSyst _placement = placement; _transform = transform; _sprite = sprite; - ZIndex = 1000; } protected override void Draw(in OverlayDrawArgs args) @@ -57,7 +55,7 @@ protected override void Draw(in OverlayDrawArgs args) if (snap) { - localPos = localPos.Floored() + grid.TileSizeHalfVector; + localPos = (Vector2) localPos.Floored() + grid.TileSizeHalfVector; } // Nothing uses snap cardinals so probably don't need preview? diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs index 1c1f1984de4..60d2b6a6ef6 100644 --- a/Content.Client/Examine/ExamineSystem.cs +++ b/Content.Client/Examine/ExamineSystem.cs @@ -1,12 +1,8 @@ -using System.Linq; -using System.Numerics; -using System.Threading; using Content.Client.Verbs; +using Content.Shared.Eye.Blinding; using Content.Shared.Examine; using Content.Shared.IdentityManagement; using Content.Shared.Input; -using Content.Shared.Interaction.Events; -using Content.Shared.Item; using Content.Shared.Verbs; using JetBrains.Annotations; using Robust.Client.GameObjects; @@ -17,8 +13,15 @@ using Robust.Shared.Input.Binding; using Robust.Shared.Map; using Robust.Shared.Utility; +using System.Linq; +using System.Numerics; +using System.Threading; +using Content.Shared.Eye.Blinding.Components; +using Robust.Client; using static Content.Shared.Interaction.SharedInteractionSystem; using static Robust.Client.UserInterface.Controls.BoxContainer; +using Content.Shared.Interaction.Events; +using Content.Shared.Item; using Direction = Robust.Shared.Maths.Direction; namespace Content.Client.Examine @@ -35,6 +38,7 @@ public sealed class ExamineSystem : ExamineSystemShared private EntityUid _examinedEntity; private EntityUid _lastExaminedEntity; + private EntityUid _playerEntity; private Popup? _examineTooltipOpen; private ScreenCoordinates _popupPos; private CancellationTokenSource? _requestCancelTokenSource; @@ -73,9 +77,9 @@ private void OnExaminedItemDropped(EntityUid item, ItemComponent comp, DroppedEv public override void Update(float frameTime) { if (_examineTooltipOpen is not {Visible: true}) return; - if (!_examinedEntity.Valid || _playerManager.LocalEntity is not { } player) return; + if (!_examinedEntity.Valid || !_playerEntity.Valid) return; - if (!CanExamine(player, _examinedEntity)) + if (!CanExamine(_playerEntity, _examinedEntity)) CloseTooltip(); } @@ -113,8 +117,9 @@ private bool HandleExamine(in PointerInputCmdHandler.PointerInputCmdArgs args) return false; } - if (_playerManager.LocalEntity is not { } player || - !CanExamine(player, entity)) + _playerEntity = _playerManager.LocalEntity ?? default; + + if (_playerEntity == default || !CanExamine(_playerEntity, entity)) { return false; } @@ -355,7 +360,10 @@ public void DoExamine(EntityUid entity, bool centeredOnCursor = true, EntityUid? FormattedMessage message; - OpenTooltip(playerEnt.Value, entity, centeredOnCursor, false); + // Basically this just predicts that we can't make out the entity if we have poor vision. + var canSeeClearly = !HasComp(playerEnt); + + OpenTooltip(playerEnt.Value, entity, centeredOnCursor, false, knowTarget: canSeeClearly); // Always update tooltip info from client first. // If we get it wrong, server will correct us later anyway. diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml index 19d00a0bbf8..97968c4b990 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml @@ -21,7 +21,6 @@ Orientation="Vertical"> - [RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause] -[Access(typeof(SharedAnomalySystem), typeof(SharedInnerBodyAnomalySystem))] +[Access(typeof(SharedAnomalySystem))] public sealed partial class AnomalyComponent : Component { /// @@ -184,21 +184,21 @@ public sealed partial class AnomalyComponent : Component /// /// The minimum amount of research points generated per second /// - [DataField] + [DataField("minPointsPerSecond")] public int MinPointsPerSecond = 10; /// /// The maximum amount of research points generated per second /// This doesn't include the point bonus for being unstable. /// - [DataField] + [DataField("maxPointsPerSecond")] public int MaxPointsPerSecond = 70; /// /// The multiplier applied to the point value for the /// anomaly being above the /// - [DataField] + [DataField("growingPointMultiplier")] public float GrowingPointMultiplier = 1.5f; #endregion @@ -252,13 +252,10 @@ public sealed partial class AnomalyComponent : Component /// [ViewVariables(VVAccess.ReadWrite)] [DataField("offset")] - public Vector2 FloatingOffset = new(0, 0); + public Vector2 FloatingOffset = new(0, 0.15f); public readonly string AnimationKey = "anomalyfloat"; #endregion - - [DataField] - public bool DeleteEntity = true; } /// diff --git a/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs b/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs deleted file mode 100644 index e88cedb18ef..00000000000 --- a/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs +++ /dev/null @@ -1,72 +0,0 @@ -using Content.Shared.Anomaly.Effects; -using Content.Shared.Body.Prototypes; -using Robust.Shared.Audio; -using Robust.Shared.GameStates; -using Robust.Shared.Prototypes; -using Robust.Shared.Utility; - -namespace Content.Shared.Anomaly.Components; - -/// -/// An anomaly within the body of a living being. Controls the ability to return to the standard state. -/// -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), Access(typeof(SharedInnerBodyAnomalySystem))] -public sealed partial class InnerBodyAnomalyComponent : Component -{ - [DataField] - public bool Injected; - - /// - /// A prototype of an entity whose components will be added to the anomaly host **AND** then removed at the right time - /// - [DataField(required: true)] - public EntProtoId? InjectionProto; - - /// - /// Duration of stun from the effect of the anomaly - /// - [DataField] - public float StunDuration = 4f; - - /// - /// A message sent in chat to a player who has become infected by an anomaly - /// - [DataField] - public LocId? StartMessage = null; - - /// - /// A message sent in chat to a player who has cleared an anomaly - /// - [DataField] - public LocId? EndMessage = "inner-anomaly-end-message"; - - /// - /// Sound, playing on becoming anomaly - /// - [DataField] - public SoundSpecifier? StartSound = new SoundPathSpecifier("/Audio/Effects/inneranomaly.ogg"); - - /// - /// Used to display messages to the player about their level of disease progression - /// - [DataField] - public float LastSeverityInformed = 0f; - - /// - /// The fallback sprite to be added on the original entity. Allows you to visually identify the feature and type of anomaly to other players - /// - [DataField, AutoNetworkedField] - public SpriteSpecifier? FallbackSprite = null; - - /// - /// Ability to use unique sprites for different body types - /// - [DataField, AutoNetworkedField] - public Dictionary, SpriteSpecifier> SpeciesSprites = new(); - - /// - /// The key of the entity layer into which the sprite will be inserted - /// - [DataField] - public string LayerMap = "inner_anomaly_layer"; -} diff --git a/Content.Shared/Anomaly/Components/InnerBodyAnomalyInjectorComponent.cs b/Content.Shared/Anomaly/Components/InnerBodyAnomalyInjectorComponent.cs deleted file mode 100644 index e4c398c9cc5..00000000000 --- a/Content.Shared/Anomaly/Components/InnerBodyAnomalyInjectorComponent.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Content.Shared.Anomaly.Effects; -using Content.Shared.Whitelist; -using Robust.Shared.Prototypes; - -namespace Content.Shared.Anomaly.Components; - -/// -/// On contact with an entity, if it meets the conditions, it will transfer the specified components to it -/// -[RegisterComponent, Access(typeof(SharedInnerBodyAnomalySystem))] -public sealed partial class InnerBodyAnomalyInjectorComponent : Component -{ - [DataField] - public EntityWhitelist? Whitelist; - - /// - /// components that will be automatically removed after “curing” - /// - [DataField(required: true)] - public ComponentRegistry InjectionComponents = default!; -} diff --git a/Content.Shared/Anomaly/Effects/SharedInnerBodyAnomalySystem.cs b/Content.Shared/Anomaly/Effects/SharedInnerBodyAnomalySystem.cs deleted file mode 100644 index a1ec7cd3973..00000000000 --- a/Content.Shared/Anomaly/Effects/SharedInnerBodyAnomalySystem.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace Content.Shared.Anomaly.Effects; - -public abstract class SharedInnerBodyAnomalySystem : EntitySystem -{ -} diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs index 07beb1444d7..c3d6591b725 100644 --- a/Content.Shared/Anomaly/SharedAnomalySystem.cs +++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs @@ -1,10 +1,13 @@ using Content.Shared.Administration.Logs; using Content.Shared.Anomaly.Components; using Content.Shared.Anomaly.Prototypes; +using Content.Shared.Damage; using Content.Shared.Database; +using Content.Shared.Interaction; using Content.Shared.Physics; using Content.Shared.Popups; using Content.Shared.Weapons.Melee.Components; +using Content.Shared.Weapons.Melee.Events; using Robust.Shared.Audio.Systems; using Robust.Shared.Map; using Robust.Shared.Map.Components; @@ -18,7 +21,6 @@ using Robust.Shared.Utility; using System.Linq; using System.Numerics; -using Content.Shared.Actions; namespace Content.Shared.Anomaly; @@ -34,7 +36,6 @@ public abstract class SharedAnomalySystem : EntitySystem [Dependency] protected readonly SharedPopupSystem Popup = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; public override void Initialize() { @@ -144,7 +145,7 @@ public void DoAnomalySupercriticalEvent(EntityUid uid, AnomalyComponent? compone if (!Timing.IsFirstTimePredicted) return; - Audio.PlayPvs(component.SupercriticalSound, Transform(uid).Coordinates); + Audio.PlayPvs(component.SupercriticalSound, uid); if (_net.IsServer) Log.Info($"Raising supercritical event. Entity: {ToPrettyString(uid)}"); @@ -168,8 +169,7 @@ public void DoAnomalySupercriticalEvent(EntityUid uid, AnomalyComponent? compone /// The anomaly being shut down /// /// Whether or not the anomaly ended via supercritical event - /// Create anomaly cores based on the result of completing an anomaly? - public void EndAnomaly(EntityUid uid, AnomalyComponent? component = null, bool supercritical = false, bool spawnCore = true) + public void EndAnomaly(EntityUid uid, AnomalyComponent? component = null, bool supercritical = false) { // Logging before resolve, in case the anomaly has deleted itself. if (_net.IsServer) @@ -186,16 +186,9 @@ public void EndAnomaly(EntityUid uid, AnomalyComponent? component = null, bool s if (Terminating(uid) || _net.IsClient) return; - if (spawnCore) - { - var core = Spawn(supercritical ? component.CorePrototype : component.CoreInertPrototype, Transform(uid).Coordinates); - _transform.PlaceNextTo(core, uid); - } + Spawn(supercritical ? component.CorePrototype : component.CoreInertPrototype, Transform(uid).Coordinates); - if (component.DeleteEntity) - QueueDel(uid); - else - RemCompDeferred(uid); + QueueDel(uid); } /// @@ -465,5 +458,3 @@ public partial record struct AnomalySpawnSettings() /// public bool SpawnOnSeverityChanged { get; set; } = false; } - -public sealed partial class ActionAnomalyPulseEvent : InstantActionEvent { } diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs index 8b35f677f18..83c24016ceb 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs @@ -242,9 +242,8 @@ private bool CanBuckle(EntityUid buckleUid, if (_whitelistSystem.IsWhitelistFail(strapComp.Whitelist, buckleUid) || _whitelistSystem.IsBlacklistPass(strapComp.Blacklist, buckleUid)) { - if (popup) - _popup.PopupClient(Loc.GetString("buckle-component-cannot-fit-message"), user, PopupType.Medium); - + if (_netManager.IsServer && popup && user != null) + _popup.PopupEntity(Loc.GetString("buckle-component-cannot-fit-message"), user.Value, user.Value, PopupType.Medium); return false; } @@ -262,24 +261,23 @@ private bool CanBuckle(EntityUid buckleUid, if (user != null && !HasComp(user)) { - if (popup) - _popup.PopupClient(Loc.GetString("buckle-component-no-hands-message"), user); - + // PopupPredicted when + if (_netManager.IsServer && popup) + _popup.PopupEntity(Loc.GetString("buckle-component-no-hands-message"), user.Value, user.Value); return false; } - if (buckleComp.Buckled && !TryUnbuckle(buckleUid, user, buckleComp)) + if (buckleComp.Buckled) { - if (popup) - { - var message = Loc.GetString(buckleUid == user + if (_netManager.IsClient || popup || user == null) + return false; + + var message = Loc.GetString(buckleUid == user ? "buckle-component-already-buckled-message" : "buckle-component-other-already-buckled-message", ("owner", Identity.Entity(buckleUid, EntityManager))); - _popup.PopupClient(message, user); - } - + _popup.PopupEntity(message, user.Value, user.Value); return false; } @@ -293,30 +291,29 @@ private bool CanBuckle(EntityUid buckleUid, continue; } - if (popup) - { - var message = Loc.GetString(buckleUid == user + if (_netManager.IsClient || popup || user == null) + return false; + + var message = Loc.GetString(buckleUid == user ? "buckle-component-cannot-buckle-message" : "buckle-component-other-cannot-buckle-message", ("owner", Identity.Entity(buckleUid, EntityManager))); - _popup.PopupClient(message, user); - } - + _popup.PopupEntity(message, user.Value, user.Value); return false; } if (!StrapHasSpace(strapUid, buckleComp, strapComp)) { - if (popup) - { - var message = Loc.GetString(buckleUid == user - ? "buckle-component-cannot-buckle-message" - : "buckle-component-other-cannot-buckle-message", + if (_netManager.IsClient || popup || user == null) + return false; + + var message = Loc.GetString(buckleUid == user + ? "buckle-component-cannot-fit-message" + : "buckle-component-other-cannot-fit-message", ("owner", Identity.Entity(buckleUid, EntityManager))); - _popup.PopupClient(message, user); - } + _popup.PopupEntity(message, user.Value, user.Value); return false; } diff --git a/Content.Shared/Buckle/SharedBuckleSystem.cs b/Content.Shared/Buckle/SharedBuckleSystem.cs index da1d111f977..d190f685ed0 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.cs @@ -9,6 +9,7 @@ using Content.Shared.Standing; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; +using Robust.Shared.Network; using Robust.Shared.Physics.Systems; using Robust.Shared.Player; using Robust.Shared.Timing; @@ -17,6 +18,7 @@ namespace Content.Shared.Buckle; public abstract partial class SharedBuckleSystem : EntitySystem { + [Dependency] private readonly INetManager _netManager = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; [Dependency] private readonly ISharedPlayerManager _playerManager = default!; diff --git a/Content.Shared/Decals/DecalPrototype.cs b/Content.Shared/Decals/DecalPrototype.cs index 543537f1bf7..2721f5d2d25 100644 --- a/Content.Shared/Decals/DecalPrototype.cs +++ b/Content.Shared/Decals/DecalPrototype.cs @@ -1,11 +1,10 @@ using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array; using Robust.Shared.Utility; namespace Content.Shared.Decals { [Prototype("decal")] - public sealed partial class DecalPrototype : IPrototype, IInheritingPrototype + public sealed partial class DecalPrototype : IPrototype { [IdDataField] public string ID { get; } = null!; [DataField("sprite")] public SpriteSpecifier Sprite { get; private set; } = SpriteSpecifier.Invalid; @@ -34,13 +33,5 @@ public sealed partial class DecalPrototype : IPrototype, IInheritingPrototype /// [DataField] public bool DefaultSnap = true; - - [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] - public string[]? Parents { get; } - - [NeverPushInheritance] - [AbstractDataField] - public bool Abstract { get; } - } } diff --git a/Content.Shared/Fluids/Components/DrainComponent.cs b/Content.Shared/Fluids/Components/DrainComponent.cs index 50cb5f51958..4fb4fe94383 100644 --- a/Content.Shared/Fluids/Components/DrainComponent.cs +++ b/Content.Shared/Fluids/Components/DrainComponent.cs @@ -23,14 +23,14 @@ public sealed partial class DrainComponent : Component [DataField] public Entity? Solution = null; - [DataField] + [DataField("accumulator")] public float Accumulator = 0f; /// /// Does this drain automatically absorb surrouding puddles? Or is it a drain designed to empty - /// solutions in it manually? + /// solutions in it manually? /// - [DataField] + [DataField("autoDrain"), ViewVariables(VVAccess.ReadOnly)] public bool AutoDrain = true; /// @@ -38,47 +38,47 @@ public sealed partial class DrainComponent : Component /// Divided by puddles, so if there are 5 puddles this will take 1/5 from each puddle. /// This will stay fixed to 1 second no matter what DrainFrequency is. /// - [DataField] + [DataField("unitsPerSecond")] public float UnitsPerSecond = 6f; /// /// How many units are ejected from the buffer per second. /// - [DataField] + [DataField("unitsDestroyedPerSecond")] public float UnitsDestroyedPerSecond = 3f; /// /// How many (unobstructed) tiles away the drain will /// drain puddles from. /// - [DataField] + [DataField("range"), ViewVariables(VVAccess.ReadWrite)] public float Range = 2f; /// /// How often in seconds the drain checks for puddles around it. /// If the EntityQuery seems a bit unperformant this can be increased. /// - [DataField] + [DataField("drainFrequency")] public float DrainFrequency = 1f; /// /// How much time it takes to unclog it with a plunger /// - [DataField] + [DataField("unclogDuration"), ViewVariables(VVAccess.ReadWrite)] public float UnclogDuration = 1f; /// /// What's the probability of uncloging on each try /// - [DataField] + [DataField("unclogProbability"), ViewVariables(VVAccess.ReadWrite)] public float UnclogProbability = 0.75f; - [DataField] + [DataField("manualDrainSound"), ViewVariables(VVAccess.ReadOnly)] public SoundSpecifier ManualDrainSound = new SoundPathSpecifier("/Audio/Effects/Fluids/slosh.ogg"); - [DataField] + [DataField("plungerSound"), ViewVariables(VVAccess.ReadOnly)] public SoundSpecifier PlungerSound = new SoundPathSpecifier("/Audio/Items/Janitor/plunger.ogg"); - [DataField] + [DataField("unclogSound"), ViewVariables(VVAccess.ReadOnly)] public SoundSpecifier UnclogSound = new SoundPathSpecifier("/Audio/Effects/Fluids/glug.ogg"); } diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index 863d9da970f..4193e1ffdd4 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -107,14 +107,5 @@ public static BoundKeyFunction[] GetHotbarBoundKeys() => public static readonly BoundKeyFunction EditorCopyObject = "EditorCopyObject"; public static readonly BoundKeyFunction EditorFlipObject = "EditorFlipObject"; public static readonly BoundKeyFunction InspectEntity = "InspectEntity"; - - public static readonly BoundKeyFunction MappingUnselect = "MappingUnselect"; - public static readonly BoundKeyFunction SaveMap = "SaveMap"; - public static readonly BoundKeyFunction MappingEnablePick = "MappingEnablePick"; - public static readonly BoundKeyFunction MappingEnableDelete = "MappingEnableDelete"; - public static readonly BoundKeyFunction MappingPick = "MappingPick"; - public static readonly BoundKeyFunction MappingRemoveDecal = "MappingRemoveDecal"; - public static readonly BoundKeyFunction MappingCancelEraseDecal = "MappingCancelEraseDecal"; - public static readonly BoundKeyFunction MappingOpenContextMenu = "MappingOpenContextMenu"; } } diff --git a/Content.Shared/Interaction/Events/InteractionFailureEvent.cs b/Content.Shared/Interaction/Events/InteractionFailureEvent.cs deleted file mode 100644 index a820048104d..00000000000 --- a/Content.Shared/Interaction/Events/InteractionFailureEvent.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Content.Shared.Interaction.Events; - -/// -/// Raised on the target when failing to pet/hug something. -/// -[ByRefEvent] -public readonly record struct InteractionFailureEvent(EntityUid User); diff --git a/Content.Shared/Interaction/Events/InteractionSuccessEvent.cs b/Content.Shared/Interaction/Events/InteractionSuccessEvent.cs deleted file mode 100644 index da4f9e43d7d..00000000000 --- a/Content.Shared/Interaction/Events/InteractionSuccessEvent.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Content.Shared.Interaction.Events; - -/// -/// Raised on the target when successfully petting/hugging something. -/// -[ByRefEvent] -public readonly record struct InteractionSuccessEvent(EntityUid User); diff --git a/Content.Shared/Interaction/InteractionPopupSystem.cs b/Content.Shared/Interaction/InteractionPopupSystem.cs index 20c079dfd8c..2a742d4211b 100644 --- a/Content.Shared/Interaction/InteractionPopupSystem.cs +++ b/Content.Shared/Interaction/InteractionPopupSystem.cs @@ -1,7 +1,6 @@ using Content.Shared.Bed.Sleep; using Content.Shared.IdentityManagement; using Content.Shared.Interaction.Components; -using Content.Shared.Interaction.Events; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Content.Shared.Popups; @@ -101,9 +100,6 @@ private void SharedInteract( if (component.InteractSuccessSpawn != null) Spawn(component.InteractSuccessSpawn, _transform.GetMapCoordinates(uid)); - - var ev = new InteractionSuccessEvent(user); - RaiseLocalEvent(target, ref ev); } else { @@ -115,9 +111,6 @@ private void SharedInteract( if (component.InteractFailureSpawn != null) Spawn(component.InteractFailureSpawn, _transform.GetMapCoordinates(uid)); - - var ev = new InteractionFailureEvent(user); - RaiseLocalEvent(target, ref ev); } if (!string.IsNullOrEmpty(component.MessagePerceivedByOthers)) diff --git a/Content.Shared/Mapping/MappingMapDataMessage.cs b/Content.Shared/Mapping/MappingMapDataMessage.cs deleted file mode 100644 index a3961a68099..00000000000 --- a/Content.Shared/Mapping/MappingMapDataMessage.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System.IO; -using Lidgren.Network; -using Robust.Shared.Network; -using Robust.Shared.Serialization; -using Robust.Shared.Utility; - -namespace Content.Shared.Mapping; - -public sealed class MappingMapDataMessage : NetMessage -{ - public override MsgGroups MsgGroup => MsgGroups.Command; - public override NetDeliveryMethod DeliveryMethod => NetDeliveryMethod.ReliableUnordered; - - public ZStdCompressionContext Context = default!; - public string Yml = default!; - - public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer) - { - MsgSize = buffer.LengthBytes; - - var uncompressedLength = buffer.ReadVariableInt32(); - var compressedLength = buffer.ReadVariableInt32(); - var stream = new MemoryStream(compressedLength); - buffer.ReadAlignedMemory(stream, compressedLength); - using var decompress = new ZStdDecompressStream(stream); - using var decompressed = new MemoryStream(uncompressedLength); - - decompress.CopyTo(decompressed, uncompressedLength); - decompressed.Position = 0; - serializer.DeserializeDirect(decompressed, out Yml); - } - - public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer) - { - var stream = new MemoryStream(); - serializer.SerializeDirect(stream, Yml); - buffer.WriteVariableInt32((int) stream.Length); - - stream.Position = 0; - var buf = new byte[ZStd.CompressBound((int) stream.Length)]; - var length = Context.Compress2(buf, stream.AsSpan()); - - buffer.WriteVariableInt32(length); - buffer.Write(buf.AsSpan(0, length)); - } -} diff --git a/Content.Shared/Mapping/MappingSaveMapErrorMessage.cs b/Content.Shared/Mapping/MappingSaveMapErrorMessage.cs deleted file mode 100644 index e30e2573052..00000000000 --- a/Content.Shared/Mapping/MappingSaveMapErrorMessage.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Lidgren.Network; -using Robust.Shared.Network; -using Robust.Shared.Serialization; - -namespace Content.Shared.Mapping; - -public sealed class MappingSaveMapErrorMessage : NetMessage -{ - public override MsgGroups MsgGroup => MsgGroups.Command; - public override NetDeliveryMethod DeliveryMethod => NetDeliveryMethod.ReliableUnordered; - - public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer) - { - } - - public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer) - { - } -} diff --git a/Content.Shared/Mapping/MappingSaveMapMessage.cs b/Content.Shared/Mapping/MappingSaveMapMessage.cs deleted file mode 100644 index f80b8661210..00000000000 --- a/Content.Shared/Mapping/MappingSaveMapMessage.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Lidgren.Network; -using Robust.Shared.Network; -using Robust.Shared.Serialization; - -namespace Content.Shared.Mapping; - -public sealed class MappingSaveMapMessage : NetMessage -{ - public override MsgGroups MsgGroup => MsgGroups.Command; - public override NetDeliveryMethod DeliveryMethod => NetDeliveryMethod.ReliableUnordered; - - public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer) - { - } - - public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer) - { - } -} diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs index 162bca495ca..c8e1c1a4b3a 100644 --- a/Content.Shared/Mind/SharedMindSystem.cs +++ b/Content.Shared/Mind/SharedMindSystem.cs @@ -39,7 +39,6 @@ public override void Initialize() SubscribeLocalEvent(OnVisitingTerminating); SubscribeLocalEvent(OnReset); SubscribeLocalEvent(OnMindStartup); - SubscribeLocalEvent(OnRenamed); } public override void Shutdown() @@ -182,12 +181,6 @@ private void OnSuicide(EntityUid uid, MindContainerComponent component, SuicideE args.Handled = true; } - private void OnRenamed(Entity ent, ref EntityRenamedEvent args) - { - ent.Comp.CharacterName = args.NewName; - Dirty(ent); - } - public EntityUid? GetMind(EntityUid uid, MindContainerComponent? mind = null) { if (!Resolve(uid, ref mind)) diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs index 6392956d632..5f35adb3337 100644 --- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs +++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs @@ -438,7 +438,7 @@ public bool TryStartPull(EntityUid pullerUid, EntityUid pullableUid, if (!CanPull(pullerUid, pullableUid)) return false; - if (!TryComp(pullerUid, out PhysicsComponent? pullerPhysics) || !TryComp(pullableUid, out PhysicsComponent? pullablePhysics)) + if (!HasComp(pullerUid) || !TryComp(pullableUid, out PhysicsComponent? pullablePhysics)) return false; // Ensure that the puller is not currently pulling anything. @@ -485,19 +485,17 @@ public bool TryStartPull(EntityUid pullerUid, EntityUid pullableUid, // joint state handling will manage its own state if (!_timing.ApplyingState) { - var joint = _joints.CreateDistanceJoint(pullableUid, pullerUid, - pullablePhysics.LocalCenter, pullerPhysics.LocalCenter, - id: pullableComp.PullJointId); + // Joint startup + var union = _physics.GetHardAABB(pullerUid).Union(_physics.GetHardAABB(pullableUid, body: pullablePhysics)); + var length = Math.Max(union.Size.X, union.Size.Y) * 0.75f; + + var joint = _joints.CreateDistanceJoint(pullableUid, pullerUid, id: pullableComp.PullJointId); joint.CollideConnected = false; // This maximum has to be there because if the object is constrained too closely, the clamping goes backwards and asserts. - // Internally, the joint length has been set to the distance between the pivots. - // Add an additional 15cm (pretty arbitrary) to the maximum length for the hard limit. - joint.MaxLength = joint.Length + 0.15f; + joint.MaxLength = Math.Max(1.0f, length); + joint.Length = length * 0.75f; joint.MinLength = 0f; - // Set the spring stiffness to zero. The joint won't have any effect provided - // the current length is beteen MinLength and MaxLength. At those limits, the - // joint will have infinite stiffness. - joint.Stiffness = 0f; + joint.Stiffness = 1f; _physics.SetFixedRotation(pullableUid, pullableComp.FixedRotationOnPull, body: pullablePhysics); } diff --git a/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs b/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs index 2e7c8054b3b..4dffb51805c 100644 --- a/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs +++ b/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs @@ -5,7 +5,7 @@ namespace Content.Shared.NameModifier.EntitySystems; /// -public sealed class NameModifierSystem : EntitySystem +public sealed partial class NameModifierSystem : EntitySystem { [Dependency] private readonly MetaDataSystem _metaData = default!; @@ -16,10 +16,10 @@ public override void Initialize() SubscribeLocalEvent(OnEntityRenamed); } - private void OnEntityRenamed(Entity ent, ref EntityRenamedEvent args) + private void OnEntityRenamed(Entity entity, ref EntityRenamedEvent args) { - SetBaseName(ent, args.NewName); - RefreshNameModifiers((ent.Owner, ent.Comp)); + SetBaseName((entity, entity.Comp), args.NewName); + RefreshNameModifiers((entity, entity.Comp)); } private void SetBaseName(Entity entity, string name) diff --git a/Content.Shared/Objectives/Prototypes/StealTargetGroupPrototype.cs b/Content.Shared/Objectives/Prototypes/StealTargetGroupPrototype.cs index bc2af0eb092..2730acb9aca 100644 --- a/Content.Shared/Objectives/Prototypes/StealTargetGroupPrototype.cs +++ b/Content.Shared/Objectives/Prototypes/StealTargetGroupPrototype.cs @@ -10,6 +10,6 @@ namespace Content.Shared.Objectives; public sealed partial class StealTargetGroupPrototype : IPrototype { [IdDataField] public string ID { get; private set; } = default!; - [DataField] public LocId Name { get; private set; } = string.Empty; + [DataField] public string Name { get; private set; } = string.Empty; [DataField] public SpriteSpecifier Sprite { get; private set; } = SpriteSpecifier.Invalid; } diff --git a/Content.Shared/PDA/PdaComponent.cs b/Content.Shared/PDA/PdaComponent.cs index 6aeb245e27d..d4cfc4fc0d8 100644 --- a/Content.Shared/PDA/PdaComponent.cs +++ b/Content.Shared/PDA/PdaComponent.cs @@ -37,10 +37,6 @@ public sealed partial class PdaComponent : Component [ViewVariables] public bool FlashlightOn; [ViewVariables(VVAccess.ReadWrite)] public string? OwnerName; - // The Entity that "owns" the PDA, usually a player's character. - // This is useful when we are doing stuff like renaming a player and want to find their PDA to change the name - // as well. - [ViewVariables(VVAccess.ReadWrite)] public EntityUid? PdaOwner; [ViewVariables] public string? StationName; [ViewVariables] public string? StationAlertLevel; [ViewVariables] public Color StationAlertColor = Color.White; diff --git a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs index c332064ea38..a9a9390a6e0 100644 --- a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs +++ b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs @@ -1,7 +1,6 @@ using System.Numerics; using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction; -using Content.Shared.Storage; using Content.Shared.Storage.Components; namespace Content.Shared.Placeable; @@ -9,16 +8,12 @@ namespace Content.Shared.Placeable; public sealed class PlaceableSurfaceSystem : EntitySystem { [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnAfterInteractUsing); - SubscribeLocalEvent(OnStorageInteractUsingAttempt); - SubscribeLocalEvent(OnStorageAfterOpen); - SubscribeLocalEvent(OnStorageAfterClose); } public void SetPlaceable(EntityUid uid, bool isPlaceable, PlaceableSurfaceComponent? surface = null) @@ -26,9 +21,6 @@ public void SetPlaceable(EntityUid uid, bool isPlaceable, PlaceableSurfaceCompon if (!Resolve(uid, ref surface, false)) return; - if (surface.IsPlaceable == isPlaceable) - return; - surface.IsPlaceable = isPlaceable; Dirty(uid, surface); } @@ -67,24 +59,11 @@ private void OnAfterInteractUsing(EntityUid uid, PlaceableSurfaceComponent surfa if (!_handsSystem.TryDrop(args.User, args.Used)) return; - _transformSystem.SetCoordinates(args.Used, - surface.PlaceCentered ? Transform(uid).Coordinates.Offset(surface.PositionOffset) : args.ClickLocation); + if (surface.PlaceCentered) + Transform(args.Used).LocalPosition = Transform(uid).LocalPosition + surface.PositionOffset; + else + Transform(args.Used).Coordinates = args.ClickLocation; args.Handled = true; } - - private void OnStorageInteractUsingAttempt(Entity ent, ref StorageInteractUsingAttemptEvent args) - { - args.Cancelled = true; - } - - private void OnStorageAfterOpen(Entity ent, ref StorageAfterOpenEvent args) - { - SetPlaceable(ent.Owner, true, ent.Comp); - } - - private void OnStorageAfterClose(Entity ent, ref StorageAfterCloseEvent args) - { - SetPlaceable(ent.Owner, false, ent.Comp); - } } diff --git a/Content.Shared/Random/RandomPlantMutation.cs b/Content.Shared/Random/RandomPlantMutation.cs deleted file mode 100644 index d95cf7bf422..00000000000 --- a/Content.Shared/Random/RandomPlantMutation.cs +++ /dev/null @@ -1,48 +0,0 @@ -using Content.Shared.EntityEffects; -using Robust.Shared.Serialization; - -namespace Content.Shared.Random; - -/// -/// Data that specifies the odds and effects of possible random plant mutations. -/// -[Serializable, NetSerializable] -[DataDefinition] -public sealed partial class RandomPlantMutation -{ - /// - /// Odds of this mutation occurring with 1 point of mutation severity on a plant. - /// - [DataField] - public float BaseOdds = 0; - - /// - /// The name of this mutation. - /// - [DataField] - public string Name = ""; - - /// - /// The actual EntityEffect to apply to the target - /// - [DataField] - public EntityEffect Effect = default!; - - /// - /// This mutation will target the harvested produce - /// - [DataField] - public bool AppliesToProduce = true; - - /// - /// This mutation will target the growing plant as soon as this mutation is applied. - /// - [DataField] - public bool AppliesToPlant = true; - - /// - /// This mutation stays on the plant and its produce. If false while AppliesToPlant is true, the effect will run when triggered. - /// - [DataField] - public bool Persists = true; -} diff --git a/Content.Shared/Random/RandomPlantMutationListPrototype.cs b/Content.Shared/Random/RandomPlantMutationListPrototype.cs deleted file mode 100644 index 84e3b9256c3..00000000000 --- a/Content.Shared/Random/RandomPlantMutationListPrototype.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Robust.Shared.Prototypes; - -namespace Content.Shared.Random; - -/// -/// Random weighting dataset for solutions, able to specify reagents quantity. -/// -[Prototype("RandomPlantMutationList")] -public sealed partial class RandomPlantMutationListPrototype : IPrototype -{ - [IdDataField] public string ID { get; } = default!; - - /// - /// List of RandomFills that can be picked from. - /// - [DataField("mutations", required: true, serverOnly: true)] - public List mutations = new(); -} diff --git a/Content.Shared/Singularity/Components/ContainmentFieldGeneratorComponent.cs b/Content.Shared/Singularity/Components/ContainmentFieldGeneratorComponent.cs index 6b09edfa1f0..938b34f354a 100644 --- a/Content.Shared/Singularity/Components/ContainmentFieldGeneratorComponent.cs +++ b/Content.Shared/Singularity/Components/ContainmentFieldGeneratorComponent.cs @@ -79,7 +79,7 @@ public int PowerBuffer /// /// Is the generator toggled on? /// - [DataField] + [ViewVariables] public bool Enabled; /// diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs index 95abea63db0..9806077f9bb 100644 --- a/Content.Shared/StatusEffect/StatusEffectsSystem.cs +++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs @@ -14,7 +14,6 @@ public sealed class StatusEffectsSystem : EntitySystem [Dependency] private readonly IComponentFactory _componentFactory = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly AlertsSystem _alertsSystem = default!; - private List _toRemove = new(); public override void Initialize() { @@ -33,28 +32,18 @@ public override void Update(float frameTime) var curTime = _gameTiming.CurTime; var enumerator = EntityQueryEnumerator(); - _toRemove.Clear(); while (enumerator.MoveNext(out var uid, out _, out var status)) { - if (status.ActiveEffects.Count == 0) - { - // This shouldn't happen, but just in case something sneaks through - _toRemove.Add(uid); - continue; - } - - foreach (var state in status.ActiveEffects) + foreach (var state in status.ActiveEffects.ToArray()) { + // if we're past the end point of the effect if (curTime > state.Value.Cooldown.Item2) + { TryRemoveStatusEffect(uid, state.Key, status); + } } } - - foreach (var uid in _toRemove) - { - RemComp(uid); - } } private void OnGetState(EntityUid uid, StatusEffectsComponent component, ref ComponentGetState args) @@ -73,21 +62,29 @@ private void OnHandleState(EntityUid uid, StatusEffectsComponent component, ref component.AllowedEffects.AddRange(state.AllowedEffects); // Remove non-existent effects. - foreach (var key in component.ActiveEffects.Keys) + foreach (var effect in component.ActiveEffects.Keys) { - if (!state.ActiveEffects.ContainsKey(key)) - component.ActiveEffects.Remove(key); + if (!state.ActiveEffects.ContainsKey(effect)) + { + TryRemoveStatusEffect(uid, effect, component, remComp: false); + } } foreach (var (key, effect) in state.ActiveEffects) { - component.ActiveEffects[key] = new(effect); - } + // don't bother with anything if we already have it + if (component.ActiveEffects.ContainsKey(key)) + { + component.ActiveEffects[key] = new(effect); + continue; + } - if (component.ActiveEffects.Count == 0) - RemComp(uid); - else - EnsureComp(uid); + var time = effect.Cooldown.Item2 - effect.Cooldown.Item1; + + TryAddStatusEffect(uid, key, time, true, component, effect.Cooldown.Item1); + component.ActiveEffects[key].RelevantComponent = effect.RelevantComponent; + // state handling should not add networked components, that is handled separately by the client game state manager. + } } private void OnRejuvenate(EntityUid uid, StatusEffectsComponent component, RejuvenateEvent args) @@ -112,16 +109,18 @@ public bool TryAddStatusEffect(EntityUid uid, string key, TimeSpan time, bool if (!Resolve(uid, ref status, false)) return false; - if (!TryAddStatusEffect(uid, key, time, refresh, status)) - return false; - - if (HasComp(uid)) + if (TryAddStatusEffect(uid, key, time, refresh, status)) + { + // If they already have the comp, we just won't bother updating anything. + if (!EntityManager.HasComponent(uid)) + { + var comp = EntityManager.AddComponent(uid); + status.ActiveEffects[key].RelevantComponent = _componentFactory.GetComponentName(comp.GetType()); + } return true; + } - EntityManager.AddComponent(uid); - status.ActiveEffects[key].RelevantComponent = _componentFactory.GetComponentName(); - return true; - + return false; } public bool TryAddStatusEffect(EntityUid uid, string key, TimeSpan time, bool refresh, string component, @@ -163,12 +162,8 @@ public bool TryAddStatusEffect(EntityUid uid, string key, TimeSpan time, bool re /// If the effect already exists, it will simply replace the cooldown with the new one given. /// If you want special 'effect merging' behavior, do it your own damn self! /// - public bool TryAddStatusEffect(EntityUid uid, - string key, - TimeSpan time, - bool refresh, - StatusEffectsComponent? status = null, - TimeSpan? startTime = null) + public bool TryAddStatusEffect(EntityUid uid, string key, TimeSpan time, bool refresh, + StatusEffectsComponent? status = null, TimeSpan? startTime = null) { if (!Resolve(uid, ref status, false)) return false; @@ -339,7 +334,8 @@ public bool HasStatusEffect(EntityUid uid, string key, /// The entity to check on. /// The status effect ID to check for /// The status effect component, should you already have it. - public bool CanApplyEffect(EntityUid uid, string key, StatusEffectsComponent? status = null) + public bool CanApplyEffect(EntityUid uid, string key, + StatusEffectsComponent? status = null) { // don't log since stuff calling this prolly doesn't care if we don't actually have it if (!Resolve(uid, ref status, false)) diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs index 309ac0a2e09..4932613d0e6 100644 --- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs @@ -487,6 +487,9 @@ private void ModifyComponents(EntityUid uid, SharedEntityStorageComponent? compo } } + if (TryComp(uid, out var surface)) + _placeableSurface.SetPlaceable(uid, component.Open, surface); + _appearance.SetData(uid, StorageVisuals.Open, component.Open); _appearance.SetData(uid, StorageVisuals.HasContents, component.Contents.ContainedEntities.Count > 0); } diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index 3d7ff2edb73..ba766b24501 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -365,9 +365,7 @@ private void OnInteractUsing(EntityUid uid, StorageComponent storageComp, Intera if (args.Handled || !CanInteract(args.User, (uid, storageComp), storageComp.ClickInsert, false)) return; - var attemptEv = new StorageInteractUsingAttemptEvent(); - RaiseLocalEvent(uid, ref attemptEv); - if (attemptEv.Cancelled) + if (HasComp(uid)) return; PlayerInsertHeldEntity((uid, storageComp), args.User); diff --git a/Content.Shared/Storage/StorageComponent.cs b/Content.Shared/Storage/StorageComponent.cs index d2c607e57f7..a666169f529 100644 --- a/Content.Shared/Storage/StorageComponent.cs +++ b/Content.Shared/Storage/StorageComponent.cs @@ -238,9 +238,6 @@ public AnimateInsertingEntitiesEvent(NetEntity storage, List storedEn [ByRefEvent] public record struct StorageInteractAttemptEvent(bool Silent, bool Cancelled = false); - [ByRefEvent] - public record struct StorageInteractUsingAttemptEvent(bool Cancelled = false); - [NetSerializable] [Serializable] public enum StorageVisuals : byte diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml index 75cf22aa4fe..6f18510d17b 100644 --- a/Resources/Audio/Effects/attributions.yml +++ b/Resources/Audio/Effects/attributions.yml @@ -231,8 +231,3 @@ copyright: '"beep_landmine.ogg" by kaktuscsc of Discord for SS14' license: "CC-BY-SA-3.0" source: https://github.com/YuriyKiss/space-station-14/commit/971a135a9c83aed46e967aac9302ab5b35562b5f - -- files: [inneranomaly.ogg] - copyright: 'created by waveplaySFX on Freesound' - license: "CC0-1.0" - source: https://freesound.org/people/waveplaySFX/sounds/553744/ diff --git a/Resources/Audio/Effects/inneranomaly.ogg b/Resources/Audio/Effects/inneranomaly.ogg deleted file mode 100644 index 43fc40357f2..00000000000 Binary files a/Resources/Audio/Effects/inneranomaly.ogg and /dev/null differ diff --git a/Resources/Audio/Items/Toys/attributions.yml b/Resources/Audio/Items/Toys/attributions.yml index 162ee8c1c33..290539b9849 100644 --- a/Resources/Audio/Items/Toys/attributions.yml +++ b/Resources/Audio/Items/Toys/attributions.yml @@ -72,18 +72,3 @@ license: "CC-BY-SA-3.0" copyright: "Taken from ss200, made by Daeberdir" source: "https://github.com/ss220-space/Paradise/pull/3756" - -- files: ["rubber_chicken_1.ogg"] - license: "CC0-1.0" - copyright: "Created by xprospero for ss14" - source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Items/Toys/rubber_chicken_1.ogg" - -- files: ["rubber_chicken_2.ogg"] - license: "CC0-1.0" - copyright: "Created by xprospero for ss14" - source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Items/Toys/rubber_chicken_2.ogg" - -- files: ["rubber_chicken_3.ogg"] - license: "CC0-1.0" - copyright: "Created by xprospero for ss14" - source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Audio/Items/Toys/rubber_chicken_3.ogg" diff --git a/Resources/Audio/Items/Toys/rubber_chicken_1.ogg b/Resources/Audio/Items/Toys/rubber_chicken_1.ogg deleted file mode 100644 index e4ba8155a6c..00000000000 Binary files a/Resources/Audio/Items/Toys/rubber_chicken_1.ogg and /dev/null differ diff --git a/Resources/Audio/Items/Toys/rubber_chicken_2.ogg b/Resources/Audio/Items/Toys/rubber_chicken_2.ogg deleted file mode 100644 index ae79d97ff22..00000000000 Binary files a/Resources/Audio/Items/Toys/rubber_chicken_2.ogg and /dev/null differ diff --git a/Resources/Audio/Items/Toys/rubber_chicken_3.ogg b/Resources/Audio/Items/Toys/rubber_chicken_3.ogg deleted file mode 100644 index 97d93ed57e7..00000000000 Binary files a/Resources/Audio/Items/Toys/rubber_chicken_3.ogg and /dev/null differ diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 9c9673a6622..dfb4dc3556c 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -534,15 +534,5 @@ Entries: id: 66 time: '2024-09-13T22:49:27.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32125 -- author: nikthechampiongr - changes: - - message: Rename verb now acts the same as the rename command. - type: Fix - - message: Renamed entities will now have their new name appear immediately on entity - examination and on crew monitor console. - type: Fix - id: 67 - time: '2024-09-15T01:55:03.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31654 Name: Admin Order: 3 diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2c55f6b5721..af7e34b9f82 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,4 +1,346 @@ Entries: +- author: metalgearsloth + changes: + - message: Made vox roundstart. + type: Tweak + id: 6870 + time: '2024-07-04T07:11:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29704 +- author: JIPDawg + changes: + - message: Changed the basic treatment module to include a Health Analyzer and removed + the dropper. + type: Tweak + id: 6871 + time: '2024-07-04T07:17:47.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29696 +- author: PJB3005 + changes: + - message: Fixed flashlights and similar permanently getting stuck blinking. + type: Fix + id: 6872 + time: '2024-07-04T08:02:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29457 +- author: Jezithyr + changes: + - message: All species except for Vox can now be played as Nukies. (Vox will be + enabled when load out code supports them) + type: Tweak + id: 6873 + time: '2024-07-05T07:59:16.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29707 +- author: metalgearsloth + changes: + - message: Shuttle map buttons will show up faster. + type: Tweak + id: 6874 + time: '2024-07-06T03:51:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29757 +- author: JIPDawg + changes: + - message: Added Late join CryoSleepers to Origin. + type: Tweak + id: 6875 + time: '2024-07-06T17:33:20.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29761 +- author: Beck Thompson + changes: + - message: Splashing reagents on players will now apply the correct amounts. + type: Fix + id: 6876 + time: '2024-07-07T03:52:18.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29763 +- author: Tayrtahn + changes: + - message: Dead bodies will no longer remain standing after being unbuckled from + chairs. + type: Fix + id: 6877 + time: '2024-07-07T06:20:53.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29741 +- author: Simyon + changes: + - message: Ratkings now require at least 30 players in order to spawn. + type: Tweak + id: 6878 + time: '2024-07-07T13:06:24.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29737 +- author: EmoGarbage404 + changes: + - message: Intercoms now use encryption keys to determine what channels they can + broadcast on. + type: Tweak + - message: Intercoms and handheld radios no longer rely on telecom servers. + type: Fix + id: 6879 + time: '2024-07-07T14:19:10.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29580 +- author: Vermidia + changes: + - message: Some drink reactions now require shaking with the shaker or stirring + with a spoon + type: Add + id: 6880 + time: '2024-07-07T14:21:53.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29243 +- author: Dezzzix + changes: + - message: Now you can slice food with swords + type: Add + id: 6881 + time: '2024-07-07T14:22:38.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29005 +- author: EmoGarbage404 + changes: + - message: Changed AME power output. Lower injection amounts now produce more power + but further injections have diminishing returns. + type: Tweak + - message: Increased damage per injection overclocked AMEs. + type: Tweak + - message: Halved fuel per AME jar. + type: Tweak + id: 6882 + time: '2024-07-07T14:27:52.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29587 +- author: Plykiya + changes: + - message: Hyperzine's effective healing range has been changed from 70 to 120, + to anything above 70 total damage. + type: Tweak + id: 6883 + time: '2024-07-07T14:28:13.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29712 +- author: Tayrtahn + changes: + - message: Fixed admin ghosts briefly becoming visible when a news article is published. + type: Fix + id: 6884 + time: '2024-07-08T03:33:17.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29801 +- author: slarticodefast + changes: + - message: Improved throwing calculations. Thrown items now stop moving exactly + below your cursor. Throwing weapons will land at your cursor and then slide + until stopped by friction. + type: Tweak + id: 6885 + time: '2024-07-08T09:03:53.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29726 +- author: Errant + changes: + - message: Vox now have their entry in the guidebook. + type: Fix + id: 6886 + time: '2024-07-09T00:28:33.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29713 +- author: Whisper + changes: + - message: Light toggle actions now have a 1 second cooldown between uses. + type: Tweak + id: 6887 + time: '2024-07-09T04:14:51.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29833 +- author: Cojoke-dot + changes: + - message: Shotgun loading doafter now does something + type: Fix + id: 6888 + time: '2024-07-09T04:23:08.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29827 +- author: slarticodefast + changes: + - message: The construction menu and building preview now show the correct passive + vent sprite. + type: Fix + id: 6889 + time: '2024-07-09T13:39:47.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29820 +- author: Cojoke-dot + changes: + - message: Pacifists can now use foam weaponry + type: Tweak + id: 6890 + time: '2024-07-09T13:46:21.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29835 +- author: Plykiya + changes: + - message: You can now drop food and drinks to stop consuming it. + type: Fix + id: 6891 + time: '2024-07-09T23:12:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29854 +- author: Boaz1111 + changes: + - message: Guitars can now be worn in the suit storage slot + type: Add + id: 6892 + time: '2024-07-09T23:28:10.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29048 +- author: Winkarst-cpu + changes: + - message: Fixed popup spam when trying to open borg's UI while the borg is locked. + type: Fix + id: 6893 + time: '2024-07-09T23:48:56.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29861 +- author: Lokachop + changes: + - message: Scarves now count as warm clothing for the warm clothing cargo bounty. + type: Tweak + id: 6894 + time: '2024-07-10T05:26:33.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29779 +- author: Aquif + changes: + - message: It is now possible to "lock" admin faxes such that they cannot be edited + by cybersun pens or any other IC means. + type: Add + id: 6895 + time: '2024-07-10T05:28:36.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28972 +- author: Ghagliiarghii + changes: + - message: The Librarian's Books Bag can now hold D&D related items such as dice + and battlemats. + type: Tweak + id: 6896 + time: '2024-07-10T05:51:01.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29863 +- author: Beck Thompson, Tayrtahn + changes: + - message: Typing indicators now correctly stack and will not overwrite your default + species indicator. + type: Fix + id: 6897 + time: '2024-07-10T05:51:48.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29492 +- author: Winkarst-cpu + changes: + - message: Now confirmation popup is displayed and item panel status is updated + after setting a custom solution transfer volume. + type: Fix + id: 6898 + time: '2024-07-10T10:32:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29852 +- author: Winkarst-cpu + changes: + - message: Added exit confirmation for character setup menu with unsaved changes. + type: Add + id: 6899 + time: '2024-07-11T00:24:37.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29875 +- author: ShadowCommander + changes: + - message: Players can now use melee attacks and shoves while dragging an entity + in their active hand. + type: Tweak + id: 6900 + time: '2024-07-11T04:48:00.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29703 +- author: Cojoke-dot + changes: + - message: You can no longer shoot out of crates with guns + type: Fix + id: 6901 + time: '2024-07-11T05:14:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28961 +- author: Cojoke-dot + changes: + - message: The Spray Painter can now be used to paint glass airlocks to look like + regular glass airlocks. + type: Tweak + id: 6902 + time: '2024-07-11T05:33:20.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29869 +- author: MFMessage + changes: + - message: Picking a ghost role as an admin will now deadmin. + type: Fix + id: 6903 + time: '2024-07-11T05:53:15.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29790 +- author: Winkarst-cpu + changes: + - message: Admin notes popups are now more readable. + type: Tweak + id: 6904 + time: '2024-07-11T14:03:22.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29909 +- author: jonathanargo + changes: + - message: Muskets are now wieldable. + type: Tweak + id: 6905 + time: '2024-07-12T09:16:21.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29910 +- author: themias + changes: + - message: Notice boards can now be built on walls + type: Fix + id: 6906 + time: '2024-07-12T09:18:32.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29851 +- author: slarticodefast + changes: + - message: Stun batons, stun prods and banana cream pies now fly like other throwing + weapons when thrown. + type: Fix + id: 6907 + time: '2024-07-12T09:19:24.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29883 +- author: Plykiya + changes: + - message: Dropping an item while in a container now places the item in the container. + type: Fix + id: 6908 + time: '2024-07-12T09:24:08.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29900 +- author: coffeeware, slarticodefast + changes: + - message: Fixed items thrown very fast not being in the air. In particular this + fixes the pneumatic cannon. + type: Fix + - message: Buffed base hand throwing speed by 10% to be more similar to before the + recent throwing changes. + type: Tweak + id: 6909 + time: '2024-07-12T10:32:47.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29935 +- author: themias + changes: + - message: Timers can now be deconstructed + type: Fix + id: 6910 + time: '2024-07-12T11:38:59.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29917 +- author: jonathanargo + changes: + - message: Hard hat icon sprites are now centered correctly. + type: Fix + id: 6911 + time: '2024-07-12T15:00:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29953 +- author: lzk228 + changes: + - message: Secure windoors now use reinforced glass damage modifier. + type: Fix + id: 6912 + time: '2024-07-13T04:03:16.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29941 +- author: Tayrtahn + changes: + - message: Antag objective total difficulty is now properly capped. + type: Fix + id: 6913 + time: '2024-07-13T04:14:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29830 +- author: EmoGarbage404 + changes: + - message: Added wristwatches for telling time. + type: Add + id: 6914 + time: '2024-07-13T06:09:19.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29550 - author: TheShuEd changes: - message: Added diamonds ore! @@ -3546,347 +3888,3 @@ id: 7369 time: '2024-09-14T13:09:43.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32063 -- author: Just_Art - changes: - - message: Added a head gauze to customization. - type: Add - id: 7370 - time: '2024-09-14T14:55:13.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30852 -- author: deltanedas - changes: - - message: Fixed security's helmets not having any protection. - type: Fix - id: 7371 - time: '2024-09-14T15:56:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32152 -- author: eoineoineoin - changes: - - message: Ghosts can now read books. - type: Add - id: 7372 - time: '2024-09-14T16:28:33.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32151 -- author: Errant - changes: - - message: Lone Ops nukies now spawn with the appropriate species-specific survival - gear. - type: Fix - id: 7373 - time: '2024-09-14T16:34:01.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31641 -- author: Plykiya - changes: - - message: The vent spawn event now has a chance to spawn snakes. - type: Add - id: 7374 - time: '2024-09-14T17:19:32.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32070 -- author: lzk228 - changes: - - message: Command intercom now reinforced the same way as the security one. - type: Tweak - id: 7375 - time: '2024-09-14T20:40:38.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32169 -- author: de0rix - changes: - - message: Animals in critical state now all have proper sprites. - type: Fix - id: 7376 - time: '2024-09-15T01:53:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32175 -- author: notafet - changes: - - message: Pressure and volume pumps now require power to operate. - type: Tweak - id: 7377 - time: '2024-09-15T01:58:10.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28995 -- author: deltanedas - changes: - - message: Holoparasites can no longer be summoned from inside containers. - type: Tweak - id: 7378 - time: '2024-09-15T19:04:32.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32068 -- author: BackeTako - changes: - - message: Added French and Spanish speech traits. - type: Add - id: 7379 - time: '2024-09-15T20:03:15.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30966 -- author: Plykiya - changes: - - message: Meteors break through less walls now. - type: Tweak - id: 7380 - time: '2024-09-15T20:04:37.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32109 -- author: drakewill-CRL - changes: - - message: Produce harvested from sentient plants are no longer sentient themselves. - type: Fix - id: 7381 - time: '2024-09-16T00:04:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32192 -- author: DrSmugleaf - changes: - - message: Fixed examine sometimes flickering and closing until you examine something - around you. - type: Fix - id: 7382 - time: '2024-09-16T08:51:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32205 -- author: ArtisticRoomba - changes: - - message: The Bruise-O-Mat alcohol vendor has been added to the nukie outpost, - for all your pre-op drinking needs. Seems to have developed a witty personality, - too... - type: Add - id: 7383 - time: '2024-09-16T08:59:00.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32107 -- author: ArtisticRoomba - changes: - - message: The binary translator key in the syndie uplink is now correctly marked - as syndicate contraband. - type: Tweak - id: 7384 - time: '2024-09-16T10:01:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32193 -- author: MissKay1994 - changes: - - message: Lizards are now poisoned by hot chocolate - type: Fix - id: 7385 - time: '2024-09-16T12:45:15.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32147 -- author: Alice Liddel - changes: - - message: Crayon charges increased from 15 to 25 - type: Add - id: 7386 - time: '2024-09-17T00:35:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32061 -- author: TheShuEd - changes: - - message: Anomalous infections added! People can now be infected by anomalies! - This allows you to use abnormal abilities, but can easily kill the host. To - cure them, bombard them with containment particles, because if the anomaly inside - them explodes, their bodies will be gibbed.... - type: Add - - message: Flesh anomaly resprite - type: Tweak - - message: anomalies now disconnect from the anomaly synchronizer if they are too - far away from it. - type: Fix - id: 7387 - time: '2024-09-17T09:49:19.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31876 -- author: TheShuEd - changes: - - message: fix Tech anomaly loud sounds and superfast flickering - type: Fix - id: 7388 - time: '2024-09-17T16:05:38.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32245 -- author: drakewill-CRL - changes: - - message: Fixed plant mutations carrying over to other plants and future rounds. - type: Fix - id: 7389 - time: '2024-09-17T19:45:42.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32257 -- author: Moomoobeef - changes: - - message: Added more names to the pool of names the AI can have. - type: Add - id: 7390 - time: '2024-09-17T22:09:55.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31951 -- author: Calecute - changes: - - message: Corrected cake batter recipe in guidebook - type: Fix - id: 7391 - time: '2024-09-18T15:15:34.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32276 -- author: Beck Thompson - changes: - - message: Recycler no longer allows basic materials to be inserted into it. - type: Fix - id: 7392 - time: '2024-09-18T21:58:59.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32144 -- author: deltanedas - changes: - - message: Epinephrine now adds Adrenaline, because it is. - type: Tweak - id: 7393 - time: '2024-09-18T23:00:48.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32076 -- author: ShadowCommander - changes: - - message: Fixed clicking on chairs and beds with an entity buckled to them not - unbuckling them. - type: Fix - id: 7394 - time: '2024-09-18T23:55:26.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29998 -- author: Winkarst-cpu - changes: - - message: Now fire leaves burn marks on the tiles that were affected by it. - type: Add - id: 7395 - time: '2024-09-19T00:23:50.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31939 -- author: ArchRBX - changes: - - message: Mass scanners and shuttle consoles now display coordinates beneath IFF - labels - type: Add - - message: IFF labels that are beyond the viewport extents maintain their heading - and don't hug corners - type: Fix - id: 7396 - time: '2024-09-19T01:25:47.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31501 -- author: coffeeware - changes: - - message: a powered TEG won't produce infinite power when destroyed - type: Fix - id: 7397 - time: '2024-09-19T02:15:44.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29972 -- author: Boaz1111 - changes: - - message: Added plasma and uranium arrows. - type: Add - id: 7398 - time: '2024-09-19T08:41:24.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31241 -- author: Ertanic - changes: - - message: Wanted list program and its cartridge. - type: Add - - message: The cartridge has been added to the HOS locker. - type: Add - - message: Added target to thief on wanted list cartridge. - type: Add - id: 7399 - time: '2024-09-19T10:22:02.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31223 -- author: Errant - changes: - - message: Crew monitor list can now be filtered by name and job. - type: Add - id: 7400 - time: '2024-09-19T10:23:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31659 -- author: deltanedas - changes: - - message: Removed the flare blueprint from salvage, it's now unlocked roundstart - in autolathes. - type: Remove - id: 7401 - time: '2024-09-19T13:45:04.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32303 -- author: deltanedas - changes: - - message: Increased the thieving beacon's range to 2 tiles. - type: Tweak - id: 7402 - time: '2024-09-19T13:55:31.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31340 -- author: Winkarst-cpu - changes: - - message: The first editable line in the dialog window now grabs the keyboard focus - once it's open. - type: Fix - id: 7403 - time: '2024-09-19T14:01:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31294 -- author: Plykiya - changes: - - message: You can now transfer someone from a rollerbed to a bed directly. - type: Tweak - id: 7404 - time: '2024-09-19T14:08:33.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32089 -- author: SaphireLattice - changes: - - message: Fland now has public glass airlocks sectioning the hallway. - type: Fix - id: 7405 - time: '2024-09-19T19:17:19.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32264 -- author: Plykiya - changes: - - message: Cockroaches and mothroaches can no longer damage things with their bites. - type: Tweak - id: 7406 - time: '2024-09-19T22:15:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32221 -- author: PopGamer46 - changes: - - message: The rat king's rats now follow you instead of idling when there is no - one to attack during the CheeseEm order - type: Tweak - id: 7407 - time: '2024-09-19T23:27:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32181 -- author: JIPDawg - changes: - - message: Small Hydraulic clamp now correctly consumes 2% battery instead of recharging - the battery by 2% - type: Fix - id: 7408 - time: '2024-09-20T04:09:01.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32320 -- author: clinux - changes: - - message: Added the psychologist's stamp. Prescribe treatments for your less mentally - sane crew! - type: Add - id: 7409 - time: '2024-09-20T14:42:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31881 -- author: saga3152 - changes: - - message: You can now make vodka and soda water. - type: Add - id: 7410 - time: '2024-09-20T22:27:41.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32252 -- author: goet - changes: - - message: Hides character sprite in health analyzer window if the scan becomes - inactive. - type: Fix - id: 7411 - time: '2024-09-21T05:54:48.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31879 -- author: TGRCDev - changes: - - message: Station maps now have a directory for finding specific departments and - areas. - type: Add - id: 7412 - time: '2024-09-21T07:33:22.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31156 -- author: TheShuEd - changes: - - message: Cores from floral anomalies are now seeds for hydroponics! - type: Add - id: 7413 - time: '2024-09-21T19:54:56.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/31987 -- author: Plykiya - changes: - - message: The rat king is now capable of butchering things, like animals. - type: Add - id: 7414 - time: '2024-09-21T23:21:52.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/32232 diff --git a/Resources/Locale/en-US/accent/skeleton.ftl b/Resources/Locale/en-US/accent/skeleton.ftl deleted file mode 100644 index 9a839676c66..00000000000 --- a/Resources/Locale/en-US/accent/skeleton.ftl +++ /dev/null @@ -1,32 +0,0 @@ -accent-skeleton-words-1 = fuck you -accent-skeleton-words-replace-1 = I've got a BONE to pick with you - -accent-skeleton-words-2 = fucked -accent-skeleton-words-replace-2 = boned - -accent-skeleton-words-3 = fuck -accent-skeleton-words-3-2 = fck -accent-skeleton-words-3-3 = shit -accent-skeleton-words-replace-3 = RATTLE RATTLE - -accent-skeleton-words-4 = definitely -accent-skeleton-words-4-2 = absolutely -accent-skeleton-words-replace-4 = make no bones about it - -accent-skeleton-words-5 = afraid -accent-skeleton-words-5-2 = scared -accent-skeleton-words-5-3 = spooked -accent-skeleton-words-5-4 = shocked -accent-skeleton-words-replace-5 = rattled - -accent-skeleton-words-6 = killed -accent-skeleton-words-replace-6 = skeletonized - -accent-skeleton-words-7 = humorous -accent-skeleton-words-replace-7 = humerus - -accent-skeleton-words-8 = to be a -accent-skeleton-words-replace-8 = tibia - -accent-skeleton-words-9 = under -accent-skeleton-words-replace-9 = ulna diff --git a/Resources/Locale/en-US/actions/ui/actionslot.ftl b/Resources/Locale/en-US/actions/ui/actionslot.ftl index c0deaad248c..332054f10e9 100644 --- a/Resources/Locale/en-US/actions/ui/actionslot.ftl +++ b/Resources/Locale/en-US/actions/ui/actionslot.ftl @@ -1,2 +1,2 @@ ui-actionslot-charges = Uses left: {$charges} -ui-actionslot-duration = [color=#a10505] {$duration} sec cooldown ({$timeLeft} sec remaining)[/color] + diff --git a/Resources/Locale/en-US/advertisements/vending/bruiseomat.ftl b/Resources/Locale/en-US/advertisements/vending/bruiseomat.ftl deleted file mode 100644 index a8cb903efe2..00000000000 --- a/Resources/Locale/en-US/advertisements/vending/bruiseomat.ftl +++ /dev/null @@ -1,43 +0,0 @@ -advertisement-bruiseomat-1 = I VOTE WAROPS!!! -advertisement-bruiseomat-2 = Who has TC? -advertisement-bruiseomat-3 = Did anyone buy an EMAG? -advertisement-bruiseomat-4 = I wanna go back to my home station... -advertisement-bruiseomat-5 = Beware of the Mime and Clown. BEWARE! -advertisement-bruiseomat-6 = A nuke a day keeps the deathsquad at bay! -advertisement-bruiseomat-7 = You'll never be able to match MY mixing, Agent! -advertisement-bruiseomat-8 = Thirsting for blood? I got you covered! -advertisement-bruiseomat-9 = If they didn't want us to blow up the station, then why would they leave the disk so unsecured? -advertisement-bruiseomat-10 = They say an eye for an eye makes the whole world blind. So try a nuke instead! -advertisement-bruiseomat-11 = I hunger for blood! -advertisement-bruiseomat-12 = Drink up before the mission! -advertisement-bruiseomat-13 = Man, I didn't know I got moved back to Cadet City! -advertisement-bruiseomat-14 = Sicker than your average Booze-O-Mat! -advertisement-bruiseomat-15 = Nuke ops will continue until robustness improves. -thankyou-bruiseomat-1 = Good luck, schmuck! You're gonna need it! -thankyou-bruiseomat-2 = Show 'em the Gorlex Style! -thankyou-bruiseomat-3 = Don't forget to stay hydrated! -thankyou-bruiseomat-4 = You noted down the codes, right? -thankyou-bruiseomat-5 = Don't forget the nuke! -thankyou-bruiseomat-6 = I hope those are noslips. -thankyou-bruiseomat-7 = Please let this be a normal team... -thankyou-bruiseomat-8 = Seems like the station isn't the only thing getting hammered today. -thankyou-bruiseomat-9 = What the hell did you buy? -thankyou-bruiseomat-10 = Give it up for the flukeops professionals! -thankyou-bruiseomat-11 = Death to NanoTrasen!!! -thankyou-bruiseomat-12 = Really? That's your plan? -thankyou-bruiseomat-13 = In my endless life, never have I ever seen that loadout. -thankyou-bruiseomat-14 = Get that captain! -thankyou-bruiseomat-15 = Don't run off by yourself, now! -thankyou-bruiseomat-16 = Y'all are taking too long! -thankyou-bruiseomat-17 = They won't see that coming! -thankyou-bruiseomat-18 = Remember your pinpointer! -thankyou-bruiseomat-19 = See you soon! Or maybe never again, that one's more likely! -thankyou-bruiseomat-20 = Rescue another one of me! I need a friend! -thankyou-bruiseomat-21 = You're going to sober up before the mission, right? -thankyou-bruiseomat-22 = 5 telecrystal says you won't make it to the shuttle before you fall over. -thankyou-bruiseomat-23 = The soda fountain's over there, lightweight. -thankyou-bruiseomat-24 = Did you spend your TC on cat ears? -thankyou-bruiseomat-25 = Really? That's what you wanted to drink? -thankyou-bruiseomat-26 = Take a shot, give a shot! -thankyou-bruiseomat-27 = How many drinks have you had now? I've lost count. -thankyou-bruiseomat-28 = When the bosses say "die trying" they mean dying in BATTLE, not at the bar. diff --git a/Resources/Locale/en-US/advertisements/vending/donut.ftl b/Resources/Locale/en-US/advertisements/vending/donut.ftl index 53d8ee6ccb5..af801f621c4 100644 --- a/Resources/Locale/en-US/advertisements/vending/donut.ftl +++ b/Resources/Locale/en-US/advertisements/vending/donut.ftl @@ -1,5 +1,5 @@ advertisement-donut-1 = Each of us is a little cop! -advertisement-donut-2 = Hope you're hungry! +advertisement-donut-2 = Hope you're hunger! advertisement-donut-3 = Over 1 million donuts sold! advertisement-donut-4 = We pride ourselves in the consistency of our products! advertisement-donut-5 = Sweet, sugary and delicious! diff --git a/Resources/Locale/en-US/anomaly/inner_anomaly.ftl b/Resources/Locale/en-US/anomaly/inner_anomaly.ftl deleted file mode 100644 index e55c4391e30..00000000000 --- a/Resources/Locale/en-US/anomaly/inner_anomaly.ftl +++ /dev/null @@ -1,17 +0,0 @@ -inner-anomaly-start-message-pyro = You can feel the insane flame inside of you. You became the host of a pyroclastic anomaly. -inner-anomaly-start-message-shock = Lightning bolts quivering at your fingertips! You became the host of a electric anomaly. -inner-anomaly-start-message-shadow = There's an impenetrable darkness oozing out of you... You became the host of a shadow anomaly. -inner-anomaly-start-message-frost = The icy frost is binding your bones. You became the host of a ice anomaly. -inner-anomaly-start-message-flora = Leaves and flowers sprout through your skin! You became the host of a floral anomaly. -inner-anomaly-start-message-bluespace = Your thoughts are racing like mad! You became the host of a bluespace anomaly. -inner-anomaly-start-message-flesh = Your body is growing frantically. You became the host of a flesh anomaly. -inner-anomaly-start-message-grav = Everything becames unnaturally heavy and light at the same time... You became the host of a gravity anomaly. -inner-anomaly-start-message-tech = Your head is buzzing with the amount of chaotic information! You became the host of a tech anomaly. -inner-anomaly-start-message-rock = The crystals are growing through your bones! You became the host of a rock anomaly. - -inner-anomaly-end-message = The abnormal activity within you disappears without a trace.... - -inner-anomaly-severity-info-50 = You feel that the anomaly is taking over half your body. -inner-anomaly-severity-info-75 = You feel that the anomaly is taking over a large part of your body. -inner-anomaly-severity-info-90 = You feel that the anomaly has almost completely taken over your body. -inner-anomaly-severity-info-100 = The anomaly inside you is growing uncontrollably, causing immense pain, and tearing you apart! \ No newline at end of file diff --git a/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl b/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl index 7d1c0794435..500a5305621 100644 --- a/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl +++ b/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl @@ -2,5 +2,5 @@ ### Announcement earlyleave-cryo-job-unknown = Unknown -earlyleave-cryo-announcement = {$character} ({$job}) { CONJUGATE-HAVE($entity) } entered cryogenic storage! +earlyleave-cryo-announcement = {$character} ({$job}) has entered cryogenic storage! earlyleave-cryo-sender = Station diff --git a/Resources/Locale/en-US/deltav/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/deltav/objectives/conditions/steal-target-groups.ftl deleted file mode 100644 index 9ee5e824214..00000000000 --- a/Resources/Locale/en-US/deltav/objectives/conditions/steal-target-groups.ftl +++ /dev/null @@ -1,8 +0,0 @@ -steal-target-groups-plutonium-core = plutonium core -steal-target-groups-lucky-bill = logistics officer's lucky bill -steal-target-groups-ian-dossier = head of personnel's photobook -steal-target-groups-x01 = x-01 multiphase energy gun -steal-target-groups-notary-stamp = notary stamp -steal-target-groups-silvia = silvia - -steal-target-groups-recruiter-pen = recruiter's pen diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl index efb392c4bf8..fb53621389d 100644 --- a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl @@ -1,3 +1,4 @@ stamp-component-stamped-name-notary = NOTARY stamp-component-stamped-name-chiefjustice = Chief Justice +stamp-component-stamped-name-psychologist = Psychologist diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 0ba65217ef8..3e7cde8449a 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -20,7 +20,6 @@ flavor-base-fishy = fishy flavor-base-crabby = crabby flavor-base-cheesy = cheesy flavor-base-funny = funny -flavor-base-strange = strange flavor-base-tingly = tingly flavor-base-acid = acidic flavor-base-leafy = leafy diff --git a/Resources/Locale/en-US/guardian/guardian.ftl b/Resources/Locale/en-US/guardian/guardian.ftl index 141646087d3..9e0966630dd 100644 --- a/Resources/Locale/en-US/guardian/guardian.ftl +++ b/Resources/Locale/en-US/guardian/guardian.ftl @@ -10,7 +10,6 @@ guardian-activator-empty-examine = [color=#ba1919]The injector is spent.[/color] guardian-activator-invalid-target = Only humans can be injected! guardian-no-soul = Your guardian has no soul. guardian-available = Your guardian now has a soul. -guardian-inside-container = There's no room to release your guardian! ## Guardian entity specific diff --git a/Resources/Locale/en-US/mapping/editor.ftl b/Resources/Locale/en-US/mapping/editor.ftl deleted file mode 100644 index 153df531e25..00000000000 --- a/Resources/Locale/en-US/mapping/editor.ftl +++ /dev/null @@ -1,7 +0,0 @@ -mapping-entities = Entities -mapping-tiles = Tiles -mapping-decals = Decals - -mapping-replace = Replace -mapping-erase-entity = Erase Entity -mapping-erase-decal = Erase Decal \ No newline at end of file diff --git a/Resources/Locale/en-US/markings/gauze.ftl b/Resources/Locale/en-US/markings/gauze.ftl index 7ed35a90ba1..f8bedc31957 100644 --- a/Resources/Locale/en-US/markings/gauze.ftl +++ b/Resources/Locale/en-US/markings/gauze.ftl @@ -46,9 +46,6 @@ marking-GauzeUpperLegRight = Gauze Thigh Wrap (Right) marking-GauzeBlindfold-gauze_blindfold = Gauze Blindfold marking-GauzeBlindfold = Gauze Blindfold -marking-GauzeHead-gauze_head = Gauze Head Wrap -marking-GauzeHead = Gauze Head Wrap - marking-GauzeLizardBlindfold-gauze_lizard_blindfold = Gauze Blindfold marking-GauzeLizardBlindfold = Gauze Blindfold diff --git a/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl b/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl index 601c45e4e22..7fd7f4608e1 100644 --- a/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl +++ b/Resources/Locale/en-US/medical/components/crew-monitoring-component.ftl @@ -2,8 +2,6 @@ crew-monitoring-user-interface-title = Crew Monitoring Console -crew-monitor-filter-line-placeholder = Filter - crew-monitoring-user-interface-name = Name crew-monitoring-user-interface-job = Job crew-monitoring-user-interface-status = Status diff --git a/Resources/Locale/en-US/mind/commands/rename-command.ftl b/Resources/Locale/en-US/mind/commands/rename-command.ftl deleted file mode 100644 index 4749cd6379e..00000000000 --- a/Resources/Locale/en-US/mind/commands/rename-command.ftl +++ /dev/null @@ -1,5 +0,0 @@ -cmd-rename-desc = Renames an entity and its cloner entries, ID cards, and PDAs. -cmd-rename-help = rename -cmd-rename-too-long = Name is too long. -cmd-rename-not-found = Can't find username/uid: {$target} -cmd-rename-no-entity = {$target} does not have an entity. diff --git a/Resources/Locale/en-US/navmap-beacons/station_map.ftl b/Resources/Locale/en-US/navmap-beacons/station_map.ftl index e2528515566..1563e0abaf2 100644 --- a/Resources/Locale/en-US/navmap-beacons/station_map.ftl +++ b/Resources/Locale/en-US/navmap-beacons/station_map.ftl @@ -1,7 +1,6 @@ station-map-window-title = Station map station-map-user-interface-flavor-left = Don't panic station-map-user-interface-flavor-right = v1.42 -station-map-filter-placeholder = Search by name nav-beacon-window-title = Station Beacon nav-beacon-toggle-visible = Visible diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl index b21d2a83151..97dd7ffcc6a 100644 --- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl +++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl @@ -76,7 +76,6 @@ food-sequence-content-berries = berries food-sequence-content-spacemans-trumpet = spaceman's trupmet food-sequence-content-cherry = cherry food-sequence-content-snail = snail -food-sequence-content-anomaly-berry = anomaly berry # BURGERS @@ -117,7 +116,6 @@ food-sequence-burger-content-suppermatter = supper food-sequence-burger-content-hamster = hams food-sequence-burger-content-berries = berri food-sequence-burger-content-spacemans-trumpet = spacetrump -food-sequence-burger-content-anomaly-berry = anom food-sequence-burger-content-extradimensional-orange = 3d food-sequence-burger-content-world-pea = peace diff --git a/Resources/Locale/en-US/nyanotrasen/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/nyanotrasen/objectives/conditions/steal-target-groups.ftl deleted file mode 100644 index 4db9318495c..00000000000 --- a/Resources/Locale/en-US/nyanotrasen/objectives/conditions/steal-target-groups.ftl +++ /dev/null @@ -1 +0,0 @@ -steal-target-groups-anti-psychic-knife = anti-psychic knife diff --git a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl deleted file mode 100644 index 12c562422d9..00000000000 --- a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl +++ /dev/null @@ -1,68 +0,0 @@ -# Traitor single items -steal-target-groups-hypospray = hypospray -steal-target-groups-handheld-crew-monitor = handheld crew monitor -steal-target-groups-clothing-outer-hardsuit-rd = experimental research hardsuit -steal-target-groups-hand-teleporter = hand teleporter -steal-target-groups-clothing-shoes-boots-mag-adv = advanced magboots -steal-target-groups-box-folder-qm-clipboard = requisition digi-board -steal-target-groups-food-meat-corgi = prime-cut corgi meat -steal-target-groups-captain-id-card = captain ID card -steal-target-groups-jetpack-captain-filled = captain's jetpack -steal-target-groups-weapon-antique-laser = antique laser pistol -steal-target-groups-nuke-disk = nuclear authentication disk -steal-target-groups-weapon-energy-shot-gun = energy shotgun - -# Thief Collection -steal-target-groups-figurines = figurine -steal-target-groups-heads-cloaks = head's cloak -steal-target-groups-heads-bedsheets = head's bedsheet -steal-target-groups-stamps = stamp -steal-target-groups-door-remotes = door remote -steal-target-groups-encryption-keys = encryption key -steal-target-groups-technology-disks = technology disk -steal-target-groups-id-cards = ID Card -steal-target-groups-lamps = LAMP - -# Thief single item -steal-target-groups-forensic-scanner = forensic scanner -steal-target-groups-flippo-engraved-lighter = detective's Flippo engraved lighter -steal-target-groups-ammo-tech-fab-circuitboard = ammo techfab circuit board -steal-target-groups-clothing-head-hat-warden = warden's cap -steal-target-groups-clothing-outer-hardsuit-void-paramed = paramedic void suit -steal-target-groups-medical-tech-fab-circuitboard = medical techfab machine board -steal-target-groups-clothing-headset-alt-medical = chief medical officer's over-ear headset -steal-target-groups-research-and-development-server-machine-circuitboard = R&D server machine board -steal-target-groups-fire-axe = fireaxe -steal-target-groups-ame-part-flatpack = AME flatpack -steal-target-groups-salvage-expeditions-computer-circuitboard = salvage expeditions computer board -steal-target-groups-cargo-shuttle-console-circuitboard = cargo shuttle console board -steal-target-groups-clothing-eyes-hud-beer = beer goggles -steal-target-groups-bible = bible -steal-target-groups-clothing-neck-goldmedal = gold medal of crewmanship -steal-target-groups-clothing-neck-clownmedal = clown medal - -# Thief structures -steal-target-groups-teg = teg generator part -steal-target-groups-freezer-heater = freezer or heater -steal-target-groups-altar-nanotrasen = nanotrasen altar (any) - -steal-target-groups-nuclear-bomb = nuclear fission explosive -steal-target-groups-fax-machine-captain = captain long range fax machine -steal-target-groups-chem-dispenser = chemical dispenser -steal-target-groups-xeno-artifact = alien artifact -steal-target-groups-booze-dispenser = booze dispenser -# DeltaV - Epistemics Department - Replace RD with Mystagogue -steal-target-groups-plant-rd = "Mytagogue's potted plant" -steal-target-groups-toilet-golden-dirty-water = golden toilet - -# Thief Animal -steal-target-groups-animal-named-cat = CMO's Cat - -steal-target-groups-animal-ian = Ian -steal-target-groups-animal-mc-griff = McGriff -steal-target-groups-animal-walter = Walter -steal-target-groups-animal-morty = Morty -steal-target-groups-animal-renault = Renault -# DeltaV - Adjusts from Shiva because we have multiple possible sec animals -steal-target-groups-animal-shiva = Security Pet -steal-target-groups-animal-tropico = Tropico diff --git a/Resources/Locale/en-US/objectives/conditions/steal.ftl b/Resources/Locale/en-US/objectives/conditions/steal.ftl index d63f3de1883..1bca71ce90d 100644 --- a/Resources/Locale/en-US/objectives/conditions/steal.ftl +++ b/Resources/Locale/en-US/objectives/conditions/steal.ftl @@ -9,4 +9,4 @@ objective-condition-steal-Ian = head of personnel's corgi objective-condition-thief-description = The {$itemName} would be a great addition to my collection! objective-condition-thief-animal-description = The {$itemName} would be a great addition to my collection! Most importantly, alive. -objective-condition-thief-multiply-description = I need to get {$count} {MAKEPLURAL($itemName)} (any) and take them with me. +objective-condition-thief-multiply-description = I need to get {$count} {MAKEPLURAL($itemName)} and take them with me. diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index 5a8876ac925..3e150a2df48 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -17,5 +17,3 @@ stamp-component-stamped-name-warden = Warden stamp-component-stamped-name-trader = Trader stamp-component-stamped-name-syndicate = Syndicate stamp-component-stamped-name-ce = Chief Engineer -stamp-component-stamped-name-greytide = Greytide -stamp-component-stamped-name-psychologist = Psychologist \ No newline at end of file diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 8fd7f7b6e99..dafbd151762 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -15,7 +15,6 @@ loadout-group-survival-syndicate = Github is forcing me to write text that is li loadout-group-breath-tool = Species-dependent breath tools loadout-group-tank-harness = Species-specific survival equipment loadout-group-EVA-tank = Species-specific gas tank -loadout-group-pocket-tank-double = Species-specific double emergency tank in pocket loadout-group-survival-mime = Mime Survival Box # Command diff --git a/Resources/Locale/en-US/round-end/round-end-system.ftl b/Resources/Locale/en-US/round-end/round-end-system.ftl index 30069f71713..f86851506bc 100644 --- a/Resources/Locale/en-US/round-end/round-end-system.ftl +++ b/Resources/Locale/en-US/round-end/round-end-system.ftl @@ -4,7 +4,6 @@ round-end-system-shuttle-called-announcement = An emergency shuttle has been sen round-end-system-shuttle-already-called-announcement = An emergency shuttle has already been sent. round-end-system-shuttle-auto-called-announcement = An automatic crew shift change shuttle has been sent. ETA: {$time} {$units}. Recall the shuttle to extend the shift. round-end-system-shuttle-recalled-announcement = The emergency shuttle has been recalled. -round-end-system-shuttle-sender-announcement = Station round-end-system-round-restart-eta-announcement = Restarting the round in {$time} {$units}... eta-units-minutes = minutes diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index 1ca559db302..c8d524ba1d7 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -140,5 +140,3 @@ seeds-capfruit-name = capfruit seeds-capfruit-display-name = capfruit tree seeds-cherry-name = cherry seeds-cherry-display-name = cherry tree -seeds-anomaly-berry-name = anomaly berry -seeds-anomaly-berry-display-name = anomaly berries diff --git a/Resources/Locale/en-US/station-events/events/ion-storm.ftl b/Resources/Locale/en-US/station-events/events/ion-storm.ftl index 02be271cdf2..28192d96637 100644 --- a/Resources/Locale/en-US/station-events/events/ion-storm.ftl +++ b/Resources/Locale/en-US/station-events/events/ion-storm.ftl @@ -9,7 +9,6 @@ ion-storm-the-job = THE {$job} ion-storm-clowns = CLOWNS ion-storm-heads = HEADS OF STAFF ion-storm-crew = CREW -ion-storm-people = PEOPLE ion-storm-adjective-things = {$adjective} THINGS ion-storm-x-and-y = {$x} AND {$y} diff --git a/Resources/Locale/en-US/wires/components/wires-component.ftl b/Resources/Locale/en-US/wires/components/wires-component.ftl index e98e5c21cab..be27c270bb4 100644 --- a/Resources/Locale/en-US/wires/components/wires-component.ftl +++ b/Resources/Locale/en-US/wires/components/wires-component.ftl @@ -10,9 +10,3 @@ wires-component-ui-on-receive-message-cannot-mend-uncut-wire = You can't mend a wires-menu-name-label = Wires wires-menu-dead-beef-text = DEAD-BEEF -wires-menu-help-popup = - Click on the gold contacts with a multitool in hand to pulse their wire. - Click on the wires with a pair of wirecutters in hand to cut/mend them. - - The lights at the top show the state of the machine, messing with wires will probably do stuff to them. - Wire layouts are different each round, but consistent between machines of the same type. diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml index 665657f7dda..2063451a0ee 100644 --- a/Resources/Maps/Nonstations/nukieplanet.yml +++ b/Resources/Maps/Nonstations/nukieplanet.yml @@ -13721,7 +13721,7 @@ entities: - type: Transform pos: 3.5882664,-8.344303 parent: 104 -- proto: VendingMachineBoozeSyndicate +- proto: VendingMachineBooze entities: - uid: 1380 components: diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml index 9fab52cc293..748c4af9c2f 100644 --- a/Resources/Maps/Test/dev_map.yml +++ b/Resources/Maps/Test/dev_map.yml @@ -5077,7 +5077,7 @@ entities: - type: Transform pos: 3.5,7.5 parent: 179 -- proto: SpawnMobCorgiMouse +- proto: SpawnMobMouse entities: - uid: 1050 components: diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index c96d0afd03b..40cdacb4b89 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -421,6 +421,3 @@ OverlordCircuitBoard: null # 2024-09-08 HatBase: null - -# 2024-09-19 -BlueprintFlare: null diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index d6495514119..c84fa4782c6 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -507,23 +507,4 @@ accent-russian-words-3-3: accent-russian-words-replace-3 accent-russian-words-4: accent-russian-words-replace-4 accent-russian-words-5: accent-russian-words-replace-5 - accent-russian-words-6: accent-russian-words-replace-6 - -- type: accent - id: skeleton - wordReplacements: - accent-skeleton-words-1: accent-skeleton-words-replace-1 - accent-skeleton-words-2: accent-skeleton-words-replace-2 - accent-skeleton-words-3: accent-skeleton-words-replace-3 - accent-skeleton-words-3-2: accent-skeleton-words-replace-3 - accent-skeleton-words-3-3: accent-skeleton-words-replace-3 - accent-skeleton-words-4: accent-skeleton-words-replace-4 - accent-skeleton-words-4-2: accent-skeleton-words-replace-4 - accent-skeleton-words-5: accent-skeleton-words-replace-5 - accent-skeleton-words-5-2: accent-skeleton-words-replace-5 - accent-skeleton-words-5-3: accent-skeleton-words-replace-5 - accent-skeleton-words-5-4: accent-skeleton-words-replace-5 - accent-skeleton-words-6: accent-skeleton-words-replace-6 - accent-skeleton-words-7: accent-skeleton-words-replace-7 - accent-skeleton-words-8: accent-skeleton-words-replace-8 - accent-skeleton-words-9: accent-skeleton-words-replace-9 + accent-russian-words-6: accent-russian-words-replace-6 \ No newline at end of file diff --git a/Resources/Prototypes/Actions/anomaly.yml b/Resources/Prototypes/Actions/anomaly.yml deleted file mode 100644 index 65c6ae164ea..00000000000 --- a/Resources/Prototypes/Actions/anomaly.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - id: ActionAnomalyPulse - name: Anomaly pulse - description: Release a pulse of energy of your abnormal nature - components: - - type: InstantAction - icon: Structures/Specific/anomaly.rsi/anom1.png - event: !type:ActionAnomalyPulseEvent - useDelay: 30 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml index 8d28a79001e..6e91a37e2a3 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml @@ -34,7 +34,7 @@ sprite: Clothing/Mask/breath.rsi state: icon product: CrateEmergencyInternalsLarge - cost: 1200 + cost: 2000 category: cargoproduct-category-name-emergency group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml index 3239b5c1b51..78e5468164b 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml @@ -44,7 +44,7 @@ sprite: Objects/Tools/cable-coils.rsi state: coilall-30 product: CrateEngineeringCableBulk - cost: 600 + cost: 750 category: cargoproduct-category-name-engineering group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml index 7e1fb8f98b2..9532fbf74e6 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml @@ -38,7 +38,7 @@ id: CrateEmergencyInternals parent: CrateInternals name: internals crate - description: Master your life energy and control your breathing with 3 breath masks, emergency suits and large air tanks. + description: Master your life energy and control your breathing with three breath masks, three emergency oxygen tanks and three large air tanks. components: - type: StorageFill contents: @@ -57,7 +57,7 @@ id: CrateEmergencyInternalsLarge parent: CrateInternals name: internals crate (large) - description: Master your life energy and control your breathing with 6 breath masks, emergency suits and large air tanks. + description: Master your life energy and control your breathing with six breath masks, six emergency oxygen tanks and six large air tanks. components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 10595673708..3222bc27062 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -336,7 +336,6 @@ - id: ClothingHeadHatMagician - id: BeachBall - id: ClothingShoesSkates - - id: RubberChicken - type: entity id: CrateFunBikeHornImplants diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml index de39f780359..8364329ed95 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml @@ -23,10 +23,8 @@ ClothingHeadHatSurgcapBlue: 4 ClothingHeadHatSurgcapPurple: 4 ClothingShoesBootsWinterMed: 2 - contrabandInventory: - ClothingUniformJumpskirtOfLife: 1 - # Begin Delta-V additions - UniformScrubsColorCybersun: 1 - ClothingHeadHatSurgcapCybersun: 1 - ClothingOuterCoatCybersunWindbreaker: 1 - # End Delta-V additions + contrabandInventory: #DeltaV + UniformScrubsColorCybersun: 1 #DeltaV + ClothingHeadHatSurgcapCybersun: 1 #DeltaV + ClothingOuterCoatCybersunWindbreaker: 1 #DeltaV + ClothingShoesBootsWinterMed: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml index 9314de97914..5f6806afbb1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml @@ -22,12 +22,6 @@ prefix: advertisement-boozeomat- count: 19 -- type: localizedDataset - id: BruiseOMatAds - values: - prefix: advertisement-bruiseomat- - count: 15 - - type: localizedDataset id: CargoDrobeAds values: diff --git a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml index fd4e53acaa7..5a3d91db116 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml @@ -4,12 +4,6 @@ prefix: thankyou-boozeomat- count: 3 -- type: localizedDataset - id: BruiseOMatGoodbyes - values: - prefix: thankyou-bruiseomat- - count: 28 - - type: localizedDataset id: ChangGoodbyes values: diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 92ff0dc62e0..2219eec84d4 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -771,8 +771,8 @@ id: UplinkBinaryTranslatorKey name: uplink-binary-translator-key-name description: uplink-binary-translator-key-desc - icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: borg_label } - productEntity: EncryptionKeyBinarySyndicate + icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: rd_label } + productEntity: EncryptionKeyBinary cost: Telecrystal: 1 categories: diff --git a/Resources/Prototypes/Datasets/Names/ai.yml b/Resources/Prototypes/Datasets/Names/ai.yml index 539ef4e3fad..1d320c3f52f 100644 --- a/Resources/Prototypes/Datasets/Names/ai.yml +++ b/Resources/Prototypes/Datasets/Names/ai.yml @@ -2,11 +2,8 @@ id: names_ai values: - 16-20 - - 512k - - 640k #ought to be enough for anybody - "790" - Adaptive Manipulator - - Adlib #named after the famous soundcard - ALICE - Allied Mastercomputer - Alpha 2 @@ -22,28 +19,21 @@ - Aniel - AOL - Asimov - - Bell 301 #the most influential modem ever, created by the bell system. It still lives on today in certain applications - Bishop - Blitz - Box - - Calculator - Cassandra - Cell - Chii - Chip - - C.R.A.I.G. - - Cray-2 #commercial supercomputer from the 70s - - CompuServe #if we're going to have AOL we may as well have some of their major competitors - Computer - Cutie - Daedalus - - DecTalk - Dee Model - Dial Up - Dorfl - Duey - Emma-2 - - ENIAC #famous early computer - Erasmus - Everything - Ez-27 @@ -57,16 +47,12 @@ - Helios - Hivebot Overmind - Huey - - iAI #a play on the fad apple spawned of putting "i" infront of your tech products name - - I.E. 6 #hell on earth (web browser) - Icarus - - Jeeves #if you don't get this one you are too young - Jinx - K.I.N.G - Klapaucius - Knight - Louie - - Manchester Mark 2 #named after the Manchester Mark 1, the successor of which was actually named the Ferranti Mark 1, rather than Manchester Mark 2 - MARK13 - Maria - Marvin @@ -78,8 +64,6 @@ - Mugsy3000 - Multivac - NCH - - NT v6.0 #A play on both NT as in NanoTrasen and NT as in windows NT, of which version 6.0 is windows vista - - Packard Bell - PTO - Project Y2K - Revelation @@ -92,13 +76,10 @@ - Shrike - Solo - Station Control Program - - AINU (AI's Not Unix) - Super 35 - Surgeon General - TWA - Terminus - - TPM 3.0 - - Turing Complete - Tidy - Ulysses - W1k1 diff --git a/Resources/Prototypes/Decals/burnt.yml b/Resources/Prototypes/Decals/burnt.yml deleted file mode 100644 index d9d500e1aa2..00000000000 --- a/Resources/Prototypes/Decals/burnt.yml +++ /dev/null @@ -1,31 +0,0 @@ -- type: decal - id: burnt1 - tags: ["burnt"] - defaultCleanable: true - sprite: - sprite: Decals/burnt.rsi - state: burnt1 - -- type: decal - id: burnt2 - tags: ["burnt"] - defaultCleanable: true - sprite: - sprite: Decals/burnt.rsi - state: burnt2 - -- type: decal - id: burnt3 - tags: ["burnt"] - defaultCleanable: true - sprite: - sprite: Decals/burnt.rsi - state: burnt3 - -- type: decal - id: burnt4 - tags: ["burnt"] - defaultCleanable: true - sprite: - sprite: Decals/burnt.rsi - state: burnt4 diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml index fd0773d3455..2ffa4978b6e 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml @@ -56,7 +56,7 @@ id: LockerFillChiefMedicalOfficerDeltaV table: !type:AllSelector children: - - id: RubberStampPsychologist # TODO: make a psych locker and move this to it, or just remove this since psych spawns with it. + - id: RubberStampPsychologist # TODO: make a psych locker and move this to it - id: BoxPDAMedical - id: ClothingBeltMilitaryWebbingCMO # add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN! - id: CMOIDCard diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index 6f545675161..1c5cb0287b3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -1,3 +1,17 @@ +- type: entity + name: psychologist's rubber stamp + parent: RubberStampBase + id: RubberStampPsychologist + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-psychologist + stampedColor: "#00ccff" + stampState: "paper_stamp-psychologist" + - type: Sprite + sprite: DeltaV/Objects/Misc/stamps.rsi + state: stamp-psychologist + - type: entity name: notary stamp parent: RubberStampBase @@ -14,7 +28,7 @@ state: stamp-notary - type: StealTarget stealGroup: RubberStampNotary - + - type: entity name: chief justice stamp parent: RubberStampBase diff --git a/Resources/Prototypes/DeltaV/Objectives/recruiter.yml b/Resources/Prototypes/DeltaV/Objectives/recruiter.yml index d8760388c71..f73a31da35f 100644 --- a/Resources/Prototypes/DeltaV/Objectives/recruiter.yml +++ b/Resources/Prototypes/DeltaV/Objectives/recruiter.yml @@ -43,7 +43,7 @@ - type: stealTargetGroup id: RecruiterPen - name: steal-target-groups-recruiter-pen + name: recruiter pen sprite: sprite: DeltaV/Objects/Misc/recruiter_pen.rsi state: empty diff --git a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml index 1df9cd69736..19fbcd25b22 100644 --- a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml @@ -1,34 +1,34 @@ - type: stealTargetGroup id: SpaceCashLuckyBill - name: steal-target-groups-lucky-bill + name: logistics officer's lucky bill sprite: sprite: DeltaV/Objects/Misc/first_bill.rsi state: icon - type: stealTargetGroup id: BookIanDossier - name: steal-target-groups-ian-dossier + name: head of personnel's photobook sprite: sprite: DeltaV/Objects/Misc/bureaucracy.rsi state: folder-hop-ian - type: stealTargetGroup id: WeaponEnergyGunMultiphase - name: steal-target-groups-x01 + name: x-01 multiphase energy gun sprite: sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi state: base - type: stealTargetGroup id: RubberStampNotary - name: steal-target-groups-notary-stamp + name: notary stamp sprite: sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-notary - type: stealTargetGroup id: AnimalSilvia - name: steal-target-groups-silvia + name: Silvia sprite: sprite: DeltaV/Mobs/Pets/silvia.rsi state: silvia diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index c900464076b..f8912995629 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -103,7 +103,7 @@ parent: ClothingEyesBase id: ClothingEyesGlassesJamjar name: jamjar glasses - description: These retro glasses remind you of a simpler time. + description: Also known as Virginity Protectors. components: - type: Sprite sprite: Clothing/Eyes/Glasses/jamjar.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index a3e998748ca..ca312fd3313 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -231,7 +231,7 @@ node: mask - type: entity - parent: [ClothingMaskClown, BaseRestrictedContraband] + parent: ClothingMaskClown id: ClothingMaskClownSecurity name: security clown wig and mask description: A debatably oxymoronic but protective mask and wig. diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml index 1489c26493a..c4396a775da 100644 --- a/Resources/Prototypes/Entities/Effects/mobspawn.yml +++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml @@ -82,28 +82,36 @@ tags: - HideContextMenu - type: AnimationPlayer - - type: EntityTableSpawner + - type: RandomSpawner deleteSpawnerAfterSpawn: false - table: !type:NestedSelector - tableId: AnomalyFloraLootTable - -- type: entityTable - id: AnomalyFloraLootTable - table: !type:GroupSelector - children: - - id: FoodAmbrosiaVulgaris - - id: FoodAloe - - id: FoodCabbage - - id: FoodGalaxythistle - - id: FoodLemon - - id: FoodLime - - id: FoodPeaPod - - id: FoodPineapple - - id: FoodOnionRed - - id: FoodWatermelon - - id: FoodCherry - - id: MobTomatoKiller - - id: MobLuminousEntity - - id: MobLuminousObject - - id: FoodGatfruit # 0.007% spawn chance. 1 / 141 - weight: 0.10 + rareChance: 0.1 + offset: 0.3 + chance: 1 + prototypes: + - FoodAmbrosiaVulgaris + - FoodAloe + - FoodCabbage + - FoodCarrot + - FoodGalaxythistle + - FoodLemon + - FoodLime + - FoodPeaPod + - FoodPineapple + - FoodOnionRed + - FoodWatermelon + - FoodAmbrosiaVulgaris + - FoodAloe + - FoodCabbage + - FoodCarrot + - FoodGalaxythistle + - FoodLemon + - FoodLime + - FoodPeaPod + - FoodPineapple + - FoodOnionRed + - FoodWatermelon + - FoodGatfruit + - MobTomatoKiller + rarePrototypes: + - MobLuminousEntity + - MobLuminousObject diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index b74a80c39d4..552b8aae0da 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -217,6 +217,7 @@ id: SalvageEquipmentRare table: !type:GroupSelector children: + - id: BlueprintFlare - id: FultonBeacon - id: Fulton amount: !type:RangeNumberSelector diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml index 4697606af9f..25098e61d49 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml @@ -9,7 +9,6 @@ - sprite: Structures/Specific/anomaly.rsi state: anom1 - type: RandomSpawner - chance: 1 prototypes: - AnomalyPyroclastic - AnomalyGravity @@ -21,10 +20,8 @@ - AnomalyLiquid - AnomalyFlora - AnomalyShadow - - AnomalyTech - rareChance: 0.3 - rarePrototypes: - - RandomAnomalyInjectorSpawner +# - AnomalyTech # DeltaV - remove until it stops being an epileptic hazard + chance: 1 offset: 0.15 # not to put it higher. The anomaly sychnronizer looks for anomalies within this radius, and if the radius is higher, the anomaly can be attracted from a neighboring tile. - type: entity @@ -43,28 +40,4 @@ - AnomalyRockQuartz - AnomalyRockUranium chance: 1 - offset: 0.15 - -- type: entity - id: RandomAnomalyInjectorSpawner - parent: MarkerBase - components: - - type: Sprite - layers: - - state: red - - sprite: Structures/Specific/Anomalies/tech_anom.rsi - state: pulse - - type: RandomSpawner - prototypes: - - AnomalyTrapPyroclastic - - AnomalyTrapElectricity - - AnomalyTrapShadow - - AnomalyTrapIce - - AnomalyTrapFlora - - AnomalyTrapBluespace - - AnomalyTrapFlesh - - AnomalyTrapGravity - - AnomalyTrapTech - - AnomalyTrapRock - chance: 1 - \ No newline at end of file + offset: 0.15 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 7176735cb67..2447b4e213a 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -117,7 +117,6 @@ - id: BalloonNT - id: BalloonCorgi - id: MysteryFigureBox - - id: RubberChicken # Cult - !type:AllSelector children: @@ -164,7 +163,6 @@ - id: CigarGold - id: ClothingUniformJumpsuitFamilyGuy - id: WristwatchGold - #- id: RubberStampGreytide # Delta-V: prevent greytide stamp from spawning - type: entity name: Maint Loot Spawner diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index 6509965cb52..5cd162e8684 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -48,20 +48,6 @@ - MobCorgiLisa - MobCorgiIanPup -- type: entity - name: Dev Mouse Spawner - id: SpawnMobCorgiMouse - suffix: Admeme - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: ai - - type: ConditionalSpawner - prototypes: - - MobCorgiMouse - - type: entity name: Possum Morty Spawner id: SpawnMobPossumMorty diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 540d098e505..7fda98e7640 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -222,20 +222,6 @@ - sprite: Mobs/Customization/gauze.rsi state: gauze_boxerwrap_l -- type: marking - id: GauzeHead - bodyPart: Head - markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Moth] - coloring: - default: - type: - !type:SimpleColoring - color: "#FFFFFF" - sprites: - - sprite: Mobs/Customization/gauze.rsi - state: gauze_head - # Lizard Specific Markings - type: marking id: GauzeLizardLefteyePatch diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index e7d9f6f6364..7726abf9100 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -33,8 +33,6 @@ states: Alive: Base: bat - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -104,8 +102,6 @@ states: Alive: Base: 0 - Critical: - Base: dead Dead: Base: dead - type: Item @@ -356,8 +352,6 @@ states: Alive: Base: cockroach - Critical: - Base: cockroach_dead Dead: Base: cockroach_dead - type: Bloodstream @@ -400,14 +394,6 @@ - type: NonSpreaderZombie - type: SentienceTarget flavorKind: station-event-random-sentience-flavor-organic - - type: MeleeWeapon - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite - damage: - types: - Piercing: 0 - type: entity name: glockroach @@ -623,8 +609,6 @@ states: Alive: Base: duck-0 - Critical: - Base: dead-0 Dead: Base: dead-0 - type: Butcherable @@ -665,8 +649,6 @@ states: Alive: Base: duck-1 - Critical: - Base: dead-1 Dead: Base: dead-1 @@ -684,8 +666,6 @@ states: Alive: Base: duck-2 - Critical: - Base: dead-2 Dead: Base: dead-2 @@ -745,8 +725,6 @@ states: Alive: Base: butterfly - Critical: - Base: dead Dead: Base: dead - type: Bloodstream @@ -793,8 +771,6 @@ states: Alive: Base: cow - Critical: - Base: dead Dead: Base: dead - type: SolutionContainerManager @@ -879,8 +855,6 @@ states: Alive: Base: crab - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -1031,8 +1005,6 @@ states: Alive: Base: goose - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -1311,7 +1283,6 @@ tags: - VimPilot - DoorBumpOpener - - AnomalyHost - type: Reactive groups: Flammable: [ Touch ] @@ -1862,8 +1833,6 @@ states: Alive: Base: lizard - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -1920,8 +1889,6 @@ states: Alive: Base: slug - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -1975,8 +1942,6 @@ states: Alive: Base: frog - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -2029,8 +1994,6 @@ states: Alive: Base: parrot - Critical: - Base: dead Dead: Base: dead - type: Butcherable @@ -2083,8 +2046,6 @@ states: Alive: Base: penguin - Critical: - Base: penguin_dead Dead: Base: penguin_dead - type: Butcherable @@ -2154,8 +2115,6 @@ states: Alive: Base: penguin - Critical: - Base: dead Dead: Base: dead - type: MeleeWeapon @@ -2274,8 +2233,6 @@ states: Alive: Base: tarantula - Critical: - Base: tarantula_dead Dead: Base: tarantula_dead - type: Butcherable @@ -2401,8 +2358,6 @@ states: Alive: Base: clown - Critical: - Base: dead Dead: Base: dead - type: MobThresholds @@ -2473,8 +2428,6 @@ states: Alive: Base: possum - Critical: - Base: possum_dead Dead: Base: possum_dead - type: Butcherable @@ -2510,8 +2463,6 @@ states: Alive: Base: possum_old - Critical: - Base: possum_dead_old Dead: Base: possum_dead_old @@ -2547,8 +2498,6 @@ states: Alive: Base: raccoon - Critical: - Base: raccoon_dead Dead: Base: raccoon_dead - type: Butcherable @@ -2608,8 +2557,6 @@ states: Alive: Base: fox - Critical: - Base: fox_dead Dead: Base: fox_dead - type: Butcherable @@ -2682,8 +2629,6 @@ states: Alive: Base: corgi - Critical: - Base: corgi_dead Dead: Base: corgi_dead - type: Butcherable @@ -2725,8 +2670,6 @@ states: Alive: Base: narsian - Critical: - Base: narsian_dead Dead: Base: narsian_dead - type: MeleeWeapon @@ -2830,8 +2773,6 @@ states: Alive: Base: cat - Critical: - Base: cat_dead Dead: Base: cat_dead - type: Speech @@ -2882,8 +2823,6 @@ states: Alive: Base: cat2 - Critical: - Base: cat2_dead Dead: Base: cat2_dead @@ -2901,8 +2840,6 @@ states: Alive: Base: syndicat - Critical: - Base: syndicat_dead Dead: Base: syndicat_dead - type: GhostRole @@ -2948,8 +2885,6 @@ states: Alive: Base: spacecat - Critical: - Base: spacecat_dead Dead: Base: spacecat_dead - type: Temperature @@ -2987,8 +2922,6 @@ states: Alive: Base: caracal_flop - Critical: - Base: caracal_dead Dead: Base: caracal_dead @@ -3062,8 +2995,6 @@ states: Alive: Base: sloth - Critical: - Base: sloth_dead Dead: Base: sloth_dead - type: Butcherable @@ -3116,8 +3047,6 @@ states: Alive: Base: ferret - Critical: - Base: ferret_dead Dead: Base: ferret_dead - type: Butcherable @@ -3325,8 +3254,6 @@ states: Alive: Base: pig - Critical: - Base: dead Dead: Base: dead - type: Butcherable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml index a1bcd547a64..06ab02dedc9 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml @@ -13,11 +13,6 @@ true NavSmash: !type:Bool true - - type: NPCImprintingOnSpawnBehaviour - spawnFriendsSearchRadius: 10 - whitelist: - components: - - Anomaly # Friendly to inner anomaly host - type: NpcFactionMember factions: - SimpleHostile @@ -359,4 +354,4 @@ 30: Dead - type: MovementSpeedModifier baseWalkSpeed: 2 - baseSprintSpeed: 2.5 \ No newline at end of file + baseSprintSpeed: 2.5 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml index 9500345e4fc..9b90d202f3a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml @@ -16,11 +16,6 @@ - type: NpcFactionMember factions: - SimpleHostile - - type: NPCImprintingOnSpawnBehaviour - spawnFriendsSearchRadius: 10 - whitelist: - components: - - Anomaly # Friendly to inner anomaly host - type: MovementIgnoreGravity - type: MovementSpeedModifier baseWalkSpeed: 3.5 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 3fe80c75c56..377948b55d3 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -85,29 +85,6 @@ proper: true gender: female -- type: entity - name: real mouse - parent: MobCorgiIan - id: MobCorgiMouse - description: It's 100% a real hungry mouse. - components: - - type: Sprite - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: real_mouse - - type: DamageStateVisuals - states: - Alive: - Base: real_mouse - Critical: - Base: real_mouse_dead - Dead: - Base: real_mouse_dead - - type: Grammar - attributes: - proper: true - gender: female - - type: entity name: Puppy Ian parent: MobCorgiPuppy @@ -825,7 +802,6 @@ - CannotSuicide - DoorBumpOpener - VimPilot - - AnomalyHost - type: Loadout prototypes: [ MobMonkeyGear ] - type: Grammar diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 19d6cafd7b1..464f9f40972 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -122,7 +122,6 @@ - type: Grammar attributes: gender: male - - type: Sharp - type: PotentialPsionic # Nyano - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 15878a4017d..62dbf3ee106 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -2,7 +2,7 @@ - type: entity id: AiHeld description: Components added / removed from an entity that gets inserted into an AI core. - categories: [ HideSpawnMenu ] + noSpawn: true components: - type: IntrinsicRadioReceiver - type: IntrinsicRadioTransmitter @@ -341,7 +341,7 @@ - type: entity id: StationAiBrain parent: PositronicBrain - categories: [ HideSpawnMenu ] + noSpawn: true suffix: DO NOT MAP components: - type: Sprite @@ -382,7 +382,7 @@ id: StationAiHolo name: AI eye description: The AI's viewer. - categories: [ HideSpawnMenu ] + noSpawn: true suffix: DO NOT MAP components: - type: NoFTL @@ -462,7 +462,7 @@ - type: GhostRole name: ghost-role-information-syndicate-cyborg-assault-name description: ghost-role-information-syndicate-cyborg-description - rules: ghost-role-information-silicon-rules + rules: ghost-role-information-rules-default-silicon raffle: settings: default - type: GhostTakeoverAvailable @@ -495,7 +495,7 @@ - type: GhostRole name: ghost-role-information-syndicate-cyborg-saboteur-name description: ghost-role-information-syndicate-cyborg-description - rules: ghost-role-information-silicon-rules + rules: ghost-role-information-rules-default-silicon raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index b8a057fcd58..0acfdc70c99 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -25,7 +25,6 @@ - FootstepSound - DoorBumpOpener - SpiderCraft - - AnomalyHost - type: Butcherable butcheringType: Spike spawned: diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 98c79f06b3d..489c5d3aa00 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -215,7 +215,6 @@ - CanPilot - FootstepSound - DoorBumpOpener - - AnomalyHost - type: PotentialPsionic # DeltaV - organic species can all be psionic - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 69a7de8963b..cc09b8f34d7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -2553,39 +2553,3 @@ seedId: cherry - type: SpaceGarbage - type: BadFood - -- type: entity - name: anomaly berry - description: A strange blue fruit. Something about it doesn't seem right. - parent: FoodProduceBase - id: FoodAnomalyBerry - components: - - type: FlavorProfile - flavors: - - strange - - type: Sprite - sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi - state: produce - - type: Produce - seedId: anomalyBerry - - type: Food - trash: - - EffectAnomalyFloraBulb # Random loot - - type: SolutionContainerManager - solutions: - food: - maxVol: 5 - reagents: - - ReagentId: Nutriment - Quantity: 2 - - ReagentId: Vitamin - Quantity: 2 - - ReagentId: Artifexium - Quantity: 1 - - type: Tag - tags: - - Fruit - - type: FoodSequenceElement - entries: - Taco: AnomalyBerry - Burger: AnomalyBerryBurger \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index e9e57f79ce4..ff0504d39ea 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -129,10 +129,6 @@ - type: Sprite state: chocolatebar-open - type: Item - - type: Tag - tags: - - FoodSnack - - ReptilianFood - type: SolutionContainerManager solutions: food: 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 71f98d81c96..1a7a02e7337 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -100,7 +100,7 @@ - type: GhostRole name: ghost-role-information-syndicate-cyborg-assault-name description: ghost-role-information-syndicate-cyborg-description - rules: ghost-role-information-silicon-rules + rules: ghost-role-information-rules-default-silicon raffle: settings: default - type: GhostRoleMobSpawner diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index c0f27ca2c48..b35d2e435c3 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -234,22 +234,7 @@ - type: Sprite layers: - state: crypt_silver - - state: borg_label - -- type: entity - parent: [ EncryptionKey, BaseSyndicateContraband ] - id: EncryptionKeyBinarySyndicate - name: binary translator key - description: A syndicate encryption key that translates binary signals used by silicons. - components: - - type: EncryptionKey - channels: - - Binary - defaultChannel: Binary - - type: Sprite - layers: - - state: crypt_red - - state: borg_label + - state: rd_label - type: entity parent: EncryptionKey diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/shock_collar.yml b/Resources/Prototypes/Entities/Objects/Devices/shock_collar.yml similarity index 92% rename from Resources/Prototypes/DeltaV/Entities/Objects/Devices/shock_collar.yml rename to Resources/Prototypes/Entities/Objects/Devices/shock_collar.yml index 8a4a304ca86..22f2d097fc8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/shock_collar.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/shock_collar.yml @@ -29,6 +29,8 @@ - type: GuideHelp guides: - Security + - type: StealTarget + stealGroup: ClothingNeckShockCollar - type: Tag tags: - WhitelistChameleon diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml index 3c4a4800a87..ffecfdf9940 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml @@ -21,7 +21,7 @@ enum.CrayonUiKey.Key: type: CrayonBoundUserInterface - type: Crayon - capacity: 25 + capacity: 15 - type: Food - type: FlavorProfile flavors: diff --git a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml index 0bee05aa6ad..69f0ed415eb 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/immovable_rod.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: ImmovableRod name: immovable rod description: You can sense that it's hungry. That's usually a bad sign. @@ -177,14 +177,3 @@ state: icon rotation: 225 noRot: false - -- type: entity - parent: ImmovableRodKeepTilesStill - id: ImmovableRodWeh - name: immovable weh - description: WEH! - components: - - type: Sprite - sprite: Objects/Fun/toys.rsi - state: plushie_lizard - noRot: false diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 476f3e6cdfa..7a6961b148a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1327,9 +1327,10 @@ sprite: Objects/Weapons/Melee/cutlass.rsi state: foam_icon - type: MeleeWeapon - wideAnimationRotation: -135 attackRate: 1.5 range: 2.0 + angle: 0 + animation: WeaponArcThrust damage: types: Blunt: 0 @@ -1553,52 +1554,3 @@ # params: # volume: -9 # maxDistance: 3 - -- type: entity - parent: BasePlushie - id: RubberChicken - name: rubber chicken - description: A stress inducing parody of nature's most delectable avian. - components: - - type: Sprite - state: rubber_chicken - - type: EmitSoundOnUse - sound: - collection: RubberChicken - params: - variation: 0.125 - - type: EmitSoundOnLand - sound: - collection: RubberChicken - params: - variation: 0.125 - - type: EmitSoundOnActivate - sound: - collection: RubberChicken - params: - variation: 0.125 - - type: EmitSoundOnCollide - sound: - collection: RubberChicken - params: - variation: 0.125 - - type: EmitSoundOnTrigger - sound: - collection: RubberChicken - params: - variation: 0.125 - - type: Food - requiresSpecialDigestion: true - useSound: - collection: RubberChicken - params: - variation: 0.125 - - type: MeleeWeapon - wideAnimationRotation: 110 - soundHit: - collection: RubberChicken - params: - variation: 0.125 - - type: PhysicalComposition - materialComposition: - Plastic: 25 diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml index 5e05f2d644f..48026c7f805 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml @@ -22,7 +22,6 @@ contentSize: 12000 - type: ActivatableUI key: enum.PaperUiKey.Key - requiresComplex: false - type: UserInterface interfaces: enum.PaperUiKey.Key: diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index 5fb3b0a17f9..980ee35011b 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -271,30 +271,3 @@ stampState: "paper_stamp-detective" - type: Sprite state: stamp-detective - -- type: entity - name: greytide's rubber stamp - parent: RubberStampBase - id: RubberStampGreytide - description: A rubber stamp for stamping important documents. The tide washes over you, just looking at it... - components: - - type: Stamp - stampedName: stamp-component-stamped-name-greytide - stampedColor: "#323232" - stampState: "paper_stamp-greytide" - - type: Sprite - state: stamp-greytide - -- type: entity - name: psychologist's rubber stamp - parent: RubberStampBase - id: RubberStampPsychologist - suffix: DO NOT MAP - description: A rubber stamp for stamping important documents. Prescribe those treatments! - components: - - type: Stamp - stampedName: stamp-component-stamped-name-psychologist - stampedColor: "#5B97BC" - stampState: "paper_stamp-psychologist" - - type: Sprite - state: stamp-psychologist \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 1ad3dd5bdf2..6015a8bf013 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -725,13 +725,3 @@ seedId: cherry - type: Sprite sprite: Objects/Specific/Hydroponics/cherry.rsi - -- type: entity - parent: SeedBase - name: packet of anomaly berry seeds - id: AnomalyBerrySeeds - components: - - type: Seed - seedId: anomalyBerry - - type: Sprite - sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml index a97ca0f017b..c489dec1c56 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml @@ -39,7 +39,7 @@ - type: MechGrabber maxContents: 4 grabDelay: 3 - grabEnergyDelta: -20 + grabEnergyDelta: 20 - type: Tag tags: - SmallMech diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml index 69c106efab1..7b5ba23fe33 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml @@ -47,13 +47,13 @@ - type: GuideHelp guides: - Medical Doctor + - type: ToggleCellDraw - type: entity id: Defibrillator parent: [ BaseDefibrillator, PowerCellSlotMediumItem ] components: - type: MultiHandedItem - - type: ToggleCellDraw - type: PowerCellDraw useRate: 100 diff --git a/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml b/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml index 433a10210b6..1083269785d 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml @@ -38,3 +38,13 @@ - type: Blueprint providedRecipes: - SeismicCharge + +- type: entity + parent: BaseBlueprint + id: BlueprintFlare + name: flare blueprint + description: A blueprint with a schematic of a flare. It can be inserted into an autolathe. + components: + - type: Blueprint + providedRecipes: + - Flare diff --git a/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml b/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml index f0f37374175..042b3fe5173 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml @@ -6,7 +6,6 @@ components: - type: ThiefBeacon - type: StealArea - range: 2 # Slightly larger than fulton beacon's random offset - type: Item size: Normal - type: Physics diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml index f1172c5de08..6f925139fb1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml @@ -106,56 +106,3 @@ - type: Construction graph: ImprovisedArrow node: ImprovisedArrow - -- type: entity - parent: BaseArrow - id: ArrowImprovisedPlasma - name: plasma glass shard arrow - description: The greyshirt's preferred projectile. Now with extra lethality! - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi - layers: - - state: tail - color: white - - state: rod - color: darkgray - - state: tip - color: purple - - state: solution1 - map: ["enum.SolutionContainerLayers.Fill"] - visible: false - - type: Projectile - damage: - types: - Piercing: 30 - - type: Construction - graph: ImprovisedArrowPlasma - node: ImprovisedArrowPlasma - -- type: entity - parent: BaseArrow - id: ArrowImprovisedUranium - name: uranium glass shard arrow - description: The greyshirt's preferred projectile. Now with added radiation! - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi - layers: - - state: tail - color: white - - state: rod - color: darkgray - - state: tip - color: green - - state: solution1 - map: ["enum.SolutionContainerLayers.Fill"] - visible: false - - type: Projectile - damage: - types: - Piercing: 25 - Radiation: 5 - - type: Construction - graph: ImprovisedArrowUranium - node: ImprovisedArrowUranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml index 095acee4729..235010acc96 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml @@ -104,7 +104,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 300 + damage: 1250 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -144,7 +144,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 500 + damage: 1750 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -172,7 +172,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 1200 + damage: 2500 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -220,4 +220,4 @@ volume: 10 - !type:SpillBehavior solution: blood - - !type:ExplodeBehavior + - !type:ExplodeBehavior \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index 2a4b0fcf48a..d32cdc09393 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -245,6 +245,7 @@ containers: board: [ DoorElectronicsMorgue ] + - type: entity parent: AirlockScience id: AirlockScienceLocked @@ -603,15 +604,6 @@ containers: board: [ DoorElectronicsChemistry ] -- type: entity - parent: AirlockMedicalGlass - id: AirlockMedicalMorgueGlassLocked - suffix: Morgue, Locked - components: - - type: ContainerFill - containers: - board: [ DoorElectronicsMorgue ] - - type: entity parent: AirlockMedicalGlass id: AirlockMedicalGlassLocked diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 6162cd46f0d..2137fd35035 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -198,13 +198,11 @@ - ClothingHeadHatWelding - WetFloorSign - ClothingHeadHatCone - - Flare - # Begin Delta-V additions - - GoldRing - - SilverRing - - GoldRingDiamond - - SilverRingDiamond - # End Delta-V additions + - GoldRing # Delta-V + - SilverRing # Delta-V + - GoldRingDiamond # Delta-V + - SilverRingDiamond # Delta-V + - type: EmagLatheRecipes emagStaticRecipes: - BoxLethalshot @@ -1219,6 +1217,13 @@ - ClothingOuterWinterQM - ClothingOuterWinterRD - ClothingOuterChiefJustice # DeltaV - Chief Justice + - ClothingNeckMantleCap + - ClothingNeckMantleCE + - ClothingNeckMantleCMO + - ClothingNeckMantleHOP + - ClothingNeckMantleHOS + - ClothingNeckMantleRD + - ClothingNeckMantleQM - ClothingNeckCloakCJ # DeltaV - Chief Justice - ClothingOuterStasecSweater # DeltaV - added stasec sweater to uniform printer. - ClothingOuterWinterMusician diff --git a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml index f62923fe2af..8bbbad6c0d1 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml @@ -85,7 +85,6 @@ volume: -3 cutOffSound: false - type: MaterialStorage - insertOnInteract: false - type: Conveyor - type: Rotatable - type: Repairable diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 9e0d13745e9..b6504c81c48 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -199,41 +199,6 @@ - Bartender #- Drinks # DeltaV - doesn't exist -- type: entity - parent: VendingMachineBooze - id: VendingMachineBoozeSyndicate # syndie booze-o-mat for nukie outpost - name: Bruise-O-Mat - description: A refurbished Booze-O-Mat for boosting operative morale. An imprint of a blood-red hardsuit is visible on one side, and the paint seems ashed off on the other side. - components: - - type: VendingMachine - pack: BoozeOMatInventory - offState: off - brokenState: broken - normalState: normal-unshaded - denyState: deny-unshaded - loopDeny: false - - type: Advertise - pack: BruiseOMatAds - - type: SpeakOnUIClosed - pack: BruiseOMatGoodbyes - - type: Speech - - type: Sprite - sprite: Structures/Machines/VendingMachines/bruiseomat.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Base"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: AccessReader - access: [["SyndicateAgent"]] - - type: GuideHelp - guides: - - Bartender - - Drinks - - type: entity parent: VendingMachine id: VendingMachineCart diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml index ba86ca65a06..24a8cb58da0 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml @@ -24,18 +24,13 @@ pipeDirection: South - type: entity - parent: [BaseMachinePowered, GasBinaryBase] + parent: GasBinaryBase id: GasPressurePump name: gas pump description: A pump that moves gas by pressure. placement: mode: SnapgridCenter components: - - type: ApcPowerReceiver - powerLoad: 200 - - type: Rotatable - - type: Transform - noRot: false - type: Sprite sprite: Structures/Piping/Atmospherics/pump.rsi layers: @@ -69,18 +64,13 @@ path: /Audio/Ambience/Objects/gas_pump.ogg - type: entity - parent: [BaseMachinePowered, GasBinaryBase] + parent: GasBinaryBase id: GasVolumePump name: volumetric gas pump description: A pump that moves gas by volume. placement: mode: SnapgridCenter components: - - type: ApcPowerReceiver - powerLoad: 200 - - type: Rotatable - - type: Transform - noRot: false - type: Sprite sprite: Structures/Piping/Atmospherics/pump.rsi layers: diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml index b040f75ef90..b4a89fac55f 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml @@ -5,7 +5,6 @@ description: An impossible object. Should you be standing this close to it? components: - type: Anomaly - offset: 0, 0.15 pulseSound: collection: RadiationPulse params: @@ -938,4 +937,4 @@ lifetime: 2.3 - type: Tag tags: - - HideContextMenu + - HideContextMenu \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injections.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injections.yml deleted file mode 100644 index f1e535f15b4..00000000000 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injections.yml +++ /dev/null @@ -1,353 +0,0 @@ -- type: entity - id: AnomalyInjectionBase - abstract: true - components: - - type: PointLight - radius: 1.3 - energy: 2.5 - castShadows: false - - type: ActionGrant - actions: - - ActionAnomalyPulse - -- type: entity - parent: AnomalyInjectionBase - id: AnomalyInjectionPyroclastic - categories: [ HideSpawnMenu ] - components: - - type: PointLight - color: "#E25822" - - type: PyroclasticAnomaly - maximumIgnitionRadius: 3 - - type: TempAffectingAnomaly - tempChangePerSecond: 10 - hotspotExposeTemperature: 500 - - type: GasProducerAnomaly - releasedGas: 3 - releaseOnMaxSeverity: true - spawnRadius: 4 - tileCount: 5 - tempChange: 420 - - type: ProjectileAnomaly - projectilePrototype: ProjectileAnomalyFireball - projectileSpeed: 0.5 - minProjectiles: 1 - maxProjectiles: 3 - -- type: entity - parent: AnomalyInjectionBase - id: AnomalyInjectionElectric - categories: [ HideSpawnMenu ] - components: - - type: PointLight - color: "#ffffaa" - - type: ElectricityAnomaly - minBoltCount: 1 - maxBoltCount: 3 - maxElectrocuteRange: 4 - maxElectrocuteDamage: 10 - maxElectrocuteDuration: 4 - -- type: entity - parent: AnomalyInjectionBase - id: AnomalyInjectionShadow - categories: [ HideSpawnMenu ] - components: - - type: PointLight - color: "#793a80" - - type: EntitySpawnAnomaly - entries: - - settings: - spawnOnPulse: true - spawnOnSuperCritical: true - minAmount: 5 - maxAmount: 10 - maxRange: 2 - spawns: - - ShadowKudzuWeak - - settings: - spawnOnSuperCritical: true - minAmount: 15 - maxAmount: 20 - maxRange: 25 - spawns: - - ShadowKudzu - -- type: entity - parent: AnomalyInjectionBase - id: AnomalyInjectionIce - categories: [ HideSpawnMenu ] - components: - - type: PointLight - color: "#befaff" - - type: ExplosionAnomaly - supercriticalExplosion: Cryo - explosionTotalIntensity: 150 - explosionDropoff: 2 - explosionMaxTileIntensity: 20 - - type: ProjectileAnomaly - projectilePrototype: ProjectileIcicle - minProjectiles: 1 - maxProjectiles: 4 - - type: EntitySpawnAnomaly - entries: - - settings: - spawnOnStabilityChanged: true - minAmount: 3 - maxAmount: 8 - maxRange: 2 - spawns: - - IceCrust - - type: TempAffectingAnomaly - tempChangePerSecond: -10 - hotspotExposeTemperature: -500 - - type: GasProducerAnomaly - releasedGas: 8 # Frezon. Please replace if there is a better way to specify this - releaseOnMaxSeverity: true - spawnRadius: 0 - -- type: entity - parent: AnomalyInjectionBase - id: AnomalyInjectionFlora - categories: [ HideSpawnMenu ] - components: - - type: PointLight - color: "#6270bb" - - type: TileSpawnAnomaly - entries: - - settings: - spawnOnPulse: true - minAmount: 2 - maxAmount: 5 - maxRange: 2 - floor: FloorAstroGrass - - settings: - spawnOnSuperCritical: true - minAmount: 5 - maxAmount: 15 - maxRange: 7 - floor: FloorAstroGrass - - type: EntitySpawnAnomaly - entries: - - settings: - spawnOnPulse: true - minAmount: 1 - maxAmount: 3 - maxRange: 1 - spawns: - - KudzuFlowerFriendly - - settings: - spawnOnSuperCritical: true - minAmount: 2 - maxAmount: 6 - maxRange: 3 - spawns: - - KudzuFlowerAngry - -- type: entity - parent: AnomalyInjectionBase - id: AnomalyInjectionBluespace - categories: [ HideSpawnMenu ] - components: - - type: PointLight - color: "#00ccff" - - type: BluespaceAnomaly - -- type: entity - parent: AnomalyInjectionBase - id: AnomalyInjectionFlesh - categories: [ HideSpawnMenu ] - components: - - type: PointLight - color: "#cb5b7e" - - type: TileSpawnAnomaly - entries: - - settings: - spawnOnPulse: true - spawnOnStabilityChanged: true - minAmount: 1 - maxAmount: 3 - maxRange: 2 - floor: FloorFlesh - - settings: - spawnOnSuperCritical: true - minAmount: 5 - maxAmount: 15 - maxRange: 5 - floor: FloorFlesh - - type: EntitySpawnAnomaly - entries: - - settings: - spawnOnPulse: true - minAmount: 1 - maxAmount: 2 - minRange: 1.5 - maxRange: 2.5 - spawns: - - FleshBlocker - - settings: - spawnOnPulse: true - maxAmount: 1 - minRange: 2.5 - maxRange: 4.5 - spawns: - - MobFleshJared - - MobFleshGolem - - MobFleshClamp - - MobFleshLover - - settings: - spawnOnSuperCritical: true - minAmount: 5 - maxAmount: 8 - minRange: 5 - maxRange: 15 - spawns: - - FleshBlocker - - settings: - spawnOnSuperCritical: true - minAmount: 2 - maxAmount: 5 - maxRange: 8 - spawns: - - MobFleshJared - - MobFleshGolem - - MobFleshClamp - - MobFleshLover - - settings: - spawnOnSuperCritical: true - minAmount: 2 - maxAmount: 4 - maxRange: 10 - spawns: - - FleshKudzu - - settings: - spawnOnShutdown: true - maxAmount: 2 - maxRange: 1 - spawns: - - MobFleshJared - - MobFleshGolem - - MobFleshClamp - - MobFleshLover - - FleshKudzu - -- type: entity - parent: AnomalyInjectionBase - id: AnomalyInjectionGravity - categories: [ HideSpawnMenu ] - components: - - type: PointLight - color: "#1e070e" - - type: GravityAnomaly - maxGravityWellRange: 4 - maxThrowRange: 3 - maxThrowStrength: 5 - spaceRange: 1 - - type: GravityWell - maxRange: 0.7 - - type: SingularityDistortion - intensity: 100 - falloffPower: 2.7 - -- type: entity - parent: AnomalyInjectionBase - id: AnomalyInjectionTech - categories: [ HideSpawnMenu ] - components: - - type: PointLight - color: "#56c1e8" - - type: TechAnomaly - linkRadius: - min: 2 - max: 5 - linkCountPerPulse: - min: 1 - max: 4 - linkCountSupercritical: 15 - - type: DeviceLinkSource - ports: - - Pulse - - Timer - - type: WirelessNetworkConnection - range: 10 - - type: DeviceNetwork - deviceNetId: Wireless - receiveFrequencyId: BasicDevice - -- type: entity - parent: AnomalyInjectionBase - id: AnomalyInjectionRock - categories: [ HideSpawnMenu ] - components: - - type: PointLight - color: "#5ca8cb" - - type: TileSpawnAnomaly - entries: - - settings: - spawnOnPulse: true - minAmount: 7 - maxAmount: 10 - maxRange: 4 - floor: FloorAsteroidTile - - settings: - spawnOnSuperCritical: true - minAmount: 15 - maxAmount: 25 - maxRange: 6 - floor: FloorAsteroidTile - - type: EntitySpawnAnomaly - entries: - - settings: - spawnOnPulse: true - minAmount: 4 - maxAmount: 8 - minRange: 1 - maxRange: 3 - spawns: - - WallSpawnAsteroid - - WallSpawnAsteroid - - WallSpawnAsteroid - - WallSpawnAsteroid - - WallSpawnAsteroid - - WallSpawnAsteroidSilver - - WallSpawnAsteroidSilverCrab - - WallSpawnAsteroidIron - - WallSpawnAsteroidIronCrab - - WallSpawnAsteroidQuartz - - WallSpawnAsteroidQuartzCrab - - settings: - spawnOnPulse: true - maxAmount: 3 - minRange: 2.5 - maxRange: 4.5 - spawns: - - CrystalPink - - CrystalCyan - - settings: - spawnOnSuperCritical: true - minAmount: 15 - maxAmount: 20 - minRange: 2 - maxRange: 7 - spawns: - - CrystalPink - - CrystalCyan - - WallSpawnAsteroid - - WallSpawnAsteroid - - WallSpawnAsteroid - - WallSpawnAsteroid - - WallSpawnAsteroidSilver - - WallSpawnAsteroidSilverCrab - - WallSpawnAsteroidIron - - WallSpawnAsteroidIronCrab - - WallSpawnAsteroidQuartz - - WallSpawnAsteroidQuartzCrab - - settings: - spawnOnSuperCritical: true - minAmount: 3 - maxAmount: 5 - maxRange: 3 - spawns: - - MobSpawnCrabSilver - - MobSpawnCrabIron - - MobSpawnCrabQuartz \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml deleted file mode 100644 index 24a76dfb62e..00000000000 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml +++ /dev/null @@ -1,320 +0,0 @@ -- type: entity - name: anomaly injector - parent: MarkerBase - id: BaseAnomalyInjector - abstract: true - components: - - type: Physics - bodyType: Static - fixedRotation: true - - type: AmbientSound - range: 5 - volume: -5 - sound: - path: /Audio/Ambience/anomaly_drone.ogg - - type: Fixtures - fixtures: - anom: - shape: - !type:PhysShapeCircle - radius: 2.27 # i love 27 - hard: false - mask: - - MobMask - layer: - - MobLayer - - type: InnerBodyAnomalyInjector - whitelist: - tags: - - AnomalyHost - -- type: entity - parent: BaseAnomalyInjector - id: AnomalyTrapPyroclastic - suffix: Pyroclastic - components: - - type: Sprite - layers: - - state: pink - - sprite: Structures/Specific/Anomalies/pyro_anom.rsi - state: pulse - - sprite: Mobs/Species/Human/parts.rsi - state: full - - type: InnerBodyAnomalyInjector - injectionComponents: - - type: Anomaly - deleteEntity: false - maxPointsPerSecond: 100 - corePrototype: AnomalyCorePyroclastic - - type: InnerBodyAnomaly - injectionProto: AnomalyInjectionPyroclastic - startMessage: inner-anomaly-start-message-pyro - fallbackSprite: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: fire - speciesSprites: - Vox: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: fire_VOX - -- type: entity - parent: BaseAnomalyInjector - id: AnomalyTrapElectricity - suffix: Electricity - components: - - type: Sprite - layers: - - state: pink - - sprite: Structures/Specific/anomaly.rsi - state: anom3-pulse - - sprite: Mobs/Species/Human/parts.rsi - state: full - - type: InnerBodyAnomalyInjector - injectionComponents: - - type: Anomaly - deleteEntity: false - maxPointsPerSecond: 100 - corePrototype: AnomalyCoreElectricity - - type: InnerBodyAnomaly - injectionProto: AnomalyInjectionElectric - startMessage: inner-anomaly-start-message-shock - fallbackSprite: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: shock - speciesSprites: - Vox: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: shock_VOX - -- type: entity - parent: BaseAnomalyInjector - id: AnomalyTrapShadow - suffix: Shadow - components: - - type: Sprite - layers: - - state: pink - - sprite: Structures/Specific/Anomalies/shadow_anom.rsi - state: pulse - - sprite: Mobs/Species/Human/parts.rsi - state: full - - type: InnerBodyAnomalyInjector - injectionComponents: - - type: Anomaly - deleteEntity: false - maxPointsPerSecond: 100 - corePrototype: AnomalyCoreShadow - - type: InnerBodyAnomaly - injectionProto: AnomalyInjectionShadow - startMessage: inner-anomaly-start-message-shadow - fallbackSprite: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: shadow - speciesSprites: - Vox: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: shadow_VOX - -- type: entity - parent: BaseAnomalyInjector - id: AnomalyTrapIce - suffix: Ice - components: - - type: Sprite - layers: - - state: pink - - sprite: Structures/Specific/Anomalies/ice_anom.rsi - state: pulse - - sprite: Mobs/Species/Human/parts.rsi - state: full - - type: InnerBodyAnomalyInjector - injectionComponents: - - type: Anomaly - deleteEntity: false - maxPointsPerSecond: 100 - corePrototype: AnomalyCoreIce - - type: InnerBodyAnomaly - injectionProto: AnomalyInjectionIce - startMessage: inner-anomaly-start-message-frost - fallbackSprite: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: frost - speciesSprites: - Vox: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: frost_VOX - -- type: entity - parent: BaseAnomalyInjector - id: AnomalyTrapFlora - suffix: Flora - components: - - type: Sprite - layers: - - state: pink - - sprite: Structures/Specific/Anomalies/flora_anom.rsi - state: pulse - - sprite: Mobs/Species/Human/parts.rsi - state: full - - type: InnerBodyAnomalyInjector - injectionComponents: - - type: Anomaly - deleteEntity: false - maxPointsPerSecond: 100 - corePrototype: AnomalyCoreFlora - - type: InnerBodyAnomaly - injectionProto: AnomalyInjectionFlora - startMessage: inner-anomaly-start-message-flora - fallbackSprite: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: flora - speciesSprites: - Vox: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: flora_VOX - -- type: entity - parent: BaseAnomalyInjector - id: AnomalyTrapBluespace - suffix: Bluespace - components: - - type: Sprite - layers: - - state: pink - - sprite: Structures/Specific/anomaly.rsi - state: anom4-pulse - - sprite: Mobs/Species/Human/parts.rsi - state: full - - type: InnerBodyAnomalyInjector - injectionComponents: - - type: Anomaly - deleteEntity: false - maxPointsPerSecond: 100 - corePrototype: AnomalyCoreBluespace - - type: InnerBodyAnomaly - injectionProto: AnomalyInjectionBluespace - startMessage: inner-anomaly-start-message-bluespace - fallbackSprite: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: bluespace - speciesSprites: - Vox: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: bluespace_VOX - -- type: entity - parent: BaseAnomalyInjector - id: AnomalyTrapFlesh - suffix: Flesh - components: - - type: Sprite - layers: - - state: pink - - sprite: Structures/Specific/anomaly.rsi - state: anom5-pulse - - sprite: Mobs/Species/Human/parts.rsi - state: full - - type: InnerBodyAnomalyInjector - injectionComponents: - - type: Anomaly - deleteEntity: false - maxPointsPerSecond: 100 - corePrototype: AnomalyCoreFlesh - - type: InnerBodyAnomaly - injectionProto: AnomalyInjectionFlesh - startMessage: inner-anomaly-start-message-flesh - fallbackSprite: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: flesh - speciesSprites: - Vox: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: flesh_VOX - -- type: entity - parent: BaseAnomalyInjector - id: AnomalyTrapGravity - suffix: Gravity - components: - - type: Sprite - layers: - - state: pink - - sprite: Structures/Specific/anomaly.rsi - state: anom2-pulse - - sprite: Mobs/Species/Human/parts.rsi - state: full - - type: InnerBodyAnomalyInjector - injectionComponents: - - type: Anomaly - deleteEntity: false - maxPointsPerSecond: 100 - corePrototype: AnomalyCoreGravity - - type: InnerBodyAnomaly - injectionProto: AnomalyInjectionGravity - startMessage: inner-anomaly-start-message-grav - fallbackSprite: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: grav - speciesSprites: - Vox: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: grav_VOX - -- type: entity - parent: BaseAnomalyInjector - id: AnomalyTrapTech - suffix: Tech - components: - - type: Sprite - layers: - - state: pink - - sprite: Structures/Specific/Anomalies/tech_anom.rsi - state: pulse - - sprite: Mobs/Species/Human/parts.rsi - state: full - - type: InnerBodyAnomalyInjector - injectionComponents: - - type: Anomaly - deleteEntity: false - maxPointsPerSecond: 100 - corePrototype: AnomalyCoreTech - - type: InnerBodyAnomaly - injectionProto: AnomalyInjectionTech - startMessage: inner-anomaly-start-message-tech - fallbackSprite: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: tech - speciesSprites: - Vox: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: tech_VOX - -- type: entity - parent: BaseAnomalyInjector - id: AnomalyTrapRock - suffix: Rock - components: - - type: Sprite - layers: - - state: pink - - sprite: Structures/Specific/anomaly.rsi - state: anom6-pulse - color: "#5ca8cb" - - sprite: Mobs/Species/Human/parts.rsi - state: full - - type: InnerBodyAnomalyInjector - injectionComponents: - - type: Anomaly - deleteEntity: false - maxPointsPerSecond: 100 - corePrototype: AnomalyCoreRock - - type: InnerBodyAnomaly - injectionProto: AnomalyInjectionRock - startMessage: inner-anomaly-start-message-rock - fallbackSprite: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: rock - speciesSprites: - Vox: - sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi - state: rock_VOX \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml index 315505b81e9..71065a8e3d5 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml @@ -147,8 +147,6 @@ id: AnomalyCoreFlora suffix: Flora components: - - type: Seed - seedId: anomalyBerry - type: Sprite sprite: Structures/Specific/Anomalies/Cores/flora_core.rsi - type: PointLight @@ -309,8 +307,6 @@ id: AnomalyCoreFloraInert suffix: Flora, Inert components: - - type: Seed - seedId: anomalyBerry - type: Sprite sprite: Structures/Specific/Anomalies/Cores/flora_core.rsi - type: PointLight diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index ae510a55750..cefe0bdfba6 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml @@ -205,19 +205,6 @@ - type: WiresPanel open: false -- type: entity - id: BaseIntercomSecure - parent: Intercom - abstract: true - components: - - type: WiresPanel - openDelay: 5 - - type: WiresPanelSecurity - examine: wires-panel-component-on-examine-security-level2 - wiresAccessible: false - - type: Construction - node: intercomReinforced - - type: entity id: IntercomCommon parent: Intercom @@ -232,9 +219,8 @@ - type: entity id: IntercomCommand - parent: BaseIntercomSecure + parent: Intercom suffix: Command - description: An intercom. It's been reinforced with metal. components: - type: ContainerFill containers: @@ -285,10 +271,17 @@ - type: entity id: IntercomSecurity - parent: BaseIntercomSecure + parent: Intercom suffix: Security description: An intercom. It's been reinforced with metal from security helmets, making it a bitch-and-a-half to open. components: + - type: WiresPanel + openDelay: 5 + - type: WiresPanelSecurity + examine: wires-panel-component-on-examine-security-level2 + wiresAccessible: false + - type: Construction + node: intercomReinforced - type: ContainerFill containers: board: diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index f27d110552b..bc0515cacab 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -59,11 +59,6 @@ flavorType: Base description: flavor-base-funny -- type: flavor - id: strange - flavorType: Base - description: flavor-base-strange - - type: flavor id: tingly flavorType: Base diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 7b4094cd91a..497b9a1add4 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -21,7 +21,6 @@ #- id: RandomSentience # DeltaV - replaced with RandomSentienceGlimmer - id: SlimesSpawn - id: SolarFlare - - id: SnakeSpawn - id: SpiderClownSpawn - id: SpiderSpawn - id: VentClog @@ -40,35 +39,36 @@ - id: SleeperAgents - id: ZombieOutbreak + - type: entity id: BaseStationEvent parent: BaseGameRule abstract: true components: - - type: GameRule - delay: - min: 10 - max: 20 + - type: GameRule + delay: + min: 10 + max: 20 - type: entity id: BaseStationEventShortDelay parent: BaseGameRule abstract: true components: - - type: GameRule - delay: - min: 10 - max: 20 + - type: GameRule + delay: + min: 10 + max: 20 - type: entity id: BaseStationEventLongDelay parent: BaseGameRule abstract: true components: - - type: GameRule - delay: - min: 40 - max: 60 + - type: GameRule + delay: + min: 40 + max: 60 - type: entity id: AnomalySpawn @@ -291,7 +291,7 @@ startAudio: path: /Audio/Announcements/power_off.ogg params: - volume: -4 + volume: -4 duration: 60 maxDuration: 120 - type: PowerGridCheckRule @@ -359,27 +359,6 @@ - id: MobAdultSlimesYellowAngry prob: 0.02 -- type: entity - id: SnakeSpawn - parent: BaseStationEventShortDelay - components: - - type: StationEvent - startAnnouncement: station-event-vent-creatures-start-announcement - startAudio: - path: /Audio/Announcements/attention.ogg - earliestStart: 20 - minimumPlayers: 15 - weight: 5 - duration: 60 - - type: VentCrittersRule - entries: - - id: MobPurpleSnake - prob: 0.02 - - id: MobSmallPurpleSnake - prob: 0.02 - - id: MobCobraSpace - prob: 0.02 - - type: entity id: SpiderSpawn parent: BaseStationEventShortDelay @@ -470,9 +449,6 @@ max: 1 pickPlayer: false startingGear: SyndicateLoneOperativeGearFull - roleLoadout: - - RoleSurvivalNukie - components: - type: NukeOperative - type: RandomMetadata diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml index 935843257ff..e2c8ea41fd1 100644 --- a/Resources/Prototypes/GameRules/meteorswarms.yml +++ b/Resources/Prototypes/GameRules/meteorswarms.yml @@ -212,29 +212,26 @@ - type: ImmovableRodRule rodPrototypes: - id: ImmovableRodKeepTilesStill - prob: 0.94 + prob: 0.95 orGroup: rodProto - id: ImmovableRodMop - prob: 0.0075 + prob: 0.0072 orGroup: rodProto - id: ImmovableRodShark - prob: 0.0075 + prob: 0.0072 orGroup: rodProto - id: ImmovableRodClown - prob: 0.0075 + prob: 0.0072 orGroup: rodProto - id: ImmovableRodBanana - prob: 0.0075 + prob: 0.0072 orGroup: rodProto - id: ImmovableRodHammer - prob: 0.0075 + prob: 0.0072 orGroup: rodProto - id: ImmovableRodThrongler - prob: 0.0075 + prob: 0.0072 orGroup: rodProto - id: ImmovableRodGibstick - prob: 0.0075 - orGroup: rodProto - - id: ImmovableRodWeh - prob: 0.0075 + prob: 0.0072 orGroup: rodProto diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index aa484de19f1..3aa1ac09a0e 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -73,7 +73,7 @@ parent: BaseGameRule id: BaseNukeopsRule components: - - type: RandomMetadata #this generates the random operation name cuz it's cool. + - type: RandomMetadata #this generates the random operation name cuz it's cool. nameSegments: - operationPrefix - operationSuffix @@ -104,7 +104,7 @@ spawnerPrototype: SpawnPointNukeopsCommander startingGear: SyndicateCommanderGearFull roleLoadout: - - RoleSurvivalNukie + - RoleSurvivalSyndicate components: - type: NukeOperative - type: RandomMetadata @@ -122,7 +122,7 @@ spawnerPrototype: SpawnPointNukeopsMedic startingGear: SyndicateOperativeMedicFull roleLoadout: - - RoleSurvivalNukie + - RoleSurvivalSyndicate components: - type: NukeOperative - type: RandomMetadata @@ -142,7 +142,7 @@ playerRatio: 10 startingGear: SyndicateOperativeGearFull roleLoadout: - - RoleSurvivalNukie + - RoleSurvivalSyndicate components: - type: NukeOperative - type: RandomMetadata @@ -324,8 +324,8 @@ tableId: SpaceTrafficControlTable - type: entity - id: SpaceTrafficControlFriendlyEventScheduler - parent: BaseGameRule + id: SpaceTrafficControlFriendlyEventScheduler + parent: BaseGameRule components: - type: BasicStationEventScheduler minimumTimeUntilFirstEvent: 1200 # 20 mins diff --git a/Resources/Prototypes/Hydroponics/randomChemicals.yml b/Resources/Prototypes/Hydroponics/mutations.yml similarity index 100% rename from Resources/Prototypes/Hydroponics/randomChemicals.yml rename to Resources/Prototypes/Hydroponics/mutations.yml diff --git a/Resources/Prototypes/Hydroponics/randomMutations.yml b/Resources/Prototypes/Hydroponics/randomMutations.yml deleted file mode 100644 index 8f409a5eaf9..00000000000 --- a/Resources/Prototypes/Hydroponics/randomMutations.yml +++ /dev/null @@ -1,179 +0,0 @@ -- type: RandomPlantMutationList - id: RandomPlantMutations - mutations: - - name: Bioluminescent - baseOdds: 0.036 - effect: !type:Glow - - name: Sentient - baseOdds: 0.0072 - appliesToProduce: false - persists: false - effect: !type:MakeSentient # existing effect. - - name: Slippery - baseOdds: 0.036 - effect: !type:Slipify - - name: ChangeSpecies - baseOdds: 0.036 - appliesToProduce: false - effect: !type:PlantSpeciesChange - - name: Unviable - baseOdds: 0.109 - persists: false - effect: !type:PlantChangeStat - targetValue: Viable - - name: ChangeWaterConsumption - baseOdds: 0.018 - persists: false - effect: !type:PlantChangeStat - targetValue: WaterConsumption - minValue: 0.3 - maxValue: 0.9 - steps: 5 - - name: ChangeNutrientConsumption - baseOdds: 0.018 - persists: false - effect: !type:PlantChangeStat - targetValue: NutrientConsumption - minValue: 0.05 - maxValue: 1.2 - steps: 5 - - name: ChangeIdealHeat - baseOdds: 0.018 - persists: false - effect: !type:PlantChangeStat - targetValue: IdealHeat - minValue: 263 - maxValue: 323 - steps: 5 - - name: ChangeHeatTolerance - baseOdds: 0.018 - persists: false - effect: !type:PlantChangeStat - targetValue: HeatTolerance - minValue: 2 - maxValue: 25 - steps: 5 - - name: ChangeToxinsTolerance - baseOdds: 0.018 - persists: false - effect: !type:PlantChangeStat - targetValue: ToxinsTolerance - minValue: 1 - maxValue: 10 - steps: 5 - - name: ChangeLowPressureTolerance - baseOdds: 0.018 - persists: false - effect: !type:PlantChangeStat - targetValue: LowPressureTolerance - minValue: 60 - maxValue: 100 - steps: 5 - - name: ChangeHighPressureTolerance - baseOdds: 0.018 - persists: false - effect: !type:PlantChangeStat - targetValue: HighPressureTolerance - minValue: 100 - maxValue: 140 - steps: 5 - - name: ChangePestTolerance - baseOdds: 0.018 - persists: false - effect: !type:PlantChangeStat - targetValue: PestTolerance - minValue: 0 - maxValue: 15 - steps: 5 - - name: ChangeWeedTolerance - baseOdds: 0.018 - persists: false - effect: !type:PlantChangeStat - targetValue: WeedTolerance - minValue: 0 - maxValue: 15 - steps: 5 - - name: ChangeEndurance - baseOdds: 0.036 - persists: false - effect: !type:PlantChangeStat - targetValue: Endurance - minValue: 50 - maxValue: 150 - steps: 5 - - name: ChangeYield - baseOdds: 0.036 - persists: false - effect: !type:PlantChangeStat - targetValue: Yield - minValue: 3 - maxValue: 10 - steps: 5 - - name: ChangeLifespan - baseOdds: 0.036 - persists: false - effect: !type:PlantChangeStat - targetValue: Lifespan - minValue: 10 - maxValue: 80 - steps: 5 - - name: ChangeMaturation - baseOdds: 0.036 - persists: false - effect: !type:PlantChangeStat - targetValue: Maturation - minValue: 3 - maxValue: 8 - steps: 5 - - name: ChangeProduction - baseOdds: 0.036 - persists: false - effect: !type:PlantChangeStat - targetValue: Production - minValue: 1 - maxValue: 10 - steps: 5 - - name: ChangePotency - baseOdds: 0.036 - persists: false - effect: !type:PlantChangeStat - targetValue: Potency - minValue: 30 - maxValue: 100 - steps: 5 - - name: ChangeSeedless - baseOdds: 0.036 - persists: false - effect: !type:PlantChangeStat - targetValue: Seedless - - name: ChangeLigneous - baseOdds: 0.036 - persists: false - effect: !type:PlantChangeStat - targetValue: Ligneous - - name: ChangeTurnIntoKudzu - baseOdds: 0.036 - persists: false - effect: !type:PlantChangeStat - targetValue: TurnIntoKudzu - - name: ChangeScreaming - baseOdds: 0.036 - persists: false - effect: !type:PlantChangeStat - targetValue: CanScream - - name: ChangeChemicals - baseOdds: 0.072 - persists: false - effect: !type:PlantMutateChemicals - - name: ChangeExudeGasses - baseOdds: 0.0145 - persists: false - effect: !type:PlantMutateExudeGasses - - name: ChangeConsumeGasses - baseOdds: 0.0036 - persists: false - effect: !type:PlantMutateConsumeGasses - - name: ChangeHarvest - baseOdds: 0.036 - persists: false - effect: !type:PlantMutateHarvest \ No newline at end of file diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 67cf804f2c2..e126342df84 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1952,34 +1952,3 @@ Min: 1 Max: 3 PotencyDivisor: 40 - -- type: seed - id: anomalyBerry - name: seeds-anomaly-berry-name - noun: seeds-noun-seeds - displayName: seeds-anomaly-berry-display-name - plantRsi: Objects/Specific/Hydroponics/anomaly_berry.rsi - packetPrototype: AnomalyBerrySeeds - productPrototypes: - - FoodAnomalyBerry - lifespan: 25 - maturation: 12 - production: 3 - yield: 3 - potency: 10 - growthStages: 2 - waterConsumption: 0.60 - nutrientConsumption: 0.50 - chemicals: - Artifexium: - Min: 1 - Max: 1 - PotencyDivisor: 4 - Nutriment: - Min: 1 - Max: 2 - PotencyDivisor: 30 - Vitamin: - Min: 1 - Max: 2 - PotencyDivisor: 40 diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml index 41996dce543..fdaaa18b4bc 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml @@ -195,23 +195,6 @@ equipment: suitstorage: OxygenTankFilled -# Species-appropriate Double Emergency Tank in Pocket 1 -- type: loadout - id: LoadoutSpeciesPocketDoubleNitrogen - effects: - - !type:GroupLoadoutEffect - proto: NitrogenBreather - equipment: - pocket1: DoubleEmergencyNitrogenTankFilled - -- type: loadout - id: LoadoutSpeciesPocketDoubleOxygen - effects: - - !type:GroupLoadoutEffect - proto: OxygenBreather - equipment: - pocket1: DoubleEmergencyOxygenTankFilled - # Tank Harness - type: loadout id: LoadoutTankHarness diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index c0d2d2153cd..26da0d16627 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -65,14 +65,6 @@ - LoadoutSpeciesEVANitrogen - LoadoutSpeciesEVAOxygen -- type: loadoutGroup - id: GroupPocketTankDouble - name: loadout-group-pocket-tank-double - hidden: true - loadouts: - - LoadoutSpeciesPocketDoubleNitrogen - - LoadoutSpeciesPocketDoubleOxygen - # Command - type: loadoutGroup id: CaptainHead @@ -611,7 +603,7 @@ loadouts: - MimeSuspendersRed - MimeSuspendersBlack - + - type: loadoutGroup id: SurvivalMime name: loadout-group-survival-mime diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 8181b634335..056ac9520c6 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -603,13 +603,6 @@ - GroupSpeciesBreathTool - GroupTankHarness -- type: roleLoadout - id: RoleSurvivalNukie - groups: - - SurvivalSyndicate - - GroupSpeciesBreathTool - - GroupPocketTankDouble - - type: roleLoadout id: RoleSurvivalEVA groups: diff --git a/Resources/Prototypes/NPCs/mob.yml b/Resources/Prototypes/NPCs/mob.yml index dd3378618a6..b0e1c8ae9b9 100644 --- a/Resources/Prototypes/NPCs/mob.yml +++ b/Resources/Prototypes/NPCs/mob.yml @@ -15,9 +15,6 @@ - tasks: - !type:HTNCompoundTask task: RatServantCombatCompound - - tasks: - - !type:HTNCompoundTask - task: FollowCompound - tasks: - !type:HTNCompoundTask task: IdleCompound diff --git a/Resources/Prototypes/Nyanotrasen/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Nyanotrasen/Objectives/stealTargetGroups.yml index 58e6a1cb6a3..4f0e78b354d 100644 --- a/Resources/Prototypes/Nyanotrasen/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Nyanotrasen/Objectives/stealTargetGroups.yml @@ -1,6 +1,6 @@ -- type: stealTargetGroup +- type: stealTargetGroup id: AntiPsychicKnife - name: steal-target-groups-anti-psychic-knife + name: anti-psychic knife sprite: sprite: Nyanotrasen/Objects/Weapons/Melee/anti_psychic_knife.rsi state: icon diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index a3f990dcc2d..3c635d4c628 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -2,91 +2,91 @@ - type: stealTargetGroup id: Hypospray - name: steal-target-groups-hypospray + name: hypospray sprite: sprite: Objects/Specific/Medical/hypospray.rsi state: hypo - type: stealTargetGroup id: HandheldCrewMonitor - name: steal-target-groups-handheld-crew-monitor + name: handheld crew monitor sprite: sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi state: scanner - type: stealTargetGroup id: ClothingOuterHardsuitRd - name: steal-target-groups-clothing-outer-hardsuit-rd + name: experimental research hardsuit sprite: sprite: Clothing/OuterClothing/Hardsuits/rd.rsi state: icon - type: stealTargetGroup id: HandTeleporter - name: steal-target-groups-hand-teleporter + name: hand teleporter sprite: sprite: Objects/Devices/hand_teleporter.rsi state: icon - type: stealTargetGroup id: ClothingShoesBootsMagAdv - name: steal-target-groups-clothing-shoes-boots-mag-adv + name: advanced magboots sprite: sprite: Clothing/Shoes/Boots/magboots-advanced.rsi state: icon - type: stealTargetGroup id: BoxFolderQmClipboard - name: steal-target-groups-box-folder-qm-clipboard + name: requisition digi-board sprite: sprite: Objects/Misc/qm_clipboard.rsi state: qm_clipboard - type: stealTargetGroup id: FoodMeatCorgi - name: steal-target-groups-food-meat-corgi + name: prime-cut corgi meat sprite: sprite: Objects/Consumable/Food/meat.rsi state: corgi # - type: stealTargetGroup id: CaptainIDCard - name: steal-target-groups-captain-id-card + name: captain ID card sprite: sprite: Objects/Misc/id_cards.rsi state: ert_commander #no one will know the difference. - type: stealTargetGroup id: JetpackCaptainFilled - name: steal-target-groups-jetpack-captain-filled + name: captain's jetpack sprite: sprite: Objects/Tanks/Jetpacks/captain.rsi state: icon - type: stealTargetGroup id: WeaponAntiqueLaser - name: steal-target-groups-weapon-antique-laser + name: antique laser pistol sprite: sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi state: base - type: stealTargetGroup id: NukeDisk - name: steal-target-groups-nuke-disk + name: nuclear authentication disk sprite: sprite: Objects/Misc/nukedisk.rsi state: icon - type: stealTargetGroup # DeltaV, upstream reverted id: PlutoniumCore - name: steal-target-groups-plutonium-core + name: plutonium core sprite: sprite: Objects/Misc/plutonium_core.rsi state: icon - type: stealTargetGroup id: WeaponEnergyShotgun - name: steal-target-groups-weapon-energy-shot-gun + name: energy shotgun sprite: sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi state: base @@ -95,63 +95,63 @@ - type: stealTargetGroup id: Figurines - name: steal-target-groups-figurines + name: figurines (any) sprite: sprite: Objects/Fun/figurines.rsi state: figurine_spawner - type: stealTargetGroup id: HeadCloak - name: steal-target-groups-heads-cloaks + name: head's cloaks (any) sprite: sprite: Clothing/Neck/Cloaks/cap.rsi state: icon - type: stealTargetGroup id: HeadBedsheet - name: steal-target-groups-heads-bedsheets + name: head's bedsheets (any) sprite: sprite: Objects/Misc/bedsheets.rsi state: sheetNT - type: stealTargetGroup id: Stamp - name: steal-target-groups-stamps + name: stamps (any) sprite: sprite: Objects/Misc/stamps.rsi state: stamp-cap - type: stealTargetGroup id: DoorRemote - name: steal-target-groups-door-remotes + name: door remotes (any) sprite: sprite: Objects/Devices/door_remote.rsi state: door_remotebase - type: stealTargetGroup id: EncryptionKey - name: steal-target-groups-encryption-keys + name: encryption keys (any) sprite: sprite: Objects/Devices/encryption_keys.rsi state: crypt_gray - type: stealTargetGroup id: TechnologyDisk - name: steal-target-groups-technology-disks + name: technology disks sprite: sprite: Objects/Misc/module.rsi state: datadisk_base - type: stealTargetGroup id: IDCard - name: steal-target-groups-id-cards + name: ID Cards (any) sprite: sprite: Objects/Misc/id_cards.rsi state: default - type: stealTargetGroup id: LAMP - name: steal-target-groups-lamps + name: LAMPS sprite: sprite: Objects/Tools/lantern.rsi state: lantern @@ -160,184 +160,191 @@ - type: stealTargetGroup id: ForensicScanner - name: steal-target-groups-forensic-scanner + name: forensic scanner sprite: sprite: Objects/Devices/forensic_scanner.rsi state: forensicnew - type: stealTargetGroup id: FlippoEngravedLighter - name: steal-target-groups-flippo-engraved-lighter + name: detective's Flippo engraved lighter sprite: sprite: Objects/Tools/lighters.rsi state: zippo_engraved_icon_base - type: stealTargetGroup id: AmmoTechFabCircuitboard - name: steal-target-groups-ammo-tech-fab-circuitboard + name: ammo techfab circuit board sprite: sprite: Objects/Misc/module.rsi state: security - type: stealTargetGroup id: ClothingHeadHatWarden - name: steal-target-groups-clothing-head-hat-warden + name: warden's cap sprite: sprite: Clothing/Head/Hats/warden.rsi state: icon - type: stealTargetGroup id: ClothingOuterHardsuitVoidParamed - name: steal-target-groups-clothing-outer-hardsuit-void-paramed + name: paramedic void suit sprite: sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi state: icon - type: stealTargetGroup id: MedicalTechFabCircuitboard - name: steal-target-groups-medical-tech-fab-circuitboard + name: medical techfab machine board sprite: sprite: Objects/Misc/module.rsi state: medical - type: stealTargetGroup id: ClothingHeadsetAltMedical - name: steal-target-groups-clothing-headset-alt-medical + name: chief medical officer's over-ear headset sprite: sprite: Clothing/Ears/Headsets/medical.rsi state: icon_alt - type: stealTargetGroup id: ResearchAndDevelopmentServerMachineCircuitboard - name: steal-target-groups-research-and-development-server-machine-circuitboard + name: R&D server machine board sprite: sprite: Objects/Misc/module.rsi state: science - type: stealTargetGroup id: FireAxe - name: steal-target-groups-fire-axe + name: fireaxe sprite: sprite: Objects/Weapons/Melee/fireaxe.rsi state: icon - type: stealTargetGroup id: AmePartFlatpack - name: steal-target-groups-ame-part-flatpack + name: AME part sprite: sprite: Objects/Devices/flatpack.rsi state: ame-part - type: stealTargetGroup id: SalvageExpeditionsComputerCircuitboard - name: steal-target-groups-salvage-expeditions-computer-circuitboard + name: salvage expeditions computer board sprite: sprite: Objects/Misc/module.rsi state: cpu_supply - type: stealTargetGroup id: CargoShuttleConsoleCircuitboard - name: steal-target-groups-cargo-shuttle-console-circuitboard + name: cargo shuttle console board sprite: sprite: Objects/Misc/module.rsi state: cpuboard - type: stealTargetGroup id: ClothingEyesHudBeer - name: steal-target-groups-clothing-eyes-hud-beer + name: beer goggles sprite: sprite: Clothing/Eyes/Hud/beergoggles.rsi state: icon - type: stealTargetGroup id: Bible - name: steal-target-groups-bible + name: bible sprite: sprite: Objects/Specific/Chapel/bible.rsi state: icon - type: stealTargetGroup id: ClothingNeckGoldmedal - name: steal-target-groups-clothing-neck-goldmedal + name: gold medal of crewmanship sprite: sprite: Clothing/Neck/Medals/gold.rsi state: icon - type: stealTargetGroup id: ClothingNeckClownmedal - name: steal-target-groups-clothing-neck-clownmedal + name: clown medal sprite: sprite: Clothing/Neck/Medals/clownmedal.rsi state: icon +- type: stealTargetGroup + id: ClothingNeckShockCollar + name: shock collar + sprite: + sprite: Clothing/Neck/Misc/shock_collar.rsi + state: icon + #Thief structures - type: stealTargetGroup id: NuclearBomb - name: steal-target-groups-nuclear-bomb + name: nuclear fission explosive sprite: sprite: Objects/Devices/nuke.rsi state: nuclearbomb_base - type: stealTargetGroup id: FaxMachineCaptain - name: steal-target-groups-fax-machine-captain + name: captain long range fax machine sprite: sprite: Structures/Machines/fax_machine.rsi state: icon - type: stealTargetGroup id: ChemDispenser - name: steal-target-groups-chem-dispenser + name: chemical dispenser sprite: sprite: Structures/dispensers.rsi state: industrial-working - type: stealTargetGroup id: XenoArtifact - name: steal-target-groups-xeno-artifact + name: big alien artifact sprite: sprite: Objects/Specific/Xenoarchaeology/xeno_artifacts.rsi state: ano28 - type: stealTargetGroup id: FreezerHeater - name: steal-target-groups-freezer-heater + name: freezer or heater sprite: sprite: Structures/Piping/Atmospherics/thermomachine.rsi state: heaterOff - type: stealTargetGroup id: Teg - name: steal-target-groups-teg + name: teg generator part sprite: sprite: Structures/Power/Generation/teg.rsi state: teg - type: stealTargetGroup id: BoozeDispenser - name: steal-target-groups-booze-dispenser + name: booze dispenser sprite: sprite: Structures/smalldispensers.rsi state: booze - type: stealTargetGroup id: AltarNanotrasen - name: steal-target-groups-altar-nanotrasen + name: nanotrasen altar (any) sprite: sprite: Structures/Furniture/Altars/Gods/nanotrasen.rsi state: nanotrasen - type: stealTargetGroup id: PlantRD - name: steal-target-groups-plant-rd + name: Mystagogue's potted plant # DeltaV - Epistemics Department - Replace Research Director with Mystagogue sprite: sprite: Structures/Furniture/potted_plants.rsi state: plant-25 - type: stealTargetGroup id: ToiletGoldenDirtyWater - name: steal-target-groups-toilet-golden-dirty-water + name: golden toilet sprite: sprite: Structures/Furniture/golden_toilet.rsi state: condisposal @@ -346,56 +353,58 @@ - type: stealTargetGroup id: AnimalIan - name: steal-target-groups-animal-ian + name: Ian sprite: sprite: Mobs/Pets/corgi.rsi state: ian - type: stealTargetGroup id: AnimalNamedCat - name: steal-target-groups-animal-named-cat + name: CMO's Cat sprite: sprite: Mobs/Pets/bingus.rsi state: bingus - type: stealTargetGroup id: AnimalMcGriff - name: steal-target-groups-animal-mc-griff + name: McGriff sprite: sprite: Mobs/Pets/mcgriff.rsi state: mcgriff - type: stealTargetGroup id: AnimalWalter - name: steal-target-groups-animal-walter + name: Walter sprite: sprite: Mobs/Pets/walter.rsi state: walter - type: stealTargetGroup id: AnimalMorty - name: steal-target-groups-animal-morty + name: Morty sprite: sprite: Mobs/Animals/possum.rsi state: possum - type: stealTargetGroup id: AnimalRenault - name: steal-target-groups-animal-renault + name: Renault sprite: sprite: Mobs/Animals/fox.rsi state: fox - type: stealTargetGroup id: AnimalSecurity #DeltaV - Adjusts because we have multiple possible sec animals - name: steal-target-groups-animal-shiva + name: Security Pet #DeltaV - Adjusts because we have multiple possible sec animals sprite: sprite: Mobs/Pets/shiva.rsi state: shiva - type: stealTargetGroup id: AnimalTropico - name: steal-target-groups-animal-tropico + name: Tropico sprite: sprite: Mobs/Animals/crab.rsi state: crab + + diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index 7a397d9ab6f..ca6053a2ee8 100644 --- a/Resources/Prototypes/Objectives/thief.yml +++ b/Resources/Prototypes/Objectives/thief.yml @@ -305,6 +305,17 @@ # - type: Objective # difficulty: 1 +- type: entity + parent: BaseThiefStealObjective + id: ClothingNeckShockCollarStealObjective + components: + - type: NotJobRequirement + job: Warden + - type: StealCondition + stealGroup: ClothingNeckShockCollar + - type: Objective + difficulty: 1 + # Structures - type: entity diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index fc97e1797c7..c2ac0958929 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -49,6 +49,7 @@ - type: EscapeShuttleCondition - type: entity + noSpawn: true parent: BaseTraitorObjective id: DieObjective name: Die a glorious death @@ -301,6 +302,7 @@ # Station - type: entity + noSpawn: true parent: BaseTraitorStealObjective id: PlutoniumCoreStealObjective components: diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 21640c7aebe..defe4c1af38 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -368,10 +368,6 @@ key: KnockedDown time: 0.75 type: Remove - - !type:GenericStatusEffect - key: Adrenaline # Guess what epinephrine is... - component: IgnoreSlowOnDamage - time: 5 # lingers less than hivemind reagent to give it a niche - type: reagent id: Hyronalin diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 12b05f9b232..a39d845729d 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -407,6 +407,8 @@ effects: - !type:HealthChange conditions: + - !type:ReagentThreshold + min: 1 - !type:OrganType type: Animal # Applying damage to the mobs with lower metabolism capabilities damage: @@ -415,6 +417,8 @@ - !type:ChemVomit probability: 0.04 #Scaled for time, not metabolismrate. conditions: + - !type:ReagentThreshold + min: 3 - !type:OrganType type: Animal diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml index 20e06e9f484..04b94690467 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml @@ -21,51 +21,3 @@ - node: ImprovisedArrow entity: ArrowImprovised - -- type: constructionGraph - id: ImprovisedArrowPlasma - start: start - graph: - - node: start - edges: - - to: ImprovisedArrowPlasma - steps: - - material: MetalRod - amount: 1 - doAfter: 0.5 - - material: Cloth - amount: 1 - doAfter: 0.5 - - tag: PlasmaGlassShard - name: plasma glass shard - icon: - sprite: Objects/Materials/Shards/shard.rsi - state: shard1 - doAfter: 0.5 - - - node: ImprovisedArrowPlasma - entity: ArrowImprovisedPlasma - -- type: constructionGraph - id: ImprovisedArrowUranium - start: start - graph: - - node: start - edges: - - to: ImprovisedArrowUranium - steps: - - material: MetalRod - amount: 1 - doAfter: 0.5 - - material: Cloth - amount: 1 - doAfter: 0.5 - - tag: UraniumGlassShard - name: uranium glass shard - icon: - sprite: Objects/Materials/Shards/shard.rsi - state: shard1 - doAfter: 0.5 - - - node: ImprovisedArrowUranium - entity: ArrowImprovisedUranium diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml index 5936a350691..040d4c8963d 100644 --- a/Resources/Prototypes/Recipes/Construction/weapons.yml +++ b/Resources/Prototypes/Recipes/Construction/weapons.yml @@ -152,28 +152,6 @@ icon: { sprite: Objects/Weapons/Guns/Bow/bow.rsi, state: wielded-arrow } objectType: Item -- type: construction - name: plasma glass shard arrow - id: ImprovisedArrowPlasma - graph: ImprovisedArrowPlasma - startNode: start - targetNode: ImprovisedArrowPlasma - category: construction-category-weapons - description: An arrow tipped with pieces of a plasma glass shard, for use with a bow. - icon: { sprite: Objects/Weapons/Guns/Bow/bow.rsi, state: wielded-arrow } - objectType: Item - -- type: construction - name: uranium glass shard arrow - id: ImprovisedArrowUranium - graph: ImprovisedArrowUranium - startNode: start - targetNode: ImprovisedArrowUranium - category: construction-category-weapons - description: An arrow tipped with pieces of a uranium glass shard, for use with a bow. - icon: { sprite: Objects/Weapons/Guns/Bow/bow.rsi, state: wielded-arrow } - objectType: Item - - type: construction name: improvised bow id: ImprovisedBow diff --git a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml index 0654376442c..43d6fe8852b 100644 --- a/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml +++ b/Resources/Prototypes/Recipes/Cooking/food_sequence_element.yml @@ -1176,20 +1176,3 @@ sprites: - sprite: Objects/Consumable/Food/Baked/cake.rsi state: suppermatter-shard - - -# Anomaly berries - -- type: foodSequenceElement - id: AnomalyBerry - name: food-sequence-content-anomaly-berry - sprites: - - sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi - state: produce - -- type: foodSequenceElement - id: AnomalyBerryBurger - name: food-sequence-burger-content-anomaly-berry - sprites: - - sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi - state: produce diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 0db72f36636..b7b6a5c1a15 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -1,964 +1,1313 @@ -# Base prototypes +# Jumpsuits/skirts - type: latheRecipe - abstract: true - id: BaseJumpsuitRecipe + id: ClothingUniformJumpsuitColorGrey # Tide + result: ClothingUniformJumpsuitColorGrey completetime: 4 materials: Cloth: 300 - type: latheRecipe - abstract: true - parent: BaseJumpsuitRecipe - id: BaseCommandJumpsuitRecipe - materials: - Cloth: 300 - Durathread: 100 - -- type: latheRecipe - abstract: true - id: BaseCoatRecipe - completetime: 3.2 # don't ask why its faster than a jumpsuit?? - materials: - Cloth: 500 - Durathread: 200 - -- type: latheRecipe - abstract: true - parent: BaseCoatRecipe - id: BaseCommandCoatRecipe - materials: - Cloth: 500 - Durathread: 300 - -- type: latheRecipe - abstract: true - id: BaseHatRecipe - completetime: 2 - materials: - Cloth: 100 - -- type: latheRecipe - abstract: true - id: BaseCarpetRecipe - completetime: 1 - materials: - Cloth: 100 - -- type: latheRecipe - abstract: true - parent: BaseHatRecipe - id: BaseCommandHatRecipe - materials: - Cloth: 100 - Durathread: 50 - -- type: latheRecipe - abstract: true - id: BaseNeckClothingRecipe - completetime: 2 - materials: - Cloth: 200 - -# Recipes - -# Jumpsuits/skirts -- type: latheRecipe - parent: BaseJumpsuitRecipe - id: ClothingUniformJumpsuitColorGrey # Tide - result: ClothingUniformJumpsuitColorGrey # Tide - -- type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtColorGrey result: ClothingUniformJumpskirtColorGrey + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitBartender result: ClothingUniformJumpsuitBartender + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtBartender result: ClothingUniformJumpskirtBartender + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitCaptain result: ClothingUniformJumpsuitCaptain + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitCapFormal result: ClothingUniformJumpsuitCapFormal + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 + - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtCapFormalDress result: ClothingUniformJumpskirtCapFormalDress + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtCaptain result: ClothingUniformJumpskirtCaptain + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitCargo result: ClothingUniformJumpsuitCargo + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtCargo result: ClothingUniformJumpskirtCargo + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitSalvageSpecialist result: ClothingUniformJumpsuitSalvageSpecialist + completetime: 4 + materials: + Cloth: 500 #It's armored but I don't want to include durathread for a non-head - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitCentcomAgent result: ClothingUniformJumpsuitCentcomAgent + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitCentcomFormal result: ClothingUniformJumpsuitCentcomFormal + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtCentcomFormalDress result: ClothingUniformJumpskirtCentcomFormalDress + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitCentcomOfficer result: ClothingUniformJumpsuitCentcomOfficer + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitCentcomOfficial result: ClothingUniformJumpsuitCentcomOfficial - -## CE + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitChiefEngineer result: ClothingUniformJumpsuitChiefEngineer + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtChiefEngineer result: ClothingUniformJumpskirtChiefEngineer + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitChiefEngineerTurtle result: ClothingUniformJumpsuitChiefEngineerTurtle + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtChiefEngineerTurtle result: ClothingUniformJumpskirtChiefEngineerTurtle - -## Chaplain + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitChaplain result: ClothingUniformJumpsuitChaplain + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtChaplain result: ClothingUniformJumpskirtChaplain - -## Chef + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitChef result: ClothingUniformJumpsuitChef + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtChef result: ClothingUniformJumpskirtChef - -## Chemist + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitChemistry result: ClothingUniformJumpsuitChemistry + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtChemistry result: ClothingUniformJumpskirtChemistry - -## Clown + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitClown result: ClothingUniformJumpsuitClown - -## CMO + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitCMO result: ClothingUniformJumpsuitCMO + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtCMO result: ClothingUniformJumpskirtCMO + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitCMOTurtle result: ClothingUniformJumpsuitCMOTurtle + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtCMOTurtle result: ClothingUniformJumpskirtCMOTurtle - -## Detective + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitDetective result: ClothingUniformJumpsuitDetective + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtDetective result: ClothingUniformJumpskirtDetective - -## Engineer + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitEngineering result: ClothingUniformJumpsuitEngineering + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtEngineering result: ClothingUniformJumpskirtEngineering + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitSeniorEngineer result: ClothingUniformJumpsuitSeniorEngineer + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtSeniorEngineer result: ClothingUniformJumpskirtSeniorEngineer - -## HoP + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitHoP result: ClothingUniformJumpsuitHoP + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtHoP result: ClothingUniformJumpskirtHoP - -## HoS + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitHoS result: ClothingUniformJumpsuitHoS + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtHoS result: ClothingUniformJumpskirtHoS + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitHosFormal result: ClothingUniformJumpsuitHosFormal + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtHosFormal result: ClothingUniformJumpskirtHosFormal + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitHoSParadeMale result: ClothingUniformJumpsuitHoSParadeMale + completetime: 5 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtHoSParadeMale result: ClothingUniformJumpskirtHoSParadeMale + completetime: 5 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitHoSAlt result: ClothingUniformJumpsuitHoSAlt + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitHoSBlue result: ClothingUniformJumpsuitHoSBlue + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitHoSGrey result: ClothingUniformJumpsuitHoSGrey + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtHoSAlt result: ClothingUniformJumpskirtHoSAlt - -## Hydroponics + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitHydroponics result: ClothingUniformJumpsuitHydroponics + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtHydroponics result: ClothingUniformJumpskirtHydroponics - -## Janitor + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitJanitor result: ClothingUniformJumpsuitJanitor + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtJanitor result: ClothingUniformJumpskirtJanitor - -## Lawyer + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitLawyerBlack result: ClothingUniformJumpsuitLawyerBlack - -## Librarian + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitLibrarian result: ClothingUniformJumpsuitLibrarian + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtColorLightBrown #Librarian - result: ClothingUniformJumpskirtColorLightBrown #Librarian - -## Medical Doctor + result: ClothingUniformJumpskirtColorLightBrown + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitMedicalDoctor result: ClothingUniformJumpsuitMedicalDoctor + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtMedicalDoctor result: ClothingUniformJumpskirtMedicalDoctor + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitSeniorPhysician result: ClothingUniformJumpsuitSeniorPhysician + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtSeniorPhysician result: ClothingUniformJumpskirtSeniorPhysician - -## Mime + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitMime result: ClothingUniformJumpsuitMime + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtMime result: ClothingUniformJumpskirtMime - -## Musician + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitMusician result: ClothingUniformJumpsuitMusician - -## Operative + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitOperative result: ClothingUniformJumpsuitOperative + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtOperative result: ClothingUniformJumpskirtOperative - -## Paramedic + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitParamedic result: ClothingUniformJumpsuitParamedic + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtParamedic result: ClothingUniformJumpskirtParamedic - -## Senior Officer + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitSeniorOfficer result: ClothingUniformJumpsuitSeniorOfficer + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtSeniorOfficer result: ClothingUniformJumpskirtSeniorOfficer - -## Prisoner + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitPrisoner result: ClothingUniformJumpsuitPrisoner + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtPrisoner result: ClothingUniformJumpskirtPrisoner - -## QM + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitQM result: ClothingUniformJumpsuitQM + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitQMFormal result: ClothingUniformJumpsuitQMFormal + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtQM result: ClothingUniformJumpskirtQM + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitQMTurtleneck result: ClothingUniformJumpsuitQMTurtleneck + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtQMTurtleneck result: ClothingUniformJumpskirtQMTurtleneck - -## RD + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpsuitResearchDirector result: ClothingUniformJumpsuitResearchDirector + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseCommandJumpsuitRecipe id: ClothingUniformJumpskirtResearchDirector result: ClothingUniformJumpskirtResearchDirector - -## Scientist + completetime: 4 + materials: + Cloth: 300 + Durathread: 100 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitScientist result: ClothingUniformJumpsuitScientist + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtScientist result: ClothingUniformJumpskirtScientist + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitSeniorResearcher result: ClothingUniformJumpsuitSeniorResearcher + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtSeniorResearcher result: ClothingUniformJumpskirtSeniorResearcher - -## Security Officer + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitSec result: ClothingUniformJumpsuitSec + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtSec result: ClothingUniformJumpskirtSec - -## Brigmedic + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitBrigmedic result: ClothingUniformJumpsuitBrigmedic + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtBrigmedic result: ClothingUniformJumpskirtBrigmedic + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitSyndieFormal result: ClothingUniformJumpsuitSyndieFormal + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtSyndieFormalDress result: ClothingUniformJumpskirtSyndieFormalDress + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitPyjamaSyndicateBlack result: ClothingUniformJumpsuitPyjamaSyndicateBlack + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitPyjamaSyndicatePink result: ClothingUniformJumpsuitPyjamaSyndicatePink + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitPyjamaSyndicateRed result: ClothingUniformJumpsuitPyjamaSyndicateRed + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpsuitWarden result: ClothingUniformJumpsuitWarden + completetime: 4 + materials: + Cloth: 300 - type: latheRecipe - parent: BaseJumpsuitRecipe id: ClothingUniformJumpskirtWarden result: ClothingUniformJumpskirtWarden - + completetime: 4 + materials: + Cloth: 300 # Command winter coats - type: latheRecipe - parent: BaseCommandCoatRecipe id: ClothingOuterWinterCap result: ClothingOuterWinterCap + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 300 - type: latheRecipe - parent: BaseCommandCoatRecipe id: ClothingOuterWinterCE result: ClothingOuterWinterCE + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 300 - type: latheRecipe - parent: BaseCommandCoatRecipe id: ClothingOuterWinterCentcom result: ClothingOuterWinterCentcom + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 300 - type: latheRecipe - parent: BaseCommandCoatRecipe id: ClothingOuterWinterCMO result: ClothingOuterWinterCMO + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 300 + +- type: latheRecipe + id: ClothingOuterWinterHoP + result: ClothingOuterWinterHoP + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 300 + +- type: latheRecipe + id: ClothingOuterWinterHoSUnarmored + result: ClothingOuterWinterHoSUnarmored + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 300 + +- type: latheRecipe + id: ClothingOuterWinterWardenUnarmored + result: ClothingOuterWinterWardenUnarmored + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 300 + +- type: latheRecipe + id: ClothingOuterWinterQM + result: ClothingOuterWinterQM + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 300 + +- type: latheRecipe + id: ClothingOuterWinterRD + result: ClothingOuterWinterRD + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 300 +# Mantles +- type: latheRecipe + id: ClothingNeckMantleCap + result: ClothingNeckMantleCap + completetime: 2.8 + materials: + Cloth: 200 + Durathread: 150 - type: latheRecipe - parent: BaseCommandCoatRecipe - id: ClothingOuterWinterHoP - result: ClothingOuterWinterHoP + id: ClothingNeckMantleCE + result: ClothingNeckMantleCE + completetime: 2.8 + materials: + Cloth: 200 + Durathread: 150 - type: latheRecipe - parent: BaseCommandCoatRecipe - id: ClothingOuterWinterHoSUnarmored - result: ClothingOuterWinterHoSUnarmored + id: ClothingNeckMantleCMO + result: ClothingNeckMantleCMO + completetime: 2.8 + materials: + Cloth: 200 + Durathread: 150 - type: latheRecipe - parent: BaseCommandCoatRecipe - id: ClothingOuterWinterWardenUnarmored - result: ClothingOuterWinterWardenUnarmored + id: ClothingNeckMantleHOP + result: ClothingNeckMantleHOP + completetime: 2.8 + materials: + Cloth: 200 + Durathread: 150 - type: latheRecipe - parent: BaseCommandCoatRecipe - id: ClothingOuterWinterQM - result: ClothingOuterWinterQM + id: ClothingNeckMantleHOS + result: ClothingNeckMantleHOS + completetime: 2.8 + materials: + Cloth: 200 + Durathread: 150 - type: latheRecipe - parent: BaseCommandCoatRecipe - id: ClothingOuterWinterRD - result: ClothingOuterWinterRD + id: ClothingNeckMantleRD + result: ClothingNeckMantleRD + completetime: 2.8 + materials: + Cloth: 200 + Durathread: 150 +- type: latheRecipe + id: ClothingNeckMantleQM + result: ClothingNeckMantleQM + completetime: 2.8 + materials: + Cloth: 200 + Durathread: 150 # Winter coats - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterMusician result: ClothingOuterWinterMusician + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterClown result: ClothingOuterWinterClown + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterMime result: ClothingOuterWinterMime + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterCoat result: ClothingOuterWinterCoat + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterJani result: ClothingOuterWinterJani + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterBar result: ClothingOuterWinterBar + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterChef result: ClothingOuterWinterChef + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterHydro result: ClothingOuterWinterHydro + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterAtmos result: ClothingOuterWinterAtmos + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterEngi result: ClothingOuterWinterEngi + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterCargo result: ClothingOuterWinterCargo + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterMiner result: ClothingOuterWinterMiner + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterMed result: ClothingOuterWinterMed + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterPara result: ClothingOuterWinterPara + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterChem result: ClothingOuterWinterChem + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterGen result: ClothingOuterWinterGen + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterViro result: ClothingOuterWinterViro + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterSci result: ClothingOuterWinterSci + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterRobo result: ClothingOuterWinterRobo + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterSec result: ClothingOuterWinterSec + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterSyndie result: ClothingOuterWinterSyndie + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 - type: latheRecipe - parent: BaseCoatRecipe id: ClothingOuterWinterSyndieCap result: ClothingOuterWinterSyndieCap - + completetime: 3.2 + materials: + Cloth: 500 + Durathread: 200 # Hats - type: latheRecipe - parent: BaseCommandHatRecipe id: ClothingHeadHatCaptain result: ClothingHeadHatCaptain + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseCommandHatRecipe id: ClothingHeadHatCapcap result: ClothingHeadHatCapcap + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseCommandHatRecipe - id: ClothingHeadHatCentcom - result: ClothingHeadHatCentcom - -- type: latheRecipe - parent: BaseCommandHatRecipe - id: ClothingHeadHatCentcomcap - result: ClothingHeadHatCentcomcap - -- type: latheRecipe - parent: BaseCommandHatRecipe id: ClothingHeadHatBeretHoS result: ClothingHeadHatBeretHoS + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseCommandHatRecipe id: ClothingHeadHatHoshat result: ClothingHeadHatHoshat + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseCommandHatRecipe id: ClothingHeadHatWarden result: ClothingHeadHatWarden + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseCommandHatRecipe id: ClothingHeadHatBeretWarden result: ClothingHeadHatBeretWarden + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseCommandHatRecipe id: ClothingHeadHatHopcap result: ClothingHeadHatHopcap + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseCommandHatRecipe id: ClothingHeadHatQMsoft result: ClothingHeadHatQMsoft + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseCommandHatRecipe id: ClothingHeadHatBeretRND result: ClothingHeadHatBeretRND + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseCommandHatRecipe id: ClothingHeadHatBeretEngineering result: ClothingHeadHatBeretEngineering + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseCommandHatRecipe id: ClothingHeadHatBeretQM result: ClothingHeadHatBeretQM + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseCommandHatRecipe id: ClothingHeadHatBeretCmo result: ClothingHeadHatBeretCmo - -# Non-command hats + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseHatRecipe id: ClothingHeadHatBeretMedic result: ClothingHeadHatBeretMedic + completetime: 2 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseHatRecipe id: ClothingHeadHatBeretBrigmedic result: ClothingHeadHatBeretBrigmedic + completetime: 2 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseHatRecipe id: ClothingHeadHatBeretSecurity result: ClothingHeadHatBeretSecurity + completetime: 2 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseHatRecipe id: ClothingHeadHatBeretSeniorPhysician result: ClothingHeadHatBeretSeniorPhysician + completetime: 2 + materials: + Cloth: 100 + +- type: latheRecipe + id: ClothingHeadHatCentcom + result: ClothingHeadHatCentcom + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 + +- type: latheRecipe + id: ClothingHeadHatCentcomcap + result: ClothingHeadHatCentcomcap + completetime: 2 + materials: + Cloth: 100 + Durathread: 50 - type: latheRecipe - parent: BaseHatRecipe id: ClothingHeadHatSyndie result: ClothingHeadHatSyndie + completetime: 2 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseHatRecipe id: ClothingHeadHatSyndieMAA result: ClothingHeadHatSyndieMAA + completetime: 2 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseHatRecipe id: ClothingHeadPyjamaSyndicateBlack result: ClothingHeadPyjamaSyndicateBlack + completetime: 2 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseHatRecipe id: ClothingHeadPyjamaSyndicatePink result: ClothingHeadPyjamaSyndicatePink + completetime: 2 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseHatRecipe id: ClothingHeadPyjamaSyndicateRed result: ClothingHeadPyjamaSyndicateRed + completetime: 2 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseHatRecipe id: ClothingHeadHatParamedicsoft result: ClothingHeadHatParamedicsoft - + completetime: 1 + materials: + Cloth: 100 # Ties - type: latheRecipe - parent: BaseNeckClothingRecipe id: ClothingNeckTieRed result: ClothingNeckTieRed + completetime: 2 + materials: + Cloth: 200 - type: latheRecipe - parent: BaseNeckClothingRecipe id: ClothingNeckTieDet result: ClothingNeckTieDet + completetime: 2 + materials: + Cloth: 200 - type: latheRecipe - parent: BaseNeckClothingRecipe id: ClothingNeckTieSci result: ClothingNeckTieSci - + completetime: 2 + materials: + Cloth: 200 # Scarfs - type: latheRecipe - parent: BaseNeckClothingRecipe id: ClothingNeckScarfStripedGreen result: ClothingNeckScarfStripedGreen + completetime: 2 + materials: + Cloth: 200 - type: latheRecipe - parent: BaseNeckClothingRecipe id: ClothingNeckScarfStripedBlue result: ClothingNeckScarfStripedBlue + completetime: 2 + materials: + Cloth: 200 - type: latheRecipe - parent: BaseNeckClothingRecipe id: ClothingNeckScarfStripedRed result: ClothingNeckScarfStripedRed + completetime: 2 + materials: + Cloth: 200 - type: latheRecipe - parent: BaseNeckClothingRecipe id: ClothingNeckScarfStripedBrown result: ClothingNeckScarfStripedBrown + completetime: 2 + materials: + Cloth: 200 - type: latheRecipe - parent: BaseNeckClothingRecipe id: ClothingNeckScarfStripedLightBlue result: ClothingNeckScarfStripedLightBlue + completetime: 2 + materials: + Cloth: 200 - type: latheRecipe - parent: BaseNeckClothingRecipe id: ClothingNeckScarfStripedOrange result: ClothingNeckScarfStripedOrange + completetime: 2 + materials: + Cloth: 200 - type: latheRecipe - parent: BaseNeckClothingRecipe id: ClothingNeckScarfStripedBlack result: ClothingNeckScarfStripedBlack + completetime: 2 + materials: + Cloth: 200 - type: latheRecipe - parent: BaseNeckClothingRecipe id: ClothingNeckScarfStripedPurple result: ClothingNeckScarfStripedPurple - + completetime: 2 + materials: + Cloth: 200 # Carpets - type: latheRecipe - parent: BaseCarpetRecipe id: Carpet result: FloorCarpetItemRed + completetime: 1 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseCarpetRecipe id: CarpetBlack result: FloorCarpetItemBlack + completetime: 1 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseCarpetRecipe id: CarpetPink result: FloorCarpetItemPink + completetime: 1 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseCarpetRecipe id: CarpetBlue result: FloorCarpetItemBlue + completetime: 1 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseCarpetRecipe id: CarpetGreen result: FloorCarpetItemGreen + completetime: 1 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseCarpetRecipe id: CarpetOrange result: FloorCarpetItemOrange + completetime: 1 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseCarpetRecipe id: CarpetPurple result: FloorCarpetItemPurple + completetime: 1 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseCarpetRecipe id: CarpetCyan result: FloorCarpetItemCyan + completetime: 1 + materials: + Cloth: 100 - type: latheRecipe - parent: BaseCarpetRecipe id: CarpetWhite result: FloorCarpetItemWhite + completetime: 1 + materials: + Cloth: 100 diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 9bbd07848a8..67a5b54f81a 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -941,18 +941,6 @@ products: SnowWhite: 3 -- type: reaction - id: SodaWater - requiredMixerCategories: - - Shake - reactants: - Water: - amount: 5 - CarbonDioxide: - amount: 1 - products: - SodaWater: 6 - - type: reaction id: SoyLatte reactants: @@ -1158,18 +1146,6 @@ products: TheMartinez: 6 -- type: reaction - id: Vodka - requiredMixerCategories: - - Stir - reactants: - Ethanol: - amount: 1 - Water: - amount: 1 - products: - Vodka: 2 - - type: reaction id: WaterBreakdown source: true diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index ab3f901171b..311e5b5c094 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -63,6 +63,7 @@ outerClothing: ClothingOuterHardsuitSyndie shoes: ClothingShoesBootsCombatFilled id: SyndiPDA + pocket1: DoubleEmergencyOxygenTankFilled pocket2: PlushieCarp belt: ClothingBeltMilitaryWebbing storage: @@ -86,7 +87,7 @@ neck: SyndicateWhistle outerClothing: ClothingOuterHardsuitSyndieCommander inhand: - - NukeOpsDeclarationOfWar + - NukeOpsDeclarationOfWar #Nuclear Operative Medic Gear - type: startingGear diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 4e69c4a3c87..3ab9d1b975a 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -25,6 +25,7 @@ shoes: ClothingShoesLeather id: PsychologistPDA ears: ClothingHeadsetMedical - storage: - back: - - RubberStampPsychologist + pocket1: RubberStampPsychologist + #storage: + #back: + #- Stuff diff --git a/Resources/Prototypes/SoundCollections/rubber_chicken.yml b/Resources/Prototypes/SoundCollections/rubber_chicken.yml deleted file mode 100644 index c468516f71e..00000000000 --- a/Resources/Prototypes/SoundCollections/rubber_chicken.yml +++ /dev/null @@ -1,6 +0,0 @@ -- type: soundCollection - id: RubberChicken - files: - - /Audio/Items/Toys/rubber_chicken_1.ogg - - /Audio/Items/Toys/rubber_chicken_2.ogg - - /Audio/Items/Toys/rubber_chicken_3.ogg diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 63148e39c96..3e780a38ee1 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -15,9 +15,6 @@ - type: Tag id: Ambrosia -- type: Tag - id: AnomalyHost - - type: Tag id: AppraisalTool diff --git a/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml b/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml index 7e5e20139b0..3eb9c2ca2f2 100644 --- a/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml +++ b/Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml @@ -13,7 +13,7 @@ WARNING: This is not an automatically generated list, things here may become out - Tortila Dough = 15 Cornmeal, 10 Water - Tofu = 5 Enzyme (Catalyst), 30 Soy Milk - Pie Dough = 2 Eggs (12u), 15 Flour, 5 Table Salt -- Cake Batter = 2 Eggs(12u), 15 flour, 5 Sugar, 5 Milk +- Cake Batter = 2 Eggs(12u), 15 flour, 5 Sugar - Vegan Cake Batter = 15 Soy Milk, 15 Flour, 5 Sugar - Butter = 30 Milk, 5 Table Salt (Catalyst) - Cheese Wheel = 5 Enzyme (Catalyst), 40 Milk diff --git a/Resources/Textures/Decals/burnt.rsi/burnt1.png b/Resources/Textures/Decals/burnt.rsi/burnt1.png deleted file mode 100644 index 3fcb7a4949b..00000000000 Binary files a/Resources/Textures/Decals/burnt.rsi/burnt1.png and /dev/null differ diff --git a/Resources/Textures/Decals/burnt.rsi/burnt2.png b/Resources/Textures/Decals/burnt.rsi/burnt2.png deleted file mode 100644 index 01f8f220b2d..00000000000 Binary files a/Resources/Textures/Decals/burnt.rsi/burnt2.png and /dev/null differ diff --git a/Resources/Textures/Decals/burnt.rsi/burnt3.png b/Resources/Textures/Decals/burnt.rsi/burnt3.png deleted file mode 100644 index e9dcbe37533..00000000000 Binary files a/Resources/Textures/Decals/burnt.rsi/burnt3.png and /dev/null differ diff --git a/Resources/Textures/Decals/burnt.rsi/burnt4.png b/Resources/Textures/Decals/burnt.rsi/burnt4.png deleted file mode 100644 index f1db0637ccb..00000000000 Binary files a/Resources/Textures/Decals/burnt.rsi/burnt4.png and /dev/null differ diff --git a/Resources/Textures/Decals/burnt.rsi/meta.json b/Resources/Textures/Decals/burnt.rsi/meta.json deleted file mode 100644 index 48a8f33138c..00000000000 --- a/Resources/Textures/Decals/burnt.rsi/meta.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "From https://github.com/BeeStation/BeeStation-Hornet/blob/master/icons/turf/turf_damage.dmi at f2d6fbdf36aa0951049498cf28e028a38e32fe0b", - "states": [ - { - "name": "burnt1" - - }, - { - "name": "burnt2" - - }, - { - "name": "burnt3" - - }, - { - "name": "burnt4" - - } - ] -} diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json index ea9f292ad8e..04f59797615 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json @@ -12,6 +12,9 @@ }, { "name": "stamp-notary" + }, + { + "name": "stamp-psychologist" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-psychologist.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-psychologist.png new file mode 100644 index 00000000000..94a07297919 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-psychologist.png differ diff --git a/Resources/Textures/Interface/Misc/health_analyzer_out_of_range.png b/Resources/Textures/Interface/Misc/health_analyzer_out_of_range.png deleted file mode 100644 index 8a76b0e83f2..00000000000 Binary files a/Resources/Textures/Interface/Misc/health_analyzer_out_of_range.png and /dev/null differ diff --git a/Resources/Textures/Interface/eraser.svg b/Resources/Textures/Interface/eraser.svg deleted file mode 100644 index e7060e56fbd..00000000000 --- a/Resources/Textures/Interface/eraser.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Resources/Textures/Interface/eraser.svg.png b/Resources/Textures/Interface/eraser.svg.png deleted file mode 100644 index de3ed8b1c7e..00000000000 Binary files a/Resources/Textures/Interface/eraser.svg.png and /dev/null differ diff --git a/Resources/Textures/Interface/eyedropper.svg b/Resources/Textures/Interface/eyedropper.svg deleted file mode 100644 index 601caaf70cb..00000000000 --- a/Resources/Textures/Interface/eyedropper.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Resources/Textures/Interface/eyedropper.svg.png b/Resources/Textures/Interface/eyedropper.svg.png deleted file mode 100644 index ce3e41a7168..00000000000 Binary files a/Resources/Textures/Interface/eyedropper.svg.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_head.png b/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_head.png deleted file mode 100644 index 713ae3d4bc5..00000000000 Binary files a/Resources/Textures/Mobs/Customization/gauze.rsi/gauze_head.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json b/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json index bd7d1ed4eb4..8d82ccab517 100644 --- a/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/gauze.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Gauze sprites by Github KittenColony / Discord kittencolony (297865728374210561), gauze_head by github:DreamlyJack(624946166152298517)", + "copyright": "Gauze sprites by Github KittenColony / Discord kittencolony (297865728374210561)", "size": { "x": 32, "y": 32 @@ -142,10 +142,6 @@ { "name": "gauze_moth_lowerleg_l", "directions": 4 - }, - { - "name": "gauze_head", - "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json b/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json index 0e36d32316f..3a540931649 100644 --- a/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json +++ b/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json @@ -5,60 +5,207 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , cerberus by Alekshhh, real mouse by TheShuEd", + "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , cerberus by Alekshhh", "states": [ { "name": "corgi", - "directions": 4 + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] }, { "name": "corgi_rest", - "directions": 4 + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] }, { - "name": "corgi_dead" + "name": "corgi_dead", + "delays": [ + [ + 1 + ] + ] }, { "name": "ian", - "directions": 4 + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] }, { - "name": "ian_dead" + "name": "ian_dead", + "delays": [ + [ + 1 + ] + ] }, { - "name": "corgi_deadcollar" + "name": "corgi_deadcollar", + "delays": [ + [ + 1 + ] + ] }, { - "name": "corgi_deadtag" + "name": "corgi_deadtag", + "delays": [ + [ + 1 + ] + ] }, { "name": "ian_shaved", - "directions": 4 + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] }, { - "name": "ian_shaved_dead" + "name": "ian_shaved_dead", + "delays": [ + [ + 1 + ] + ] }, { "name": "corgicollar", - "directions": 4 + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] }, { "name": "corgitag", - "directions": 4 + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] }, { "name": "lisa", - "directions": 4 + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] }, { - "name": "lisa_dead" + "name": "lisa_dead", + "delays": [ + [ + 1 + ] + ] }, { "name": "lisa_shaved", - "directions": 4 + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] }, { - "name": "lisa_shaved_dead" + "name": "lisa_shaved_dead", + "delays": [ + [ + 1 + ] + ] }, { "name": "narsian", @@ -91,7 +238,12 @@ ] }, { - "name": "old_ian_dead" + "name": "old_ian_dead", + "delays": [ + [ + 1 + ] + ] }, { "name": "old_ian_shaved", @@ -116,42 +268,116 @@ ] }, { - "name": "old_ian_shaved_dead" + "name": "old_ian_shaved_dead", + "delays": [ + [ + 1 + ] + ] }, { "name": "puppy", - "directions": 4 + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] }, { - "name": "puppy_dead" + "name": "puppy_dead", + "delays": [ + [ + 1 + ] + ] }, { - "name": "puppy_deadcollar" + "name": "puppy_deadcollar", + "delays": [ + [ + 1 + ] + ] }, { - "name": "puppy_deadtag" + "name": "puppy_deadtag", + "delays": [ + [ + 1 + ] + ] }, { "name": "puppy_shaved", - "directions": 4 + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] }, { - "name": "puppy_shaved_dead" + "name": "puppy_shaved_dead", + "delays": [ + [ + 1 + ] + ] }, { "name": "puppycollar", - "directions": 4 + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] }, { "name": "puppytag", - "directions": 4 - }, - { - "name": "real_mouse", - "directions": 4 - }, - { - "name": "real_mouse_dead" + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] } ] } diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse.png b/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse.png deleted file mode 100644 index 2983063c4fd..00000000000 Binary files a/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse_dead.png b/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse_dead.png deleted file mode 100644 index 4b51443c73b..00000000000 Binary files a/Resources/Textures/Mobs/Pets/corgi.rsi/real_mouse_dead.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/borg_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/borg_label.png deleted file mode 100644 index 2b56e167730..00000000000 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/borg_label.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json index 6ae7bca9dda..e44abd8d1e6 100644 --- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba", + "copyright": "Created by DSC@300074782328750080 for Space Station 14.", "size": { "x": 32, "y": 32 @@ -34,7 +34,6 @@ {"name": "sci_label"}, {"name": "sec_label"}, {"name": "service_label"}, - {"name": "synd_label"}, - {"name": "borg_label"} + {"name": "synd_label"} ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index 45f429f3e69..4975ba04611 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github). Lizard hat sprite made by Cinder, rubber_chicken by xprospero", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github). Lizard hat sprite made by Cinder", "size": { "x": 32, "y": 32 @@ -362,9 +362,6 @@ { "name": "beachb-inhand-right", "directions": 4 - }, - { - "name": "rubber_chicken" } ] } diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rubber_chicken.png b/Resources/Textures/Objects/Fun/toys.rsi/rubber_chicken.png deleted file mode 100644 index 543a3fbafea..00000000000 Binary files a/Resources/Textures/Objects/Fun/toys.rsi/rubber_chicken.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index c10dbd9c705..0f1351cba1c 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. paper_stamp-greytide by ubaser. paper_stamp-psychologist by clinux | paper_stamp-signature by Mnemotechnician.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. psychologist paper stamp resprited by Guess-My-Name. paper_stamp-signature by Mnemotechnician.", "size": { "x": 32, "y": 32 @@ -229,16 +229,13 @@ "name": "paper_stamp-mantis" }, { - "name": "paper_stamp-notary" - }, - { - "name": "paper_stamp-signature" + "name": "paper_stamp-psychologist" }, { - "name": "paper_stamp-greytide" + "name": "paper_stamp-notary" }, { - "name": "paper_stamp-psychologist" + "name": "paper_stamp-signature" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-greytide.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-greytide.png deleted file mode 100644 index 067be8405be..00000000000 Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-greytide.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png index 401e3e15c72..d3c8ad7afff 100644 Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png differ diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json index 9eafd62cb19..8ce4882a2f8 100644 --- a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. stamp-lawyer is a darker version of stamp-cap. paper_stamp-greytide is a grey and shaded in version of stamp-hos. paper_stamp-psychologist is a recolored stamp-cmo.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. stamp-lawyer is a darker version of stamp-cap.", "size": { "x": 32, "y": 32 @@ -60,12 +60,6 @@ }, { "name": "stamp-warden" - }, - { - "name": "stamp-greytide" - }, - { - "name": "stamp-psychologist" } ] } diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-greytide.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-greytide.png deleted file mode 100644 index 064c74a2a87..00000000000 Binary files a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-greytide.png and /dev/null differ diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-psychologist.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-psychologist.png deleted file mode 100644 index 08675d15919..00000000000 Binary files a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-psychologist.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/dead.png deleted file mode 100644 index e6082a57443..00000000000 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/dead.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/harvest.png deleted file mode 100644 index 5a405285d7e..00000000000 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/harvest.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json deleted file mode 100644 index 7d86d10f9bb..00000000000 --- a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/meta.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by TheShuEd for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "dead" - }, - { - "name": "harvest" - }, - { - "name": "produce" - }, - { - "name": "seed" - }, - { - "name": "stage-1" - }, - { - "name": "stage-2" - } - ] -} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce.png deleted file mode 100644 index ce9f83bd592..00000000000 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/produce.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/seed.png deleted file mode 100644 index dd6f8ea52ae..00000000000 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/seed.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-1.png deleted file mode 100644 index b6511c4e61d..00000000000 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-2.png deleted file mode 100644 index c3ba2f74e23..00000000000 Binary files a/Resources/Textures/Objects/Specific/Hydroponics/anomaly_berry.rsi/stage-2.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/broken.png deleted file mode 100644 index 1df63230654..00000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/deny-unshaded.png deleted file mode 100644 index 52f43a543f7..00000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/deny-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/meta.json deleted file mode 100644 index dcf3878b514..00000000000 --- a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/meta.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept, further modification by ArtisticRoomba", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "broken" - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "normal-unshaded", - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "off" - }, - { - "name": "panel" - } - ] -} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/normal-unshaded.png deleted file mode 100644 index ff9ad344c26..00000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/off.png deleted file mode 100644 index c3427b7188c..00000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/panel.png deleted file mode 100644 index 60dbf76b85e..00000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/bruiseomat.rsi/panel.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace.png deleted file mode 100644 index 5e9311e0641..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_VOX.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_VOX.png deleted file mode 100644 index b594cac2a90..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/bluespace_VOX.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire.png deleted file mode 100644 index a6fcde7a184..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_VOX.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_VOX.png deleted file mode 100644 index 91eb3957040..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/fire_VOX.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh.png deleted file mode 100644 index 6e178307c33..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_VOX.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_VOX.png deleted file mode 100644 index b1a1c43da0f..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flesh_VOX.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora.png deleted file mode 100644 index 70e369cb02b..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_VOX.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_VOX.png deleted file mode 100644 index 97969116a97..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/flora_VOX.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost.png deleted file mode 100644 index 4823cb5a6f2..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_VOX.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_VOX.png deleted file mode 100644 index 346cad09b10..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/frost_VOX.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav.png deleted file mode 100644 index c0775c0fb93..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_VOX.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_VOX.png deleted file mode 100644 index 04bfb8a0bfd..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/grav_VOX.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json deleted file mode 100644 index 4e069d0cd90..00000000000 --- a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/meta.json +++ /dev/null @@ -1,643 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Created by TheShuEd (github) for Space Station 14", - "states": [ - { - "name": "bluespace", - "directions": 4, - "delays": [ - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "bluespace_VOX", - "directions": 4, - "delays": [ - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "fire", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "fire_VOX", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "flesh", - "directions": 4, - "delays": [ - [ - 0.8, - 0.2, - 0.2 - ], - [ - 0.8, - 0.2, - 0.2 - ], - [ - 0.8, - 0.2, - 0.2 - ], - [ - 0.8, - 0.2, - 0.2 - ] - ] - }, - { - "name": "flesh_VOX", - "directions": 4, - "delays": [ - [ - 0.8, - 0.2, - 0.2 - ], - [ - 0.8, - 0.2, - 0.2 - ], - [ - 0.8, - 0.2, - 0.2 - ], - [ - 0.8, - 0.2, - 0.2 - ] - ] - }, - { - "name": "flora", - "directions": 4, - "delays": [ - [ - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "flora_VOX", - "directions": 4, - "delays": [ - [ - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "frost", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "frost_VOX", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "grav", - "directions": 4, - "delays": [ - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "grav_VOX", - "directions": 4, - "delays": [ - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ], - [ - 0.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "rock", - "directions": 4, - "delays": [ - [ - 0.9, - 0.2, - 0.2, - 0.2 - ], - [ - 0.9, - 0.2, - 0.2, - 0.2 - ], - [ - 0.9, - 0.2, - 0.2, - 0.2 - ], - [ - 0.9, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "rock_VOX", - "directions": 4, - "delays": [ - [ - 0.9, - 0.2, - 0.2, - 0.2 - ], - [ - 0.9, - 0.2, - 0.2, - 0.2 - ], - [ - 0.9, - 0.2, - 0.2, - 0.2 - ], - [ - 0.9, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "shadow", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "shadow_VOX", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "shock", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "shock_VOX", - "directions": 4, - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ], - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "tech", - "directions": 4, - "delays": [ - [ - 0.2, - 0.4, - 0.2, - 0.4 - ], - [ - 0.2, - 0.4, - 0.2, - 0.4 - ], - [ - 0.2, - 0.4, - 0.2, - 0.4 - ], - [ - 0.2, - 0.4, - 0.2, - 0.4 - ] - ] - }, - { - "name": "tech_VOX", - "directions": 4, - "delays": [ - [ - 0.2, - 0.4, - 0.2, - 0.4 - ], - [ - 0.2, - 0.4, - 0.2, - 0.4 - ], - [ - 0.2, - 0.4, - 0.2, - 0.4 - ], - [ - 0.2, - 0.4, - 0.2, - 0.4 - ] - ] - } - ] -} diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock.png deleted file mode 100644 index 770e4b8d2f8..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_VOX.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_VOX.png deleted file mode 100644 index b11a9182fb7..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/rock_VOX.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow.png deleted file mode 100644 index 345248bc536..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_VOX.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_VOX.png deleted file mode 100644 index 6efb246ac18..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shadow_VOX.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock.png deleted file mode 100644 index acdc87a291c..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_VOX.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_VOX.png deleted file mode 100644 index d1f011c44d3..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/shock_VOX.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech.png deleted file mode 100644 index 0611fa8a2a0..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_VOX.png b/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_VOX.png deleted file mode 100644 index 1787cdd4e06..00000000000 Binary files a/Resources/Textures/Structures/Specific/Anomalies/inner_anom_layer.rsi/tech_VOX.png and /dev/null differ diff --git a/Resources/Textures/Structures/Specific/anomaly.rsi/anom5-pulse.png b/Resources/Textures/Structures/Specific/anomaly.rsi/anom5-pulse.png index d8b6f14c119..c0e547f8dd9 100644 Binary files a/Resources/Textures/Structures/Specific/anomaly.rsi/anom5-pulse.png and b/Resources/Textures/Structures/Specific/anomaly.rsi/anom5-pulse.png differ diff --git a/Resources/Textures/Structures/Specific/anomaly.rsi/anom5.png b/Resources/Textures/Structures/Specific/anomaly.rsi/anom5.png index a36dd2b64ad..6117776649f 100644 Binary files a/Resources/Textures/Structures/Specific/anomaly.rsi/anom5.png and b/Resources/Textures/Structures/Specific/anomaly.rsi/anom5.png differ diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index 3b8158b7c7a..00bf1f60aa9 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -554,33 +554,3 @@ binds: - function: Hotbar9 type: State key: Num9 -- function: MappingUnselect - type: State - key: MouseRight - canFocus: true -- function: SaveMap - type: State - key: S - mod1: Control -- function: MappingEnablePick - type: State - key: Num5 -- function: MappingEnableDelete - type: State - key: Num6 -- function: MappingPick - type: State - key: MouseLeft - canFocus: true -- function: MappingRemoveDecal - type: State - key: MouseLeft - canFocus: true -- function: MappingCancelEraseDecal - type: State - key: MouseRight - canFocus: true -- function: MappingOpenContextMenu - type: State - key: MouseRight - canFocus: true diff --git a/RobustToolbox b/RobustToolbox index c86cb0b7951..0f60ad9018f 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit c86cb0b7951cc4a662c7292138c5f45d868c5f58 +Subproject commit 0f60ad9018f54f9b49da1810bbffa01e2c5975f7 diff --git a/Tools/SS14 Aseprite Templates/IconSmoothingTemplate README.txt b/Tools/SS14 Aseprite Templates/IconSmoothingTemplate README.txt deleted file mode 100644 index 083e803ecd1..00000000000 --- a/Tools/SS14 Aseprite Templates/IconSmoothingTemplate README.txt +++ /dev/null @@ -1,4 +0,0 @@ -This is a template that greatly simplifies working with IconSmooth sprites. - -A video on how to use it can be found at the link: -https://github.com/space-wizards/space-station-14/pull/32210 \ No newline at end of file diff --git a/Tools/SS14 Aseprite Templates/IconSmoothingTemplate.aseprite b/Tools/SS14 Aseprite Templates/IconSmoothingTemplate.aseprite deleted file mode 100644 index 112a1d932ca..00000000000 Binary files a/Tools/SS14 Aseprite Templates/IconSmoothingTemplate.aseprite and /dev/null differ diff --git a/Tools/publish_multi_request.py b/Tools/publish_multi_request.py deleted file mode 100755 index 03edea02b4e..00000000000 --- a/Tools/publish_multi_request.py +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env python3 - -import requests -import os -import subprocess -from typing import Iterable - -PUBLISH_TOKEN = os.environ["PUBLISH_TOKEN"] -VERSION = os.environ["GITHUB_SHA"] - -RELEASE_DIR = "release" - -# -# CONFIGURATION PARAMETERS -# Forks should change these to publish to their own infrastructure. -# -ROBUST_CDN_URL = "https://cdn.delta-v.org/" -FORK_ID = "delta-v" - -def main(): - session = requests.Session() - session.headers = { - "Authorization": f"Bearer {PUBLISH_TOKEN}", - } - - print(f"Starting publish on Robust.Cdn for version {VERSION}") - - data = { - "version": VERSION, - "engineVersion": get_engine_version(), - } - headers = { - "Content-Type": "application/json" - } - resp = session.post(f"{ROBUST_CDN_URL}fork/{FORK_ID}/publish/start", json=data, headers=headers) - resp.raise_for_status() - print("Publish successfully started, adding files...") - - for file in get_files_to_publish(): - print(f"Publishing {file}") - with open(file, "rb") as f: - headers = { - "Content-Type": "application/octet-stream", - "Robust-Cdn-Publish-File": os.path.basename(file), - "Robust-Cdn-Publish-Version": VERSION - } - resp = session.post(f"{ROBUST_CDN_URL}fork/{FORK_ID}/publish/file", data=f, headers=headers) - - resp.raise_for_status() - - print("Successfully pushed files, finishing publish...") - - data = { - "version": VERSION - } - headers = { - "Content-Type": "application/json" - } - resp = session.post(f"{ROBUST_CDN_URL}fork/{FORK_ID}/publish/finish", json=data, headers=headers) - resp.raise_for_status() - - print("SUCCESS!") - - -def get_files_to_publish() -> Iterable[str]: - for file in os.listdir(RELEASE_DIR): - yield os.path.join(RELEASE_DIR, file) - - -def get_engine_version() -> str: - proc = subprocess.run(["git", "describe","--tags", "--abbrev=0"], stdout=subprocess.PIPE, cwd="RobustToolbox", check=True, encoding="UTF-8") - tag = proc.stdout.strip() - assert tag.startswith("v") - return tag[1:] # Cut off v prefix. - - -if __name__ == '__main__': - main()