некоторые фиксы

Lost-Paradise-Project · Sep 11, 2024 · 95c710b · 95c710b
1 parent aa4dca5
commit 95c710b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 22 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/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