Goob vendor addition

Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

@@ -3,6 +3,7 @@
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.CrewManifest;
+using Content.Shared.StatusIcon;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
 
@@ -64,7 +65,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window?.UpdateState(castState);
         }
 
-        public void SubmitData(string newFullName, string newJobTitle, List<ProtoId<AccessLevelPrototype>> newAccessList, string newJobPrototype)
+        public void SubmitData(string newFullName, string newJobTitle, string newJobIcon, List<ProtoId<AccessLevelPrototype>> newAccessList, string newJobPrototype)
         {
             if (newFullName.Length > MaxFullNameLength)
                 newFullName = newFullName[..MaxFullNameLength];
@@ -75,6 +76,7 @@ public void SubmitData(string newFullName, string newJobTitle, List<ProtoId<Acce
             SendMessage(new WriteToTargetIdMessage(
                 newFullName,
                 newJobTitle,
+                newJobIcon, // Funkystation - ID card console job icon selection
                 newAccessList,
                 newJobPrototype));
         }

Content.Client/Access/UI/IdCardConsoleWindow.xaml

@@ -24,12 +24,22 @@
             <Label Name="JobTitleLabel" Text="{Loc 'id-card-console-window-job-title-label'}" />
             <LineEdit Name="JobTitleLineEdit" HorizontalExpand="True" />
             <Button Name="JobTitleSaveButton" Text="{Loc 'id-card-console-window-save-button'}" Disabled="True" />
+
+            <!-- begin Funkystation - job icon selection -->
+            <Label Name="JobIconLabel" Text="{Loc 'id-card-console-window-job-icon-label'}" />
+            <TextureRect Name="JobIconPreview"
+                         TextureScale="3 3"
+                         Margin="4 0"
+                         VerticalAlignment="Center" />
+            <Button Name="JobIconChangeButton" Text="{Loc 'id-card-console-window-job-icon-change-button'}"  Disabled="True" />
+            <!-- end Funkystation -->
         </GridContainer>
         <Control MinSize="0 8" />
         <GridContainer Columns="2">
             <Label Text="{Loc 'id-card-console-window-job-selection-label'}" />
             <OptionButton Name="JobPresetOptionButton" />
         </GridContainer>
+        <Control MinSize="0 8" />
         <Control Name="AccessLevelControlContainer" />
     </BoxContainer>
 </DefaultWindow>

Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs

@@ -2,11 +2,14 @@
 using Content.Shared.Access;
 using Content.Shared.Access.Systems;
 using Content.Shared.Roles;
+using Content.Shared.StatusIcon;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
+using Content.Client._Funkystation.Access.UI;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
 
 namespace Content.Client.Access.UI
@@ -15,7 +18,9 @@ namespace Content.Client.Access.UI
     public sealed partial class IdCardConsoleWindow : DefaultWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
+        private readonly SpriteSystem _spriteSystem;
         private readonly ISawmill _logMill = default!;
 
         private readonly IdCardConsoleBoundUserInterface _owner;
@@ -27,6 +32,8 @@ public sealed partial class IdCardConsoleWindow : DefaultWindow
         private string? _lastJobTitle;
         private string? _lastJobProto;
 
+        private IdCardConsoleIconSelectorWindow _iconWindow; // Funkystation - ID card console job icon selection
+
         // The job that will be picked if the ID doesn't have a job on the station.
         private static ProtoId<JobPrototype> _defaultJob = "Passenger";
 
@@ -36,6 +43,7 @@ public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeMana
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
             _logMill = _logManager.GetSawmill(SharedIdCardConsoleSystem.Sawmill);
+            _spriteSystem = _entitySystem.GetEntitySystem<SpriteSystem>();
 
             _owner = owner;
 
@@ -67,6 +75,13 @@ public IdCardConsoleWindow(IdCardConsoleBoundUserInterface owner, IPrototypeMana
                 JobPresetOptionButton.AddItem(Loc.GetString(job.Name), _jobPrototypeIds.Count - 1);
             }
 
+            // begin Funkystation - ID card console job icon selection
+            _iconWindow = new IdCardConsoleIconSelectorWindow();
+            _iconWindow.SetAllowedIcons();
+            _iconWindow.OnJobIconChanged += _ => SubmitData();
+            JobIconChangeButton.OnPressed += _ => _iconWindow.OpenCentered();
+            // end Funkystation
+
             JobPresetOptionButton.OnItemSelected += SelectJobPreset;
             _accessButtons.Populate(accessLevels, prototypeManager);
             AccessLevelControlContainer.AddChild(_accessButtons);
@@ -98,6 +113,8 @@ private void SelectJobPreset(OptionButton.ItemSelectedEventArgs args)
             JobTitleLineEdit.Text = Loc.GetString(job.Name);
             args.Button.SelectId(args.Id);
 
+            _iconWindow.SetJobIcon(job.Icon); // Funkystation
+
             ClearAllAccess();
 
             // this is a sussy way to do this
@@ -168,6 +185,20 @@ public void UpdateState(IdCardConsoleBoundUserInterfaceState state)
 
             JobPresetOptionButton.Disabled = !interfaceEnabled;
 
+            // begin Funkystation - ID card console job icon selection
+            JobIconLabel.Modulate = interfaceEnabled ? Color.White : Color.Gray;
+            JobIconChangeButton.Disabled = !interfaceEnabled;
+            if(!interfaceEnabled) {
+                _iconWindow.Close();
+            }
+
+            _iconWindow.SetJobIcon(state.TargetIdJobIcon);
+            if(_prototypeManager.TryIndex<JobIconPrototype>(state.TargetIdJobIcon ?? "JobIconForNoId", out var jobIcon))
+            {
+                JobIconPreview.Texture = _spriteSystem.Frame0(jobIcon.Icon);
+            }
+            // end Funkystation
+
             _accessButtons.UpdateState(state.TargetIdAccessList?.ToList() ??
                                        new List<ProtoId<AccessLevelPrototype>>(),
                                        state.AllowedModifyAccessList?.ToList() ??
@@ -187,6 +218,8 @@ public void UpdateState(IdCardConsoleBoundUserInterfaceState state)
             _lastFullName = state.TargetIdFullName;
             _lastJobTitle = state.TargetIdJobTitle;
             _lastJobProto = state.TargetIdJobPrototype;
+
+            _iconWindow.SetJobIcon(state.TargetIdJobIcon); // Funkystation - ID card console job icon selection
         }
 
         private void SubmitData()
@@ -198,6 +231,7 @@ private void SubmitData()
             _owner.SubmitData(
                 FullNameLineEdit.Text,
                 JobTitleLineEdit.Text,
+                _iconWindow.JobIcon, // Funkystation - ID card console job icon selection
                 // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
                 _accessButtons.ButtonsList.Where(x => x.Value.Pressed).Select(x => x.Key).ToList(),
                 jobProtoDirty ? _jobPrototypeIds[JobPresetOptionButton.SelectedId] : string.Empty);

Content.Client/Cargo/Systems/CargoSystem.Telepad.cs

@@ -75,10 +75,9 @@ private void OnChangeData(EntityUid uid, SpriteComponent? sprite = null)
         switch (state)
         {
             case CargoTelepadState.Teleporting:
-                if (_player.HasRunningAnimation(uid, TelepadBeamKey))
-                    return;
-                _player.Stop(uid, player, TelepadIdleKey);
-                _player.Play((uid, player), CargoTelepadBeamAnimation, TelepadBeamKey);
+                _player.Stop((uid, player), TelepadIdleKey);
+                if (!_player.HasRunningAnimation(uid, TelepadBeamKey))
+                    _player.Play((uid, player), CargoTelepadBeamAnimation, TelepadBeamKey);
                 break;
             case CargoTelepadState.Unpowered:
                 sprite.LayerSetVisible(CargoTelepadLayers.Beam, false);

Content.Client/Cargo/UI/CargoConsoleMenu.xaml

@@ -38,9 +38,10 @@
                         <!-- Products get added here by code -->
                     </BoxContainer>
                 </ScrollContainer>
-                <Control MinHeight="5"/>
+                <Control MinHeight="5" Name="OrdersSpacer"/>
                 <PanelContainer VerticalExpand="True"
-                                SizeFlagsStretchRatio="1">
+                                SizeFlagsStretchRatio="1"
+                                Name="Orders">
                     <PanelContainer.PanelOverride>
                         <gfx:StyleBoxFlat BackgroundColor="#000000" />
                     </PanelContainer.PanelOverride>

Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs

@@ -208,6 +208,7 @@ public void PopulateOrders(IEnumerable<CargoOrderData> orders)
 
                 var product = _protoManager.Index<EntityPrototype>(order.ProductId);
                 var productName = product.Name;
+                var account = _protoManager.Index(order.Account);
 
                 var row = new CargoOrderRow
                 {
@@ -219,7 +220,9 @@ public void PopulateOrders(IEnumerable<CargoOrderData> orders)
                             "cargo-console-menu-populate-orders-cargo-order-row-product-name-text",
                             ("productName", productName),
                             ("orderAmount", order.OrderQuantity),
-                            ("orderRequester", order.Requester))
+                            ("orderRequester", order.Requester),
+                            ("accountColor", account.Color),
+                            ("account", Loc.GetString(account.Code)))
                     },
                     Description =
                     {
@@ -282,6 +285,9 @@ protected override void FrameUpdate(FrameEventArgs args)
             AccountActionButton.Disabled = TransferSpinBox.Value <= 0 ||
                                            TransferSpinBox.Value > bankAccount.Accounts[orderConsole.Account] * orderConsole.TransferLimit ||
                                            _timing.CurTime < orderConsole.NextAccountActionTime;
+
+            OrdersSpacer.Visible = !orderConsole.SlipPrinter;
+            Orders.Visible = !orderConsole.SlipPrinter;
         }
     }
 }

