Merge pull request #648 from xtray85/craft_for_mech

локализации из секретки
AdventureTimeSS14 · Apr 27, 2024 · 696a36a · 696a36a
2 parents 5a1785a + 557d4b1
commit 696a36a
Show file tree

Hide file tree

Showing 33 changed files with 252 additions and 28 deletions.
diff --git a/ADT_STATION b/ADT_STATION
diff --git a/Resources/Audio/ADT/Machines/shell_in.ogg b/Resources/Audio/ADT/Machines/shell_in.ogg
diff --git a/Resources/Audio/Announcements/alert.ogg b/Resources/Audio/Announcements/alert.ogg
diff --git a/Resources/Audio/Announcements/announce.ogg b/Resources/Audio/Announcements/announce.ogg
diff --git a/Resources/Audio/Announcements/attention.ogg b/Resources/Audio/Announcements/attention.ogg
diff --git a/Resources/Audio/Announcements/shuttlecalled.ogg b/Resources/Audio/Announcements/shuttlecalled.ogg
diff --git a/Resources/Audio/Announcements/shuttlerecalled.ogg b/Resources/Audio/Announcements/shuttlerecalled.ogg
diff --git a/Resources/Audio/Corvax/Announcements/announce.ogg b/Resources/Audio/Corvax/Announcements/announce.ogg
diff --git a/Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ADT/Objects/structuries/machines/vending_machines.ftl
@@ -17,3 +17,11 @@ ent-ADTVendingMachineParaDrobe = ПараШкаф
 ent-ADTVendingMachineTSFArmoury = оружейная ТСФ
     .desc = Связанный с удаленным хранилищем шкаф, используемый для выдачи оружия и экипировки бойцов ТСФ. 
     .suffix = { "ТСФ" }
+
+ent-ADTVendingMachineShell = выдача снарядов
+    .desc = Связанный с орудийным погребом машина, используемая для выдачи снарядов к корабельным орудиям. 
+    .suffix = { "Космические бои" }
+
+ent-ADTVendingMachineFleetGun = выдача стрелкового оружия
+    .desc = Связанный с арсеналом машина, используемая для выдачи стрелкового оружия и боеприпасов. 
+    .suffix = { "Космические бои" }
diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl
@@ -55,6 +55,23 @@ job-name-ADTInvestigator = Следователь СБ
 job-name-ussp-army-private = Военнослужащий СССП
 job-name-ussp-army-officer = Офицер СССП
 
+job-name-ntfleetpilot = пилот флота NT
+job-name-gorlaxfleetpilot = пилот флота Горлакса
+job-name-ntfleetcaptain = капитан флота NT
+job-name-gorlaxfleetcaptain = капитан флота Горлакса
+job-name-ntfleetstarpom = старпом флота NT
+job-name-gorlaxfleetstarpom = старпом флота Горлакса
+job-name-ntfleetchiefcanonire = старший канонир флота NT
+job-name-gorlaxfleetchiefcanonire = старший канонир флота Горлакса
+job-name-ntfleetcanonire = канонир флота NT
+job-name-gorlaxfleetcanonire = канонир флота Горлакса
+job-name-ntfleetengineer = инженер флота NT
+job-name-gorlaxfleetengineer = инженер флота Горлакса
+job-name-ntfleetmedic = корабельный врач NT
+job-name-gorlaxfleetmedic = корабельный врач Горлакса
+job-name-ntfleetstormtroop = штурмовик NT
+job-name-gorlaxfleetstormtroop = штурмовик Горлакса
+
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = Атмосферный техник
 JobBartender = Бармен
@@ -119,3 +136,20 @@ JobADTSecurityCyborg = Киборг СБ
 JobADTRoboticist = Робототехник
 JobUSSPArmyPrivate = Военнослужащий СССП
 JobUSSPArmyOfficer = Офицер СССП
+
+ADTNanotrasenFleetPilot = пилот флота NT
+ADTGorlaxFleetPilot = пилот флота Горлакса
+ADTNanotrasenFleetCaptain = капитан флота NT
+ADTGorlaxFleetCaptain = капитан флота Горлакса
+ADTNanotrasenFleetStarpom = старпом флота NT
+ADTGorlaxFleetStarpom = старпом флота Горлакса
+ADTNanotrasenFleetChiefCanonire = старший канонир флота NT
+ADTGorlaxFleetChiefCanonire = старший канонир флота Горлакса
+ADTNanotrasenFleetCanonire = канонир флота NT
+ADTGorlaxFleetCanonire = канонир флота Горлакса
+ADTNanotrasenFleetEngineer = инженер флота NT
+ADTGorlaxFleetEngineer = инженер флота Горлакса
+ADTNanotrasenFleetMedic = корабельный врач NT
+ADTGorlaxFleetMedic = корабельный врач Горлакса
+ADTNanotrasenFleetStormtroop = штурмовик NT
+ADTGorlaxFleetStormtroop = штурмовик Горлакса
diff --git a/Resources/Locale/ru-RU/research/technologies.ftl b/Resources/Locale/ru-RU/research/technologies.ftl
@@ -80,6 +80,10 @@ research-technology-advanced-anomaly-research = Продвинутые иссл
 research-technology-portable-fission = Эксперементальные батареи
 
 ADT-research-technology-doll-house = Кукольный домик
