Merge branch 'new-frontiers-14:master' into апстим

Corvax-Frontier · Apr 9, 2024 · 0f8e479 · 0f8e479
2 parents 7219816 + d25285f
commit 0f8e479
Show file tree

Hide file tree

Showing 289 changed files with 6,060 additions and 682 deletions.
diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -287,7 +287,7 @@ private void OnInteractUsing(Entity<PlantHolderComponent> entity, ref InteractUs
                 return;
             }
 
-            component.Health -= (_random.Next(3, 5) * 5);
+            component.Health -= (_random.Next(3, 5) * 2);
             component.Seed.Unique = false;
             var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User, component.Health);
             _randomHelper.RandomOffset(seed, 0.25f);

diff --git a/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs b/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs
@@ -25,7 +25,7 @@ public sealed partial class ShipyardConsoleComponent : Component
     public string ShipyardChannel = "Traffic";
 
     [DataField("securityShipyardChannel")]
-    public string SecurityShipyardChannel = "Security";
+    public string SecurityShipyardChannel = "NFSD";
 
     [DataField("blackMarketShipyardChannel")]
     public string BlackMarketShipyardChannel = "Syndicate";

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -3968,3 +3968,56 @@ Entries:
       message: Fixed missing HV cable on Stratos SMES unit.
   id: 4905
   time: '2024-04-08T19:59:32.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Prevents dungeons from spawning multiple bosses.
+    - type: Tweak
+      message: >-
+        Syndicate NPCs store loot in special bags, that can be worn as a
+        backpack, but don't function as one - it spawns a predefined set of
+        items on use and disappears.
+    - type: Tweak
+      message: >-
+        Ascended Cultist (blood cult expedition boss) can be butchered by
+        players if they wish to obtain some of its powers for themselves.
+    - type: Tweak
+      message: Listening Post Bravo is now manned by appropriate forces.
+    - type: Tweak
+      message: Wizards and Blood Cultists have trouble sleeping.
+    - type: Tweak
+      message: >-
+        Incapacitated (put in crit) hostile agents can be exchanged for Frontier
+        Uplink Coins at NFSD Outpost.
+    - type: Tweak
+      message: >-
+        Reclassified some items as contraband: wizard items (hard suits, armor,
+        staffs, and wands), blood cult items (armor, weapons).
+  id: 4906
+  time: '2024-04-08T20:23:48.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Remove
+      message: Gravity guns have disappeared from the public research database forever.
+  id: 4907
+  time: '2024-04-08T21:40:38.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Add
+      message: 'NFSD got a new color on their radio with new frequency. '
+  id: 4908
+  time: '2024-04-08T21:43:54.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Tweak
+      message: Slightly lowered the value of smuggled crates
+    - type: Fix
+      message: Fixed dead drop spawn rate
+  id: 4909
+  time: '2024-04-08T22:40:23.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Tweak
+      message: Temporarily changed plants to lose less health when clipped
+  id: 4910
+  time: '2024-04-08T22:40:38.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/advertisements/mobchatter/mimehostilehumanoidmob.ftl b/Resources/Locale/en-US/_NF/advertisements/mobchatter/mimehostilehumanoidmob.ftl
@@ -0,0 +1,20 @@
+advertisement-mimehumanoid-1 = *pretends to whistle*
+advertisement-mimehumanoid-2 = *points at you and drags finger across neck*
+advertisement-mimehumanoid-3 = *performs a sensual jigga of manslaughter*
+advertisement-mimehumanoid-4 = *slowly shifts from heel to toe*
+advertisement-mimehumanoid-5 = *pretends to be trapped by invisible walls*
+advertisement-mimehumanoid-6 = *stands completely still*
+advertisement-mimehumanoid-7 = *moves around in uneven jerking fashion*
+advertisement-mimehumanoid-8 = *sneezes multiple times without sound*
+advertisement-mimehumanoid-9 = *pretends to draw with pencil on canvas fixed to an easel*
+advertisement-mimehumanoid-10 = *imitates waiter serving table for two with wine*
+advertisement-mimehumanoid-11 = *performs a cartwheel and ends the motion in a handstand*
+advertisement-mimehumanoid-12 = *imitates playing on violin, you recognise the melody as "The Day Clowns Heads Rolled"*
+advertisement-mimehumanoid-13 = *pretends to have a dinner with family they never had*
+advertisement-mimehumanoid-14 = *imitates intense phone negotiations, appears to be on the losing side*
+advertisement-mimehumanoid-15 = *pretends to slip but instead of fallingб smoothly transitions to performing tap dance*
+advertisement-mimehumanoid-16 = *pretends to be a jazz musitian*
+advertisement-mimehumanoid-17 = *flips imaginary coin, doesn't seem happy with the result*
+advertisement-mimehumanoid-18 = *cries and wails without sound*
+advertisement-mimehumanoid-19 = *counts something on their fingers*
+advertisement-mimehumanoid-20 = *dances to the tune only they can hear*
diff --git a/Resources/Locale/en-US/_NF/headset/headset-component.ftl b/Resources/Locale/en-US/_NF/headset/headset-component.ftl
@@ -1 +1,2 @@
-chat-radio-traffic = Traffic
+chat-radio-traffic = Traffic
+chat-radio-nfsd = NFSD
diff --git a/Resources/Locale/en-US/advertisements/vending/nfsddrobe.ftl b/Resources/Locale/en-US/advertisements/vending/nfsddrobe.ftl
@@ -0,0 +1,5 @@
+advertisement-nfsddrobe-1 = Looking To 'Cop' A Fresh Look?
+advertisement-nfsddrobe-2 = From Boots to Caps, We Got Your Back
+advertisement-nfsddrobe-3 = Enforce Fashion With Arresting Attire
+advertisement-nfsddrobe-4 = Serve Justice, Look Fabulous!
+advertisement-nfsddrobe-5 = Now you can wear your brown pants too
diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl
@@ -10,7 +10,7 @@ chat-radio-command = Command
 chat-radio-engineering = Engineering
 chat-radio-medical = Medical
 chat-radio-science = Science
-chat-radio-security = NFSD
+chat-radio-security = Guard
 chat-radio-service = Service
 chat-radio-supply = Supply
 chat-radio-syndicate = Syndicate

diff --git a/Resources/Maps/_NF/POI/lpbravo.yml b/Resources/Maps/_NF/POI/lpbravo.yml
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -141,7 +141,7 @@
       - id: BoxSurvivalSecurity
       - id: Flash
       - id: MagazinePistol
-      - id: RubberStampHos  # Frontier
+      - id: RubberStampSheriff # Frontier
       - id: DoorRemoteSecurity  # Frontier
       - id: SecurityTechFabCircuitboard # Frontier
       - id: BaseSecurityUplinkRadioSheriff # Frontier
@@ -399,3 +399,4 @@
       - id: BoxSurvivalBrigmedic
       - id: Flash
       - id: FrontierUplinkCoin5
+      - id: EncryptionKeyMedical
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -151,7 +151,7 @@
       - id: BoxSurvivalSecurity
       - id: Flash
       - id: MagazinePistol
-      - id: RubberStampHos  # Frontier
+      - id: RubberStampSheriff # Frontier
       - id: DoorRemoteSecurity  # Frontier
       - id: SecurityTechFabCircuitboard # Frontier
       - id: BaseSecurityUplinkRadioSheriff # Frontier

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -165,7 +165,7 @@
       - id: BoxSurvivalSecurity
       - id: Flash
       - id: MagazinePistol
-      - id: RubberStampHos  # Frontier
+      - id: RubberStampSheriff # Frontier
       - id: DoorRemoteSecurity  # Frontier
       - id: SecurityTechFabCircuitboard # Frontier
       - id: BaseSecurityUplinkRadioSheriff # Frontier

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -1,3 +1,99 @@
+- type: entity
+  id: LockerBrigmedicFilledHardsuit
+  suffix: Filled, Hardsuit
+  parent: LockerBrigmedic
+  components:
+  - type: StorageFill
+    contents:
+#      - id: ClothingEyesHudSecurity
+#      - id: WeaponDisabler
+      - id: ClothingOuterHardsuitBrigmedic
+      - id: BoxSterileMask
+#      - id: ClothingHeadHatBeretBrigmedic
+#      - id: ClothingOuterCoatAMG
+#      - id: ClothingUniformJumpsuitBrigmedic
+#      - id: ClothingUniformJumpskirtBrigmedic
+#      - id: ClothingUniformJumpskirtOfLife
+#        prob: 0.1
+      - id: MedkitFilled
+      - id: MedkitCombatFilled
+#        prob: 0.6
+      - id: MedkitAdvancedFilled
+#        prob: 0.4
+#      - id: MedkitOxygenFilled
+#        prob: 0.3
+#      - id: MedkitBruteFilled
+#        prob: 0.3
+#      - id: MedkitToxinFilled
+#        prob: 0.3
+#      - id: MedkitBurnFilled
+#        prob: 0.7
+#      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
+#        prob: 0.15
+#      - id: NitrogenTankFilled
+#      - id: OxygenTankFilled
+      - id: AirTankFilled
+      - id: ClothingMaskBreathMedicalSecurity
+      - id: JetpackSecurityFilled
+      - id: HandheldGPSBasic
+      - id: ClothingShoesBootsMagCombatFilled
+      - id: HypoBrigmedic # Frontier
+
+- type: entity
+  id: LockerBrigmedicFilled
+  suffix: Filled
+  parent: LockerBrigmedic
+  components:
+  - type: StorageFill
+    contents:
+#      - id: ClothingEyesHudSecurity
+#      - id: WeaponDisabler
+      - id: BoxSterileMask
+#      - id: ClothingHeadHatBeretBrigmedic
+#      - id: ClothingOuterCoatAMG
+#      - id: ClothingUniformJumpsuitBrigmedic
+#      - id: ClothingUniformJumpskirtBrigmedic
+#      - id: ClothingUniformJumpskirtOfLife
+#        prob: 0.1
+      - id: MedkitFilled
+      - id: MedkitCombatFilled
+#        prob: 0.6
+      - id: MedkitAdvancedFilled
+#        prob: 0.4
+#      - id: MedkitOxygenFilled
+#        prob: 0.3
+#      - id: MedkitBruteFilled
+#        prob: 0.3
+#      - id: MedkitToxinFilled
+#        prob: 0.3
+#      - id: MedkitBurnFilled
+#        prob: 0.7
+#      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
+#        prob: 0.15
+      - id: HypoBrigmedic # Frontier
+
+- type: entity
+  id: LockerSecurityFilled
+  suffix: Filled
+  parent: LockerSecurity
+  components:
+  - type: StorageFill
+    contents:
+#      - id: FlashlightSeclite
+#      - id: ClothingUniformJumpsuitSecGrey
+#        prob: 0.3
+      - id: ClothingHeadHelmetBasic
+      - id: ClothingOuterArmorBasic
+#      - id: ClothingBeltSecurityFilled
+#      - id: Flash
+#      - id: ClothingEyesGlassesSecurity
+      - id: ClothingHeadsetSecuritySafe # Ask SR or Sheriff for keys
+#      - id: ClothingHandsGlovesColorBlack
+#      - id: ClothingShoesBootsJack
+#      - id: WeaponMeleeNeedle
+#        prob: 0.1
+#      - id: ClothingEyesHudSecurity
+
 - type: entity
   id: LockerWardenFilledHardsuit
   suffix: Filled, Hardsuit
@@ -55,28 +151,6 @@
 #      - id: HoloprojectorSecurity # Frontier - Starting gear
 #      - id: ClothingEyesHudSecurity
 
