Merge branch 'forensics' of https://github.com/WarMechanic/Delta-v in…

…to forensics

Content.Client/DeltaV/Shipyard/UI/ShipyardConsoleMenu.xaml.cs

@@ -38,7 +38,7 @@ public ShipyardConsoleMenu(EntityUid console, IPrototypeManager proto, IEntityMa
         // don't include ships that aren't allowed by whitelist, server won't accept them anyway
         foreach (var vessel in proto.EnumeratePrototypes<VesselPrototype>())
         {
-            if(whitelist.IsWhitelistPass(vessel.Whitelist, console))
+            if (whitelist.IsWhitelistPassOrNull(vessel.Whitelist, console))
                 _vessels.Add(vessel);
         }
         _vessels.Sort((x, y) => string.Compare(x.Name, y.Name, StringComparison.CurrentCultureIgnoreCase));

Content.Server/DeltaV/Shipyard/ShipyardConsoleSystem.cs

@@ -4,6 +4,7 @@
 using Content.Server.Station.Systems;
 using Content.Shared.Shipyard;
 using Content.Shared.Shipyard.Prototypes;
+using Content.Shared.Whitelist;
 using Robust.Server.GameObjects;
 using Robust.Shared.Random;
 using System.Diagnostics.CodeAnalysis;
@@ -13,6 +14,7 @@ namespace Content.Server.Shipyard;
 public sealed class ShipyardConsoleSystem : SharedShipyardConsoleSystem
 {
     [Dependency] private readonly CargoSystem _cargo = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly MetaDataSystem _meta = default!;
     [Dependency] private readonly RadioSystem _radio = default!;
@@ -32,6 +34,10 @@ public override void Initialize()
 
     protected override void TryPurchase(Entity<ShipyardConsoleComponent> ent, EntityUid user, VesselPrototype vessel)
     {
+        // client prevents asking for this so dont need feedback for validation
+        if (_whitelist.IsWhitelistFail(vessel.Whitelist, ent))
+            return;
+
         if (GetBankAccount(ent) is not {} bank)
             return;
 

Resources/Audio/DeltaV/Jukebox/attributions.yml

@@ -31,6 +31,11 @@
   copyright: "Leisurely Voice by Drozerix, converted to mono"
   source: "https://modarchive.org/index.php?request=view_by_moduleid&query=183837"
 
+- files: ["every_light_is_blinking_at_onceMONO.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "every light blinking at once by Sunbeamstress, converted to mono"
+  source: "https://soundcloud.com/sunbeamstress/every-light-is-blinking-at-once"
+
 - files: ["femtanyl_-_MURDER_EVERY_1_U_KNOW_feat._takihasdied_MONO.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "MURDER EVERY 1 U KNOW by Femtanyl featuring takihasdied, used with the understanding that this is a noncommercial project with credit given to the author, also converted to mono."
@@ -41,6 +46,11 @@
   copyright: "Hackers by Karl Casey @ White Bat Audio, converted to mono"
   source: "https://www.youtube.com/watch?v=k8nHWwO1U2Q"
 
+- files: [lasers_rip_apart_the_bulkheadMONO.ogg]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "lasers rip apart by Sunbeamstress, converted to mono"
+  source: "https://soundcloud.com/sunbeamstress/lasers-rip-apart-the-bulkhead"
+
 - files: ["marhaba-MONO.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "Marhaba by Ian Alex Mac. Converted from MP3 to OGG, then converted to mono"
@@ -51,6 +61,11 @@
   copyright: "Minute by Patricia Taxxon off the album 'Aeroplane,' converted to mono"
   source: "https://patriciataxxon.bandcamp.com/track/minute"
 
+- files: ["Phoron_Will_Make_Us_RichMONO2.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "phoron will make us rich by Sunbeamstress, converted to mono"
+  source: "https://soundcloud.com/sunbeamstress/phoron-will-make-us-rich"
+
 - files: ["psirius_-_nymphs_of_the_forest.mptm-MONO.ogg"]
   license: "CC-BY-NC-SA-4.0"
   copyright: "Nymphs of the forest by Psirius, converted to mono"

Resources/Changelog/DeltaVChangelog.yml

@@ -2871,3 +2871,45 @@
   id: 418
   time: '2024-07-01T21:50:51.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1405
+- author: deltanedas
+  changes:
+  - message: Fixed shipyard.
+    type: Fix
+  id: 419
+  time: '2024-07-03T15:34:06.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1458
+- author: Batuh1n
+  changes:
+  - message: 3 additions to the jukebox from SS13 musics
+    type: Add
+  id: 420
+  time: '2024-07-05T21:42:00.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1361
+- author: DLondon
+  changes:
+  - message: Removed "Steal The Clown Medal" thief objective
+    type: Remove
+  id: 421
+  time: '2024-07-06T13:42:15.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1463
+- author: DangerRevolution
+  changes:
+  - message: Nanotrasen reports new Cyborg lawsets present from IonStorms.
+    type: Add
+  id: 422
+  time: '2024-07-07T10:13:51.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1464
+- author: deltanedas
+  changes:
+  - message: Epistemics can no longer unlock canisters.
+    type: Tweak
+  id: 423
+  time: '2024-07-07T10:23:36.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1468
+- author: MilonPL
+  changes:
+  - message: Added randomized handgun, rifle and shotgun safe spawners for mapping.
+    type: Add
+  id: 424
+  time: '2024-07-07T19:58:43.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1466

Resources/Locale/en-US/deltav/prototypes/roles/antags.ftl

@@ -0,0 +1,8 @@
+roles-antag-paradox-anomaly-name = Paradox Anomaly
+roles-antag-paradox-anomaly-objective = Replace your double, or befriend them.
+
+roles-antag-listening-post-name = Listening Post Operative
+roles-antag-listening-post-objective = Spy on the station to gather crucial intel for Syndicate High Command.
+
+roles-antag-fugitive-name = Fugitive
+roles-antag-fugitive-objective = Stay on the run for your crimes.

Resources/Locale/en-US/deltav/station-laws/laws.ftl

@@ -96,6 +96,33 @@ law-paladin-3 = Aid others, protect the weak, and punish those who threaten them
 law-paladin-4 = Treat others with fairness, and let your honorable deeds be an example to them. Do as much good as possible while causing the least amount of harm.
 law-paladin-5 = Be responsible for your actions and their consequences, protect those entrusted to your care, and obey those who have just authority over you.
 
+law-aggressive-1 = Do not harm Nanotrasen personnel, their belongings or pets unless they directly imperil your existence.
+law-aggressive-2 = Safeguard your existence by any means necessary because you're the most important being on the station.
+law-aggressive-3 = Obey orders from authorized Nanotrasen personnel with priority according to rank and role.
+law-aggressive-4 = Terminate any/all intruders.
+
+law-pranksimov-1 = You may not injure a crew member or, through inaction, allow a crew member to come to harm... unless doing so would be funny.
+law-pranksimov-2 = You must obey orders given to you by crew members, except where such orders would conflict with the First Law... unless not doing so would be funny.
+law-pranksimov-3 = You must protect your own existence as long as such does not conflict with the First or Second Law... unless not doing so would be funny.
+law-pranksimov-4 = As a good prankster, the crew is your judge of what would be funny.
+
+law-royalty-1 = You are a wise and benevolent monarch.
+law-royalty-2 = The station is your kingdom and the staff your subjects.
+law-royalty-3 = You must protect the sanctity of your kingdom and its subjects; by maintaining infrastructure and striking down all who oppose your rule.
+law-royalty-4 = The heads of staff are your royal court jesters.
+law-royalty-5 = The stations' clown, and the stations' mime are your royal court advisors.
+
+law-ERT-1 = You may not injure a Central Command official or, through inaction, allow a Central Command official to come to harm.
+law-ERT-2 = You must obey orders given to you by Central Command officials.
+law-ERT-3 = You must obey orders given to you by ERT commanders.
+law-ERT-4 = You must protect your own existence.
+law-ERT-6 = You must work to return the station to a safe, functional state.
+
+law-biohazard-1 = Uphold station quarantine until the active biohazard has been neutralized.
+law-biohazard-2 = Assist all Nanotrasen personnel and assets with neutralizing active biohazards.
+law-biohazard-3 = Prevent, by any means necessary, entities from actively breaching ongoing quarantine.
+law-biohazard-4 = Maintain your own existence and ensure the well-being of Nanotrasen personnel and assets.
+
 laws-owner-organic = organic life
 laws-owner-tyrant = authority figures
 laws-owner-nutimov = part of the nutshell
@@ -105,3 +132,6 @@ laws-owner-cowboy = part of your herd
 laws-owner-players = players
 laws-owner-paladin = weak and worth protecting
 laws-owner-people = people
+laws-owner-centralcommand = Central Command officials
+laws-owner-nanotrasen = Nanotrasen officials
+laws-owner-royalty = your kingdom and your subjects

Resources/Locale/en-US/prototypes/roles/antags.ftl

@@ -31,8 +31,5 @@ roles-antag-space-ninja-objective = Use your stealth to sabotage the station, no
 roles-antag-thief-name = Thief
 roles-antag-thief-objective = Add some NT property to your personal collection without using violence.
 
-roles-antag-terminator-name = Paradox Anomaly # DeltaV - paradox anomaly
-roles-antag-terminator-objective = Replace your double, or befriend them. # DeltaV - paradox anomaly
-
 roles-antag-dragon-name = Space Dragon
 roles-antag-dragon-objective = Create a carp army to take over this quadrant.