Фиксы мерджей

Corvax-Frontier · Jun 7, 2024 · e6506b4 · e6506b4
2 parents 61b2384 + de8a049
commit e6506b4
Show file tree

Hide file tree

Showing 52 changed files with 506 additions and 486,976 deletions.
diff --git a/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs b/Content.Server/Nyanotrasen/Mail/Components/MailComponent.cs
@@ -75,7 +75,7 @@ public sealed partial class MailComponent : SharedMailComponent
         /// The amount that cargo will be awarded for delivering this mail.
         /// </summary>
         [DataField("bounty")]
-        public int Bounty = 750;
+        public int Bounty = 7500; // Frontier 750<7500
 
         /// <summary>
         /// Penalty if the mail is destroyed.

diff --git a/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs b/Content.Server/Nyanotrasen/Mail/Components/MailTeleporterComponent.cs
@@ -12,10 +12,10 @@ public sealed partial class MailTeleporterComponent : Component
 
         // Not starting accumulator at 0 so mail carriers have some deliveries to make shortly after roundstart.
         [DataField("accumulator")]
-        public float Accumulator = 285f;
+        public float Accumulator = 1995f; // Frontier 285*7=1995
 
         [DataField("teleportInterval")]
-        public TimeSpan TeleportInterval = TimeSpan.FromMinutes(5);
+        public TimeSpan TeleportInterval = TimeSpan.FromMinutes(35);
 
         /// <summary>
         /// The sound that's played when new mail arrives.
@@ -72,7 +72,7 @@ public sealed partial class MailTeleporterComponent : Component
         /// What's the bonus for delivering a fragile package intact?
         /// </summary>
         [DataField("fragileBonus")]
-        public int FragileBonus = 200;
+        public int FragileBonus = 2000; // Frontier 200<2000
 
         /// <summary>
         /// What's the malus for failing to deliver a fragile package?
@@ -91,13 +91,13 @@ public sealed partial class MailTeleporterComponent : Component
         /// if not delivered?
         /// </summary>
         [DataField("priorityDuration")]
-        public TimeSpan priorityDuration = TimeSpan.FromMinutes(15);
+        public TimeSpan priorityDuration = TimeSpan.FromMinutes(45); // Frontier 15<45
 
         /// <summary>
         /// What's the bonus for delivering a priority package on time?
         /// </summary>
         [DataField("priorityBonus")]
-        public int PriorityBonus = 500;
+        public int PriorityBonus = 5000; // Frontier 500<5000
 
         /// <summary>
         /// What's the malus for failing to deliver a priority package?

diff --git a/Content.Server/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs
@@ -230,8 +230,8 @@ private void OnAfterInteractUsing(EntityUid uid, MailComponent component, AfterI
                 return;
             }
 
-            //_popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward", ("bounty", component.Bounty)), uid, args.User);
-            _popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward"), uid, args.User); // Frontier - Remove the mention of station income
+            _popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward", ("bounty", component.Bounty)), uid, args.User);
+            //_popupSystem.PopupEntity(Loc.GetString("mail-unlocked-reward"), uid, args.User); // Frontier - Remove the mention of station income
 
             component.IsProfitable = false;
 

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4829,3 +4829,35 @@ Entries:
         sprites by Dragonfruits.
   id: 5013
   time: '2024-06-06T00:22:52.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Tweak
+      message: Lowered the movement speed and damage of ore crabs and golems
+    - type: Tweak
+      message: Increased the ore yield from ore crabs and golems
+  id: 5014
+  time: '2024-06-07T07:50:15.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Add
+      message: Private Security Hardsuit.
+    - type: Add
+      message: Private security cosmetic options to merc loadout.
+  id: 5015
+  time: '2024-06-07T09:53:14.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Add
+      message: >-
+        Rubber bullets can be printed in the NFSD techfab with Nonlethal
+        Ammunition researched.
+  id: 5016
+  time: '2024-06-07T10:58:39.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: >-
+        Frontier has increased mail related profits, but lowered the amount of
+        existing mail, expect the mail to find you soon. 
+  id: 5017
+  time: '2024-06-07T17:10:14.0000000+00:00'
diff --git a/Resources/Locale/en-US/nyanotrasen/mail.ftl b/Resources/Locale/en-US/nyanotrasen/mail.ftl
@@ -9,7 +9,7 @@ mail-desc-priority = The anti-tamper lock's [color=yellow]yellow priority tape[/
 mail-desc-priority-inactive = The anti-tamper lock's [color=#886600]yellow priority tape[/color] is inactive.
 mail-unlocked = Anti-tamper system unlocked.
 mail-unlocked-by-emag = Anti-tamper system *BZZT*.
