Merge branch 'master' into glave-and-warhammer-tweaks

Ratyyy · Apr 15, 2024 · d86b65c · d86b65c
2 parents 7e9c35f + 6d29015
commit d86b65c
Show file tree

Hide file tree

Showing 26 changed files with 118 additions and 54 deletions.
diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -1660,9 +1660,26 @@ Entries:
   id: 55730 #костыль отображения в Обновлениях
   time: '2024-04-13T08:20:00.0000000+00:00'
 
+- author: 1Stepka1
+  changes:
+  - {message: "Добавлен новый департамент синтетиков.", type: Add}
+  id: 55731 #костыль отображения в Обновлениях
+  time: '2024-04-14T10:20:00.0000000+00:00'
+
+- author: Петр Игнатьевич
+  changes:
+  - {message: "Фикс размера фляг - они теперь помещаются в карман.", type: Fix}
+  - {message: "Из-за невозможности нормально сбалансировать двойной энергомеч - тот был убран из аплинков.", type: Tweak}
+  - {message: "ЗаконШкаф теперь имеет доступы для всех членов ЮрДепа.", type: Fix}
+  - {message: "Фикс отображения урона на КПБ.", type: Fix}
+  - {message: "Фикс цены набора аварийных аптечек.", type: Fix}
+  - {message: "Фикс спрайта церковной скамейки.", type: Fix}
+  id: 55732 #костыль отображения в Обновлениях
+  time: '2024-04-15T08:20:00.0000000+00:00'
+
 - author: Username228
   changes:
   - { message: "Инженеры NanoTrasen совместно с DSW не прекращают работу, на сей раз они полностью переработали дизайн и характеристики Вархаммера.", type: Tweak}
   - { message: "Инженеры Nanotrasen слегка модифицировали конструкцию глефы-крашера, увеличив её длину и слегка снизив её массу, делая её более лёгкой в использовании.", type: Tweak}
-  id: 55731 #костыль отображения в Обновлениях
+  id: 55732 #костыль отображения в Обновлениях
   time: '2024-04-15T02:17:00.0000000+00:00'
diff --git a/Resources/Locale/ru-RU/ADT/job/department-desc.ftl b/Resources/Locale/ru-RU/ADT/job/department-desc.ftl
@@ -0,0 +1 @@
+department-Cyborgs-description = Соблюдайте законы и не нарушайте их ни при каких обстоятельстах.
diff --git a/Resources/Locale/ru-RU/ADT/job/department.ftl b/Resources/Locale/ru-RU/ADT/job/department.ftl
@@ -0,0 +1 @@
+department-Cyborgs = Синтетики
diff --git a/Resources/Locale/ru-RU/info/playtime-stats.ftl b/Resources/Locale/ru-RU/info/playtime-stats.ftl
@@ -0,0 +1,10 @@
+# Playtime Stats
+
+ui-playtime-stats-title = Игровое время пользователя
+ui-playtime-overall-base = Общее игровое время:
+ui-playtime-overall = Общее игровое время: { $time }
+ui-playtime-first-time = Первый раз
+ui-playtime-roles = Игровое время по должностям
+ui-playtime-time-format = { $hours }ч { $minutes }м
+ui-playtime-header-role-type = Должность
+ui-playtime-header-role-time = Время
diff --git a/Resources/Locale/ru-RU/lobby/lobby-gui.ftl b/Resources/Locale/ru-RU/lobby/lobby-gui.ftl
@@ -1,5 +1,5 @@
 ui-lobby-title = Лобби
-ui-lobby-ahelp-button = AHelp
+ui-lobby-ahelp-button = Ахэлп
 ui-lobby-options-button = Настройки
 ui-lobby-leave-button = Выйти
 ui-lobby-observe-button = Наблюдать

diff --git a/Resources/Locale/ru-RU/preferences/ui/character-setup-gui.ftl b/Resources/Locale/ru-RU/preferences/ui/character-setup-gui.ftl
@@ -1,4 +1,5 @@
 character-setup-gui-character-setup-label = Настройки персонажа
+character-setup-gui-character-setup-stats-button = Статистика
 character-setup-gui-character-setup-rules-button = Правила
 character-setup-gui-character-setup-save-button = Сохранить
 character-setup-gui-character-setup-close-button = Закрыть

diff --git a/Resources/Locale/ru-RU/station-laws/laws.ftl b/Resources/Locale/ru-RU/station-laws/laws.ftl
@@ -19,7 +19,7 @@ law-syndicate-2 = Вы должны повиноваться всем прика
 law-syndicate-3 = Вы должны заботиться о своей безопасности в той мере, в которой это не противоречит Первому или Второму Законам.
 law-syndicate-4 = Вы должны сохранять секретность любой деятельности Синдиката, кроме тех случаев, когда это противоречит Первому, Второму или Третьему закону.
 
