Merge branch 'Languages' of https://github.com/FoxxoTrystan/Einstein-…

…Engines into Languages

Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs

@@ -42,11 +42,12 @@ ActionButton MakeButton(int index)
         {
             var button = new ActionButton(_entity);
 
-            if (keys.TryGetValue(index, out var boundKey))
-            {
-                button.KeyBind = boundKey;
+            if (!keys.TryGetValue(index, out var boundKey))
+                return button;
 
-                var binding = _input.GetKeyBinding(boundKey);
+            button.KeyBind = boundKey;
+            if (_input.TryGetKeyBinding(boundKey, out var binding))
+            {
                 button.Label.Text = binding.GetKeyString();
             }
 

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -57,6 +57,7 @@ public sealed class PostMapInitTest
             "Asterisk", //DeltaV
             "TheHive", //DeltaV
             "Hammurabi", //DeltaV
+            "Lighthouse", //DeltaV
 			"Submarine" //DeltaV
         };
 

Content.Server/GameTicking/GameTicker.Player.cs

@@ -1,10 +1,13 @@
 using Content.Server.Database;
+using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.GameWindow;
 using Content.Shared.Players;
 using Content.Shared.Preferences;
 using JetBrains.Annotations;
 using Robust.Server.Player;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Enums;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
@@ -17,6 +20,7 @@ public sealed partial class GameTicker
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IServerDbManager _dbManager = default!;
+        [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
 
         private void InitializePlayer()
         {
@@ -69,6 +73,11 @@ private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs ar
 
                     RaiseNetworkEvent(GetConnectionStatusMsg(), session.Channel);
 
+                    if (firstConnection && _configurationManager.GetCVar(CCVars.AdminNewPlayerJoinSound))
+                        _audioSystem.PlayGlobal(new SoundPathSpecifier("/Audio/Effects/newplayerping.ogg"),
+                            Filter.Empty().AddPlayers(_adminManager.ActiveAdmins), false,
+                            audioParams: new AudioParams { Volume = -5f });
+
                     if (LobbyEnabled && _roundStartCountdownHasNotStartedYetDueToNoPlayers)
                     {
                         _roundStartCountdownHasNotStartedYetDueToNoPlayers = false;

Content.Server/Spreader/SpreaderSystem.cs

@@ -215,7 +215,7 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
                 xformQuery.TryGetComponent(dock.DockedWith, out var dockedXform) &&
                 TryComp<MapGridComponent>(dockedXform.GridUid, out var dockedGrid))
             {
-                neighborTiles.Add((ent.Value, dockedGrid, _map.CoordinatesToTile(ent.Value, dockedGrid, dockedXform.Coordinates), xform.LocalRotation.ToAtmosDirection(), dockedXform.LocalRotation.ToAtmosDirection()));
+                neighborTiles.Add((dockedXform.GridUid.Value, dockedGrid, _map.CoordinatesToTile(dockedXform.GridUid.Value, dockedGrid, dockedXform.Coordinates), xform.LocalRotation.ToAtmosDirection(), dockedXform.LocalRotation.ToAtmosDirection()));
             }
 
             // If we're on a blocked tile work out which directions we can go.

Content.Shared/CCVar/CCVars.cs

@@ -772,6 +772,12 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> SeeOwnNotes =
             CVarDef.Create("admin.see_own_notes", false, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
 
+        /// <summary>
+        /// Should the server play a quick sound to the active admins whenever a new player joins?
+        /// </summary>
+        public static readonly CVarDef<bool> AdminNewPlayerJoinSound =
+            CVarDef.Create("admin.new_player_join_sound", false, CVar.SERVERONLY);
+
         /// <summary>
         /// The amount of days before the note starts fading. It will slowly lose opacity until it reaches stale. Set to 0 to disable.
         /// </summary>

Resources/Audio/Effects/attributions.yml

@@ -216,3 +216,8 @@
   copyright: Bhijn and Myr (github username deathride58)
   license: CC0-1.0
   source: https://github.com/space-wizards/space-station-14/pull/23212
+
+- files: ["newplayerping.ogg"]
+  copyright: TGStation at 3df5d3b42bfb6b3b5adba1067ab41f83816255bb
+  license: CC-BY-SA-3.0
+  source: https://github.com/tgstation/tgstation/blob/3df5d3b42bfb6b3b5adba1067ab41f83816255bb/sound/misc/server-ready.ogg

Resources/Prototypes/Catalog/Cargo/cargo_vending.yml

@@ -33,8 +33,8 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 7250 #DeltaV
-  category: Service
+  cost: 7245
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct

Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml

@@ -100,6 +100,7 @@
     ClothingHandsGlovesColorGreen: 2
     ClothingHandsGlovesColorOrange: 2
     ClothingHandsGlovesColorPurple: 2
+    ClothingEyesGlassesCheapSunglasses: 3
   contrabandInventory:
     ClothingMaskNeckGaiter: 2
     ClothingUniformJumpsuitTacticool: 1

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -129,17 +129,14 @@
 
 - type: entity
   parent: ClothingEyesBase
-  id: ClothingEyesGlassesSunglasses
-  name: sun glasses
-  description: A pair of black sunglasses.
+  id: ClothingEyesGlassesCheapSunglasses
+  name: cheap sunglasses
+  description: A pair of black sunglasses. Doesn't block light well, more of an accessory than something useful.
   components:
   - type: Sprite
     sprite: Clothing/Eyes/Glasses/sunglasses.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Glasses/sunglasses.rsi
-  - type: FlashImmunity
-  - type: EyeProtection
-    protectionTime: 5
   - type: Tag
     tags:
     - HamsterWearable
@@ -148,6 +145,16 @@
   - type: IdentityBlocker
     coverage: EYES
 
+- type: entity
+  parent: ClothingEyesGlassesCheapSunglasses
+  id: ClothingEyesGlassesSunglasses
+  name: sun glasses
+  description: A pair of black sunglasses.
+  components:
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+
 - type: entity
   parent: ClothingEyesBase
   id: ClothingEyesGlassesSecurity

Resources/Prototypes/Entities/Objects/Weapons/security.yml

@@ -100,7 +100,7 @@
   - type: Item
     size: Normal
   - type: Clothing
-    sprite: Objects\Weapons\Melee\truncheon.rsi
+    sprite: Objects/Weapons/Melee/truncheon.rsi
     quickEquip: false
     slots:
     - Belt

Resources/Prototypes/Maps/Pools/default.yml

@@ -6,6 +6,7 @@
   - Asterisk
   - Edge
   - Hammurabi
+  - Lighthouse
   - Pebble
   - Shoukou
   - Tortuga

Resources/Prototypes/Maps/lighthouse.yml

@@ -0,0 +1,68 @@
+- type: gameMap
+  id: Lighthouse
+  mapName: Lighthouse
+  mapPath: /Maps/lighthouse.yml
+  minPlayers: 15
+  maxPlayers: 55
+  stations:
+    Lighthouse:
+      stationProto: StandardNanotrasenStation
+      components:
+      - type: StationEmergencyShuttle
+        emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_BC20.yml
+      - type: StationNameSetup
+        mapNameTemplate: '{0} Lighthouse {1}'
+        nameGenerator:
+          !type:NanotrasenNameGenerator
+          prefixCreator: '14'
+      - type: StationJobs
+        overflowJobs:
+        - Passenger
+        availableJobs:
+        #service
+          Captain: [ 1, 1 ]
+          HeadOfPersonnel: [ 1, 1 ]
+          Bartender: [ 1, 2 ]
+          Botanist: [ 2, 2 ]
+          Boxer: [ 2, 2 ]
+          Chef: [ 1, 2 ]
+          Clown: [ 1, 1 ]
+          Lawyer: [ 2, 2 ]
+          Reporter: [ 0, 2 ]
+          Musician: [ 1, 1 ]
+          Janitor: [ 1, 2 ]
+          Mime: [ 1, 1 ]
+        #engineering
+          ChiefEngineer: [ 1, 1 ]
+          AtmosphericTechnician: [ 1, 2 ]
+          StationEngineer: [ 3, 4 ]
+          TechnicalAssistant: [ 2, 3 ]
+        #medical
+          ChiefMedicalOfficer: [ 1, 1 ]
+          Chemist: [ 1, 2 ]
+          Paramedic: [ 1, 2 ]
+          Psychologist: [ 1, 1 ]
+          MedicalDoctor: [ 3, 4 ]
+          MedicalIntern: [ 2, 3 ]
+        #science
+          ResearchDirector: [ 1, 1 ]
+          Chaplain: [ 1, 1 ]
+          ForensicMantis: [ 1, 1 ]
+          Scientist: [ 3, 4 ]
+          ResearchAssistant: [ 2, 3 ]
+          Borg: [ 1, 2 ]
+        #security
+          HeadOfSecurity: [ 1, 1 ]
+          Warden: [ 1, 1 ]
+          Detective: [ 1, 1 ]
+          SecurityOfficer: [ 2, 4 ]
+          SecurityCadet: [ 1, 4 ]
+          Prisoner: [ 2, 3 ]
+        #supply
+          Quartermaster: [ 1, 1 ]
+          MailCarrier: [ 2, 2 ]
+          SalvageSpecialist: [ 2, 3 ]
+          CargoTechnician: [ 2, 4 ]
+        #civilian
+          Passenger: [ -1, -1 ]
+