-mail-unlocked-reward = Anti-tamper system unlocked.
+mail-unlocked-reward = Anti-tamper system unlocked. {$bounty} spesos have been added to Frontier account.
 mail-penalty-lock = ANTI-TAMPER LOCK BROKEN. STATION BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
 mail-penalty-fragile = INTEGRITY COMPROMISED. STATION BANK ACCOUNT PENALIZED BY {$credits} SPESOS.
 mail-penalty-expired = DELIVERY PAST DUE. STATION BANK ACCOUNT PENALIZED BY {$credits} SPESOS.

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -93,10 +93,10 @@
       path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
     damage:
       types:
-        Blunt: 6
+        Blunt: 5
   - type: MovementSpeedModifier
     baseWalkSpeed : 2
-    baseSprintSpeed : 2.5
+    baseSprintSpeed : 2.25
   - type: NpcFactionMember
     factions:
       - SimpleHostile

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -388,6 +388,7 @@
       - ClothingOuterHardsuitRd # Frontier
       - ClothingOuterHardsuitLuxury # Frontier
       - ClothingOuterHardsuitMercenary # Frontier
+      - ClothingOuterHardsuitPrivateSecurity # Frontier
       - ClothingOuterHardsuitScaf # Frontier
       - ClothingOuterHardsuitPilot # Frontier
       - ClothingOuterHardsuitMaximPrototype # Frontier
@@ -965,10 +966,10 @@
       - MagazineBoxPistolUranium
       - MagazineBoxRifleIncendiary
       - MagazineBoxRifleUranium
-#      - MagazineBoxLightRifleRubber # Frontier - Restore This Later
-#      - MagazineBoxMagnumRubber # Frontier - Restore This Later
-#      - MagazineBoxPistolRubber # Frontier - Restore This Later
-#      - MagazineBoxRifleRubber # Frontier - Restore This Later
+      - MagazineBoxLightRifleRubber # Frontier
+      - MagazineBoxMagnumRubber # Frontier
+      - MagazineBoxPistolRubber # Frontier
+      - MagazineBoxRifleRubber # Frontier
       - MagazineGrenadeEmpty
       - MagazineLightRifleIncendiary
       - MagazineLightRifleUranium

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml
@@ -5,7 +5,8 @@
   name: mail-item-name-unaddressed
   components:
   - type: Item
-    size: Normal
+#    size: Normal # Frontier
+    storedRotation: -90
   - type: Mail
   - type: AccessReader
   - type: Sprite
@@ -19,8 +20,8 @@
       map: ["enum.MailVisualLayers.FragileStamp"]
       visible: false
     - map: ["enum.MailVisualLayers.JobStamp"]
-      scale: 0.5, 0.5
-      offset: 0.275, 0.2
+      scale: 0.8, 0.8 # Frontier 0.5<0.8
+      offset: 0.225, 0.165 # Frontier (0.275, 0.2)<(0.225, 0.165)
     - state: locked
       map: ["enum.MailVisualLayers.Lock"]
     - state: priority
@@ -92,7 +93,7 @@
     damage:
       types:
         Blunt: 10
-  - type: CargoSellBlacklist
+  - type: CargoSellBlacklist # Frontier
   - type: AutoDelete
     delayToCheck: 60
     delayToDelete: 1800

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
@@ -74,6 +74,10 @@
   - ShellTranquilizer
   - BoxBeanbag
   - WeaponDisabler
+  - MagazineBoxLightRifleRubber # Frontier
+  - MagazineBoxMagnumRubber # Frontier
+  - MagazineBoxPistolRubber # Frontier
+  - MagazineBoxRifleRubber # Frontier
 
 - type: technology
   id: UraniumMunitions

diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml
@@ -56,6 +56,16 @@
   category: cargoproduct-category-name-security
   group: market
 
+- type: cargoProduct
+  id: CrateVendingMachineRestockNonLethalVend
+  icon:
+    sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockNonLethalVendFilled
+  cost: 100 # Frontier
+  category: cargoproduct-category-name-security
+  group: market
+
 - type: cargoProduct
   id: CrateVendingMachineRestockAutoTuneVend
   abstract: true

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml
@@ -53,6 +53,17 @@
       - id: VendingMachineRestockLessLethalVend
         amount: 2
 
+- type: entity
+  id: CrateVendingMachineRestockNonLethalVendFilled
+  parent: CratePlasticBiodegradable
+  name: NonLethalVend restock crate
+  description: Contains two restock boxes for the NonLethalVend vending machine.
+  components:
+  - type: StorageFill
+    contents:
+      - id: VendingMachineRestockNonLethalVend
+        amount: 2
+
 - type: entity
   id: CrateVendingMachineRestockAutoTuneVendFilled
   parent: CratePlasticBiodegradable

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -80,6 +80,22 @@
   - type: AccessReader
     access: [["Captain"], ["Mercenary"]]
 
