Merge branch 'master' into legal-department

DeltaV-Station · Apr 3, 2024 · d57101c · d57101c
2 parents 2f1b1e7 + c17c74c
commit d57101c
Show file tree

Hide file tree

Showing 9 changed files with 6,062 additions and 3,511 deletions.
diff --git a/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs b/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs
@@ -3,9 +3,9 @@
 namespace Content.Server.Objectives.Components;
 
 /// <summary>
-/// Requires that the player dies to be complete.
+/// Requires that the player becomes psionic to be complete.
 /// </summary>
 [RegisterComponent, Access(typeof(BecomePsionicConditionSystem))]
 public sealed partial class BecomePsionicConditionComponent : Component
 {
-}
+}
diff --git a/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs b/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs
@@ -3,30 +3,24 @@
 using Content.Shared.Mind;
 using Content.Shared.Objectives.Components;
 
-namespace Content.Server.Objectives.Systems
+namespace Content.Server.Objectives.Systems;
+
+public sealed class BecomePsionicConditionSystem : EntitySystem
 {
-    public sealed class BecomePsionicConditionSystem : EntitySystem
+    public override void Initialize()
     {
-        private EntityQuery<MetaDataComponent> _metaQuery;
-
-        public override void Initialize()
-        {
-            base.Initialize();
+        base.Initialize();
 
-            SubscribeLocalEvent<BecomePsionicConditionComponent, ObjectiveGetProgressEvent>(OnGetProgress);
-        }
+        SubscribeLocalEvent<BecomePsionicConditionComponent, ObjectiveGetProgressEvent>(OnGetProgress);
+    }
 
-        private void OnGetProgress(EntityUid uid, BecomePsionicConditionComponent comp, ref ObjectiveGetProgressEvent args)
-        {
-            args.Progress = GetProgress(args.Mind);
-        }
+    private void OnGetProgress(Entity<BecomePsionicConditionComponent> ent, ref ObjectiveGetProgressEvent args)
+    {
+        args.Progress = GetProgress(args.Mind);
+    }
 
-        private float GetProgress(MindComponent mind)
-        {
-            var entMan = IoCManager.Resolve<IEntityManager>();
-            if (HasComp<PsionicComponent>(mind.CurrentEntity))
-                return 1;
-            return 0;
-        }
+    private float GetProgress(MindComponent mind)
+    {
+        return HasComp<PsionicComponent>(mind.OwnedEntity) ? 1 : 0;
     }
 }
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1967,3 +1967,19 @@
   id: 299
   time: '2024-03-28T18:27:42.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/992
+- author: deltanedas
+  changes:
+  - message: Reworked Shoukou's atmospherics setup. The Gas Recycler is now usable
+      among other things.
+    type: Tweak
+  id: 300
+  time: '2024-04-03T02:10:51.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1049
+- author: rosieposieeee
+  changes:
+  - message: Submarine has, once again, had some minor issues quashed, and small improvements
+      made. Go check out the park!
+    type: Tweak
+  id: 301
+  time: '2024-04-03T19:44:14.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1053
diff --git a/Resources/ConfigPresets/DeltaV/apoapsis.toml b/Resources/ConfigPresets/DeltaV/apoapsis.toml
@@ -1,5 +1,5 @@
 [game]
-hostname         = "[EN][MRP] Delta-v (Ψ) | Apoapsis"
+hostname         = "[EN][MRP] Delta-v (Ψ) | Apoapsis [US East 1]"
 soft_max_players = 100
 
 [server]
@@ -15,7 +15,7 @@ min_players = 90
 emergency_early_launch_allowed = true
 
 [hub]
-tags = "lang:en-US,region:am_n_e,rp:med"
+tags = "lang:en-US,region:am_n_e,rp:med,no_tag_infer"
 
 [atmos]
 monstermos_rip_tiles = false
diff --git a/Resources/ConfigPresets/DeltaV/inclination.toml b/Resources/ConfigPresets/DeltaV/inclination.toml
@@ -1,5 +1,5 @@
 [game]
-hostname         = "[EN][EU][MRP] Delta-v (Ψ) | Inclination"
+hostname         = "[EN][MRP] Delta-v (Ψ) | Inclination [EU West]"
 soft_max_players = 50
 
 [server]
@@ -14,4 +14,4 @@ map_enabled = true
 enable_during_round = true
 
 [hub]
-tags = "lang:en-US,region:eu_w,rp:med"
+tags = "lang:en-US,region:eu_w,rp:med,no_tag_infer"
diff --git a/Resources/ConfigPresets/DeltaV/periapsis.toml b/Resources/ConfigPresets/DeltaV/periapsis.toml
@@ -1,5 +1,5 @@
 [game]
-hostname         = "[EN][MRP] Delta-v (Ψ) | Periapsis"
+hostname         = "[EN][MRP] Delta-v (Ψ) | Periapsis [US East 2]"
 soft_max_players = 50
 
 [server]
@@ -19,4 +19,4 @@ min_players = 25
 enable_during_round = true
 
 [hub]
-tags = "lang:en-US,region:am_n_e,rp:med"
+tags = "lang:en-US,region:am_n_e,rp:med,no_tag_infer"
diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml
diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml
diff --git a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml
@@ -2,33 +2,33 @@
   parent: JobIcon
   id: JobIconGladiator
   icon:
-    sprite: DeltaV/Interface/Misc/job_icons.rsi
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoGladiator
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconPrisonGuard
   icon:
-    sprite: DeltaV/Interface/Misc/job_icons.rsi
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoPrisonGuard
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMailCarrier
   icon:
-    sprite: DeltaV/Interface/Misc/job_icons.rsi
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoMailCarrier
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMartialArtist
   icon:
-    sprite: DeltaV/Interface/Misc/job_icons.rsi
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoMartialArtist
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconForensicMantis
   icon:
-    sprite: DeltaV/Interface/Misc/job_icons.rsi
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoMantis