Юпитер-6

AdventureTimeSS14 · Mar 1, 2024 · 8aed889 · 8aed889
1 parent 603dfbe
commit 8aed889
Show file tree

Hide file tree

Showing 9 changed files with 5,258 additions and 34 deletions.
diff --git a/Content.Server/ADT/StationEvents/Components/TraderSpawnRuleComponent.cs b/Content.Server/ADT/StationEvents/Components/TraderSpawnRuleComponent.cs
@@ -8,5 +8,5 @@ namespace Content.Server.StationEvents.Components;
 public sealed partial class TraderSpawnRuleComponent : Component
 {
     [DataField("TraderShuttlePath")]
-    public string TraderShuttlePath = "Maps/Shuttles/trader.yml";
+    public string TraderShuttlePath = "Maps/traderpost.yml";
 }
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -1358,3 +1358,9 @@ Entries:
   - {message: Финансовое положение патологоанатома исправлено; теперь он спавнится с 500 кредитами в сумке как и остальные роли., type: Fix}
   id: 55695 #костыль отображения в Обновлениях
   time: '2024-02-27T22:08:00.0000000+00:00'
+
+- author: Xelasto
+  changes:
+  - {message: "Добавленна станция Юпитер-6 торговцев ТСФ.", type: Add}
+  id: 55696 #костыль отображения в Обновлениях
+  time: '2024-03-1T20:20:00.0000000+00:00'
diff --git a/Resources/Locale/ru-RU/ADT/Trader/trader.ftl b/Resources/Locale/ru-RU/ADT/Trader/trader.ftl
@@ -11,3 +11,8 @@ ent-AirlockGlassTraderLocked = { ent-AirlockGlass }
 ent-SecureWindoorTraderLocked = { ent-WindoorSecure }
     .desc = { ent-WindoorSecure.desc }
 station-event-trader-spawn-announcement = Станция в ваш сектор прибывает шаттл торговой программы, для налаживания торговых отношений с ТСФ
+chat-radio-trader = ТСФ
+ent-EncryptionKeyTrader = ключ шифрования торговцев
+    .desc = Ключ шифрования, используемый торговцами.
+ent-ClothingHeadsetTrader = гарнитура торговцев
+    .desc = Гарнитура, используемая торговцами.
diff --git a/Resources/Maps/traderpost.yml b/Resources/Maps/traderpost.yml
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml b/Resources/Prototypes/ADT/Entities/Mobs/player/trader.yml
@@ -1,5 +1,8 @@
-- type: randomHumanoidSettings
+- type: entity
+  noSpawn: true
+  parent: MobHuman
   id: Trader
+  name: Trader
   components:
     - type: MindShield
     - type: GhostRole
@@ -9,14 +12,9 @@
       - !type:OverallPlaytimeRequirement
         time: 108000 # 30h overall
     - type: GhostTakeoverAvailable
+    - type: RandomHumanoidAppearance
     - type: Loadout
       prototypes: [ Trader ]
-    - type: InitialInfectedExempt
-    - type: RandomMetadata
-      nameSegments:
-      - names_first_male
-      - NamesLastERTCallsign
-
 - type: entity
   parent: BasePDA
   id: TraderPDA
@@ -44,6 +42,45 @@
     - type: Access
       tags:
       - Trader
+      - External
+
+- type: radioChannel
+  id: Trader
+  name: chat-radio-trader
+  keycode: 'ф'
+  frequency: 1673
+  color: "#b88646"
+
+- type: entity
+  parent: EncryptionKey
+  id: EncryptionKeyTrader
+  name: trader encryption key
+  description: An encryption key used by trader.
+  components:
+  - type: EncryptionKey
+    channels:
+    - Trader
+    defaultChannel: Trader
+  - type: Sprite
+    layers:
+    - state: crypt_gray
+    - state: cargo_label
+
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetTrader
+  name: trader headset
+  description: A headset used by trader.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyTrader
+      - EncryptionKeyCommon
+  - type: Sprite
+    sprite: Clothing/Ears/Headsets/cargo.rsi
+  - type: Clothing
+    sprite: Clothing/Ears/Headsets/cargo.rsi
 
 - type: entity
   noSpawn: true
