Merge pull request #263 from nopeingeneer/QoL

небольшая переработка карго
AdventureTimeSS14 · Dec 31, 2023 · 1d83fda · 1d83fda
2 parents c9c1dbe + e43ca7e
commit 1d83fda
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 46 deletions.
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -36,9 +36,9 @@ public sealed partial class ShuttleSystem
 
     public const float DefaultStartupTime = 5.5f;
     public const float DefaultTravelTime = 40f;
-    public const float DefaultArrivalTime = 80f;
-    private const float FTLCooldown = 50f;
-    private const float ShuttleFTLRange = 100f;
+    public const float DefaultArrivalTime = 40f;
+    private const float FTLCooldown = 30f;
+    private const float ShuttleFTLRange = 50f;
 
     /// <summary>
     /// Minimum mass a grid needs to be to block a shuttle recall.

diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/marinne.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/marinne.yml
@@ -22,6 +22,7 @@
         Piercing: 0.5 
         Heat: 0.5
         Radiation: 0.5
+        Stun: 0.7
   - type: ExplosionResistance
     damageCoefficient: 0.3
   - type: ToggleableClothing

diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml
@@ -1,6 +1,6 @@
 - type: cargoBounty
   id: BountyArtifact
-  reward: 5000
+  reward: 15000
   description: bounty-description-artifact
   entries:
   - name: bounty-item-artifact
@@ -11,7 +11,7 @@
 
 - type: cargoBounty
   id: BountyBaseballBat
-  reward: 1500
+  reward: 4500
   description: bounty-description-baseball-bat
   entries:
   - name: bounty-item-baseball-bat
@@ -22,7 +22,7 @@
 
 - type: cargoBounty
   id: BountyBoxHug
-  reward: 1000
+  reward: 5000
   description: bounty-description-box-hugs
   entries:
   - name: bounty-item-box-hugs
@@ -33,7 +33,7 @@
 
 - type: cargoBounty
   id: BountyBrain
-  reward: 5000
+  reward: 10000
   description: bounty-description-brain
   entries:
   - name: bounty-item-brain
@@ -44,7 +44,7 @@
 
 - type: cargoBounty
   id: BountyBread
-  reward: 800
+  reward: 1000
   description: bounty-description-bread
   entries:
   - name: bounty-item-bread
@@ -55,7 +55,7 @@
 
 - type: cargoBounty
   id: BountyBriefcase
-  reward: 3000
+  reward: 12000
   description: bounty-description-briefcase
   entries:
   - name: bounty-item-briefcase
@@ -66,7 +66,7 @@
 
 - type: cargoBounty
   id: BountyCarrot
-  reward: 3000
+  reward: 6000
   description: bounty-description-carrot
   entries:
   - name: bounty-item-carrot
@@ -77,7 +77,7 @@
 
 - type: cargoBounty
   id: BountyCarrotFries
-  reward: 3200
+  reward: 12000
   description: bounty-description-carrot-fries
   entries:
   - name: bounty-item-carrot-fries
@@ -88,7 +88,7 @@
 
 - type: cargoBounty
   id: BountyCarp
-  reward: 10000
+  reward: 15000
   description: bounty-description-carp
   entries:
   - name: bounty-item-carp
@@ -115,7 +115,7 @@
 
 - type: cargoBounty
   id: BountyCorn
-  reward: 4000
+  reward: 8000
   description: bounty-description-corn
   entries:
   - name: bounty-item-corn
@@ -192,7 +192,7 @@
 
 - type: cargoBounty
   id: BountyFlower
-  reward: 3000
+  reward: 8000
   description: bounty-description-flower
   entries:
   - name: bounty-item-flower
@@ -203,7 +203,7 @@
 
 - type: cargoBounty
   id: BountyGalaxyThistle
-  reward: 4000
+  reward: 9000
   description: bounty-description-galaxythistle
   entries:
   - name: bounty-item-galaxythistle
@@ -280,7 +280,7 @@
 
 - type: cargoBounty
   id: BountyMonkeyCube
-  reward: 2500
+  reward: 25000
   description: bounty-description-monkey-cube
   entries:
   - name: bounty-item-monkey-cube