+- type: entity
+  id: SuitStoragePrivateSecurity
+  parent: SuitStorageBase
+  suffix: Private Security
+  components:
+  - type: StorageFill
+    contents:
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitPrivateSecurity
+        - id: ClothingMaskGasSecurity
+        - id: JetpackMiniFilled
+        - id: HandheldGPSBasic
+#        - id: ClothingShoesBootsMagCombat # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
+  - type: AccessReader
+    access: [["Captain"], ["Mercenary"]]
+
 #SCAF hardsuit
 - type: entity
   id: SuitStorageScaf

diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml
@@ -40,7 +40,7 @@
     CrayonRainbow: 5
     WeaponWaterPistol: 8
     WeaponWaterBlaster: 4
-    TargetDarts: 1
+    TargetDartsFlatpack: 1
     BoxDarts: 2
     ChessBoard: 2
     BackgammonBoard: 2

diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml
@@ -6,23 +6,17 @@
     WeaponRevolverArgentiNonlethal: 10
     WeaponShotgunDoubleBarreledRubber: 10
     WeaponFlareGun: 20
-    BoxDonkSoftBox: 10
-    BoxCartridgeCap: 10
-    MagazineBoxPistolRubber: 10
-    MagazineBoxMagnumRubber: 10
     BoxBeanbag: 8
     MagazineBoxRifleRubber: 8
-    MagazineBoxLightRifleRubber: 4
-    MagazineBoxCaselessRifleRubber: 4
-    SpeedLoaderRifleHeavyRubber: 10
+    MagazineBoxCaselessRifleRubber: 10
+    MagazineBoxLightRifleRubber: 5
+    MagazineBoxPistolRubber: 10
+    MagazineBoxMagnumRubber: 10
   contrabandInventory:
+    SpeedLoaderRifleHeavyRubber: 3
+    SpeedLoaderPistolRubber: 3
+    SpeedLoaderMagnumRubber: 3
     WeaponRifleBB: 2
     BoxCartridgeBB: 10
   emaggedInventory:
-    WeaponLaserCarbinePractice: 4
-    WeaponDisablerPractice: 4
-    MagazineBoxPistolPractice: 10
-    MagazineBoxMagnumPractice: 10
-    MagazineBoxLightRiflePractice: 10
-    MagazineBoxCaselessRiflePractice: 10
-    BoxShotgunPractice: 10
+    ThrowingKnife: 1
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml
@@ -0,0 +1,23 @@
+- type: vendingMachineInventory
+  id: NonLethalVendInventory
+  startingInventory:
+    WeaponDisablerPractice: 4
+    WeaponLaserCarbinePractice: 4
+    BoxShotgunPractice: 8
+    MagazineBoxRiflePractice: 8
+    MagazineBoxCaselessRiflePractice: 10
+    MagazineBoxLightRiflePractice: 5
+    MagazineBoxPistolPractice: 10
+    MagazineBoxMagnumPractice: 10
+    RevolverCapGun: 2
+    BoxCartridgeCap: 4
+    FoamCrossbow: 2
+    BoxDonkSoftBox: 4
+    TargetDartsFlatpack: 2
+    BoxDarts: 4
+  contrabandInventory:
+    SpeedLoaderRifleHeavyPractice: 3
+    SpeedLoaderPistolPractice: 3
+    SpeedLoaderMagnumPractice: 3
+  emaggedInventory:
+    ThrowingKnife: 1
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -11,6 +11,7 @@
   name: mercenary hardsuit helmet
   description: Lightly armored hardsuit helmet for mercenary needs.
   components:
+  - type: BreathMask
   - type: Sprite
     sprite: _NF/Clothing/Head/Hardsuits/mercenary.rsi
   - type: Clothing
@@ -27,6 +28,19 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
+
+- type: entity
+  parent: ClothingHeadHelmetHardsuitMercenary
+  id: ClothingHeadHelmetHardsuitPrivateSecurity
+  name: private security hardsuit helmet
+  description: Lightly armored hardsuit helmet for private security needs.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hardsuits/private_security.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hardsuits/private_security.rsi
+  - type: PointLight
+    color: "#ffff00"
 
 #Pilot Hardsuit
 - type: entity

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -29,6 +29,19 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitMercenary
+
+- type: entity
+  parent: ClothingOuterHardsuitMercenary
+  id: ClothingOuterHardsuitPrivateSecurity # stats are of merc hardsuit
+  name: private security hardsuit
+  description: A special suit that protects from the danger of space, employed by private security forces.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Hardsuits/private_security.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Hardsuits/private_security.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitPrivateSecurity
 
 # Pilot Hardsuit - Spationaut stats
 - type: entity