@@ -54,6 +91,8 @@
       contents:
         - id: BoxSurvival
         - id: RubberStampTrader
+        - id: AppraisalTool
+        - id: SpaceCash500
 
 - type: entity
   name: Trader
@@ -67,36 +106,18 @@
         state: cargo_tech
   - type: ConditionalSpawner
     prototypes:
-      - RandomHumanoidSpawnerTrader
-
-- type: entity
-  id: RandomHumanoidSpawnerTrader
-  name: Trader
-  suffix: Trader
-  components:
-    - type: Sprite
-      sprite: Markers/jobs.rsi
-      state: cargo_tech
-    - type: RandomHumanoidSpawner
-      settings: Trader
-    - type: InitialInfectedExempt
+      - Trader
 
 - type: entity
-  name: RandomCargoProduct
-  id: RandomCargoProduct
+  name: RandomTraderProduct
+  id: RandomTraderProduct
   parent: MarkerBase
   components:
   - type: Sprite
     layers:
       - state: green
   - type: ConditionalSpawner
     prototypes:
-      - CrateArmorySMG
-      - CrateArmoryShotgun
-      - CrateTrackingImplants
-      - CrateTrainingBombs
-      - CrateArmoryLaser
-      - CrateArmoryPistols
       - AirCanister
       - OxygenCanister
       - LiquidOxygenCanister
@@ -226,6 +247,25 @@
       - CrateArtifactContainer
       - RandomArtifactSpawner
       - CrateScienceBiosuit
+      - Thruster
+      - Gyroscope
+
+- type: entity
+  name: RandomTraderArmory
+  id: RandomTraderArmory
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+  - type: ConditionalSpawner
+    prototypes:
+      - CrateArmorySMG
+      - CrateArmoryShotgun
+      - CrateTrackingImplants
+      - CrateTrainingBombs
+      - CrateArmoryLaser
+      - CrateArmoryPistols
       - CrateSecurityArmor
       - CrateSecurityHelmet
       - CrateSecurityNonlethal
@@ -236,5 +276,24 @@
       - DeployableBarrier
       - CrateSecurityHardsuit
       - CrateSecurityUSSPjuggernaut
-      - Thruster
-      - Gyroscope
+
+- type: entity
+  name: RandomTraderLoot
+  id: RandomTraderLoot
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+  - type: ConditionalSpawner
+    prototypes:
+      - ADTTallRobotFMekaCargo
+      - ADTTallRobotFMekaEng
+      - ADTTallRobotFMekaJani
+      - ADTTallRobotFMekaMed
+      - ADTTallRobotFMekaServe
+      - ADTTallRobotMekaCargo
+      - ADTTallRobotMekaEng
+      - ADTTallRobotMekaJani
+      - ADTTallRobotMekaMed
+      - ADTTallRobotMekaServe
diff --git a/Resources/Prototypes/ADT/StartingGear/trader.yml b/Resources/Prototypes/ADT/StartingGear/trader.yml
@@ -6,8 +6,8 @@
     back: ClothingBackpackCargoTraderFilled
     shoes: ClothingShoesColorBlack
     id: TraderPDA
+    ears: ClothingHeadsetTrader
     belt: ClothingBeltUtilityFilled
-    pocket1: AppraisalTool
     underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear
     socks: ClothingUnderwearSocksNormal
   underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear

diff --git a/Resources/Prototypes/ADT/Tallrobot/base.yml b/Resources/Prototypes/ADT/Tallrobot/base.yml
@@ -31,7 +31,7 @@
   - type: ContainerFill
     containers:
       borg_brain:
-      - MMIFilled
+      - PositronicBrain
   - type: ItemSlots
     slots:
       cell_slot:

diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml
@@ -51,3 +51,6 @@
 
 - type: Tag
   id: HighVoltageDefibrillator
+
+- type: Tag
+  id: Trader
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
@@ -512,6 +512,8 @@
     startAnnouncement: station-event-trader-spawn-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    weight: 15
+    weight: 10
     minimumPlayers: 45
+    earliestStart: 30
+    maxOccurrences: 1
   - type: TraderSpawnRule