-- type: entity
-  id: LockerSecurityFilled
-  suffix: Filled
-  parent: LockerSecurity
-  components:
-  - type: StorageFill
-    contents:
-#      - id: FlashlightSeclite
-#      - id: ClothingUniformJumpsuitSecGrey
-#        prob: 0.3
-      - id: ClothingHeadHelmetBasic
-      - id: ClothingOuterArmorBasic
-#      - id: ClothingBeltSecurityFilled
-#      - id: Flash
-#      - id: ClothingEyesGlassesSecurity
-      - id: ClothingHeadsetSecuritySafe # Ask SR or Sheriff for keys
-#      - id: ClothingHandsGlovesColorBlack
-#      - id: ClothingShoesBootsJack
-#      - id: WeaponMeleeNeedle
-#        prob: 0.1
-#      - id: ClothingEyesHudSecurity
-
 - type: entity
   id: LockerDetectiveFilled
   suffix: Filled

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
@@ -42,6 +42,7 @@
     DeskBell: 3 # Frontier
     EncryptionKeyCommand: 3 # Frontier
     EncryptionKeySecurity: 10 # Frontier  1<10
+    EncryptionKeyNFSD: 10 # Frontier  1<10
     EncryptionKeyCargo: 20 # Frontier 2<20
     EncryptionKeyEngineering: 20 # Frontier 2<20
     EncryptionKeyMedical: 20 # Frontier 2<20

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -592,6 +592,7 @@
         - Gun
         - BallisticAmmoProvider
         - CartridgeAmmo
+  - type: Contraband #frontier
 
 - type: entity
   parent: ClothingBeltStorageBase
@@ -686,3 +687,4 @@
     whitelist:
       tags:
       - WizardWand
+  - type: Contraband #frontier
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -70,6 +70,7 @@
     sprite: Clothing/Head/Helmets/swat_syndicate.rsi
   - type: Clothing
     sprite: Clothing/Head/Helmets/swat_syndicate.rsi
+  - type: Contraband #frontier
 
 #Light Riot Helmet
 - type: entity
@@ -146,6 +147,7 @@
         Slash: 0.8
         Piercing: 0.9
         Heat: 0.9
+  - type: Contraband #frontier
 
 #SCAF Helmet
 - type: entity
@@ -227,6 +229,7 @@
     sprite: Clothing/Head/Helmets/wizardhelm.rsi
   - type: IngestionBlocker
   - type: IdentityBlocker
+  - type: Contraband #frontier
 
 #Fire Helmet
 - type: entity

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -112,6 +112,7 @@
     tags:
     - HidesHair
     - WhitelistChameleon
+  - type: Contraband #frontier
 
 - type: entity
   parent: ClothingHeadBase

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -118,6 +118,7 @@
         Piercing: 0.6
         Heat: 0.5
   - type: GroupExamine
+  - type: Contraband #frontier
 
 - type: entity
   parent: ClothingOuterBaseLarge
@@ -173,6 +174,7 @@
     sprite: Clothing/OuterClothing/Armor/magusblue.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Armor/magusblue.rsi
+  - type: Contraband #frontier
 
 - type: entity
   parent: ClothingOuterArmorHeavy
@@ -184,6 +186,7 @@
     sprite: Clothing/OuterClothing/Armor/magusred.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Armor/magusred.rsi
+  - type: Contraband #frontier
 
 - type: entity
   parent: ClothingOuterBaseLarge

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -327,6 +327,7 @@
     sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi
+  - type: Contraband #frontier
 
 - type: entity
   parent: ClothingOuterCoatHoSTrench
@@ -338,6 +339,7 @@
     sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi
+  - type: Contraband #frontier
 
 - type: entity
   parent: ClothingOuterStorageBase

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -666,6 +666,7 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitWizard
+  - type: Contraband #frontier
 
 #Ling Space Suit
 - type: entity