Merge branch 'master' into tweakssss

2024-08-06 10:29:02 +03:00
parent c719eb56e0 3cad3721a5
commit c7f9bc5e70
21 changed files with 157 additions and 27 deletions
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -7811,3 +7811,29 @@
  id: 465
  time: '2024-08-04T13:54:10.0000000+00:00'
  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/562
+- author: Aviu
+  changes:
+  - message: "\u0414\u0435\u0444\u0438\u0431\u0430\u043C\u0438 \u043C\u043E\u0436\u043D\
+      \u043E \u0442\u0435\u043F\u0435\u0440\u044C \u0431\u0438\u0442\u044C \u0436\u0438\
+      \u0432\u044B\u0445."
+    type: Add
+  - message: "\u0414\u0435\u0444\u0438\u0431\u044B \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u043C\u043E\u0436\u043D\u043E \u0435\u043C\u0430\u0433\u043D\u0443\u0442\u044C\
+      , \u044D\u0442\u043E \u0434\u0430\u0441\u0442 \u0438\u043C \u0432\u043E\u0437\
+      \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0431\u0438\u0442\u044C \u0432\
+      \ \u0431\u043E\u0435\u0432\u043E\u043C \u0440\u0435\u0436\u0438\u043C\u0435\
+      \ \u0440\u0430\u0437 \u0432 5 \u0441\u0435\u043A\u0443\u043D\u0434, \u043D\u0430\
+      \u043D\u043E\u0441\u044F 60 \u0441\u0442\u0430\u043C\u0438\u043D\u044B \u0438\
+      \ \u0440\u043E\u043D\u044F\u044F \u043D\u0430 \u043F\u043E\u043B \u043D\u0430\
+      \ 1.5 \u0441\u0435\u043A\u0443\u043D\u0434\u044B. \u0422\u0430\u043A\u0436\u0435\
+      \ \u0443\u0440\u043E\u043D \u043F\u0440\u0438 \u0443\u0434\u0430\u0440\u0435\
+      \ \u0435\u043C\u0430\u0433\u043D\u0443\u0442\u044B\u043C \u0434\u0435\u0444\u0438\
+      \u0431\u043E\u043C \u0443\u0432\u0435\u043B\u0438\u0447\u0438\u0432\u0430\u0435\
+      \u0442\u0441\u044F \u0434\u043E 55, \u0432\u0440\u0435\u043C\u044F \u0441\u0442\
+      \u0430\u043D\u0430 \u0443\u0432\u0435\u043B\u0438\u0447\u0438\u0432\u0430\u0435\
+      \u0442\u0441\u044F \u0434\u043E 6, \u0430 \u043A\u0434 \u0443\u043C\u0435\u043D\
+      \u044C\u0448\u0430\u0435\u0442\u0441\u044F \u0434\u043E 1."
+    type: Add
+  id: 466
+  time: '2024-08-05T13:39:31.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/567
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml
@@ -35,6 +35,9 @@
      zapHeal:
        types:
          Asphyxiation: -40
+      emaggedAttackWhitelist:
+        components:
+        - Stamina
    - type: DoAfter
    - type: UseDelay
    - type: StaticPrice
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/common.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobSalvageSpecialist
-      time: 9999999999 # 15 hours 54000
+      time: 54000 # 15 hours

 # Head

--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobClown
-      time: 9999999999 # 30 hours as clown required to ascend 108000
+      time: 108000 # 30 hours as clown required to ascend

 - type: loadoutEffectGroup # WD
  id: MedalClownTimer
@@ -15,7 +15,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobClown
-      time: 9999999999 # 10 hours 36000
+      time: 36000 # 10 hours

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobJanitor
-      time: 9999999999 # 10 hours 36000
+      time: 36000 # 10 hours

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobPassenger
-      time: 9999999999 #10 hrs, silly reward for people who play passenger a lot 36000
+      time: 36000 #10 hrs, silly reward for people who play passenger a lot

 # Face
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobHeadOfPersonnel
-      time: 9999999999 #15 hrs, special reward for HoP mains 54000
+      time: 54000 #15 hrs, special reward for HoP mains

 # Jumpsuit
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
@@ -6,17 +6,17 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobAtmosphericTechnician
-      time: 9999999999 #6 hrs 21600
+      time: 21600 #6 hrs
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:RoleTimeRequirement
      role: JobStationEngineer
-      time: 9999999999 #6 hrs 21600
+      time: 21600 #6 hrs
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:DepartmentTimeRequirement
      department: Engineering
-      time: 9999999999 # 60 hrs 216000
+      time: 216000 # 60 hrs

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
@@ -6,17 +6,17 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobChemist
-      time: 9999999999 #6 hrs 21600
+      time: 21600 #6 hrs
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:RoleTimeRequirement
      role: JobMedicalDoctor
-      time: 9999999999 #6 hrs 21600
+      time: 21600 #6 hrs
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:DepartmentTimeRequirement
      department: Medical
-      time: 9999999999 # 60 hrs 216000
+      time: 216000 # 60 hrs

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:DepartmentTimeRequirement
      department: Science
-      time: 9999999999 #60 hrs 216000
+      time: 216000 #60 hrs

 # Head

--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -6,12 +6,12 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobWarden
-      time: 9999999999 #6 hrs 21600
+      time: 21600 #6 hrs
  - !type:JobRequirementLoadoutEffect
    requirement:
      !type:DepartmentTimeRequirement
      department: Security
-      time: 9999999999 # 60 hrs 216000
+      time: 216000 # 60 hrs

 # Head
 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/Jobs/common.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/common.yml
@@ -7,7 +7,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobPassenger
-      time: 9999999999 # 50 hours 180000
+      time: 180000 # 50 hours

 # Eyes

--- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
@@ -6,7 +6,7 @@
    requirement:
      !type:RoleTimeRequirement
      role: JobLibrarian
-      time: 9999999999 # 1 hour of being the biggest nerd on the station 3600
+      time: 3600 # 1 hour of being the biggest nerd on the station

 - type: loadoutEffectGroup
  id: JensenTimer
@@ -15,7 +15,7 @@
    requirement:
      !type:DepartmentTimeRequirement
      department: Cargo
-      time: 9999999999 #5 hours of being a space trucker 18000
+      time: 18000 #5 hours of being a space trucker

 # Basic options
 # Glasses
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -269,3 +269,6 @@ ComfyChairCargo: BrownComfyChair
 ComfyChairService: GreenComfyChair

 BoxTrashbag: TrashBag
+
+# 2024-08-05 WD
+OmntnsHammer: JudgeHammer