fixes

Update coats.yml Update books.yml Hack solution for missing sprite Fix more missing items Cherrypick a force merge Fix brig access Revert "Cherrypick a force merge" This reverts commit f2c9c57. GUH Fix more errors Update lighthouse.yml Update lighthouse.yml Fix tests Test Moment fix character editor remove hyperlink books
Simple-Station · Jul 20, 2024 · 185e9df · 185e9df
1 parent 4cf0d13
commit 185e9df
Show file tree

Hide file tree

Showing 28 changed files with 230 additions and 451 deletions.
diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
@@ -61,12 +61,6 @@ private void PreferencesDataLoaded()
         if (_previewDummy != null)
             EntityManager.DeleteEntity(_previewDummy);
 
-        _previewDummy =
-            EntityManager.SpawnEntity(
-                _prototypeManager.Index<SpeciesPrototype>(HumanoidCharacterProfile.DefaultWithSpecies().Species)
-                    .DollPrototype, MapCoordinates.Nullspace);
-        _previewPanel?.SetSprite(_previewDummy.Value);
-
         UpdateCharacterUI();
     }
 
@@ -104,6 +98,15 @@ public void UpdateCharacterUI()
             return;
         }
 
+        if (_previewDummy == null)
+        {
+            _previewDummy =
+                EntityManager.SpawnEntity(
+                    _prototypeManager.Index<SpeciesPrototype>(HumanoidCharacterProfile.DefaultWithSpecies().Species)
+                        .DollPrototype, MapCoordinates.Nullspace);
+            _previewPanel?.SetSprite(_previewDummy.Value);
+        }
+
         _previewPanel?.SetLoaded(true);
 
         if (_preferencesManager.Preferences?.SelectedCharacter is not HumanoidCharacterProfile selectedCharacter)

diff --git a/Content.Client/Lobby/UI/LobbyCharacterPanel.xaml.cs b/Content.Client/Lobby/UI/LobbyCharacterPanel.xaml.cs
@@ -26,7 +26,7 @@ public void SetLoaded(bool value)
 
     public void SetSummaryText(string value)
     {
-        Summary.Text = string.Empty;
+        Summary.Text = value;
     }
 
     public void SetSprite(EntityUid uid)

diff --git a/Content.Server/Advertise/Components/AdvertiseComponent.cs b/Content.Server/Advertise/Components/AdvertiseComponent.cs
@@ -1,4 +1,3 @@
-using Content.Server.Advertise.EntitySystems;
 using Content.Shared.Advertise;
 using Robust.Shared.Prototypes;
 
@@ -8,21 +7,21 @@ namespace Content.Server.Advertise.Components;
 /// Makes this entity periodically advertise by speaking a randomly selected
 /// message from a specified MessagePack into local chat.
 /// </summary>