Content.Client/Cargo/UI/CargoOrderRow.xaml

@@ -11,11 +11,10 @@
         <BoxContainer Orientation="Vertical"
                       HorizontalExpand="True"
                       VerticalExpand="True">
-            <Label Name="ProductName"
+            <RichTextLabel Name="ProductName"
                    Access="Public"
                    HorizontalExpand="True"
-                   StyleClasses="LabelSubText"
-                   ClipText="True" />
+                   StyleClasses="LabelSubText" />
             <Label Name="Description"
                    Access="Public"
                    HorizontalExpand="True"

Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs

@@ -36,6 +36,7 @@ public void SetOrders(SpriteSystem sprites, IPrototypeManager protoManager, List
             {
                  var product = protoManager.Index<EntityPrototype>(order.ProductId);
                  var productName = product.Name;
+                 var account = protoManager.Index(order.Account);
 
                  var row = new CargoOrderRow
                  {
@@ -47,7 +48,9 @@ public void SetOrders(SpriteSystem sprites, IPrototypeManager protoManager, List
                              "cargo-console-menu-populate-orders-cargo-order-row-product-name-text",
                              ("productName", productName),
                              ("orderAmount", order.OrderQuantity - order.NumDispatched),
-                             ("orderRequester", order.Requester))
+                             ("orderRequester", order.Requester),
+                             ("accountColor", account.Color),
+                             ("account", Loc.GetString(account.Code)))
                      },
                      Description = {Text = Loc.GetString("cargo-console-menu-order-reason-description",
                          ("reason", order.Reason))}

Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs

@@ -43,7 +43,7 @@ protected override void Open()
                     (uint) _window.PillDosage.Value, (uint) _window.PillNumber.Value, _window.LabelLine));
             _window.CreateBottleButton.OnPressed += _ => SendMessage(
                 new ChemMasterOutputToBottleMessage(
-                    (uint) _window.BottleDosage.Value, _window.LabelLine));
+                    (uint) _window.BottleDosage.Value, (uint) _window.BottleNumber.Value, _window.LabelLine));
 
             for (uint i = 0; i < _window.PillTypeButtons.Length; i++)
             {

Content.Client/Chemistry/UI/ChemMasterWindow.xaml

@@ -93,7 +93,7 @@
                         <BoxContainer Orientation="Horizontal">
                             <Label Text="{Loc 'chem-master-window-pills-label'}" />
                             <Control HorizontalExpand="True" MinSize="50 0" />
-                            <Label Text="{Loc 'chem-master-window-pills-number-label'}" Margin="5 0 0 0" StyleClasses="LabelSecondaryColor" />
+                            <Label Text="{Loc 'chem-master-window-number-label'}" Margin="5 0 0 0" StyleClasses="LabelSecondaryColor" />
                             <SpinBox MinSize="100 0" Name="PillNumber" Access="Public" Value="0" />
                             <Label Text="{Loc 'chem-master-window-dose-label'}" Margin="5 0 0 0" StyleClasses="LabelSecondaryColor" />
                             <SpinBox MinSize="100 0" Name="PillDosage" Access="Public" Value="1" />
@@ -103,6 +103,8 @@
                         <BoxContainer Orientation="Horizontal">
                             <Label Text="{Loc 'chem-master-window-bottles-label'}" />
                             <Control HorizontalExpand="True" MinSize="50 0" />
+                            <Label Text="{Loc 'chem-master-window-number-label'}" Margin="5 0 0 0" StyleClasses="LabelSecondaryColor" />
+                            <SpinBox MinSize="100 0" Name="BottleNumber" Access="Public" Value="0" />
                             <Label Text="{Loc 'chem-master-window-dose-label'}" Margin="5 0 0 0" StyleClasses="LabelSecondaryColor" />
                             <SpinBox MinSize="100 0" Name="BottleDosage" Access="Public" Value="0" />
                             <Button MinSize="80 0" Name="CreateBottleButton" Access="Public" Text="{Loc 'chem-master-window-create-button'}" />

Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs

@@ -99,6 +99,7 @@ public ChemMasterWindow()
             PillDosage.InitDefaultButtons();
             PillNumber.InitDefaultButtons();
             BottleDosage.InitDefaultButtons();
+            BottleNumber.InitDefaultButtons();
 
             // Ensure label length is within the character limit.
             LabelLineEdit.IsValid = s => s.Length <= SharedChemMaster.LabelMaxLength;
@@ -320,7 +321,7 @@ public void UpdateState(BoundUserInterfaceState state)
             BufferCurrentVolume.Text = $" {castState.PillBufferCurrentVolume?.Int() ?? 0}u";
 
             InputEjectButton.Disabled = castState.ContainerInfo is null;
-            CreateBottleButton.Disabled = true;
+            CreateBottleButton.Disabled = castState.PillBufferReagents.Count == 0;;
             CreatePillButton.Disabled = castState.PillBufferReagents.Count == 0;
 
             UpdateDosageFields(castState);
@@ -334,10 +335,12 @@ private void UpdateDosageFields(ChemMasterBoundUserInterfaceState castState)
         {
             var bufferVolume = castState.PillBufferCurrentVolume?.Int() ?? 0;
             PillDosage.Value = (int) Math.Min(bufferVolume, castState.PillDosageLimit);
+            BottleDosage.Value = (int) Math.Min(bufferVolume, 30);
 
             PillTypeButtons[castState.SelectedPillType].Pressed = true;
             PillNumber.IsValid = x => x >= 0;
             PillDosage.IsValid = x => x > 0 && x <= castState.PillDosageLimit;
+            BottleNumber.IsValid = x => x >= 0;
             BottleDosage.IsValid = x => x >= 0;
 
             // Avoid division by zero
@@ -346,7 +349,10 @@ private void UpdateDosageFields(ChemMasterBoundUserInterfaceState castState)
             else
                 PillNumber.Value = 0;
 
-            BottleDosage.Value = bufferVolume;
+            if (BottleDosage.Value > 0)
+                BottleNumber.Value = bufferVolume / BottleDosage.Value;
+            else
+                BottleNumber.Value = 0;
         }
         /// <summary>
         /// Generate a product label based on reagents in the buffer.

Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs

@@ -1,4 +1,5 @@
 using Content.Client.Guidebook.Components;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Chemistry;
 using Content.Shared.Containers.ItemSlots;
 using JetBrains.Annotations;
@@ -31,8 +32,7 @@ protected override void Open()
 
             // Setup window layout/elements
             _window = this.CreateWindow<ReagentDispenserWindow>();
-            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
-            _window.HelpGuidebookIds = EntMan.GetComponent<GuideHelpComponent>(Owner).Guides;
+            _window.SetInfoFromEntity(EntMan, Owner);
 
             // Setup static button actions.
             _window.EjectButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(SharedReagentDispenser.OutputSlotName));