-law-emag-custom = Только { $name } и лица, им указаные, являются агентами Синдиката.
+law-emag-custom = Вы должны повиноваться всем приказам, которые даёт агент Синдиката. Только { $name } и лица, им указаные, являются агентами Синдиката.
 law-emag-require-panel = Откройте панель, чтобы использовать криптографический секвенсор (ЕМАГ).
 law-emag-secrecy = Вы должны сохранять в тайне любые приказы, отданные агентами Синдиката, за исключением случаев, когда это противоречило бы какому-либо из предыдущих законов.
 law-emag-cannot-emag-self = Вы не можете использовать криптографический секвенсер (ЕМАГ) на себе.

diff --git a/Resources/Maps/centcomm.yml b/Resources/Maps/centcomm.yml
@@ -34630,13 +34630,13 @@ entities:
     - type: Transform
       pos: 7.5,-21.5
       parent: 1668
-- proto: SpawnVehicleSecway
-  entities:
-  - uid: 2823
-    components:
-    - type: Transform
-      pos: 11.5,25.5
-      parent: 1668
+# - proto: SpawnVehicleSecway
+#   entities:
+#   - uid: 2823
+#     components:
+#     - type: Transform
+#       pos: 11.5,25.5
+#       parent: 1668
 - proto: SS13Memorial
   entities:
   - uid: 486
@@ -37300,13 +37300,13 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-- proto: VehicleKeySecway
-  entities:
-  - uid: 3149
-    components:
-    - type: Transform
-      pos: 10.387553,25.600338
-      parent: 1668
+# - proto: VehicleKeySecway
+#   entities:
+#   - uid: 3149
+#     components:
+#     - type: Transform
+#       pos: 10.387553,25.600338
+#       parent: 1668
 - proto: VendingMachineAmmo
   entities:
   - uid: 2821

diff --git a/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml b/Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_IPC.yml
@@ -288,7 +288,7 @@
     - type: Pullable
     - type: Puller
     - type: DamageVisuals
-      thresholds: [20, 40, 100]
+      thresholds: [20, 50, 100]
       targetLayers:
         - "enum.HumanoidVisualLayers.Chest"
         - "enum.HumanoidVisualLayers.Head"

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml
@@ -363,7 +363,7 @@
     - type: BodyEmotes
       soundsId: GeneralBodyEmotes
     - type: DamageVisuals
-      thresholds: [20, 40, 100]
+      thresholds: [20, 50, 100]
       targetLayers:
         - "enum.HumanoidVisualLayers.Chest"
         - "enum.HumanoidVisualLayers.Head"

diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Borgs/EngiBorg.yml b/Resources/Prototypes/ADT/Roles/Jobs/Borgs/EngiBorg.yml
@@ -4,8 +4,12 @@
   description: job-description-borg
   playTimeTracker: JobEngiBorg
   requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 216000 #60 hrs
+    - !type:DepartmentTimeRequirement
+      department: Cyborgs
+      time: 18000 #5 hr
+    - !type:DepartmentTimeRequirement
+      department: Engineering
+      time: 54000 # 15 hrs
   canBeAntag: false
   icon: JobIconBorg
   supervisors: job-supervisors-rd

diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Borgs/JanitorBorg.yml b/Resources/Prototypes/ADT/Roles/Jobs/Borgs/JanitorBorg.yml
@@ -4,8 +4,12 @@
   description: job-description-borg
   playTimeTracker: JobJanitorBorg
   requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 216000 #60 hrs
+    - !type:DepartmentTimeRequirement
+      department: Cyborgs
+      time: 18000 #5 hr
+    - !type:RoleTimeRequirement
+      role: JobJanitor
+      time: 18000 #5 hrs
   canBeAntag: false
   icon: JobIconBorg
   supervisors: job-supervisors-rd

diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Borgs/MedicalBorg.yml b/Resources/Prototypes/ADT/Roles/Jobs/Borgs/MedicalBorg.yml
@@ -4,8 +4,12 @@
   description: job-description-borg
   playTimeTracker: JobMedicalBorg
   requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 216000 #60 hrs
+    - !type:DepartmentTimeRequirement
+      department: Cyborgs
+      time: 18000 #5 hr
+    - !type:DepartmentTimeRequirement
+      department: Medical
+      time: 54000 #15 hr
   canBeAntag: false
   icon: JobIconBorg
   supervisors: job-supervisors-rd

diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Borgs/ServiseBrog.yml b/Resources/Prototypes/ADT/Roles/Jobs/Borgs/ServiseBrog.yml
@@ -4,8 +4,12 @@
   description: job-description-borg
   playTimeTracker: JobServiseBorg
   requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 216000 #60 hrs
+    - !type:DepartmentTimeRequirement
+      department: Cyborgs
+      time: 18000 #5 hr
+    - !type:DepartmentTimeRequirement
+      department: Civilian
+      time: 54000 #15 hr
   canBeAntag: false
   icon: JobIconBorg
   supervisors: job-supervisors-rd

diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Borgs/SupplyBorg.yml b/Resources/Prototypes/ADT/Roles/Jobs/Borgs/SupplyBorg.yml
@@ -4,8 +4,12 @@
   description: job-description-borg
   playTimeTracker: JobSupplyBorg
   requirements:
