Merge pull request #94 from Corvax-Frontier/Zekins3366-patch-1

Оптимизация made by Zekins
Corvax-Frontier · Apr 30, 2024 · 0cac50a · 0cac50a
2 parents 090fcd3 + ccef700
commit 0cac50a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 4 deletions.
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -214,9 +214,6 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                         // TODO: Can't predict entity deletions.
                         //if (cartridge.DeleteOnSpawn)
                         //    Del(cartridge.Owner);
-                        // Добавляем компонент TimedDespawnComponent на сущность патрона - Корвакс
-                        var despawnComponent = EnsureComp<TimedDespawnComponent>(ent.Value);
-                        despawnComponent.Lifetime = 300;
                     }
                     else
                     {

diff --git a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
@@ -46,7 +46,7 @@ public sealed partial class CartridgeAmmoComponent : AmmoComponent
     /// Caseless ammunition.
     /// </summary>
     [DataField("deleteOnSpawn")]
-    public bool DeleteOnSpawn;
+    public bool DeleteOnSpawn = true; // Corvax-Frontier-Optimization
 
     [DataField("soundEject")]
     public SoundSpecifier? EjectSound = new SoundCollectionSpecifier("CasingEject");

diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -31,3 +31,5 @@
     - SheetGlass1
   - type: StaticPrice
     price: 1
+  - type: TimedDespawn # Corvax-Frontier-Optimization
+    lifetime: 600
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -116,6 +116,8 @@
   - type: PhysicalComposition
     materialComposition:
       Plastic: 25
+  - type: TimedDespawn # Corvax-Frontier-Optimization
+    lifetime: 300
   - type: StaticPrice
     price: 1
 
@@ -128,6 +130,8 @@
   - type: Sprite
     sprite: Objects/Misc/zipties.rsi
     state: cuff-broken
+  - type: TimedDespawn # Corvax-Frontier-Optimization
+    lifetime: 300
 
 - type: entity
   name: broken cables
@@ -147,6 +151,8 @@
       right:
         - state: inhand-right
           color: forestgreen
+  - type: TimedDespawn # Corvax-Frontier-Optimization
+    lifetime: 300
 
 - type: entity
   parent: Handcuffs

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -186,6 +186,8 @@
     contentMargin: 16.0, 16.0, 16.0, 16.0
     headerImagePath: "/Textures/Interface/Paper/paper_heading_cargo_invoice.svg.96dpi.png"
     headerMargin: 0.0, 12.0, 0.0, 0.0
+  - type: TimedDespawn
+    lifetime: 450
 
 - type: entity
   id: PaperCargoBountyManifest

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -131,6 +131,8 @@
     solution: food
   - type: Extractable
     grindableSolutionName: food
+  - type: TimedDespawn
+    lifetime: 300
 
 - type: entity
   parent: Ash

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml
@@ -103,6 +103,8 @@
         reagents:
         - ReagentId: Nothing
           Quantity: 1
+  - type: TimedDespawn # Corvax-Frontier-Optimization
+    lifetime: 1500
 
 # This empty parcel is allowed to exist and evade the tests for the admin
 # mailto command.

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml
@@ -22,3 +22,5 @@
     tags:
     - Recyclable
     - Trash
+  - type: TimedDespawn # Corvax-Frontier-Optimisation
+    lifetime: 300