diff --git a/Content.Server/Administration/Commands/AdminWhoCommand.cs b/Content.Server/Administration/Commands/AdminWhoCommand.cs index cf2f8c453c..1a709c885a 100644 --- 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 index 78386af931..d8a12735b4 100644 --- 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 index dd639009d6..3e65e12d3c 100644 --- 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 index 087a40ae25..1b2e0b78e7 100644 --- 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 index 4baf719606..61c67893ac 100644 --- 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