-ADT-research-technology-gigax = боевой мех "Гайгэкс"
-ADT-research-technology-odysseus = медицинский мех "Одиссей"
-ADT-research-technology-medgun = медиган
+ADT-research-technology-gigax = Боевой мех "Гайгэкс"
+ADT-research-technology-odysseus = Медицинский мех "Одиссей"
+ADT-research-technology-medgun = Медиган
+ADT-research-technology-clarke = Исследовательский мех "Кларк"
+ADT-research-technology-durand = Боевой мех "Дюранд"
+ADT-research-technology-phazon = Боевой мех "Фазон"
+ADT-research-technology-ripleymk2 = Пакет модификации меха "Рипли"
diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/tsf_armoury.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/tsf_armoury.yml
@@ -17,3 +17,22 @@
     ADTRadioHandheldTSFBackpack: 2
     ClothingHandsGlovesCombat: 15
     ClothingShoesBootsJack: 15
+
+
+- type: vendingMachineInventory
+  id: ADTShellDispenserInventory
+  startingInventory:
+    GrenadeBlast: 50
+    GrenadeFrag: 30
+    GrenadeEMP: 30
+    GrenadeFlash: 15
+
+- type: vendingMachineInventory
+  id: ADTFleetGunDispenserInventory
+  startingInventory:
+    ADTWeaponRifleTAR60SF: 15
+    ADTMagazineRifleAR12: 60
+    MagazineBoxRifle: 30
+    ADTClothingWarbeltTSF: 15
+    ADTClothingTSFMagBelt: 15
+    ADTClothingTSFMedBelt: 15
diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml
@@ -245,3 +245,79 @@
       shader: unshaded
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+
+#Раздатчик снарядов
+- type: entity
+  parent: VendingMachine
+  id: ADTVendingMachineShell
+  name: Shell Dispenser
+  description: Shell Dispenser
+  components:
+  - type: VendingMachine
+    pack: ADTShellDispenserInventory
+    dispenseOnHitChance: 0.25
+    dispenseOnHitThreshold: 2
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    ejectState: eject-unshaded
+    denyState: deny-unshaded
+    # screenState: screen
+    ejectDelay: 2
+    soundVend: /Audio/ADT/Machines/shell_in.ogg
+  - type: Speech
+  - type: Sprite
+    sprite: ADT/Structures/Machines/VendingMachines/shelldispenser.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    # - state: "screen"
+    #   map: ["enum.VendingMachineVisualLayers.Screen"]
+    #   shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 0.1
+    energy: 0.1
+    color: "#ffffff"
+
+#Раздатчик оружия
+#Раздатчик снарядов
+- type: entity
+  parent: VendingMachine
+  id: ADTVendingMachineFleetGun
+  name: Gun Dispenser
+  description: Gun Dispenser
+  components:
+  - type: VendingMachine
+    pack: ADTFleetGunDispenserInventory
+    dispenseOnHitChance: 0.25
+    dispenseOnHitThreshold: 2
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    # ejectState: eject-unshaded
+    # denyState: deny-unshaded
+    # screenState: screen
+    ejectDelay: 1
+  - type: Speech
+  - type: Sprite
+    sprite: ADT/Structures/Machines/VendingMachines/gunfleetdispenser.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    # - state: "screen"
+    #   map: ["enum.VendingMachineVisualLayers.Screen"]
+    #   shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  # - type: PointLight
+  #   radius: 1.5
+  #   energy: 1.3
+  #   color: "#ad7c4b"
diff --git a/Resources/Prototypes/ADT/Entities/Structures/miningwallgirder.yml b/Resources/Prototypes/ADT/Entities/Structures/miningwallgirder.yml
@@ -21,7 +21,7 @@
               southRotation: true
           steps:
             - material: Steel
-              amount: 3
+              amount: 2
               doAfter: 1
 
     - node: mining_girder
@@ -31,7 +31,7 @@
           completed:
             - !type:SpawnPrototype
               prototype: SheetSteel1
-              amount: 3
+              amount: 2
             - !type:DeleteEntity {}
           conditions:
             - !type:EntityAnchored

diff --git a/Resources/Prototypes/Corvax/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Corvax/Entities/Structures/Machines/Computers/computers.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: ComputerComms
   id: CentcomComputerComms
   name: centcom communications computer
@@ -9,6 +9,6 @@
       title: comms-console-announcement-title-centcom
       global: true
       sound:
-        path: /Audio/Corvax/Announcements/centcomm.ogg
+        path: /Audio/Announcements/attention.ogg
         params:
           volume: -4
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -634,7 +634,7 @@
       coefficients:
         Blunt: 0.4
         Slash: 0.4
-        Piercing: 0.35
+        Piercing: 0.3
         Heat: 0.4
         Radiation: 0.20
         Caustic: 0.5
@@ -841,7 +841,7 @@
         Blunt: 0.4
         Slash: 0.4
         Piercing: 0.3
