Merge pull request #134 from Evgencheg/master

фиксы
Lost-Paradise-Project · Sep 11, 2024 · 112c9a1 · 112c9a1
2 parents aa4dca5 + b075f98
commit 112c9a1
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 38 deletions.
diff --git a/Content.Server/Administration/Commands/AdminWhoCommand.cs b/Content.Server/Administration/Commands/AdminWhoCommand.cs
@@ -7,7 +7,7 @@
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AnyCommand]
 public sealed class AdminWhoCommand : IConsoleCommand
 {
     public string Command => "adminwho";
@@ -33,16 +33,16 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         var first = true;
         foreach (var admin in adminMgr.ActiveAdmins)
         {
-            if (!first)
-                sb.Append('\n');
-            first = false;
-
             var adminData = adminMgr.GetAdminData(admin)!;
             DebugTools.AssertNotNull(adminData);
 
             if (adminData.Stealth && !seeStealth)
                 continue;
 
+            if (!first)
+                sb.Append('\n');
+            first = false;
+
             sb.Append(admin.Name);
             if (adminData.Title is { } title)
                 sb.Append($": [{title}]");

diff --git a/Resources/Locale/ru-RU/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/ru-RU/deltav/navmap-beacons/station-beacons.ftl
@@ -19,7 +19,7 @@ station-beacon-reporter = Репортёр
 station-beacon-camera-servers = Камеры
 station-beacon-boxing-ring = Боксёрская
 station-beacon-park = Парк
-station-beacon-corpsman = Парамедик
+station-beacon-corpsman = Морг
 station-beacon-justice = Судебная
 station-beacon-chiefjustice = Верховный судья
 station-beacon-prosecutor = Прокурор
diff --git a/Resources/Locale/ru-RU/deltav/prototypes/access/accesses.ftl b/Resources/Locale/ru-RU/deltav/prototypes/access/accesses.ftl
@@ -3,5 +3,5 @@ id-card-access-level-mantis = Мантис
 id-card-access-level-chief-justice = Верховный судья
 id-card-access-level-cj = Верховный судья
 id-card-access-level-prosecutor = Прокурор
-id-card-access-level-justice = Судья
-id-card-access-level-corpsman = Парамедик
+id-card-access-level-justice = Суд
+id-card-access-level-corpsman = Морг
diff --git a/Resources/Locale/ru-RU/preferences/loadouts.ftl b/Resources/Locale/ru-RU/preferences/loadouts.ftl
@@ -26,7 +26,7 @@ Lawyer-loadout = Адвкоат
 Chemist-loadout = Химик
 MedicalDoctor-loadout = Врач
 MedicalIntern-loadout = Интерн
-Paramedic-loadout = парамедик
+Paramedic-loadout = Парамедик
 Psychologist-loadout = Психолог
 ResearchAssistant-loadout = Научный ассистент
 Scientist-loadout = Учёный

diff --git a/Resources/Locale/ru-RU/prototypes/access/accesses.ftl b/Resources/Locale/ru-RU/prototypes/access/accesses.ftl
@@ -15,7 +15,7 @@ id-card-access-level-research = Научный
 id-card-access-level-chief-medical-officer = Главный врач
 id-card-access-level-medical = Медицинский
 id-card-access-level-chemistry = Химия
-id-card-access-level-paramedic = парамедик
+id-card-access-level-paramedic = Парамедик
 id-card-access-level-psychologist = Психолог
 id-card-access-level-quartermaster = Квартирмейстер
 id-card-access-level-cargo = Снабжение

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/suit_storage.ftl
@@ -65,5 +65,5 @@ ent-SuitStorageParamedic = { ent-SuitStorageBase }
     .suffix = Парамедик
     .desc = { ent-SuitStorageBase.desc }
 ent-SuitStorageCorpsman = { ent-SuitStorageBase }
-    .suffix = Парамедик
+    .suffix = Морг
     .desc = { ent-SuitStorageBase.desc }
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/belt/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/belt/belts.ftl
@@ -2,5 +2,5 @@ ent-ClothingBeltCeremonial = церемониальный пояс
     .desc = Бело-голубой пояс с множеством карманов и подсумков.
 ent-ClothingBeltSuspendersBlack = черные подтяжки
     .desc = Чтобы ты поддерживал свои штаны.
-ent-ClothingBeltCorpsmanWebbing = РПС парамедика
+ent-ClothingBeltCorpsmanWebbing = РПС следящего за моргом
     .desc = Комплект защитных лент с синими вставками.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/head/hats.ftl
@@ -31,7 +31,7 @@ ent-ClothingHeadHatDirCap = фуражка директора
     .desc = Зеленая фуражка с эмблемой директорского ранга, принадлежащая высокопоставленному члену Центрального командования. Кто бы это ни был, они занимаются важными делами.
 ent-ClothingHeadHatBeretLogi = берет снабжения
     .desc = Для интеллектуального и усердного бухгалтера. Точно не знак революции!
-ent-ClothingHeadHatBeretCorpsman = берет парамедика
+ent-ClothingHeadHatBeretCorpsman = берет следящего за моргом
     .desc = для стильных боевых спасателей и медицинских специалистов.
 ent-ClothingHeadHatCJToque = шляпа верховного судьи
     .desc = Стандартная судейская шляпа. Парики в любом случае старомодны.
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/pda.ftl
@@ -1,4 +1,4 @@
-ent-CorpsmanPDA = КПК Парамедика
+ent-CorpsmanPDA = КПК морга
     .desc = Стерильно и безопасно. Имеет встроенный анализатор здоровья.
 ent-ChiefJusticePDA = КПК верховного судьи
     .desc = Носитель этого КПК имеет истинную власть на этой станции.

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl
@@ -44,7 +44,7 @@ ent-DefaultStationBeaconPark = { ent-DefaultStationBeacon }
     .suffix = Парк
     .desc = { ent-DefaultStationBeacon.desc }
 ent-DefaultStationBeaconCorpsman = { ent-DefaultStationBeaconSecurity }
-    .suffix = Лазарет
+    .suffix = Морг
     .desc = { ent-DefaultStationBeaconSecurity.desc }
 ent-DefaultStationBeaconJustice = { ent-DefaultStationBeacon }
     .suffix = Адвокатская

diff --git a/...rces/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/airlocks/access.ftl b/...rces/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/doors/airlocks/access.ftl
@@ -32,10 +32,10 @@ ent-AirlockMaintProsecutorLocked = { ent-AirlockMaint }
     .suffix = Прокурор, Закрыто
     .desc = { ent-AirlockMaint.desc }
 ent-AirlockCorpsmanLocked = { ent-AirlockSecurity }
-    .suffix = Парамедик, Закрыто
+    .suffix = Морг, Закрыто
     .desc = { ent-AirlockSecurity.desc }
 ent-AirlockCorpsmanGlassLocked = { ent-AirlockSecurityGlass }
-    .suffix = Парамедик, Закрыто
+    .suffix = Морг, Закрыто
     .desc = { ent-AirlockSecurityGlass.desc }
 ent-AirlockExternalGlassShuttleEscapeSub = { ent-AirlockGlassShuttle }
     .suffix = Внешний, Выход, Стеклянный, Док

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
@@ -3,7 +3,7 @@
   startingInventory:
     Jug: 4
     JugAluminium: 2
-    JugCarbon: 4
+    JugCarbon: 6
     JugChlorine: 1
     JugCopper: 2
     JugEthanol: 2
@@ -14,7 +14,7 @@
     JugLithium: 2
     JugMercury: 1
     JugNitrogen: 3
-    JugOxygen: 3
+    JugOxygen: 4
     JugPhosphorus: 1
     JugPotassium: 2
     JugRadium: 1
@@ -30,7 +30,7 @@
   startingInventory:
     Jug: 4
     JugAluminium: 2
-    JugCarbon: 4
+    JugCarbon: 6
     JugChlorine: 1
     JugCopper: 2
     JugEthanol: 2
@@ -41,7 +41,7 @@
     JugLithium: 2
     JugMercury: 1
     JugNitrogen: 3
-    JugOxygen: 3
+    JugOxygen: 4
     JugPhosphorus: 1
     JugPotassium: 2
     JugRadium: 1
@@ -55,4 +55,3 @@
     MuteToxinChemistryBottle: 3
     LeadChemistryBottle: 2
     ToxinChemistryBottle: 1
-
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml
@@ -38,6 +38,7 @@
   - type: GhostTakeoverAvailable
   - type: InteractionPopup
     successChance: 1
+  - type: ScentTracker
   - type: Butcherable
     spawned:
     - id: FoodMeat

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2267,6 +2267,7 @@
     - Xeno
     understands:
     - Xeno
+    - GalacticCommon
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-tarantula

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
@@ -4,18 +4,8 @@
   description: job-description-librarian
   playTimeTracker: JobLibrarian
   requirements:
-    - !type:CharacterDepartmentTimeRequirement
-      department: Epistemics
-      min: 14400
-    - !type:CharacterLogicOrRequirement
-      requirements:
-        - !type:CharacterSpeciesRequirement
-          inverted: true
-          species:
-            - IPC
-        - !type:CharacterTraitRequirement
-          traits:
-            - AnomalousPositronics
+    - !type:CharacterOverallTimeRequirement
+      min: 1800 # LostParadise - 30 min
   startingGear: LibrarianGear
   icon: "JobIconLibrarian"
   supervisors: job-supervisors-rd

diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -52,6 +52,14 @@
   - Lawyer
   - Cargo
   - Atmospherics
+  - Corpsman
+  - Paramedic
+  - Psychologist
+  - Mail
+  - Orders
+  - Mantis
+  - Prosecutor
+  - Justice
   - Medical
   - Boxer # DeltaV - Add Boxer access
   - Clown # DeltaV - Add Clown access

diff --git a/Resources/Prototypes/_LostParadise/GameRules/roundstart.yml b/Resources/Prototypes/_LostParadise/GameRules/roundstart.yml
@@ -4,7 +4,7 @@
   noSpawn: true
   components:
   - type: RampingStationEventScheduler
-    chaosModifier: 2 # By default, one event eac.h 30-10 seconds after two hours Changing CVars will cause this to deviate.
-    startingChaosRatio: 0.001 # Starts as slow as survival, but quickly ramps up
-    shiftLengthModifier: 0.5
-    EventDelayModifier: 2
+#    chaosModifier: 2 # By default, one event eac.h 30-10 seconds after two hours Changing CVars will cause this to deviate.
+#    startingChaosRatio: 0.001 # Starts as slow as survival, but quickly ramps up
+#    shiftLengthModifier: 0.5
+#    EventDelayModifier: 2