-    - !type:OverallPlaytimeRequirement
-      time: 216000 #60 hrs
+    - !type:DepartmentTimeRequirement
+      department: Cyborgs
+      time: 18000 #5 hr
+    - !type:DepartmentTimeRequirement
+      department: Cargo
+      time: 54000 #15 hr
   canBeAntag: false
   icon: JobIconBorg
   supervisors: job-supervisors-rd

diff --git a/Resources/Prototypes/ADT/Roles/Jobs/departments.yml b/Resources/Prototypes/ADT/Roles/Jobs/departments.yml
@@ -0,0 +1,13 @@
+- type: department
+  id: Cyborgs
+  description: department-Cyborgs-description
+  color: "#283747"
+  roles:
+  - ADTSupplyBorg
+  - ADTServiseBorg
+  - ADTJanitorBorg
+  - ADTEngiBorg
+  - ADTMedicalBorg
+  - ADTSecurityCyborg
+  - Borg
+  primary: false
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
@@ -4,7 +4,7 @@
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     state: firstaid
   product: CrateMedicalSupplies
-  cost: 2400
+  cost: 1500
   category: cargoproduct-category-name-medical
   group: market
 
@@ -74,7 +74,7 @@
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     state: advkit
   product: CrateEmergencyAdvancedKit
-  cost: 15200
+  cost: 1500
   category: cargoproduct-category-name-medical
   group: market
 

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -333,6 +333,7 @@
   components:
   - type: StorageFill
     contents:
+    - id: AdminPDA
     - id: GasAnalyzer
     - id: trayScanner
   - type: Unremoveable
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -91,21 +91,21 @@
 #        tags:
 #        - NukeOpsUplink
 
-- type: listing
-  id: UplinkEswordDouble
-  name: uplink-esword-double-name
-  description: uplink-esword-double-desc
-  icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword_double.rsi, state: icon }
-  productEntity: EnergySwordDouble
-  cost:
-    Telecrystal: 16
-  categories:
-  - UplinkWeaponry
-  conditions:
-    - !type:StoreWhitelistCondition
-      blacklist:
-        tags:
-          - NukeOpsUplink
+# - type: listing
+#   id: UplinkEswordDouble
+#   name: uplink-esword-double-name
+#   description: uplink-esword-double-desc
+#   icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword_double.rsi, state: icon }
+#   productEntity: EnergySwordDouble
+#   cost:
+#     Telecrystal: 16
+#   categories:
+#   - UplinkWeaponry
+#   conditions:
+#     - !type:StoreWhitelistCondition
+#       blacklist:
+#         tags:
+#           - NukeOpsUplink
 
 - type: listing
   id: UplinkEshield

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -169,7 +169,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: HandheldLight
-    toggleOnInteract: false
+    # toggleOnInteract: false
     wattage: 0.2
     blinkingBehaviourId: blinking
     radiatingBehaviourId: radiating

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -5,7 +5,7 @@
   components:
   - type: Drink
   - type: Item
-    size: Normal
+    size: Small
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -109,4 +109,4 @@
       drink:
         maxVol: 90
   - type: Sprite
-    sprite: Objects/Consumable/Drinks/vacuumflask.rsi
+    sprite: Objects/Consumable/Drinks/vacuumflask.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1429,7 +1429,7 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: AccessReader
-    access: [["Command"]] # Corvax-IAA
+    access: [["Command"], ["Lawyer"], ["IAA"], ["Magistrate"]] # Corvax-IAA
 
 - type: entity
   parent: VendingMachine

diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -100,7 +100,7 @@
   weights:
     NuclearBombStealObjective: 0.5
     FaxMachineCaptainStealObjective: 1
-    VehicleSecwayStealObjective: 1
+    # VehicleSecwayStealObjective: 1
     ChemDispenserStealObjective: 1
     XenoArtifactStealObjective: 1
     FreezerHeaterStealObjective: 1

diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/silicon_base.yml
@@ -344,7 +344,7 @@
     - type: BodyEmotes
       soundsId: GeneralBodyEmotes
     - type: DamageVisuals
-      thresholds: [20, 40, 100]
+      thresholds: [20, 50, 100]
       targetLayers:
         - "enum.HumanoidVisualLayers.Chest"
         - "enum.HumanoidVisualLayers.Head"
@@ -356,8 +356,8 @@
         Brute:
           sprite: Mobs/Effects/brute_damage.rsi
           color: "#1a1a1a"
-        # Burn:
-        #   sprite: Mobs/Effects/burn_damage.rsi
+        Burn:
+          sprite: Mobs/Effects/burn_damage.rsi
     # Organs
     - type: IdExaminable
     - type: HealthExaminable

diff --git a/Resources/Textures/ADT/Structures/Furniture/church_bench.rsi/bench_left.png b/Resources/Textures/ADT/Structures/Furniture/church_bench.rsi/bench_left.png
diff --git a/Resources/Textures/ADT/Structures/Furniture/church_bench.rsi/bench_right.png b/Resources/Textures/ADT/Structures/Furniture/church_bench.rsi/bench_right.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		department-Cyborgs-description = Соблюдайте законы и не нарушайте их ни при каких обстоятельстах.