выполняем требования ревввью

AdventureTimeSS14 · Jul 17, 2024 · b68803e · b68803e
1 parent 6fc2293
commit b68803e
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 88 deletions.
diff --git a/...s/Objects/Specific/Storage/weaponcase.yml → ...ototypes/ADT/Catalog/Fills/weaponcase.yml b/...s/Objects/Specific/Storage/weaponcase.yml → ...ototypes/ADT/Catalog/Fills/weaponcase.yml
diff --git a/...s/ADT/Entities/Objects/Specific/bober.yml → ...ototypes/ADT/Catalog/boobr/listenings.yml b/...s/ADT/Entities/Objects/Specific/bober.yml → ...ototypes/ADT/Catalog/boobr/listenings.yml
diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/uplink_ERT.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/uplink_ERT.yml
@@ -1,13 +1,3 @@
-- type: storeCategory
-  id: ADTUplinkERTWeapon
-  name: вооружение
-  priority: 1
-
-- type: storeCategory
-  id: ADTUplinkERTMisc
-  name: прочее
-  priority: 2
-
 - type: entity
   id: ADTStorePresetUplinkERT
   abstract: true

diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Fun/emergenctresponceteam.yml b/Resources/Prototypes/ADT/Roles/Jobs/Fun/emergenctresponceteam.yml
@@ -41,6 +41,21 @@
     - BoxZiptie
     - CrowbarRed
 
+- type: job
+  id: ERTLeader
+  name: job-name-ertleader
+  description: job-description-ertleader
+  playTimeTracker: JobERTLeader
+  setPreference: false
+  startingGear: ADTERTLeaderGearEVA
+  icon: "JobIconNanotrasen"
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  accessGroups:
+  - AllAccess
+  access:
+  - CentralCommand
+
 - type: startingGear
   id: ADTERTLeaderGearEVARiot
   equipment:
@@ -125,6 +140,21 @@
     - SheetGlass
     - GasAnalyzer
 
+- type: job
+  id: ERTEngineer
+  name: job-name-ertengineer
+  description: job-description-ertengineer
+  playTimeTracker: JobERTEngineer
+  setPreference: false
+  startingGear: ADTERTEngineerGearEVA
+  icon: "JobIconNanotrasen"
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  accessGroups:
+  - AllAccess
+  access:
+  - CentralCommand
+
 - type: startingGear
   id: ADTERTEngineerGearEVARiot
   equipment:
@@ -200,6 +230,21 @@
     - BoxZiptie
     - CrowbarRed
 
+- type: job
+  id: ERTSecurity
+  name: job-name-ertsecurity
+  description: job-description-ertsecurity
+  playTimeTracker: JobERTSecurity
+  setPreference: false
+  startingGear: ADTERTEngineerGearEVA
+  icon: "JobIconNanotrasen"
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  accessGroups:
+  - AllAccess
+  access:
+  - CentralCommand
+
 - type: startingGear
   id: ADTERTSecurityGearEVARiot
   equipment:
@@ -277,6 +322,21 @@
     - EpinephrineChemistryBottle
     - EpinephrineChemistryBottle
 
+- type: job
+  id: ERTMedical
+  name: job-name-ertmedic
+  description: job-description-ertmedic
+  playTimeTracker: JobERTMedical
+  setPreference: false
+  startingGear: ADTERTMedicalGearEVA
+  icon: "JobIconNanotrasen"
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  accessGroups:
+  - AllAccess
+  access:
+  - CentralCommand
+
 - type: startingGear
   id: ADTERTMedicalGearEVARiot
   equipment:
@@ -353,6 +413,21 @@
     - CrowbarRed
     - AdvMopItem
 
+- type: job
+  id: ERTJanitor
+  name: job-name-ertjanitor
+  description: job-description-ertjanitor
+  playTimeTracker: JobERTJanitor
+  setPreference: false
+  startingGear: ADTERTJanitorGearEVA
+  icon: "JobIconNanotrasen"
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  accessGroups:
+  - AllAccess
+  access:
+  - CentralCommand
+
 - type: startingGear
   id: ADTERTJanitorGearEVARiot
   equipment:
@@ -376,81 +451,3 @@
     - Soap
     - CrowbarRed
     - AdvMopItem
-
-#ertkibs
-
-- type: job
-  id: ERTLeader
-  name: job-name-ertleader
-  description: job-description-ertleader
-  playTimeTracker: JobERTLeader
-  setPreference: false
-  startingGear: ADTERTLeaderGearEVA
-  icon: "JobIconNanotrasen"
-  supervisors: job-supervisors-centcom
-  canBeAntag: false
-  accessGroups:
-  - AllAccess
-  access:
-  - CentralCommand
-
-
-- type: job
-  id: ERTEngineer
-  name: job-name-ertengineer
-  description: job-description-ertengineer
-  playTimeTracker: JobERTEngineer
-  setPreference: false
-  startingGear: ADTERTEngineerGearEVA
-  icon: "JobIconNanotrasen"
-  supervisors: job-supervisors-centcom
-  canBeAntag: false
-  accessGroups:
-  - AllAccess
-  access:
-  - CentralCommand
-
-- type: job
-  id: ERTSecurity
-  name: job-name-ertsecurity
-  description: job-description-ertsecurity
-  playTimeTracker: JobERTSecurity
-  setPreference: false
-  startingGear: ADTERTEngineerGearEVA
-  icon: "JobIconNanotrasen"
-  supervisors: job-supervisors-centcom
-  canBeAntag: false
-  accessGroups:
-  - AllAccess
-  access:
-  - CentralCommand
-
-- type: job
-  id: ERTMedical
-  name: job-name-ertmedic
-  description: job-description-ertmedic
-  playTimeTracker: JobERTMedical
-  setPreference: false
-  startingGear: ADTERTMedicalGearEVA
-  icon: "JobIconNanotrasen"
-  supervisors: job-supervisors-centcom
-  canBeAntag: false
-  accessGroups:
-  - AllAccess
-  access:
-  - CentralCommand
-
-- type: job
-  id: ERTJanitor
-  name: job-name-ertjanitor
-  description: job-description-ertjanitor
-  playTimeTracker: JobERTJanitor
-  setPreference: false
-  startingGear: ADTERTJanitorGearEVA
-  icon: "JobIconNanotrasen"
-  supervisors: job-supervisors-centcom
-  canBeAntag: false
-  accessGroups:
-  - AllAccess
-  access:
-  - CentralCommand
diff --git a/Resources/Prototypes/ADT/Store/categories.yml b/Resources/Prototypes/ADT/Store/categories.yml
@@ -0,0 +1,9 @@
+- type: storeCategory
+  id: ADTUplinkERTWeapon
+  name: вооружение
+  priority: 1
+
+- type: storeCategory
+  id: ADTUplinkERTMisc
+  name: прочее
+  priority: 2