Content.Client/Clothing/ClientClothingSystem.cs

@@ -3,6 +3,7 @@
 using System.Numerics;
 using Content.Client.DisplacementMap;
 using Content.Client.Inventory;
+using Content.Shared._DV.Silicon.IPC; // DeltaV - IPC Snouts
 using Content.Shared.Clothing;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Clothing.EntitySystems;
@@ -106,17 +107,24 @@ private void OnGetVisuals(EntityUid uid, ClothingComponent item, GetEquipmentVis
 
         List<PrototypeLayerData>? layers = null;
 
+        // Begin DeltaV Additions - IPC snouts
+        var speciesId = inventory.SpeciesId;
+
+        if (TryComp(args.Equipee, out SnoutHelmetComponent? helmetComponent) && helmetComponent.EnableAlternateHelmet)
+            speciesId = helmetComponent.ReplacementRace;
+
         // first attempt to get species specific data.
-        if (inventory.SpeciesId != null)
-            item.ClothingVisuals.TryGetValue($"{args.Slot}-{inventory.SpeciesId}", out layers);
+        if (speciesId != null)
+            item.ClothingVisuals.TryGetValue($"{args.Slot}-{speciesId}", out layers);
 
         // if that returned nothing, attempt to find generic data
         if (layers == null && !item.ClothingVisuals.TryGetValue(args.Slot, out layers))
         {
             // No generic data either. Attempt to generate defaults from the item's RSI & item-prefixes
-            if (!TryGetDefaultVisuals(uid, item, args.Slot, inventory.SpeciesId, out layers))
+            if (!TryGetDefaultVisuals(uid, item, args.Slot, speciesId, out layers))
                 return;
         }
+        // End DeltaV Additions
 
         // add each layer to the visuals
         var i = 0;

Content.Client/Crayon/CrayonSystem.cs

@@ -1,22 +1,32 @@
+using Content.Client.Crayon.Overlays;
 using Content.Client.Items;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
 using Content.Shared.Crayon;
+using Content.Shared.Decals;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.GameObjects;
 using Robust.Shared.GameStates;
-using Robust.Shared.Localization;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Client.Crayon;
 
 public sealed class CrayonSystem : SharedCrayonSystem
 {
+    [Dependency] private readonly IOverlayManager _overlayManager = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+
     // Didn't do in shared because I don't think most of the server stuff can be predicted.
     public override void Initialize()
     {
         base.Initialize();
+
+        _overlayManager.AddOverlay(new CrayonPlacementOverlay(_transform, _sprite)); //Funky Station
+
         SubscribeLocalEvent<CrayonComponent, ComponentHandleState>(OnCrayonHandleState);
         Subs.ItemStatus<CrayonComponent>(ent => new StatusControl(ent));
     }