-[RegisterComponent, Access(typeof(AdvertiseSystem))]
+[RegisterComponent]
 public sealed partial class AdvertiseComponent : Component
 {
     /// <summary>
     /// Minimum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal to 1.
     /// </summary>
     [DataField]
-    public int MinimumWait { get; private set; } = 8 * 60;
+    public int MinimumWait { get; set; } = 8 * 60;
 
     /// <summary>
     /// Maximum time in seconds to wait before saying a new ad, in seconds. Has to be larger than or equal
     /// to <see cref="MinimumWait"/>
     /// </summary>
     [DataField]
-    public int MaximumWait { get; private set; } = 10 * 60;
+    public int MaximumWait { get; set; } = 10 * 60;
 
     /// <summary>
     /// If true, the delay before the first advertisement (at MapInit) will ignore <see cref="MinimumWait"/>

diff --git a/Content.Server/Antag/MobReplacementRuleSystem.cs b/Content.Server/Antag/MobReplacementRuleSystem.cs
@@ -1,4 +1,6 @@
 using System.Numerics;
+using Content.Server.Advertise.Components;
+using Content.Server.Advertise.EntitySystems;
 using Content.Server.Antag.Mimic;
 using Content.Server.Chat.Systems;
 using Content.Server.GameTicking.Rules;
@@ -19,7 +21,6 @@
 using Content.Server.NPC.HTN;
 using Content.Server.NPC;
 using Content.Shared.Weapons.Melee;
-using Content.Server.Advertise;
 using Content.Server.Power.Components;
 using Content.Shared.CombatMode;
 
@@ -36,7 +37,7 @@ public sealed class MobReplacementRuleSystem : GameRuleSystem<MobReplacementRule
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
     [Dependency] private readonly NPCSystem _npc = default!;
-    [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly AdvertiseSystem _advertise = default!;
 
 
@@ -171,7 +172,6 @@ private void SetupMimicVendor(EntityUid uid, MobReplacementRuleComponent mimicCo
         vendorComponent.MinimumWait = 5;
         vendorComponent.MaximumWait = 15;
         _advertise.SayAdvertisement(uid, vendorComponent);
-        _advertise.RefreshTimer(uid, vendorComponent);
 
         if (TryComp<ApcPowerReceiverComponent>(uid, out var aPC))
             aPC.NeedsPower = false;

diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl b/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl
@@ -4,4 +4,4 @@ advertisement-courierdrobe-3 = Wear your brown with pride!
 advertisement-courierdrobe-4 = These shorts are comfy and easy to wear, get yours now!
 advertisement-courierdrobe-5 = Outrun every danger with our stylish clothes!
 thankyou-courierdrobe-1 = Now get out there and deliver that mail!
-thankyou-courierdrobe-1 = Those parcels aren't going to deliver themselves!
+thankyou-courierdrobe-2 = Those parcels aren't going to deliver themselves!
diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl b/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl
@@ -2,4 +2,4 @@ advertisement-pride-1 = Be gay do crime!
 advertisement-pride-2 = Full of colors!
 advertisement-pride-3 = You are valid!
 thankyou-pride-1 = Go, do some crime!
-thankyou-pride-1 = Have a colorful day!
+thankyou-pride-2 = Have a colorful day!
diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml
@@ -7451,7 +7451,7 @@ entities:
     - type: Transform
       pos: -52.5,-20.5
       parent: 2
-- proto: BodyBag_Folded
+- proto: BodyBagFolded
   entities:
   - uid: 7103
     components:

diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml
@@ -14056,14 +14056,6 @@ entities:
     - type: Transform
       pos: 11.693138,27.631475
       parent: 100
-- proto: BookFishops
-  entities:
-  - uid: 5268
-    components:
-    - type: Transform
-      parent: 5207
-    - type: Physics
-      canCollide: False
 - proto: BookLeafLoversSecret
   entities:
   - uid: 504
@@ -14122,18 +14114,6 @@ entities:
     - type: Transform
       pos: 11.5,-4.5
       parent: 100
-    - type: Storage
-      storedItems:
-        5268:
-          position: 0,0
-          _rotation: South
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 5268
   - uid: 11782
     components:
     - type: Transform

diff --git a/Resources/Maps/submarine.yml b/Resources/Maps/submarine.yml
@@ -35942,7 +35942,7 @@ entities:
     - type: Transform
       pos: -45.5,26.5
       parent: 2
-- proto: BodyBag_Folded
+- proto: BodyBagFolded
   entities:
   - uid: 1410
     components:

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -33,7 +33,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 2400
+  cost: 4500
   category: cargoproduct-category-name-service
   group: market
 
@@ -43,7 +43,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockAutoDrobeFilled
-  cost: 1200
+  cost: 1700
   category: cargoproduct-category-name-service
   group: market
 

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -20,7 +20,7 @@
     contents:
       - id: BoxSurvivalMedical
       - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
       - id: Portafib
 
 - type: entity
@@ -33,7 +33,7 @@
       - id: BoxSurvivalMedical
       - id: RubberStampPsychologist
 
-  
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpack

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -7,7 +7,7 @@
     contents:
       - id: BoxSurvivalMedical
       - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
       - id: Portafib
 
 - type: entity
@@ -20,7 +20,7 @@
       - id: BoxSurvivalMedical
       - id: RubberStampPsychologist
 
-  
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackDuffel

diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -7,7 +7,7 @@
     contents:
       - id: BoxSurvivalMedical
       - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
       - id: Portafib
 
 - type: entity
@@ -20,7 +20,7 @@
       - id: BoxSurvivalMedical
       - id: RubberStampPsychologist
 
-  
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSatchel

diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml
@@ -7,7 +7,7 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
       - id: Portafib
     #  - id: Flash
       - id: BruteAutoInjector

diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml
@@ -7,7 +7,7 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
       - id: Portafib
     #  - id: Flash
       - id: BruteAutoInjector

diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml
@@ -7,7 +7,7 @@
     contents:
       - id: BoxSurvivalSecurity
       - id: EmergencyRollerBedSpawnFolded
-      - id: BodyBag_Folded
+      - id: BodyBagFolded
       - id: Portafib
     #  - id: Flash
       - id: BruteAutoInjector