@@ -291,7 +291,7 @@
 
 - type: cargoBounty
   id: BountyMouse
-  reward: 2400
+  reward: 7200
   description: bounty-description-mouse
   entries:
   - name: bounty-item-mouse
@@ -302,7 +302,7 @@
 
 - type: cargoBounty
   id: BountyPancake
-  reward: 4000
+  reward: 13000
   description: bounty-description-pancake
   entries:
   - name: bounty-item-pancake
@@ -346,7 +346,7 @@
 
 - type: cargoBounty
   id: BountyPrisonUniform
-  reward: 4000
+  reward: 8000
   description: bounty-description-prison-uniform
   entries:
   - name: bounty-item-prison-uniform
@@ -361,7 +361,7 @@
   description: bounty-description-radio
   entries:
   - name: bounty-item-radio
-    amount: 10
+    amount: 5
     whitelist:
       components:
       - Headset
@@ -371,7 +371,7 @@
 
 - type: cargoBounty
   id: BountyResearchDisk
-  reward: 6000
+  reward: 9000
   description: bounty-description-research-disk
   entries:
   - name: bounty-item-research-disk
@@ -382,7 +382,7 @@
 
 - type: cargoBounty
   id: BountyShiv
-  reward: 3000
+  reward: 6000
   description: bounty-description-shiv
   entries:
   - name: bounty-item-shiv
@@ -393,7 +393,7 @@
 
 - type: cargoBounty
   id: BountySoap
-  reward: 3000
+  reward: 6000
   description: bounty-description-soap
   entries:
   - name: bounty-item-soap
@@ -404,7 +404,7 @@
 
 - type: cargoBounty
   id: BountySoup
-  reward: 6000
+  reward: 9000
   description: bounty-description-soup
   entries:
   - name: bounty-item-soup
@@ -415,7 +415,7 @@
 
 - type: cargoBounty
   id: BountySpear
-  reward: 3500
+  reward: 10000
   description: bounty-description-spear
   entries:
   - name: bounty-item-spear
@@ -426,7 +426,7 @@
 
 - type: cargoBounty
   id: BountySyringe
-  reward: 3000
+  reward: 6000
   description: bounty-description-syringe
   entries:
   - name: bounty-item-syringe
@@ -448,7 +448,7 @@
 
 - type: cargoBounty
   id: BountyToolbox
-  reward: 3000
+  reward: 6000
   description: bounty-description-toolbox
   entries:
   - name: bounty-item-toolbox
@@ -503,7 +503,7 @@
 
 - type: cargoBounty
   id: BountyOrgans
-  reward: 3500
+  reward: 15000
   description: bounty-description-organs
   entries:
   - name: bounty-item-organs
@@ -525,7 +525,7 @@
 
 - type: cargoBounty
   id: BountyWarmCloth
-  reward: 6000
+  reward: 15000
   description: bounty-description-warm-cloth
   entries:
   - name: bounty-item-warm-cloth
@@ -562,7 +562,7 @@
   description: bounty-description-food
   entries:
   - name: bounty-food
-    amount: 30
+    amount: 15
     whitelist:
       tags:
       - Meat
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -134,7 +134,7 @@
     sprite: Mobs/Animals/mouse.rsi
     state: icon-0
   product: CrateNPCMouse
-  cost: 4400
+  cost: 15000
   category: Livestock
   group: market
 

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
@@ -163,6 +163,9 @@
     - id: ClothingUniformJumpskirtSyndieFormalDress
       prob: 0.01
       orGroup: Clothes
+    - id: ClothingOuterHardsuitDeathsquad
+      prob: 0.0001
+      orGroup: Clothes
     #swag
     - id: ClothingNeckBling
       prob: 0.01
@@ -254,6 +257,9 @@
       prob: 0.01
       orGroup: Useful
     - id: ToyAmongPequeno
+      prob: 0.01  
+      orGroup: Useful
+    - id: PenExploding
       prob: 0.01
       orGroup: Useful
     #notuseful

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -82,6 +82,7 @@
         Piercing: 0.95
         Heat: 0.90
         Radiation: 0.25
+        Stun: 0.8
   - type: ToggleableClothing
     slot: head
   - type: ContainerContainer