-        Heat: 0.2
+        Heat: 0.4
         Radiation: 0.20
         Caustic: 0.5
         Stun: 0.4
@@ -891,7 +891,7 @@
         Blunt: 0.4
         Slash: 0.4
         Piercing: 0.3
-        Heat: 0.2
+        Heat: 0.4
         Radiation: 0.20
         Caustic: 0.5
         Stun: 0.4
@@ -916,7 +916,7 @@
         Blunt: 0.4
         Slash: 0.4
         Piercing: 0.3
-        Heat: 0.2
+        Heat: 0.4
         Radiation: 0.20
         Caustic: 0.5
         Stun: 0.4

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -566,7 +566,7 @@
   - type: CommunicationsConsole
     title: comms-console-announcement-title-station
     sound: # Corvax-Announcements
-      path: /Audio/Corvax/Announcements/announce.ogg
+      path: /Audio/Announcements/attention.ogg
       params:
         volume: -5
   - type: DeviceNetwork

diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
@@ -59,7 +59,7 @@
   - type: StationEvent
     startAnnouncement: station-event-bureaucratic-error-announcement
     minimumPlayers: 25
-    weight: 3
+    weight: 1
     duration: 1
   - type: BureaucraticErrorRule
 
@@ -71,7 +71,7 @@
   - type: StationEvent
     startAnnouncement: station-event-clerical-error-announcement
     minimumPlayers: 15
-    weight: 5
+    weight: 3
     duration: 1
   - type: ClericalErrorRule
 
@@ -93,7 +93,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 5
+    weight: 2
     duration: 1
     earliestStart: 45
     reoccurrenceDelay: 60
@@ -111,7 +111,7 @@
     duration: 1
     earliestStart: 30
     reoccurrenceDelay: 60
-    minimumPlayers: 40
+    minimumPlayers: 20
   - type: NinjaSpawnRule
 
 - type: entity
@@ -179,7 +179,7 @@
   components:
   - type: StationEvent
     earliestStart: 15
-    weight: 2
+    weight: 3
     minimumPlayers: 25 #Enough to hopefully have at least one engineering guy
     startAnnouncement: station-event-meteor-swarm-start-announcement
     endAnnouncement: station-event-meteor-swarm-end-announcement
@@ -369,7 +369,7 @@
     startDelay: 10
     earliestStart: 20
     minimumPlayers: 15
-    weight: 5
+    weight: 3
     duration: 60
   - type: VentCrittersRule
     entries:
@@ -394,7 +394,7 @@
     startDelay: 10
     earliestStart: 20
     minimumPlayers: 15
-    weight: 5
+    weight: 3
     duration: 60
   - type: VentCrittersRule
     entries:
@@ -412,13 +412,13 @@
       path: /Audio/Announcements/attention.ogg
     startDelay: 10
     earliestStart: 20
-    minimumPlayers: 15
+    minimumPlayers: 30
     weight: 1
     duration: 60
   - type: VentCrittersRule
     entries:
     - id: MobClownSpider
-      prob: 0.05
+      prob: 0.01
 
 #- type: entity
 #  id: ZombieOutbreak
@@ -445,7 +445,7 @@
   - type: StationEvent
     earliestStart: 45
     weight: 5
-    minimumPlayers: 30
+    minimumPlayers: 45
     reoccurrenceDelay: 30
     duration: 1
   - type: LoneOpsSpawnRule

diff --git a/Resources/Prototypes/NES/Entities/Structures/Decoration/furniture.yml b/Resources/Prototypes/NES/Entities/Structures/Decoration/furniture.yml
@@ -208,7 +208,7 @@
       global: true
       canShuttle: false
       sound:
-        path: /Audio/NES/StationEvents/ERTincoming.ogg
+        path: /Audio/Announcements/attention.ogg
         params:
           volume: -10
 

diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
@@ -12,6 +12,17 @@
   materials:
     Glass: 200
 
+# - type: latheRecipe
+#   id: DnaSyringeGun
+#   result: DnaSyringeGun
+#   completetime: 5
+#   materials:
+#     Steel: 350
+#     Plastic: 350
+#     Glass: 200
+#     Plasma: 100
+#     Silver: 100
+
 - type: latheRecipe
   id: Syringecartridge
   result: Syringecartridge

diff --git a/Resources/Prototypes/secret_weights.yml b/Resources/Prototypes/secret_weights.yml
@@ -2,9 +2,9 @@
   id: Secret
   weights:
     Nukeops: 0.15
-    Traitor: 0.30
-#    Zombie: 0.05
-    Survival: 0.05
+    Traitor: 0.35
+    # Zombie: 0.05
+    # Survival: 0.05
     Revolutionary: 0.1
-    TraitorChangeling: 0.1
+    TraitorChangeling: 0.15
     Changeling: 0.25
diff --git a/...xtures/ADT/Structures/Machines/VendingMachines/gunfleetdispenser.rsi/broken.png b/...xtures/ADT/Structures/Machines/VendingMachines/gunfleetdispenser.rsi/broken.png