From 3749f2e822bb3e1b6bc86b748f0d3f6737e58e14 Mon Sep 17 00:00:00 2001 From: MODERN <87994977+modern-nm@users.noreply.github.com> Date: Fri, 24 May 2024 00:31:09 +0300 Subject: [PATCH] =?UTF-8?q?corvax=20loadout=20removed,=20modern=20emotePan?= =?UTF-8?q?el=20removed,=20"type:=20UserInterface"=20fixes=20bullets,=20ad?= =?UTF-8?q?s,=20eva=20and=20synd=20.rsi=20fixes=20TODO:=20RANDOM=20BOOKS?= =?UTF-8?q?=20TODO:=20ChangelingRule=20other=20=D0=9B=D0=A3=D0=A7=D0=A8?= =?UTF-8?q?=D0=90=D0=AF=20=D0=A0=D0=90=D0=91=D0=9E=D0=A2=D0=90=20=D0=92=20?= =?UTF-8?q?=D0=9C=D0=98=D0=A0=D0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Corvax/Loadout/LoadoutPrototype.cs | 44 +- .../Corvax/Loadout/LoadoutSystem.cs | 188 +- .../GameTicking/Rules/ChangelingRuleSystem.cs | 2 +- Content.Shared/Humanoid/NamingSystem.cs | 10 + .../Humanoid/Prototypes/SpeciesPrototype.cs | 2 + .../ADT/Catalog/Loadout/sponsor.yml | 115 +- .../Advertisements/patholodrobe.yml | 10 +- .../VendingMachines/Advertisements/pill.yml | 14 +- .../ADT/Entities/Clothing/Back/backpacks.yml | 8 +- .../Clothing/Head/Hats/orientalears.yml | 38 + .../ADT/Entities/Clothing/Masks/mask.yml | 1 - .../ADT/Entities/Clothing/Neck/manties.yml | 13 +- .../Entities/Clothing/OuterClothing/armor.yml | 4 +- .../Clothing/OuterClothing/specific.yml | 4 +- .../ADT/Entities/Clothing/Shoes/Boots.yml | 4 +- .../ADT/Entities/Loadout/loadouts.yml | 27 + .../ADT/Entities/Mobs/NPCs/animals.yml | 4 +- .../ADT/Entities/Mobs/NPCs/xeno.yml | 4 +- .../ADT/Entities/Mobs/Species/DroneAntag.yml | 12 +- .../Entities/Mobs/Species/DroneAntag_IPC.yml | 6 +- .../Entities/Mobs/Species/secutirycyborg.yml | 8 +- .../ADT/Entities/Mobs/player/drones.yml | 16 +- .../Entities/Mobs/player/securitycyborg.yml | 2 - .../ADT/Entities/Objects/Device/boombox.yml | 4 +- .../ADT/Entities/Objects/Device/listening.yml | 4 +- .../ADT/Entities/Objects/Magic/JessusX.yml | 4 +- .../ADT/Entities/Objects/Misc/itensil.yml | 4 +- .../Entities/Objects/Misc/radio_handheld.yml | 2 +- .../ADT/Entities/Objects/Misc/secretbook.yml | 1846 ++++++++--------- .../Specific/Medical/Chemistry/Chemistry.yml | 16 +- .../Medical/Chemistry/chemical_jugs.yml | 306 +-- .../Objects/Specific/Medical/healing.yml | 1 + .../Objects/Specific/Medical/misc.yml | 4 +- .../Service/zookeperhealthanalyzer.yml | 2 +- .../ADT/Entities/Objects/Tools/Tools.yml | 16 +- .../Guns/Ammunition/Projectiles/dartgun.yml | 6 +- .../Guns/Ammunition/Projectiles/magnum.yml | 52 +- .../Guns/Ammunition/Projectiles/pistol.yml | 24 +- .../Weapons/Guns/Projectiles/projectiles.yml | 19 +- .../Storage/Mannequin/mannequin.yml | 6 +- .../Prototypes/ADT/Recipes/Lathes/ammo.yml | 36 +- .../ADT/Recipes/Lathes/clothing.yml | 13 +- .../Prototypes/ADT/Voice/speech_emotes.yml | 21 +- Resources/Prototypes/Actions/types.yml | 24 +- .../Prototypes/Catalog/uplink_catalog.yml | 38 +- .../Corvax/Catalog/Loadout/head.yml | 13 +- .../Corvax/Catalog/Loadout/sponsor.yml | 246 +-- .../Corvax/Entities/Clothing/Neck/mantles.yml | 20 +- Resources/Prototypes/Damage/types.yml | 1 + .../Prototypes/Entities/Clothing/Eyes/hud.yml | 2 - .../Entities/Clothing/Uniforms/specific.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/pets.yml | 4 +- .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 2 - .../Entities/Mobs/Player/silicon.yml | 12 +- .../Prototypes/Entities/Mobs/Species/base.yml | 3 +- .../Entities/Mobs/Species/slime.yml | 15 +- .../Entities/Objects/Misc/books.yml | 42 +- .../Objects/Misc/identification_cards.yml | 2 +- .../Weapons/Guns/Shotguns/shotguns.yml | 1 - .../Machines/bluespace_harvester.yml | 4 +- .../Entities/Structures/Machines/lathe.yml | 6 - .../Entities/Structures/Walls/asteroid.yml | 2 +- .../NES/Entities/Mobs/Pets/mobs.yml | 4 +- .../Mobs/SpeciesSound/vulpkanin_voice.yml | 4 + Resources/Prototypes/NES/Ivents/frostpunk.yml | 252 --- .../Reagents/Consumable/Drink/drinks.yml | 26 +- .../Prototypes/Recipes/Lathes/clothing.yml | 11 - .../Prototypes/Recipes/Lathes/electronics.yml | 86 +- .../Roles/Jobs/Fun/misc_startinggear.yml | 28 +- .../Entities/Mobs/Player/ipc.yml | 1 - .../Entities/Mobs/Player/silicon_base.yml | 6 +- .../Prototypes/Sirena/Actions/emotes.yml | 5 + .../Entities/Structures/stalagmities.yml | 2 +- Resources/Prototypes/Voice/disease_emotes.yml | 2 + Resources/Prototypes/Voice/speech_emotes.yml | 224 +- .../Head/Misc/head_mirror.rsi/meta.json | 4 +- .../Suits/eva_emergency.rsi/meta.json | 1 + 77 files changed, 2014 insertions(+), 2003 deletions(-) create mode 100644 Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/orientalears.yml create mode 100644 Resources/Prototypes/ADT/Entities/Loadout/loadouts.yml delete mode 100644 Resources/Prototypes/NES/Ivents/frostpunk.yml diff --git a/Content.Server/Corvax/Loadout/LoadoutPrototype.cs b/Content.Server/Corvax/Loadout/LoadoutPrototype.cs index 0d6b6c14d4e..1d723d66a4a 100644 --- a/Content.Server/Corvax/Loadout/LoadoutPrototype.cs +++ b/Content.Server/Corvax/Loadout/LoadoutPrototype.cs @@ -1,29 +1,29 @@ -using Content.Shared.Roles; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; +// using Content.Shared.Roles; +// using Robust.Shared.Prototypes; +// using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +// using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; -namespace Content.Server.Corvax.Loadout; +// namespace Content.Server.Corvax.Loadout; -[Prototype("loadout")] -public sealed class LoadoutItemPrototype : IPrototype -{ - [IdDataFieldAttribute] public string ID { get; } = default!; +// [Prototype("loadout")] +// public sealed class LoadoutItemPrototype : IPrototype +// { +// [IdDataFieldAttribute] public string ID { get; } = default!; - [DataField("entity", required: true, customTypeSerializer: typeof(PrototypeIdSerializer))] - public string EntityId { get; } = default!; +// [DataField("entity", required: true, customTypeSerializer: typeof(PrototypeIdSerializer))] +// public string EntityId { get; } = default!; - // Corvax-Sponsors-Start - [DataField("sponsorOnly")] - public bool SponsorOnly = false; - // Corvax-Sponsors-End +// // Corvax-Sponsors-Start +// [DataField("sponsorOnly")] +// public bool SponsorOnly = false; +// // Corvax-Sponsors-End - [DataField("whitelistJobs", customTypeSerializer: typeof(PrototypeIdListSerializer))] - public List? WhitelistJobs { get; } +// [DataField("whitelistJobs", customTypeSerializer: typeof(PrototypeIdListSerializer))] +// public List? WhitelistJobs { get; } - [DataField("blacklistJobs", customTypeSerializer: typeof(PrototypeIdListSerializer))] - public List? BlacklistJobs { get; } +// [DataField("blacklistJobs", customTypeSerializer: typeof(PrototypeIdListSerializer))] +// public List? BlacklistJobs { get; } - [DataField("speciesRestriction")] - public List? SpeciesRestrictions { get; } -} +// [DataField("speciesRestriction")] +// public List? SpeciesRestrictions { get; } +// } diff --git a/Content.Server/Corvax/Loadout/LoadoutSystem.cs b/Content.Server/Corvax/Loadout/LoadoutSystem.cs index 6e7b87d5c63..e13aefd0709 100644 --- a/Content.Server/Corvax/Loadout/LoadoutSystem.cs +++ b/Content.Server/Corvax/Loadout/LoadoutSystem.cs @@ -1,109 +1,109 @@ -using System.Linq; -using Content.Server.Corvax.OwOAction; -using Content.Server.Corvax.Sponsors; -using Content.Server.GameTicking; -using Content.Server.Hands.Systems; -using Content.Server.Storage.EntitySystems; -using Content.Shared.Clothing.Components; -using Content.Shared.Inventory; -using Robust.Shared.Prototypes; +// using System.Linq; +// using Content.Server.Corvax.OwOAction; +// using Content.Server.Corvax.Sponsors; +// using Content.Server.GameTicking; +// using Content.Server.Hands.Systems; +// using Content.Server.Storage.EntitySystems; +// using Content.Shared.Clothing.Components; +// using Content.Shared.Inventory; +// using Robust.Shared.Prototypes; -namespace Content.Server.Corvax.Loadout; +// namespace Content.Server.Corvax.Loadout; -// NOTE: Full implementation will be in future, now just sponsor items -public sealed class LoadoutSystem : EntitySystem -{ - private const string BackpackSlotId = "back"; +// // NOTE: Full implementation will be in future, now just sponsor items +// public sealed class LoadoutSystem : EntitySystem +// { +// private const string BackpackSlotId = "back"; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly HandsSystem _handsSystem = default!; - [Dependency] private readonly StorageSystem _storageSystem = default!; - [Dependency] private readonly SponsorsManager _sponsorsManager = default!; - [Dependency] private readonly EntityManager _entityManager = default!; +// [Dependency] private readonly IPrototypeManager _prototypeManager = default!; +// [Dependency] private readonly InventorySystem _inventorySystem = default!; +// [Dependency] private readonly HandsSystem _handsSystem = default!; +// [Dependency] private readonly StorageSystem _storageSystem = default!; +// [Dependency] private readonly SponsorsManager _sponsorsManager = default!; +// [Dependency] private readonly EntityManager _entityManager = default!; - public override void Initialize() - { - SubscribeLocalEvent(OnPlayerSpawned); - } +// public override void Initialize() +// { +// SubscribeLocalEvent(OnPlayerSpawned); +// } - private void OnPlayerSpawned(PlayerSpawnCompleteEvent ev) - { - if (_sponsorsManager.TryGetInfo(ev.Player.UserId, out var sponsor)) - { - // Тут можно снабжать компонентами спонсоров - if (sponsor.Tier >= 3) - { - _entityManager.AddComponent(ev.Mob); - } +// private void OnPlayerSpawned(PlayerSpawnCompleteEvent ev) +// { +// if (_sponsorsManager.TryGetInfo(ev.Player.UserId, out var sponsor)) +// { +// // Тут можно снабжать компонентами спонсоров +// if (sponsor.Tier >= 3) +// { +// _entityManager.AddComponent(ev.Mob); +// } - foreach (var loadoutId in sponsor.AllowedMarkings) - { - // NOTE: Now is easy to not extract method because event give all info we need - if (_prototypeManager.TryIndex(loadoutId, out var loadout)) - { - var isSponsorOnly = loadout.SponsorOnly && - !sponsor.AllowedMarkings.Contains(loadoutId); - var isWhitelisted = ev.JobId != null && - loadout.WhitelistJobs != null && - !loadout.WhitelistJobs.Contains(ev.JobId); - var isBlacklisted = ev.JobId != null && - loadout.BlacklistJobs != null && - loadout.BlacklistJobs.Contains(ev.JobId); - var isSpeciesRestricted = loadout.SpeciesRestrictions != null && - loadout.SpeciesRestrictions.Contains(ev.Profile.Species); +// foreach (var loadoutId in sponsor.AllowedMarkings) +// { +// // NOTE: Now is easy to not extract method because event give all info we need +// if (_prototypeManager.TryIndex(loadoutId, out var loadout)) +// { +// var isSponsorOnly = loadout.SponsorOnly && +// !sponsor.AllowedMarkings.Contains(loadoutId); +// var isWhitelisted = ev.JobId != null && +// loadout.WhitelistJobs != null && +// !loadout.WhitelistJobs.Contains(ev.JobId); +// var isBlacklisted = ev.JobId != null && +// loadout.BlacklistJobs != null && +// loadout.BlacklistJobs.Contains(ev.JobId); +// var isSpeciesRestricted = loadout.SpeciesRestrictions != null && +// loadout.SpeciesRestrictions.Contains(ev.Profile.Species); - if (isSponsorOnly || isWhitelisted || isBlacklisted || isSpeciesRestricted) - continue; +// if (isSponsorOnly || isWhitelisted || isBlacklisted || isSpeciesRestricted) +// continue; - var entity = Spawn(loadout.EntityId, Transform(ev.Mob).Coordinates); +// var entity = Spawn(loadout.EntityId, Transform(ev.Mob).Coordinates); - // Take in hand if not clothes - if (!TryComp(entity, out var clothing)) - { - _handsSystem.TryPickup(ev.Mob, entity); - continue; - } +// // Take in hand if not clothes +// if (!TryComp(entity, out var clothing)) +// { +// _handsSystem.TryPickup(ev.Mob, entity); +// continue; +// } - // Automatically search empty slot for clothes to equip - string? firstSlotName = null; - bool isEquiped = false; - SlotDefinition[]? slots; - if (_inventorySystem.TryGetSlots(ev.Mob, out slots)) - { - foreach (var slot in slots) - { - if (!clothing.Slots.HasFlag(slot.SlotFlags)) - continue; +// // Automatically search empty slot for clothes to equip +// string? firstSlotName = null; +// bool isEquiped = false; +// SlotDefinition[]? slots; +// if (_inventorySystem.TryGetSlots(ev.Mob, out slots)) +// { +// foreach (var slot in slots) +// { +// if (!clothing.Slots.HasFlag(slot.SlotFlags)) +// continue; - if (firstSlotName == null) - firstSlotName = slot.Name; +// if (firstSlotName == null) +// firstSlotName = slot.Name; - if (_inventorySystem.TryGetSlotEntity(ev.Mob, slot.Name, out var _)) - continue; +// if (_inventorySystem.TryGetSlotEntity(ev.Mob, slot.Name, out var _)) +// continue; - if (_inventorySystem.TryEquip(ev.Mob, entity, slot.Name, true)) - { - isEquiped = true; - break; - } - } - } +// if (_inventorySystem.TryEquip(ev.Mob, entity, slot.Name, true)) +// { +// isEquiped = true; +// break; +// } +// } +// } - if (isEquiped || firstSlotName == null) - continue; +// if (isEquiped || firstSlotName == null) +// continue; - // Force equip to first valid clothes slot - // Get occupied entity -> Insert to backpack -> Equip loadout entity - if (_inventorySystem.TryGetSlotEntity(ev.Mob, firstSlotName, out var slotEntity) && - _inventorySystem.TryGetSlotEntity(ev.Mob, BackpackSlotId, out var backEntity) && - _storageSystem.CanInsert(backEntity.Value, slotEntity.Value, out _)) - { - _storageSystem.Insert(backEntity.Value, slotEntity.Value, out _, playSound: false); - } - _inventorySystem.TryEquip(ev.Mob, entity, firstSlotName, true); - } - } - } - } -} +// // Force equip to first valid clothes slot +// // Get occupied entity -> Insert to backpack -> Equip loadout entity +// if (_inventorySystem.TryGetSlotEntity(ev.Mob, firstSlotName, out var slotEntity) && +// _inventorySystem.TryGetSlotEntity(ev.Mob, BackpackSlotId, out var backEntity) && +// _storageSystem.CanInsert(backEntity.Value, slotEntity.Value, out _)) +// { +// _storageSystem.Insert(backEntity.Value, slotEntity.Value, out _, playSound: false); +// } +// _inventorySystem.TryEquip(ev.Mob, entity, firstSlotName, true); +// } +// } +// } +// } +// } diff --git a/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs b/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs index 3259aa3c84a..dd210b18526 100644 --- a/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs @@ -54,7 +54,7 @@ public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnStartAttempt); + //SubscribeLocalEvent(OnStartAttempt); // TODO-MODERN: Переписать RuleSystem //SubscribeLocalEvent(OnPlayersSpawned); // TODO-MODERN: Переписать RuleSystem SubscribeLocalEvent(HandleLatejoin); diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs index 825eca17cff..ec7477a8fdc 100644 --- a/Content.Shared/Humanoid/NamingSystem.cs +++ b/Content.Shared/Humanoid/NamingSystem.cs @@ -35,6 +35,16 @@ public string GetName(string species, Gender? gender = null) case SpeciesNaming.FirstDashFirst: return Loc.GetString("namepreset-firstdashfirst", ("first1", GetFirstName(speciesProto, gender)), ("first2", GetFirstName(speciesProto, gender))); + // ADT-Drasks-START + case SpeciesNaming.FirstDashFirstDashFirst: + return Loc.GetString("namepreset-firstdashfirstdashfirst", + ("first1", GetFirstName(speciesProto, gender)), ("first2", GetFirstName(speciesProto, gender)), ("first3", GetFirstName(speciesProto, gender))); + // ADT-Drasks-END + // Parkstation-Ipc-Start + case SpeciesNaming.FirstDashLast: + return Loc.GetString("namepreset-firstdashlast", + ("first", GetFirstName(speciesProto, gender)), ("last", GetLastName(speciesProto))); + // Parkstation-Ipc-End case SpeciesNaming.FirstLast: default: return Loc.GetString("namepreset-firstlast", diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs index e91785114ca..f17767ff6e8 100644 --- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs +++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs @@ -140,5 +140,7 @@ public enum SpeciesNaming : byte First, FirstLast, FirstDashFirst, + FirstDashFirstDashFirst, // ADT-Drasks TheFirstofLast, + FirstDashLast, // Parkstation-IPC } diff --git a/Resources/Prototypes/ADT/Catalog/Loadout/sponsor.yml b/Resources/Prototypes/ADT/Catalog/Loadout/sponsor.yml index 57e2843a7e0..cee22a298af 100644 --- a/Resources/Prototypes/ADT/Catalog/Loadout/sponsor.yml +++ b/Resources/Prototypes/ADT/Catalog/Loadout/sponsor.yml @@ -1,57 +1,58 @@ -- type: loadout - id: LixonLoadout - entity: ADTWeaponMinigunL - sponsorOnly: true - -- type: loadout - id: ADTHolographicMonoclineInsulgonLoadout - entity: ADTHolographicMonoclineL - sponsorOnly: true - -- type: loadout - id: ADTClothingUniformsJumpsuitInsulgonLoadout - entity: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL - sponsorOnly: true - -- type: loadout - id: GoldStanerLoadout - entity: WeaponDisablerIdan - sponsorOnly: true - -- type: loadout - id: OktyabrinaLoadout - entity: ADTClothingHeadHatOktyabrinaOrientalEars - sponsorOnly: true - -#Chu-See - -- type: loadout - id: TrueDetectiveCoat - entity: ADTClothingOuterCoatTrueDetectivesCoat - sponsorOnly: true - whitelistJobs: [Detective] - -- type: loadout - id: TrueDetectiveJumpskirt - entity: ADTClothingUniformTrueDetectiveJumpskirt - sponsorOnly: true - whitelistJobs: [Detective] - -- type: loadout - id: TrueDetectiveHat - entity: ADTClothingHeadHatsTrueDetectiveHat - sponsorOnly: true - whitelistJobs: [Detective] - - -#Nova - -- type: loadout - id: NovaGloves - entity: ADTClothingHandsNovaGloves - sponsorOnly: true - -- type: loadout - id: AstraKnifeLoadout - entity: ADTAstraKnife - sponsorOnly: true \ No newline at end of file +# Corvax loadouts removed +# - type: loadout +# id: LixonLoadout +# entity: ADTWeaponMinigunL +# sponsorOnly: true + +# - type: loadout +# id: ADTHolographicMonoclineInsulgonLoadout +# entity: ADTHolographicMonoclineL +# sponsorOnly: true + +# - type: loadout +# id: ADTClothingUniformsJumpsuitInsulgonLoadout +# entity: ADTClothingUniformsJumpsuitWhiteDiplomatSuitL +# sponsorOnly: true + +# - type: loadout +# id: GoldStanerLoadout +# entity: WeaponDisablerIdan +# sponsorOnly: true + +# - type: loadout +# id: OktyabrinaLoadout +# entity: ADTClothingHeadHatOktyabrinaOrientalEars +# sponsorOnly: true + +# #Chu-See + +# - type: loadout +# id: TrueDetectiveCoat +# entity: ADTClothingOuterCoatTrueDetectivesCoat +# sponsorOnly: true +# whitelistJobs: [Detective] + +# - type: loadout +# id: TrueDetectiveJumpskirt +# entity: ADTClothingUniformTrueDetectiveJumpskirt +# sponsorOnly: true +# whitelistJobs: [Detective] + +# - type: loadout +# id: TrueDetectiveHat +# entity: ADTClothingHeadHatsTrueDetectiveHat +# sponsorOnly: true +# whitelistJobs: [Detective] + + +# #Nova + +# - type: loadout +# id: NovaGloves +# entity: ADTClothingHandsNovaGloves +# sponsorOnly: true + +# - type: loadout +# id: AstraKnifeLoadout +# entity: ADTAstraKnife +# sponsorOnly: true \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml index 8bc74a39f83..c3eecd72b58 100644 --- a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml +++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/patholodrobe.yml @@ -1,5 +1,5 @@ -- type: advertisementsPack - id: PatholodrobeAds - advertisements: - - advertisement-patholog-1 - - advertisement-patholog-2 \ No newline at end of file +# - type: advertisementsPack +# id: PatholodrobeAds +# advertisements: +# - advertisement-patholog-1 +# - advertisement-patholog-2 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/pill.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/pill.yml index c67cdffb08c..4a28c041b89 100644 --- a/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/pill.yml +++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Advertisements/pill.yml @@ -1,7 +1,7 @@ -- type: advertisementsPack - id: PillAds - advertisements: - - advertisement-pill-1 - - advertisement-pill-2 - - advertisement-pill-3 - - advertisement-pill-4 \ No newline at end of file +# - type: advertisementsPack +# id: PillAds +# advertisements: +# - advertisement-pill-1 +# - advertisement-pill-2 +# - advertisement-pill-3 +# - advertisement-pill-4 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml index 99b1031c12c..4fbe964d7fa 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml @@ -23,8 +23,8 @@ ents: [] - type: UserInterface interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface # to prevent bag open/honk spam - type: UseDelay delay: 0.5 @@ -57,8 +57,8 @@ sprintModifier: 0.8 - type: UserInterface interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface # to prevent bag open/honk spam - type: UseDelay delay: 0.5 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/orientalears.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/orientalears.yml new file mode 100644 index 00000000000..841ddf5a08b --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/Hats/orientalears.yml @@ -0,0 +1,38 @@ +# - type: entity +# parent: ClothingHeadBase +# id: ADTClothingHeadHatBlackOrientalEars +# name: oriental ears +# description: "NYAH!" +# components: +# - type: Tag +# tags: # ignore "WhitelistChameleon" tag +# - WhitelistChameleon +# - type: Sprite +# sprite: ADT/Clothing/Head/Hats/orientalears.rsi +# - type: Clothing +# sprite: ADT/Clothing/Head/Hats/orientalears.rsi +# - type: AddAccentClothing +# accent: NyaAccent + +# - type: entity +# parent: ClothingHeadBase +# id: ADTClothingHeadHatOktyabrinaOrientalEars +# name: gift for October +# description: "On the inside is scrawled 'For the one whose hair is the color of lilac'. This smells like a joy and happy" +# components: +# - type: Tag +# tags: # ignore "WhitelistChameleon" tag +# - WhitelistChameleon +# - type: Sprite +# sprite: ADT/Clothing/Head/Hats/orientalears.rsi +# - type: Clothing +# sprite: ADT/Clothing/Head/Hats/orientalears.rsi + + +# - type: loadout +# id: OktyabrinaLoadout +# entity: ADTClothingHeadHatOktyabrinaOrientalEars +# sponsorOnly: true + + + diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml index c062b8892ae..7d40970a26e 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml @@ -207,7 +207,6 @@ - type: Clothing sprite: ADT/Clothing/Mask/chronosvisor.rsi - type: BreathMask - - type: ShowSecurityIcons - type: FlashImmunity - type: EyeProtection protectionTime: 5 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties.yml index d094ab9aef4..ae5be446292 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/manties.yml @@ -32,4 +32,15 @@ - type: Sprite sprite: ADT/Clothing/Neck/mantles/mantle_centcomm.rsi - type: Clothing - sprite: ADT/Clothing/Neck/mantles/mantle_centcomm.rsi \ No newline at end of file + sprite: ADT/Clothing/Neck/mantles/mantle_centcomm.rsi + +- type: entity # Corvax-Resprite: Old mantle renamed and saved as that new entity + parent: ClothingNeckBase + id: ClothingNeckMantleHOSShoulder + name: head of security's shoulder mantle + description: Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station. + components: + - type: Sprite + sprite: Clothing/Neck/mantles/hosmantle_shoulder.rsi + - type: Clothing + sprite: Clothing/Neck/mantles/hosmantle_shoulder.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml index 390445e015a..d6fe80be7d1 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml @@ -204,8 +204,8 @@ ents: [] - type: UserInterface interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface # to prevent bag open/honk spam - type: UseDelay delay: 0.5 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/specific.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/specific.yml index b6c62042004..0e7a7aa496b 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/specific.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/specific.yml @@ -25,8 +25,8 @@ ents: [] - type: UserInterface interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface # to prevent bag open/honk spam - type: UseDelay delay: 0.5 diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml index 9d4cbe9f014..718ec2c0c6c 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/Boots.yml @@ -54,8 +54,8 @@ key: enum.SharedGasTankUiKey.Key - type: UserInterface interfaces: - - key: enum.SharedGasTankUiKey.Key - type: GasTankBoundUserInterface + enum.SharedGasTankUiKey.Key: + type: GasTankBoundUserInterface - type: Explosive explosionType: Default maxIntensity: 20 diff --git a/Resources/Prototypes/ADT/Entities/Loadout/loadouts.yml b/Resources/Prototypes/ADT/Entities/Loadout/loadouts.yml new file mode 100644 index 00000000000..7a7f42794fe --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Loadout/loadouts.yml @@ -0,0 +1,27 @@ +# #Chu-See + +# - type: loadout +# id: TrueDetectiveCoat +# entity: ADTClothingOuterCoatTrueDetectivesCoat +# sponsorOnly: true +# whitelistJobs: [Detective] + +# - type: loadout +# id: TrueDetectiveJumpskirt +# entity: ADTClothingUniformTrueDetectiveJumpskirt +# sponsorOnly: true +# whitelistJobs: [Detective] + +# - type: loadout +# id: TrueDetectiveHat +# entity: ADTClothingHeadHatsTrueDetectiveHat +# sponsorOnly: true +# whitelistJobs: [Detective] + + +# #Nova + +# - type: loadout +# id: NovaGloves +# entity: ADTClothingHandsNovaGloves +# sponsorOnly: true diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/animals.yml index 4d6dbf7b234..483cd08b4fc 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/animals.yml @@ -114,8 +114,8 @@ voice: Eugene - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: Hands - type: Body prototype: Primate diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/xeno.yml index 50ffec2dd92..0500d057b11 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/xeno.yml @@ -47,8 +47,8 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: Damageable damageModifierSet: ADTMobXenoBritshSet # ЗАдаёт модификаторы защиты от урона - type: Hands diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag.yml index 3b2a826e9d2..3869f344039 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag.yml @@ -341,8 +341,8 @@ doAfterDelay: 5 - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: Inventory templateId: DroneAntagInventory @@ -493,8 +493,8 @@ doAfterDelay: 5 - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: Inventory templateId: DroneAntagInventory @@ -647,8 +647,8 @@ doAfterDelay: 5 - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: Inventory templateId: DroneAntagInventory diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag_IPC.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag_IPC.yml index 8443ae3c57e..1f1b8a7627f 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag_IPC.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/DroneAntag_IPC.yml @@ -258,11 +258,11 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.VoiceMaskUIKey.Key + enum.VoiceMaskUIKey.Key: type: VoiceMaskBoundUserInterface - - key: enum.HumanoidMarkingModifierKey.Key + enum.HumanoidMarkingModifierKey.Key: type: HumanoidMarkingModifierBoundUserInterface - - key: enum.StrippingUiKey.Key + enum.StrippingUiKey.Key: type: StrippableBoundUserInterface - type: StandingState - type: CanEscapeInventory diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/secutirycyborg.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/secutirycyborg.yml index 97a89f2adbb..95fa41171af 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/secutirycyborg.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/secutirycyborg.yml @@ -300,13 +300,13 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.VoiceMaskUIKey.Key + enum.VoiceMaskUIKey.Key: type: VoiceMaskBoundUserInterface - - key: enum.HumanoidMarkingModifierKey.Key + enum.HumanoidMarkingModifierKey.Key: type: HumanoidMarkingModifierBoundUserInterface - - key: enum.StrippingUiKey.Key + enum.StrippingUiKey.Key: type: StrippableBoundUserInterface - - key: enum.SiliconLawsUiKey.Key + enum.SiliconLawsUiKey.Key: type: SiliconLawBoundUserInterface - type: Emoting - type: Grammar diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/drones.yml b/Resources/Prototypes/ADT/Entities/Mobs/player/drones.yml index 768d6720bc6..0eb7fbea14c 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/player/drones.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/player/drones.yml @@ -30,8 +30,8 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface #- type: GhostTakeoverAvailable # makeSentient: true # name: Maintenance Drone @@ -153,8 +153,8 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface #- type: GhostTakeoverAvailable # makeSentient: true # name: Maintenance Drone @@ -273,8 +273,8 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: Body prototype: foodDistributorBots - type: Inventory @@ -407,8 +407,8 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface #- type: GhostTakeoverAvailable # makeSentient: true # name: Maintenance Drone diff --git a/Resources/Prototypes/ADT/Entities/Mobs/player/securitycyborg.yml b/Resources/Prototypes/ADT/Entities/Mobs/player/securitycyborg.yml index e8e41be93e9..29b2a0c4153 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/player/securitycyborg.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/player/securitycyborg.yml @@ -87,10 +87,8 @@ layoutId: ADTBodyCyborgSec - type: SSDIndicator #- type: UnblockableSpeech По идее должен иметь возможность разговаривать после крита, но тоже самое после смерти - - type: EmotePanel - type: ContentEye maxZoom: 1.0,1.0 - - type: ShowSecurityIcons - type: SiliconLawBound - type: SiliconLawProvider laws: SecCybLaw diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/boombox.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/boombox.yml index f4652d4b109..c7c6dcadb9f 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Device/boombox.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/boombox.yml @@ -30,8 +30,8 @@ key: enum.BoomBoxUiKey.Key - type: UserInterface interfaces: - - key: enum.BoomBoxUiKey.Key - type: BoomBoxBoundUi + enum.BoomBoxUiKey.Key: + type: BoomBoxBoundUi - type: DeviceLinkSource ports: - Pressed diff --git a/Resources/Prototypes/ADT/Entities/Objects/Device/listening.yml b/Resources/Prototypes/ADT/Entities/Objects/Device/listening.yml index 90728816f86..0038638313c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Device/listening.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Device/listening.yml @@ -18,8 +18,8 @@ ents: [] - type: UserInterface interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface - type: entity diff --git a/Resources/Prototypes/ADT/Entities/Objects/Magic/JessusX.yml b/Resources/Prototypes/ADT/Entities/Objects/Magic/JessusX.yml index 20c2a709f5f..6344683e6a1 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Magic/JessusX.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Magic/JessusX.yml @@ -44,5 +44,5 @@ maxItemSize: Tiny - type: UserInterface interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface + enum.StorageUiKey.Key: + type: StorageBoundUserInterface diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/itensil.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/itensil.yml index ce8ccfc692b..f0e1c0e840b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/itensil.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/itensil.yml @@ -71,8 +71,8 @@ state: icon - type: UserInterface interfaces: - - key: enum.TransferAmountUiKey.Key - type: TransferAmountBoundUserInterface + enum.TransferAmountUiKey.Key: + type: TransferAmountBoundUserInterface - type: PhysicalComposition materialComposition: Steel: 10 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/radio_handheld.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/radio_handheld.yml index 61f1db5dea5..11db3779951 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/radio_handheld.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/radio_handheld.yml @@ -44,7 +44,7 @@ key: enum.IntercomUiKey.Key - type: UserInterface interfaces: - - key: enum.IntercomUiKey.Key + enum.IntercomUiKey.Key: type: IntercomBoundUserInterface - type: Item size: Small diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/secretbook.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/secretbook.yml index 9e46369aca2..fa9d2ae827e 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/secretbook.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/secretbook.yml @@ -1,924 +1,924 @@ -- type: entity - id: ADTSecretBookBase - parent: BaseItem - name: Book - abstract: true - description: A common book - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book0 - map: [ "enum.DamageStateVisualLayers.Base" ] - - type: Item - size: Normal - shape: - - 0,0,0,1 - - type: Storage - maxItemSize: Small - grid: - - 0,0,0,1 - - type: ContainerContainer - containers: - storagebase: !type:Container - ents: [] - - type: UserInterface - interfaces: - - key: enum.StorageUiKey.Key - type: StorageBoundUserInterface - - type: Tag - tags: - - Book - - type: Construction - graph: SecretBook - node: secret - -- type: entity - id: ADTSecretBookRandom - parent: ADTSecretBookBase - name: Book - description: A common book - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book6 - - type: Construction - graph: SecretBook - node: secretrandom - -- type: entity - id: ADTSecretBookSpaceEncyclopedia - parent: ADTSecretBookBase - name: space encyclopedia - description: An encyclopedia containing all the knowledge. The author of this encyclopedia is unknown. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book0 # placeholder(?). if only we have a better sprite that fits this. - - type: Construction - graph: SecretBook - node: secretspaceencyclopedia - -- type: entity - id: ADTSecretBookTheBookOfControl - parent: ADTSecretBookBase - name: the book of control - description: Essential to become robust. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book7 - - type: Construction - graph: SecretBook - node: secretthebookofcontrol - -- type: entity - id: ADTSecretBookBartendersManual - parent: ADTSecretBookBase - name: bartender's manual - description: This manual is stained with beer. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_bar - - type: Construction - graph: SecretBook - node: secretbartendersmanual - -- type: entity - id: ADTSecretBookChefGaming - parent: ADTSecretBookBase - name: chef gaming - description: A book about cooking written by a gamer chef. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_cooking - - type: Construction - graph: SecretBook - node: secretchefgaming - -- type: entity - id: ADTSecretBookLeafLoversSecret - parent: ADTSecretBookBase - name: leaf lover's secret - description: It has a strong weed smell. It motivates you to feed and seed. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_hydroponics_pod_people - - type: Construction - graph: SecretBook - node: secretleafloverssecret - -- type: entity - id: ADTSecretBookEngineersHandbook - parent: ADTSecretBookBase - name: engineer's handbook - description: A handbook about engineering written by Nanotrasen. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_engineering - - type: Construction - graph: SecretBook - node: secretengineershandbook - -- type: entity - id: ADTSecretBookScientistsGuidebook - parent: ADTSecretBookBase - name: scientist's guidebook - description: A guidebook about science written by Nanotrasen. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_science - - type: Construction - graph: SecretBook - node: secretscientistsguidebook - -- type: entity - id: ADTSecretBookSecurity - parent: ADTSecretBookBase - name: security 101 - description: A book about security written by Nanotrasen. The book is stained with blood. It seems to have been used more as a weapon than reading material. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_security - - type: MeleeWeapon - wideAnimationRotation: 180 - damage: - types: - Blunt: 6 - - type: Construction - graph: SecretBook - node: secretsecurity - -- type: entity - id: ADTSecretBookHowToKeepStationClean - parent: ADTSecretBookBase - name: how to keep station clean - description: This book is very clean. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book0 # no janitorial book sprite so this is a placeholder - - type: Construction - graph: SecretBook - node: secrethowtokeepstationclean - -- type: entity - id: ADTSecretBookHowToRockAndStone - parent: ADTSecretBookBase - name: how to rock and stone - description: A very detailed guide about salvage written by Karl, a legendary space miner, however he's missing. It motivates you to rock and stone. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book0 # no salvage book sprite so this is a placeholder - - type: Construction - graph: SecretBook - node: secrethowtorockandstone +# - type: entity +# id: ADTSecretBookBase +# parent: BaseItem +# name: Book +# abstract: true +# description: A common book +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book0 +# map: [ "enum.DamageStateVisualLayers.Base" ] +# - type: Item +# size: Normal +# shape: +# - 0,0,0,1 +# - type: Storage +# maxItemSize: Small +# grid: +# - 0,0,0,1 +# - type: ContainerContainer +# containers: +# storagebase: !type:Container +# ents: [] +# - type: UserInterface +# interfaces: +# - key: enum.StorageUiKey.Key +# type: StorageBoundUserInterface +# - type: Tag +# tags: +# - Book +# - type: Construction +# graph: SecretBook +# node: secret + +# - type: entity +# id: ADTSecretBookRandom +# parent: ADTSecretBookBase +# name: Book +# description: A common book +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book6 +# - type: Construction +# graph: SecretBook +# node: secretrandom + +# - type: entity +# id: ADTSecretBookSpaceEncyclopedia +# parent: ADTSecretBookBase +# name: space encyclopedia +# description: An encyclopedia containing all the knowledge. The author of this encyclopedia is unknown. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book0 # placeholder(?). if only we have a better sprite that fits this. +# - type: Construction +# graph: SecretBook +# node: secretspaceencyclopedia + +# - type: entity +# id: ADTSecretBookTheBookOfControl +# parent: ADTSecretBookBase +# name: the book of control +# description: Essential to become robust. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book7 +# - type: Construction +# graph: SecretBook +# node: secretthebookofcontrol + +# - type: entity +# id: ADTSecretBookBartendersManual +# parent: ADTSecretBookBase +# name: bartender's manual +# description: This manual is stained with beer. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_bar +# - type: Construction +# graph: SecretBook +# node: secretbartendersmanual + +# - type: entity +# id: ADTSecretBookChefGaming +# parent: ADTSecretBookBase +# name: chef gaming +# description: A book about cooking written by a gamer chef. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_cooking +# - type: Construction +# graph: SecretBook +# node: secretchefgaming + +# - type: entity +# id: ADTSecretBookLeafLoversSecret +# parent: ADTSecretBookBase +# name: leaf lover's secret +# description: It has a strong weed smell. It motivates you to feed and seed. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_hydroponics_pod_people +# - type: Construction +# graph: SecretBook +# node: secretleafloverssecret + +# - type: entity +# id: ADTSecretBookEngineersHandbook +# parent: ADTSecretBookBase +# name: engineer's handbook +# description: A handbook about engineering written by Nanotrasen. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_engineering +# - type: Construction +# graph: SecretBook +# node: secretengineershandbook + +# - type: entity +# id: ADTSecretBookScientistsGuidebook +# parent: ADTSecretBookBase +# name: scientist's guidebook +# description: A guidebook about science written by Nanotrasen. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_science +# - type: Construction +# graph: SecretBook +# node: secretscientistsguidebook + +# - type: entity +# id: ADTSecretBookSecurity +# parent: ADTSecretBookBase +# name: security 101 +# description: A book about security written by Nanotrasen. The book is stained with blood. It seems to have been used more as a weapon than reading material. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_security +# - type: MeleeWeapon +# wideAnimationRotation: 180 +# damage: +# types: +# Blunt: 6 +# - type: Construction +# graph: SecretBook +# node: secretsecurity + +# - type: entity +# id: ADTSecretBookHowToKeepStationClean +# parent: ADTSecretBookBase +# name: how to keep station clean +# description: This book is very clean. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book0 # no janitorial book sprite so this is a placeholder +# - type: Construction +# graph: SecretBook +# node: secrethowtokeepstationclean + +# - type: entity +# id: ADTSecretBookHowToRockAndStone +# parent: ADTSecretBookBase +# name: how to rock and stone +# description: A very detailed guide about salvage written by Karl, a legendary space miner, however he's missing. It motivates you to rock and stone. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book0 # no salvage book sprite so this is a placeholder +# - type: Construction +# graph: SecretBook +# node: secrethowtorockandstone -- type: entity - id: ADTSecretBookMedicalReferenceBook - parent: ADTSecretBookBase - name: medical reference book - description: A reference book about medical written by an old doctor. The handwriting is barely comprehensible. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_medical - - type: Construction - graph: SecretBook - node: secretmedicalreferencebook - -- type: entity - id: ADTSecretBookHowToSurvive - parent: ADTSecretBookBase - name: how to survive - description: Ironically the author of this book is dead. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_engineering - - type: Construction - graph: SecretBook - node: secrethowtosurvive - -- type: entity - id: ADTSecretBookChemicalCompendium - parent: ADTSecretBookBase - name: chempendium - description: A comprehensive guide written by some old skeleton of a professor about chemical synthesis. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_chemistry - - type: Construction - graph: SecretBook - node: secretchemicalcompendium - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookEscalation - name: Robert's Rules of Escalation - description: The book is stained with blood. It seems to have been used more as a weapon than reading material. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book2 - - type: Construction - graph: SecretBook - node: secretescalation - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookEscalationSecurity - name: "Robert's Rules of Escalation: Security Edition" - description: The book is stained with blood. It seems to have been used more as a weapon than reading material. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book2 - - type: MeleeWeapon - wideAnimationRotation: 180 - damage: - types: - Blunt: 6 - - type: Construction - graph: SecretBook - node: secretescalationsecurity - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookAtmosDistro - name: "Newton's Guide to Atmos: The Distro" - description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book5 - - type: Construction - graph: SecretBook - node: secretatmosdistro - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookAtmosWaste - name: "Newton's Guide to Atmos: Waste" - description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book5 - - type: Construction - graph: SecretBook - node: secretatmoswaste - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookAtmosAirAlarms - name: "Newton's Guide to Atmos: Air Alarms" - description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book5 - - type: Construction - graph: SecretBook - node: secretatmosairalarms - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookAtmosVentsMore - name: "Newton's Guide to Atmos: Vents and More" - description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book5 - - type: Construction - graph: SecretBook - node: secretatmosventsmore - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookNarsieLegend - name: the legend of nar'sie - description: The book is an old, leather-bound tome with intricate engravings on the cover. The pages are yellowed and fragile with age, with the ink of the text faded in some places. It appears to have been well-read and well-loved, with dog-eared pages and marginalia scrawled in the margins. Despite its aged appearance, the book still exudes a sense of mystical power and wonder, hinting at the secrets and knowledge contained within its pages. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_narsie_legend - - type: Construction - graph: SecretBook - node: secretnarsielegend - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookTruth - name: exploring different philosophical perspectives on truth and the complexity of lying - description: A book exploring the different philosophical perspectives on truth and lying has a worn cover, with creases and marks indicating frequent use and thoughtful contemplation. The spine shows signs of wear from being pulled off the shelf again and again. The pages themselves are filled with underlines, notes in the margins, and highlighted passages as readers grapple with the nuances and complexities of the topic. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_truth - - type: Construction - graph: SecretBook - node: secrettruth - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookWorld - name: shaping the state of the world - interplay of forces and choices - description: The book is a well-preserved hardcover with a simple, elegant design on the cover, depicting the image of a world in motion. The pages are crisp and clean, with no signs of wear or tear, suggesting that it has been well-cared for and valued by its previous owner. The text is printed in a clear, legible font, and the chapters are organized in a logical and easy-to-follow manner, making it accessible to readers of all levels of expertise. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_world - - type: Construction - graph: SecretBook - node: secretworld - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookIanAntarctica - name: adventures of robert & ian - exploring antarctica - description: The book is a small paperback in good condition, with an illustration of Ian the corgi and the colony of penguins on the cover. The title, "Ian and Robert's Antarctic Adventure", is written in bold white letters against a blue background. The back cover features a brief summary of the story, highlighting the themes of humility, resilience, and the beauty of nature. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_ian_antarctica - - type: Construction - graph: SecretBook - node: secretianantarctica - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookSlothClownSSS - name: the sloth and the clown - space station shenanigans - description: The book looks new, with a glossy cover featuring Chuckles the clown and Snuggles the sloth floating in space with a backdrop of stars and planets. Chuckles is dressed in his banana costume and Snuggles is sleeping on a hammock made of space ropes. The title "The Sloth and the Clown - Space Station Shenanigans" is written in bold and colorful letters. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_scsss - - type: Construction - graph: SecretBook - node: secretslothclownsss - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookSlothClownPranks - name: the sloth and the clown - pranks on zorgs - description: The book is in excellent condition, with crisp pages and a bright cover. The cover of the book features Chuckles and Snuggles, surrounded by the different species they encountered during their adventures in space. In the background, the Zorgs can be seen peeking out from behind a spaceship. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_scpz - - type: Construction - graph: SecretBook - node: secretslothclownpranks - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookSlothClownMMD - name: the sloth and the clown - maze maze danger - description: The book looks new and vibrant, with an image of Chuckles and Snuggles standing in front of the changing maze on the cover. The title "The Sloth and the Clown - Maze Maze Danger" is written in bold, colorful letters that pop against a background of space and stars. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_scmmd - - type: Construction - graph: SecretBook - node: secretslothclownmmd - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookStruck - name: the humbling and transformative experience of being struck by lightning - description: The cover of the book is an electrifying image of lightning striking the ground, with a silhouette of a person standing in the midst of it. The title is written in bold letters in white against a black background, conveying the power and intensity of the experience. The subtitle is written in smaller letters below the title, providing a hint of the philosophical and spiritual themes explored within. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_struck - - type: Construction - graph: SecretBook - node: secretstruck - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookSun - name: reaching for the sun - a plant's quest for life - description: The book is new, with a bright and vibrant cover featuring a plant stretching its leaves towards the sun. The title, "Reaching for the Sun - A Plant's Quest for Life," is written in bold, green letters, with an image of the sun rising behind the plant. The cover evokes a sense of growth, energy, and the beauty of nature. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_sun - - type: Construction - graph: SecretBook - node: secretsun - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookPossum - name: fallen ambitions - the tragic tale of morty the possum - description: The book is in good condition, with a hardcover and a dark green forest background. In the center of the cover, there is a sad looking possum sitting on a branch, with a distant and lonely expression on its face. The title, "Fallen Ambitions - The Tragic Tale of Morty the Possum," is written in bold, gold letters above the possum. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_possum - - type: Construction - graph: SecretBook - node: secretpossum - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookCafe - name: the cafe possum - description: The book is in new condition, with a vibrant and whimsical cover that features a charming illustration of a tiny possum peeking out from behind a coffee cup, with a colorful and bustling cafe scene in the background. The title "The Cafe Possum" is written in bold, playful lettering, and the author's name is printed in a smaller font below it. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_cafe - - type: Construction - graph: SecretBook - node: secretcafe - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookFeather - name: a feather of magic - the wandering bird's journey to belonging - description: The book would be in new condition, with a glossy cover depicting the wandering bird surrounded by a glowing forest, with the magical feather at the center. The title, "A Feather of Magic," would be written in bold, glittering letters, while the subtitle, "The Wandering Bird's Journey to Belonging," would be written in smaller print underneath. The back cover would feature a brief summary of the story, along with reviews from critics praising the book's themes of hope and renewal. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book4 - - type: Construction - graph: SecretBook - node: secretfeather - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookIanLostWolfPup - name: the adventures of ian and renault - finding the lost wolf pup - description: The book is a new condition with a colorful cover, depicting Ian the corgi and Renault the fox on a journey through the forest, with the lost wolf pup to their feet. The title "The Adventures of Ian and Renault - Finding the Lost Wolf Pup" is prominently displayed at the top, with the author's name below. The cover has a whimsical and adventurous feel to it, attracting readers of all ages. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_ian_wolfpup - - type: Construction - graph: SecretBook - node: secretianlostwolfpup - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookIanRanch - name: the adventures of ian and renault - ranch expedition - description: The book appears to be new, with crisp pages and an unblemished cover. The cover features a colorful illustration of Ian and Renault, surrounded by various animals they encountered on the ranch, including horses, cows, and chickens. The title, "The Adventures of Ian and Renault - Ranch Expedition," is written in bold letters above the image, with the subtitle, "Helping Animals in Need," written below. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_ian_ranch - - type: Construction - graph: SecretBook - node: secretianranch - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookIanOcean - name: the adventures of ian and renault - an ocean adventure - description: The book is new and in excellent condition. The cover shows Ian and Renault running and playing on the beach, with the blue ocean and golden sand in the background. The title is written in bold, playful letters, and the subtitle reads "An Ocean Adventure." - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_ian_ocean - - type: Construction - graph: SecretBook - node: secretianocean - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookIanMountain - name: the adventures of ian and renault - A mountain expedition - description: The book is in new condition. The cover is a stunning mountain landscape with Ian and Renault in the foreground, looking out over the vista of the surrounding peaks and valleys. The title is written in bold, block letters at the top, with the subtitle, "A Mountain Expedition," written underneath. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_ian_mountain - - type: Construction - graph: SecretBook - node: secretianmountain - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookIanCity - name: the adventures of ian and renault - exploring the city - description: The book is in new condition, with crisp pages and a glossy cover. The cover features a colorful illustration of Ian and Renault exploring the city, with tall buildings and bustling streets in the background. Ian is leading the way, with his tail wagging excitedly, while Renault follows close behind, her ears perked up and her eyes wide with wonder. The title, "The Adventures of Ian and Renault," is written in bold, playful letters, with the subtitle, "Exploring the City," written below in smaller font. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_ian_city - - type: Construction - graph: SecretBook - node: secretiancity - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookIanArctic - name: the adventures of ian and renault - an arctic journey of courage and friendship - description: The book looks new and adventurous, with a picture of Ian and Renault standing in front of an icy landscape with snowflakes falling all around them. The title, "The Adventures of Ian and Renault," is written in bold letters at the top, with a subtitle that reads, "An Arctic Journey of Courage and Friendship." - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_ian_arctic - - type: Construction - graph: SecretBook - node: secretianarctic - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookIanDesert - name: the adventures of ian and renault - exploring the mysterious desert - description: The book is in new condition and would have a colorful cover depicting Ian and Renault against a desert backdrop. The cover would feature images of various animals and plants that the two encountered on their adventure, such as a rattlesnake, coyotes, sand dunes, and an oasis. The title, "The Adventures of Ian and Renault" is prominently displayed on the cover in bold letters, while the subtitle "Exploring the Mysterious Desert" is written in smaller letters underneath. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_ian_desert - - type: Construction - graph: SecretBook - node: secretiandesert - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookNames - name: the power of names - a philosophical exploration - description: The book is a gently used philosophy text, with a cover that features a close-up of a person's mouth, with the word "names" written on their lips. The title is "The Power of Names - A Philosophical Exploration," and the author's name is prominently displayed underneath. The overall design is simple and elegant, with the focus on the text rather than any flashy graphics or images. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_names - - type: Construction - graph: SecretBook - node: secretnames - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookEarth - name: earthly longing - description: The book is in good condition, with a slightly faded cover due to exposure to sunlight. The cover of the book depicts a panoramic view of the Earth from space, with a bright blue ocean and green landmasses. In the foreground, a lone astronaut is seen sitting in front of a window, gazing wistfully at the Earth. The title of the book, "Earthly Longing," is written in bold white letters against a black background at the top of the cover. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_earth - - type: Construction - graph: SecretBook - node: secretearth - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookAurora - name: journey beyond - the starship aurora mission - description: The book is in excellent condition, with a shiny cover depicting a spaceship hovering above a planet, perhaps with the Earth in the background. The title "Journey Beyond - The Starship Aurora Mission" is written in bold, silver letters. The cover also features a quote from a review, "A breathtaking tale of human achievement and exploration" to entice potential readers. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_aurora - - type: Construction - graph: SecretBook - node: secretaurora - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookTemple - name: the nature of the divine - embracing the many gods - description: The book appears new with crisp pages and an uncreased spine. The cover features an image of a temple with a glowing, multicolored aura around it, symbolizing the various gods discussed in the book. The title is displayed prominently in gold lettering, with the author's name and a brief summary of the book written in smaller text below. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_temple - - type: Construction - graph: SecretBook - node: secretemple - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookWatched - name: watched - description: The book is in good condition, with a slightly worn cover that features a dark and ominous space station looming in the background. The title "Watched" is written in bold letters that seem to be staring back at the reader, conveying the feeling of being constantly observed. The blurb on the back cover hints at a thrilling and suspenseful tale of paranoia and danger in a confined setting. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_watched - - type: Construction - graph: SecretBook - node: secretwatched - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookMedicalOfficer - name: horizon's battle - a medical officer's tale of trust and survival - description: The cover features Smith, the medical officer, in his uniform, looking determined and ready to face any challenge. The backdrop shows the SS Horizon under attack, with explosions and smoke filling the space station. In the foreground, a wizard with a staff can be seen, adding an element of mystery and intrigue to the scene. The title is prominently displayed in bold letters, with the author's name and a tagline indicating the book's action-packed and suspenseful nature. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_medical - - type: Construction - graph: SecretBook - node: secretmedicaloffice - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookMorgue - name: the ghostly residents of the abandoned morgue - description: The book looks old and worn, with faded lettering on the cover. The cover depicts a dark and eerie morgue, with a full moon casting an ominous glow over the scene. In the foreground are Morty the possum and Morticia the raccoon, with mischievous expressions on their faces, peeking out from behind a metal shelf. The title is written in bold, spooky letters, with the subtitle "A Tale of Animal Spirits" written in smaller font below. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_morgue - - type: Construction - graph: SecretBook - node: secretmorgue - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookRufus - name: rufus and the mischievous fairy - description: The book is in new condition, with vibrant colors and illustrations on the cover. The cover shows Rufus on his bicycle, with Blossom flying beside him in a playful manner. The title is written in bold, whimsical font, with the characters' names highlighted in a contrasting color. The overall aesthetic is charming and inviting, appealing to children and adults alike. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_rufus - - type: Construction - graph: SecretBook - node: secretrufus - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookMap - name: the map of adventure - description: The book is in a good condition, with a glossy cover depicting a jungle scene with vibrant colors and intricate details. The title "The Map of Adventure," is written in bold, gold lettering. The cover also features an image of a mysterious suitcase with the map spilling out of it. - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_map - - type: Construction - graph: SecretBook - node: secretmap - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookJourney - name: a journey of music, mountains, and self-discovery - description: The book is in excellent condition, with crisp pages and a glossy cover. The cover features a striking image of a mountain range, with a silhouette of a climber with a guitar on their back in the foreground. The title is bold and eye-catching, with the subtitle "A Journey of Music, Mountains, and Self-Discovery." - components: - - type: Sprite - sprite: Objects/Misc/authorbooks.rsi - layers: - - state: book_journ_mount - - type: Construction - graph: SecretBook - node: secretjourney - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookInspiration - name: finding inspiration - a writer's journey through the woods - description: The book is in a new condition with a cover depicting a serene forest scene with a waterfall and colorful wildflowers. The title of the book "Finding Inspiration - A Writer's Journey Through the Woods" and the author's name are prominently displayed at the bottom. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book6 - - type: Construction - graph: SecretBook - node: secretinspiration - -- type: entity - name: demonomicon - parent: ADTSecretBookBase - id: ADTSecretBookDemonomicon - noSpawn: true - description: 'Who knows what dark spells may be contained in these horrid pages?' - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_demonomicon - - type: Construction - graph: SecretBook - node: secretdemonomicon - -- type: entity - name: pharmaceutical manuscript - parent: ADTSecretBookBase - id: ADTSecretBookChemistryInsane - suffix: library salvage - description: 'You can tell whoever wrote this was off the desoxy HARD.' - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_chemistry - - type: Construction - graph: SecretBook - node: secretchemistryinsane - -- type: entity - name: botanical textbook - parent: ADTSecretBookBase - id: ADTSecretBookBotanicalTextbook - suffix: library salvage - description: 'Only a couple pages are left.' - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_hydroponics_pod_people - - type: Construction - graph: SecretBook - node: secretbotanicaltextbook - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookGnominomicon - name: gnominomicon - suffix: library salvage - description: You don't like the look of this. Looks - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book5 - - type: Construction - graph: SecretBook - node: secretgnominomicon - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookFishing - name: Tales from the Fishbowl - suffix: library salvage - description: This book sucks. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_fish - - type: Construction - graph: SecretBook - node: secretfishing - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookDetective - name: Strokgraeth Holmes, Dwarf Detective - suffix: library salvage - description: Exciting! Invigorating! This author died after his book career failed. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book_detective - - type: Construction - graph: SecretBook - node: secretdetective - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookBusido - name: Busido. Selected chapters - description: Handbook for samurai, weaboos, and armchair generals. - components: - - type: Sprite - sprite: Corvax/Objects/Misc/books.rsi - layers: - - state: book_busido - - type: Construction - graph: SecretBook - node: secretbusido - -# Книги ADT - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookSrpOperatorCentComm - name: SRP Operator CentComm - description: A book about cooking new recipe on NT station. - components: - - type: Sprite - sprite: ADT/Objects/Misc/books.rsi - layers: - - state: srp-operatorcentcomm-book - - type: Construction - graph: SecretBook - node: secretsrpoperatorcentcomm - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookNewRecipes - name: new recipe book - description: A book about cooking new recipe on NT station. - components: - - type: Sprite - sprite: ADT/Objects/Misc/books.rsi - layers: - - state: new-recipe-book - - type: Construction - graph: SecretBook - node: secretcooking - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookNewCocktails - name: new coctails note - description: Red note with a recipes of new cocktails. Writen by R.S. - components: - - type: Sprite - sprite: ADT/Objects/Misc/books.rsi - layers: - - state: new-cocktail-book - - type: Construction - graph: SecretBook - node: secretnewcocktails - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookNewChemicals - name: magazine about new medication - description: A magazine, which consists information about chemicals. - components: - - type: Sprite - sprite: ADT/Objects/Misc/books.rsi - layers: - - state: chem-book - - type: Construction - graph: SecretBook - node: secretnewchemicals - -- type: entity - parent: ADTSecretBookBase - id: ADTSecretBookSpaceLaw - name: Корпоративный закон, издание редакции 2568 года - description: На страже порядка - components: - - type: Sprite - layers: - - state: book_space_law - - type: MeleeWeapon - wideAnimationRotation: 180 - damage: - types: - Blunt: 6 - - type: Construction - graph: SecretBook - node: secretspacelaw +# - type: entity +# id: ADTSecretBookMedicalReferenceBook +# parent: ADTSecretBookBase +# name: medical reference book +# description: A reference book about medical written by an old doctor. The handwriting is barely comprehensible. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_medical +# - type: Construction +# graph: SecretBook +# node: secretmedicalreferencebook + +# - type: entity +# id: ADTSecretBookHowToSurvive +# parent: ADTSecretBookBase +# name: how to survive +# description: Ironically the author of this book is dead. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_engineering +# - type: Construction +# graph: SecretBook +# node: secrethowtosurvive + +# - type: entity +# id: ADTSecretBookChemicalCompendium +# parent: ADTSecretBookBase +# name: chempendium +# description: A comprehensive guide written by some old skeleton of a professor about chemical synthesis. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_chemistry +# - type: Construction +# graph: SecretBook +# node: secretchemicalcompendium + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookEscalation +# name: Robert's Rules of Escalation +# description: The book is stained with blood. It seems to have been used more as a weapon than reading material. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book2 +# - type: Construction +# graph: SecretBook +# node: secretescalation + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookEscalationSecurity +# name: "Robert's Rules of Escalation: Security Edition" +# description: The book is stained with blood. It seems to have been used more as a weapon than reading material. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book2 +# - type: MeleeWeapon +# wideAnimationRotation: 180 +# damage: +# types: +# Blunt: 6 +# - type: Construction +# graph: SecretBook +# node: secretescalationsecurity + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookAtmosDistro +# name: "Newton's Guide to Atmos: The Distro" +# description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book5 +# - type: Construction +# graph: SecretBook +# node: secretatmosdistro + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookAtmosWaste +# name: "Newton's Guide to Atmos: Waste" +# description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book5 +# - type: Construction +# graph: SecretBook +# node: secretatmoswaste + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookAtmosAirAlarms +# name: "Newton's Guide to Atmos: Air Alarms" +# description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book5 +# - type: Construction +# graph: SecretBook +# node: secretatmosairalarms + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookAtmosVentsMore +# name: "Newton's Guide to Atmos: Vents and More" +# description: There are endless illegible notes scribbled in the margins. Most of the text is covered in handwritten question marks. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book5 +# - type: Construction +# graph: SecretBook +# node: secretatmosventsmore + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookNarsieLegend +# name: the legend of nar'sie +# description: The book is an old, leather-bound tome with intricate engravings on the cover. The pages are yellowed and fragile with age, with the ink of the text faded in some places. It appears to have been well-read and well-loved, with dog-eared pages and marginalia scrawled in the margins. Despite its aged appearance, the book still exudes a sense of mystical power and wonder, hinting at the secrets and knowledge contained within its pages. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_narsie_legend +# - type: Construction +# graph: SecretBook +# node: secretnarsielegend + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookTruth +# name: exploring different philosophical perspectives on truth and the complexity of lying +# description: A book exploring the different philosophical perspectives on truth and lying has a worn cover, with creases and marks indicating frequent use and thoughtful contemplation. The spine shows signs of wear from being pulled off the shelf again and again. The pages themselves are filled with underlines, notes in the margins, and highlighted passages as readers grapple with the nuances and complexities of the topic. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_truth +# - type: Construction +# graph: SecretBook +# node: secrettruth + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookWorld +# name: shaping the state of the world - interplay of forces and choices +# description: The book is a well-preserved hardcover with a simple, elegant design on the cover, depicting the image of a world in motion. The pages are crisp and clean, with no signs of wear or tear, suggesting that it has been well-cared for and valued by its previous owner. The text is printed in a clear, legible font, and the chapters are organized in a logical and easy-to-follow manner, making it accessible to readers of all levels of expertise. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_world +# - type: Construction +# graph: SecretBook +# node: secretworld + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookIanAntarctica +# name: adventures of robert & ian - exploring antarctica +# description: The book is a small paperback in good condition, with an illustration of Ian the corgi and the colony of penguins on the cover. The title, "Ian and Robert's Antarctic Adventure", is written in bold white letters against a blue background. The back cover features a brief summary of the story, highlighting the themes of humility, resilience, and the beauty of nature. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_ian_antarctica +# - type: Construction +# graph: SecretBook +# node: secretianantarctica + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookSlothClownSSS +# name: the sloth and the clown - space station shenanigans +# description: The book looks new, with a glossy cover featuring Chuckles the clown and Snuggles the sloth floating in space with a backdrop of stars and planets. Chuckles is dressed in his banana costume and Snuggles is sleeping on a hammock made of space ropes. The title "The Sloth and the Clown - Space Station Shenanigans" is written in bold and colorful letters. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_scsss +# - type: Construction +# graph: SecretBook +# node: secretslothclownsss + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookSlothClownPranks +# name: the sloth and the clown - pranks on zorgs +# description: The book is in excellent condition, with crisp pages and a bright cover. The cover of the book features Chuckles and Snuggles, surrounded by the different species they encountered during their adventures in space. In the background, the Zorgs can be seen peeking out from behind a spaceship. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_scpz +# - type: Construction +# graph: SecretBook +# node: secretslothclownpranks + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookSlothClownMMD +# name: the sloth and the clown - maze maze danger +# description: The book looks new and vibrant, with an image of Chuckles and Snuggles standing in front of the changing maze on the cover. The title "The Sloth and the Clown - Maze Maze Danger" is written in bold, colorful letters that pop against a background of space and stars. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_scmmd +# - type: Construction +# graph: SecretBook +# node: secretslothclownmmd + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookStruck +# name: the humbling and transformative experience of being struck by lightning +# description: The cover of the book is an electrifying image of lightning striking the ground, with a silhouette of a person standing in the midst of it. The title is written in bold letters in white against a black background, conveying the power and intensity of the experience. The subtitle is written in smaller letters below the title, providing a hint of the philosophical and spiritual themes explored within. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_struck +# - type: Construction +# graph: SecretBook +# node: secretstruck + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookSun +# name: reaching for the sun - a plant's quest for life +# description: The book is new, with a bright and vibrant cover featuring a plant stretching its leaves towards the sun. The title, "Reaching for the Sun - A Plant's Quest for Life," is written in bold, green letters, with an image of the sun rising behind the plant. The cover evokes a sense of growth, energy, and the beauty of nature. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_sun +# - type: Construction +# graph: SecretBook +# node: secretsun + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookPossum +# name: fallen ambitions - the tragic tale of morty the possum +# description: The book is in good condition, with a hardcover and a dark green forest background. In the center of the cover, there is a sad looking possum sitting on a branch, with a distant and lonely expression on its face. The title, "Fallen Ambitions - The Tragic Tale of Morty the Possum," is written in bold, gold letters above the possum. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_possum +# - type: Construction +# graph: SecretBook +# node: secretpossum + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookCafe +# name: the cafe possum +# description: The book is in new condition, with a vibrant and whimsical cover that features a charming illustration of a tiny possum peeking out from behind a coffee cup, with a colorful and bustling cafe scene in the background. The title "The Cafe Possum" is written in bold, playful lettering, and the author's name is printed in a smaller font below it. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_cafe +# - type: Construction +# graph: SecretBook +# node: secretcafe + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookFeather +# name: a feather of magic - the wandering bird's journey to belonging +# description: The book would be in new condition, with a glossy cover depicting the wandering bird surrounded by a glowing forest, with the magical feather at the center. The title, "A Feather of Magic," would be written in bold, glittering letters, while the subtitle, "The Wandering Bird's Journey to Belonging," would be written in smaller print underneath. The back cover would feature a brief summary of the story, along with reviews from critics praising the book's themes of hope and renewal. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book4 +# - type: Construction +# graph: SecretBook +# node: secretfeather + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookIanLostWolfPup +# name: the adventures of ian and renault - finding the lost wolf pup +# description: The book is a new condition with a colorful cover, depicting Ian the corgi and Renault the fox on a journey through the forest, with the lost wolf pup to their feet. The title "The Adventures of Ian and Renault - Finding the Lost Wolf Pup" is prominently displayed at the top, with the author's name below. The cover has a whimsical and adventurous feel to it, attracting readers of all ages. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_ian_wolfpup +# - type: Construction +# graph: SecretBook +# node: secretianlostwolfpup + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookIanRanch +# name: the adventures of ian and renault - ranch expedition +# description: The book appears to be new, with crisp pages and an unblemished cover. The cover features a colorful illustration of Ian and Renault, surrounded by various animals they encountered on the ranch, including horses, cows, and chickens. The title, "The Adventures of Ian and Renault - Ranch Expedition," is written in bold letters above the image, with the subtitle, "Helping Animals in Need," written below. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_ian_ranch +# - type: Construction +# graph: SecretBook +# node: secretianranch + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookIanOcean +# name: the adventures of ian and renault - an ocean adventure +# description: The book is new and in excellent condition. The cover shows Ian and Renault running and playing on the beach, with the blue ocean and golden sand in the background. The title is written in bold, playful letters, and the subtitle reads "An Ocean Adventure." +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_ian_ocean +# - type: Construction +# graph: SecretBook +# node: secretianocean + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookIanMountain +# name: the adventures of ian and renault - A mountain expedition +# description: The book is in new condition. The cover is a stunning mountain landscape with Ian and Renault in the foreground, looking out over the vista of the surrounding peaks and valleys. The title is written in bold, block letters at the top, with the subtitle, "A Mountain Expedition," written underneath. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_ian_mountain +# - type: Construction +# graph: SecretBook +# node: secretianmountain + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookIanCity +# name: the adventures of ian and renault - exploring the city +# description: The book is in new condition, with crisp pages and a glossy cover. The cover features a colorful illustration of Ian and Renault exploring the city, with tall buildings and bustling streets in the background. Ian is leading the way, with his tail wagging excitedly, while Renault follows close behind, her ears perked up and her eyes wide with wonder. The title, "The Adventures of Ian and Renault," is written in bold, playful letters, with the subtitle, "Exploring the City," written below in smaller font. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_ian_city +# - type: Construction +# graph: SecretBook +# node: secretiancity + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookIanArctic +# name: the adventures of ian and renault - an arctic journey of courage and friendship +# description: The book looks new and adventurous, with a picture of Ian and Renault standing in front of an icy landscape with snowflakes falling all around them. The title, "The Adventures of Ian and Renault," is written in bold letters at the top, with a subtitle that reads, "An Arctic Journey of Courage and Friendship." +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_ian_arctic +# - type: Construction +# graph: SecretBook +# node: secretianarctic + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookIanDesert +# name: the adventures of ian and renault - exploring the mysterious desert +# description: The book is in new condition and would have a colorful cover depicting Ian and Renault against a desert backdrop. The cover would feature images of various animals and plants that the two encountered on their adventure, such as a rattlesnake, coyotes, sand dunes, and an oasis. The title, "The Adventures of Ian and Renault" is prominently displayed on the cover in bold letters, while the subtitle "Exploring the Mysterious Desert" is written in smaller letters underneath. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_ian_desert +# - type: Construction +# graph: SecretBook +# node: secretiandesert + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookNames +# name: the power of names - a philosophical exploration +# description: The book is a gently used philosophy text, with a cover that features a close-up of a person's mouth, with the word "names" written on their lips. The title is "The Power of Names - A Philosophical Exploration," and the author's name is prominently displayed underneath. The overall design is simple and elegant, with the focus on the text rather than any flashy graphics or images. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_names +# - type: Construction +# graph: SecretBook +# node: secretnames + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookEarth +# name: earthly longing +# description: The book is in good condition, with a slightly faded cover due to exposure to sunlight. The cover of the book depicts a panoramic view of the Earth from space, with a bright blue ocean and green landmasses. In the foreground, a lone astronaut is seen sitting in front of a window, gazing wistfully at the Earth. The title of the book, "Earthly Longing," is written in bold white letters against a black background at the top of the cover. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_earth +# - type: Construction +# graph: SecretBook +# node: secretearth + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookAurora +# name: journey beyond - the starship aurora mission +# description: The book is in excellent condition, with a shiny cover depicting a spaceship hovering above a planet, perhaps with the Earth in the background. The title "Journey Beyond - The Starship Aurora Mission" is written in bold, silver letters. The cover also features a quote from a review, "A breathtaking tale of human achievement and exploration" to entice potential readers. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_aurora +# - type: Construction +# graph: SecretBook +# node: secretaurora + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookTemple +# name: the nature of the divine - embracing the many gods +# description: The book appears new with crisp pages and an uncreased spine. The cover features an image of a temple with a glowing, multicolored aura around it, symbolizing the various gods discussed in the book. The title is displayed prominently in gold lettering, with the author's name and a brief summary of the book written in smaller text below. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_temple +# - type: Construction +# graph: SecretBook +# node: secretemple + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookWatched +# name: watched +# description: The book is in good condition, with a slightly worn cover that features a dark and ominous space station looming in the background. The title "Watched" is written in bold letters that seem to be staring back at the reader, conveying the feeling of being constantly observed. The blurb on the back cover hints at a thrilling and suspenseful tale of paranoia and danger in a confined setting. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_watched +# - type: Construction +# graph: SecretBook +# node: secretwatched + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookMedicalOfficer +# name: horizon's battle - a medical officer's tale of trust and survival +# description: The cover features Smith, the medical officer, in his uniform, looking determined and ready to face any challenge. The backdrop shows the SS Horizon under attack, with explosions and smoke filling the space station. In the foreground, a wizard with a staff can be seen, adding an element of mystery and intrigue to the scene. The title is prominently displayed in bold letters, with the author's name and a tagline indicating the book's action-packed and suspenseful nature. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_medical +# - type: Construction +# graph: SecretBook +# node: secretmedicaloffice + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookMorgue +# name: the ghostly residents of the abandoned morgue +# description: The book looks old and worn, with faded lettering on the cover. The cover depicts a dark and eerie morgue, with a full moon casting an ominous glow over the scene. In the foreground are Morty the possum and Morticia the raccoon, with mischievous expressions on their faces, peeking out from behind a metal shelf. The title is written in bold, spooky letters, with the subtitle "A Tale of Animal Spirits" written in smaller font below. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_morgue +# - type: Construction +# graph: SecretBook +# node: secretmorgue + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookRufus +# name: rufus and the mischievous fairy +# description: The book is in new condition, with vibrant colors and illustrations on the cover. The cover shows Rufus on his bicycle, with Blossom flying beside him in a playful manner. The title is written in bold, whimsical font, with the characters' names highlighted in a contrasting color. The overall aesthetic is charming and inviting, appealing to children and adults alike. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_rufus +# - type: Construction +# graph: SecretBook +# node: secretrufus + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookMap +# name: the map of adventure +# description: The book is in a good condition, with a glossy cover depicting a jungle scene with vibrant colors and intricate details. The title "The Map of Adventure," is written in bold, gold lettering. The cover also features an image of a mysterious suitcase with the map spilling out of it. +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_map +# - type: Construction +# graph: SecretBook +# node: secretmap + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookJourney +# name: a journey of music, mountains, and self-discovery +# description: The book is in excellent condition, with crisp pages and a glossy cover. The cover features a striking image of a mountain range, with a silhouette of a climber with a guitar on their back in the foreground. The title is bold and eye-catching, with the subtitle "A Journey of Music, Mountains, and Self-Discovery." +# components: +# - type: Sprite +# sprite: Objects/Misc/authorbooks.rsi +# layers: +# - state: book_journ_mount +# - type: Construction +# graph: SecretBook +# node: secretjourney + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookInspiration +# name: finding inspiration - a writer's journey through the woods +# description: The book is in a new condition with a cover depicting a serene forest scene with a waterfall and colorful wildflowers. The title of the book "Finding Inspiration - A Writer's Journey Through the Woods" and the author's name are prominently displayed at the bottom. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book6 +# - type: Construction +# graph: SecretBook +# node: secretinspiration + +# - type: entity +# name: demonomicon +# parent: ADTSecretBookBase +# id: ADTSecretBookDemonomicon +# noSpawn: true +# description: 'Who knows what dark spells may be contained in these horrid pages?' +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_demonomicon +# - type: Construction +# graph: SecretBook +# node: secretdemonomicon + +# - type: entity +# name: pharmaceutical manuscript +# parent: ADTSecretBookBase +# id: ADTSecretBookChemistryInsane +# suffix: library salvage +# description: 'You can tell whoever wrote this was off the desoxy HARD.' +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_chemistry +# - type: Construction +# graph: SecretBook +# node: secretchemistryinsane + +# - type: entity +# name: botanical textbook +# parent: ADTSecretBookBase +# id: ADTSecretBookBotanicalTextbook +# suffix: library salvage +# description: 'Only a couple pages are left.' +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_hydroponics_pod_people +# - type: Construction +# graph: SecretBook +# node: secretbotanicaltextbook + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookGnominomicon +# name: gnominomicon +# suffix: library salvage +# description: You don't like the look of this. Looks +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book5 +# - type: Construction +# graph: SecretBook +# node: secretgnominomicon + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookFishing +# name: Tales from the Fishbowl +# suffix: library salvage +# description: This book sucks. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_fish +# - type: Construction +# graph: SecretBook +# node: secretfishing + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookDetective +# name: Strokgraeth Holmes, Dwarf Detective +# suffix: library salvage +# description: Exciting! Invigorating! This author died after his book career failed. +# components: +# - type: Sprite +# sprite: Objects/Misc/books.rsi +# layers: +# - state: book_detective +# - type: Construction +# graph: SecretBook +# node: secretdetective + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookBusido +# name: Busido. Selected chapters +# description: Handbook for samurai, weaboos, and armchair generals. +# components: +# - type: Sprite +# sprite: Corvax/Objects/Misc/books.rsi +# layers: +# - state: book_busido +# - type: Construction +# graph: SecretBook +# node: secretbusido + +# # Книги ADT + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookSrpOperatorCentComm +# name: SRP Operator CentComm +# description: A book about cooking new recipe on NT station. +# components: +# - type: Sprite +# sprite: ADT/Objects/Misc/books.rsi +# layers: +# - state: srp-operatorcentcomm-book +# - type: Construction +# graph: SecretBook +# node: secretsrpoperatorcentcomm + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookNewRecipes +# name: new recipe book +# description: A book about cooking new recipe on NT station. +# components: +# - type: Sprite +# sprite: ADT/Objects/Misc/books.rsi +# layers: +# - state: new-recipe-book +# - type: Construction +# graph: SecretBook +# node: secretcooking + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookNewCocktails +# name: new coctails note +# description: Red note with a recipes of new cocktails. Writen by R.S. +# components: +# - type: Sprite +# sprite: ADT/Objects/Misc/books.rsi +# layers: +# - state: new-cocktail-book +# - type: Construction +# graph: SecretBook +# node: secretnewcocktails + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookNewChemicals +# name: magazine about new medication +# description: A magazine, which consists information about chemicals. +# components: +# - type: Sprite +# sprite: ADT/Objects/Misc/books.rsi +# layers: +# - state: chem-book +# - type: Construction +# graph: SecretBook +# node: secretnewchemicals + +# - type: entity +# parent: ADTSecretBookBase +# id: ADTSecretBookSpaceLaw +# name: Корпоративный закон, издание редакции 2568 года +# description: На страже порядка +# components: +# - type: Sprite +# layers: +# - state: book_space_law +# - type: MeleeWeapon +# wideAnimationRotation: 180 +# damage: +# types: +# Blunt: 6 +# - type: Construction +# graph: SecretBook +# node: secretspacelaw diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Chemistry.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Chemistry.yml index 1685da0f82b..c71a1587f55 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Chemistry.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/Chemistry.yml @@ -60,8 +60,8 @@ canChangeTransferAmount: true - type: UserInterface interfaces: - - key: enum.TransferAmountUiKey.Key - type: TransferAmountBoundUserInterface + enum.TransferAmountUiKey.Key: + type: TransferAmountBoundUserInterface - type: Item size: Tiny sprite: ADT/Objects/Specific/Medical/Chemistry/plastic-bottle.rsi @@ -234,8 +234,8 @@ - Trash - type: UserInterface interfaces: - - key: enum.TransferAmountUiKey.Key - type: TransferAmountBoundUserInterface + enum.TransferAmountUiKey.Key: + type: TransferAmountBoundUserInterface - type: entity name: reagent analyzer @@ -259,8 +259,8 @@ key: enum.ReagentAnalyzerUiKey.Key - type: UserInterface interfaces: - - key: enum.ReagentAnalyzerUiKey.Key - type: ReagentAnalyzerBoundUserInterface + enum.ReagentAnalyzerUiKey.Key: + type: ReagentAnalyzerBoundUserInterface - type: ReagentAnalyzer - type: ItemSlots slots: @@ -305,6 +305,7 @@ - type: ExaminableSolution solution: hypospray - type: Hypospray + onlyAffectsMobs: false transferAmount: 30 - type: entity @@ -328,6 +329,7 @@ - type: ExaminableSolution solution: hypospray - type: Hypospray + onlyAffectsMobs: false - type: UseDelay delay: 1.0 @@ -352,6 +354,7 @@ - type: ExaminableSolution solution: hypospray - type: Hypospray + onlyAffectsMobs: false - type: UseDelay delay: 0 - type: StaticPrice @@ -386,6 +389,7 @@ - type: ExaminableSolution solution: hypospray - type: Hypospray + onlyAffectsMobs: false - type: UseDelay delay: 0.5 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/chemical_jugs.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/chemical_jugs.yml index ac8387d67cc..2226cd532fd 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/chemical_jugs.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/Chemistry/chemical_jugs.yml @@ -43,7 +43,7 @@ canChangeTransferAmount: true - type: UserInterface interfaces: - - key: enum.TransferAmountUiKey.Key + enum.TransferAmountUiKey.Key: type: TransferAmountBoundUserInterface - type: Drink solution: beaker @@ -77,14 +77,14 @@ id: ADTCanisterIodine noSpawn: true components: - - type: Label - currentLabel: reagent-name-iodine - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Iodine - Quantity: 600 + - type: Label + currentLabel: reagent-name-iodine + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Iodine + Quantity: 600 - type: entity parent: ADTCanister @@ -92,14 +92,14 @@ id: ADTCanisterFluorine noSpawn: true components: - - type: Label - currentLabel: reagent-name-fluorine - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Fluorine - Quantity: 600 + - type: Label + currentLabel: reagent-name-fluorine + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Fluorine + Quantity: 600 - type: entity parent: ADTCanister @@ -107,14 +107,14 @@ id: ADTCanisterChlorine noSpawn: true components: - - type: Label - currentLabel: reagent-name-chlorine - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Chlorine - Quantity: 600 + - type: Label + currentLabel: reagent-name-chlorine + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Chlorine + Quantity: 600 - type: entity parent: ADTCanister @@ -122,14 +122,14 @@ id: ADTCanisterAluminium noSpawn: true components: - - type: Label - currentLabel: reagent-name-aluminium - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Aluminium - Quantity: 600 + - type: Label + currentLabel: reagent-name-aluminium + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Aluminium + Quantity: 600 - type: entity parent: ADTCanister @@ -137,14 +137,14 @@ id: ADTCanisterPhosphorus noSpawn: true components: - - type: Label - currentLabel: reagent-name-phosphorus - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Phosphorus - Quantity: 600 + - type: Label + currentLabel: reagent-name-phosphorus + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Phosphorus + Quantity: 600 - type: entity parent: ADTCanister @@ -152,14 +152,14 @@ id: ADTCanisterSulfur noSpawn: true components: - - type: Label - currentLabel: reagent-name-sulfur - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Sulfur - Quantity: 600 + - type: Label + currentLabel: reagent-name-sulfur + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Sulfur + Quantity: 600 - type: entity parent: ADTCanister @@ -167,14 +167,14 @@ id: ADTCanisterSilicon noSpawn: true components: - - type: Label - currentLabel: reagent-name-silicon - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Silicon - Quantity: 600 + - type: Label + currentLabel: reagent-name-silicon + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Silicon + Quantity: 600 - type: entity parent: ADTCanister @@ -182,14 +182,14 @@ id: ADTCanisterHydrogen noSpawn: true components: - - type: Label - currentLabel: reagent-name-hydrogen - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Hydrogen - Quantity: 600 + - type: Label + currentLabel: reagent-name-hydrogen + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Hydrogen + Quantity: 600 - type: entity parent: ADTCanister @@ -197,14 +197,14 @@ id: ADTCanisterLithium noSpawn: true components: - - type: Label - currentLabel: reagent-name-lithium - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Lithium - Quantity: 600 + - type: Label + currentLabel: reagent-name-lithium + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Lithium + Quantity: 600 - type: entity parent: ADTCanister @@ -212,14 +212,14 @@ id: ADTCanisterSodium noSpawn: true components: - - type: Label - currentLabel: reagent-name-sodium - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Sodium - Quantity: 600 + - type: Label + currentLabel: reagent-name-sodium + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Sodium + Quantity: 600 - type: entity parent: ADTCanister @@ -227,14 +227,14 @@ id: ADTCanisterPotassium noSpawn: true components: - - type: Label - currentLabel: reagent-name-potassium - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Potassium - Quantity: 600 + - type: Label + currentLabel: reagent-name-potassium + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Potassium + Quantity: 600 - type: entity parent: ADTCanister @@ -242,14 +242,14 @@ id: ADTCanisterRadium noSpawn: true components: - - type: Label - currentLabel: reagent-name-radium - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Radium - Quantity: 600 + - type: Label + currentLabel: reagent-name-radium + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Radium + Quantity: 600 - type: entity parent: ADTCanister @@ -257,14 +257,14 @@ id: ADTCanisterIron noSpawn: true components: - - type: Label - currentLabel: reagent-name-iron - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Iron - Quantity: 600 + - type: Label + currentLabel: reagent-name-iron + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Iron + Quantity: 600 - type: entity parent: ADTCanister @@ -272,14 +272,14 @@ id: ADTCanisterCopper noSpawn: true components: - - type: Label - currentLabel: reagent-name-copper - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Copper - Quantity: 600 + - type: Label + currentLabel: reagent-name-copper + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Copper + Quantity: 600 - type: entity parent: ADTCanister @@ -287,14 +287,14 @@ id: ADTCanisterGold noSpawn: true components: - - type: Label - currentLabel: reagent-name-gold - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Gold - Quantity: 600 + - type: Label + currentLabel: reagent-name-gold + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Gold + Quantity: 600 - type: entity parent: ADTCanister @@ -302,14 +302,14 @@ id: ADTCanisterMercury noSpawn: true components: - - type: Label - currentLabel: reagent-name-mercury - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Mercury - Quantity: 600 + - type: Label + currentLabel: reagent-name-mercury + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Mercury + Quantity: 600 - type: entity parent: ADTCanister @@ -317,14 +317,14 @@ id: ADTCanisterSilver noSpawn: true components: - - type: Label - currentLabel: reagent-name-silver - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Silver - Quantity: 600 + - type: Label + currentLabel: reagent-name-silver + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Silver + Quantity: 600 - type: entity parent: ADTCanister @@ -332,14 +332,14 @@ id: ADTCanisterEthanol noSpawn: true components: - - type: Label - currentLabel: reagent-name-ethanol - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Ethanol - Quantity: 600 + - type: Label + currentLabel: reagent-name-ethanol + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Ethanol + Quantity: 600 - type: entity parent: ADTCanister @@ -347,14 +347,14 @@ id: ADTCanisterSugar noSpawn: true components: - - type: Label - currentLabel: reagent-name-sugar - - type: SolutionContainerManager - solutions: - beaker: - reagents: - - ReagentId: Sugar - Quantity: 600 + - type: Label + currentLabel: reagent-name-sugar + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: Sugar + Quantity: 600 - type: entity parent: ADTCanister diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/healing.yml index 690ed7f1629..b369e427acb 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/healing.yml @@ -154,6 +154,7 @@ - type: DeleteOnSolutionEmpty solution: pen - type: Hypospray + onlyAffectsMobs: false solutionName: pen transferAmount: 20 injectSound: /Audio/Items/Medical/brutepack_end.ogg diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml index 390947eb60e..3e8205b0ee9 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Medical/misc.yml @@ -57,8 +57,8 @@ closeOnHandDeselect: false - type: UserInterface interfaces: - - key: enum.PaperUiKey.Key - type: PaperBoundUserInterface + enum.PaperUiKey.Key: + type: PaperBoundUserInterface - type: Item size: Tiny - type: Tag diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/zookeperhealthanalyzer.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/zookeperhealthanalyzer.yml index 61b4d907658..eb7807c985b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/zookeperhealthanalyzer.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/zookeperhealthanalyzer.yml @@ -24,7 +24,7 @@ closeOnHandDeselect: false - type: UserInterface interfaces: - - key: enum.HealthAnalyzerUiKey.Key + enum.HealthAnalyzerUiKey.Key: type: HealthAnalyzerBoundUserInterface - type: HealthAnalyzer scanningEndSound: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/Tools.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/Tools.yml index 84d6ce945dd..78840e7cc0b 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Tools/Tools.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Tools/Tools.yml @@ -15,10 +15,10 @@ - suitStorage - Pocket -- type: loadout - id: MiunGamLoadout - entity: ADTObjectsToolsMuinKnife - sponsorOnly: true +# - type: loadout +# id: MiunGamLoadout +# entity: ADTObjectsToolsMuinKnife +# sponsorOnly: true #- type: entity # name: golden candlestick @@ -194,7 +194,7 @@ size: Normal heldPrefix: gold -- type: loadout - id: UrogDjaxLoadout - entity: UrogCrowbarGold - sponsorOnly: true +# - type: loadout // Corvax loadouts removed +# id: UrogDjaxLoadout +# entity: UrogCrowbarGold +# sponsorOnly: true diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/dartgun.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/dartgun.yml index 57016ddaa25..92ed47287c9 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/dartgun.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/dartgun.yml @@ -19,8 +19,8 @@ solution: ammo - type: DrainableSolution solution: ammo - - type: SolutionInjectOnCollide - transferAmount: 7.5 - blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask + # - type: SolutionInjectOnCollide + # transferAmount: 7.5 + # blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask - type: InjectableSolution solution: ammo diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index b6b66cda316..5b48bbf60b4 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -1,26 +1,26 @@ -- type: entity - id: ADTBulletMagnumHighVelocityTranquilizer - name: bullet (.45 magnum high-velocity) - parent: BaseBulletHighVelocity - noSpawn: true - components: - - type: Projectile - damage: - types: - Blunt: 0.01 - - type: SolutionContainerManager - solutions: - ammo: - maxVol: 6 - reagents: - - ReagentId: ADTUltraChloralHydrate - Quantity: 6 - - type: RefillableSolution - solution: ammo - - type: DrainableSolution - solution: ammo - - type: SolutionInjectOnCollide - transferAmount: 6 - blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask - - type: InjectableSolution - solution: ammo +# - type: entity +# id: ADTBulletMagnumHighVelocityTranquilizer +# name: bullet (.45 magnum high-velocity) +# parent: BaseBulletHighVelocity +# noSpawn: true +# components: +# - type: Projectile +# damage: +# types: +# Blunt: 0.01 +# - type: SolutionContainerManager +# solutions: +# ammo: +# maxVol: 6 +# reagents: +# - ReagentId: ADTUltraChloralHydrate +# Quantity: 6 +# - type: RefillableSolution +# solution: ammo +# - type: DrainableSolution +# solution: ammo +# - type: SolutionInjectOnCollide +# transferAmount: 6 +# blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask +# - type: InjectableSolution +# solution: ammo diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 967abbb60e0..c4dd4a9d8eb 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -20,18 +20,18 @@ types: Blunt: 1 -- type: entity - id: Bullet357Rubber - name: bullet (.357 magnum rubber) - parent: BaseBulletRubber - noSpawn: true - components: - - type: Projectile - damage: - types: - Blunt: 6 - - type: StaminaDamageOnCollide - damage: 50 # 2 hits to stun cuz revolver on 357 +# - type: entity +# id: Bullet357Rubber +# name: bullet (.357 magnum rubber) +# parent: BaseBulletRubber +# noSpawn: true +# components: +# - type: Projectile +# damage: +# types: +# Blunt: 6 +# - type: StaminaDamageOnCollide +# damage: 50 # 2 hits to stun cuz revolver on 357 - type: entity id: Bullet357Incendiary diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 7b7bb5b22e1..1b3458da598 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -28,21 +28,4 @@ solution: reagents: - ReagentId: TearGas - Quantity: 50 - -- type: entity - id: ADTBulletBibis - name: bibis ball - parent: BaseBulletRubber - noSpawn: true - components: - - type: Projectile - damage: - types: - Blunt: 0.1 - - type: StaminaDamageOnCollide - damage: 5 - - type: Sprite - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - layers: - - state: depleted-uranium \ No newline at end of file + Quantity: 50 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Mannequin/mannequin.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Mannequin/mannequin.yml index 535a3c198c1..b43ff9b1d52 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Storage/Mannequin/mannequin.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Mannequin/mannequin.yml @@ -101,11 +101,11 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.HumanoidMarkingModifierKey.Key + enum.HumanoidMarkingModifierKey.Key: type: HumanoidMarkingModifierBoundUserInterface - - key: enum.StrippingUiKey.Key + enum.StrippingUiKey.Key: type: StrippableBoundUserInterface - - key: enum.StoreUiKey.Key + enum.StoreUiKey.Key: type: StoreBoundUserInterface - type: Pullable - type: Rotatable diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/ammo.yml b/Resources/Prototypes/ADT/Recipes/Lathes/ammo.yml index 922b661b762..7e001aefd3c 100644 --- a/Resources/Prototypes/ADT/Recipes/Lathes/ammo.yml +++ b/Resources/Prototypes/ADT/Recipes/Lathes/ammo.yml @@ -1,20 +1,20 @@ -- type: latheRecipe - id: SpeedLoader357 - result: SpeedLoader357 - completetime: 5 - materials: - Steel: 300 +# - type: latheRecipe +# id: SpeedLoader357 +# result: SpeedLoader357 +# completetime: 5 +# materials: +# Steel: 300 -- type: latheRecipe - id: SpeedLoader357Rubber - result: SpeedLoader357Rubber - completetime: 5 - materials: - Steel: 300 +# - type: latheRecipe +# id: SpeedLoader357Rubber +# result: SpeedLoader357Rubber +# completetime: 5 +# materials: +# Steel: 300 -- type: latheRecipe - id: MagazineShotgun - result: MagazineShotgun - completetime: 5 - materials: - Steel: 300 +# - type: latheRecipe +# id: MagazineShotgun +# result: MagazineShotgun +# completetime: 5 +# materials: +# Steel: 300 diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/clothing.yml b/Resources/Prototypes/ADT/Recipes/Lathes/clothing.yml index 9300f188d16..368ae6a9a7a 100644 --- a/Resources/Prototypes/ADT/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/ADT/Recipes/Lathes/clothing.yml @@ -109,4 +109,15 @@ result: ADTClothingUniformNewBarmanSkirt completetime: 4 materials: - Cloth: 300 \ No newline at end of file + Cloth: 300 + +- type: latheRecipe # Corvax-Resprite: Old HOS mantle + id: ClothingNeckMantleHOSShoulder + icon: + sprite: Clothing/Neck/mantles/hosmantle_shoulder.rsi + state: icon + result: ClothingNeckMantleHOSShoulder + completetime: 2.8 + materials: + Cloth: 200 + Durathread: 150 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Voice/speech_emotes.yml b/Resources/Prototypes/ADT/Voice/speech_emotes.yml index b6063814bac..6383fe86d3e 100644 --- a/Resources/Prototypes/ADT/Voice/speech_emotes.yml +++ b/Resources/Prototypes/ADT/Voice/speech_emotes.yml @@ -1,5 +1,6 @@ - type: emote # эмоция work out id: WorkOut + name: emote-workOut chatMessages: ["качается"] chatTriggers: - works out @@ -9,6 +10,7 @@ - type: emote id: Laugh-apathy + name: emote-laugh-apathy category: Vocal chatMessages: [выдавливает из себя смех] chatTriggers: @@ -16,6 +18,7 @@ - type: emote id: Scream-apathy + name: emote-scream-apathy category: Vocal chatMessages: [наигранно кричит!] chatTriggers: @@ -23,6 +26,7 @@ - type: emote id: Sigh-apathy + name: emote-sigh-apathy category: Vocal chatMessages: [театрально вздыхает] chatTriggers: @@ -30,6 +34,7 @@ - type: emote id: Crying-apathy + name: emote-crying-apathy category: Vocal chatMessages: [фальшиво плачет] chatTriggers: @@ -103,6 +108,7 @@ - type: emote id: SynthYes + name: emote-synthYes category: Vocal chatMessages: [утвердительно пищит] chatTriggers: @@ -117,6 +123,7 @@ - type: emote id: SynthNo + name: emote-synthNo category: Vocal chatMessages: [отрицательно пищит] chatTriggers: @@ -129,16 +136,9 @@ - не согласен - не согласен. -- type: emote - id: Ping - category: Vocal - chatMessages: [звенит] - chatTriggers: - - звенит - - звенит. - - type: emote id: SighBuzz + name: emote-synthNo category: Vocal chatMessages: [раздражённо жужжит] chatTriggers: @@ -150,6 +150,7 @@ ## vocal emotes - type: emote id: Hiss + name: emote-hiss category: Vocal chatMessages: [шипит] chatTriggers: @@ -159,6 +160,7 @@ - type: emote id: Meow + name: emote-meow category: Vocal chatMessages: [мяукает] chatTriggers: @@ -175,6 +177,7 @@ - type: emote id: Mew + name: emote-mew category: Vocal chatMessages: [мякает] chatTriggers: @@ -191,6 +194,7 @@ - type: emote id: Growl + name: emote-growl category: Vocal chatMessages: [growls] chatTriggers: @@ -205,6 +209,7 @@ - type: emote id: Purr + name: emote-purr category: Vocal chatMessages: [мурчит] chatTriggers: diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 342db9dd4d4..748d26ca7c6 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -9,18 +9,18 @@ # actions -- type: entity - id: ActionOpenEmotes - name: action-name-emotes - description: action-description-emotes - noSpawn: true - components: - - type: InstantAction - icon: Interface/Actions/emotes.png - event: !type:OpenEmotesActionEvent - #event: !type:ScreamActionEvent - checkCanInteract: false - priority: -98 +# - type: entity # modern-emotepanel removed +# id: ActionOpenEmotes +# name: action-name-emotes +# description: action-description-emotes +# noSpawn: true +# components: +# - type: InstantAction +# icon: Interface/Actions/emotes.png +# event: !type:OpenEmotesActionEvent +# #event: !type:ScreamActionEvent +# checkCanInteract: false +# priority: -98 - type: entity id: ActionScream diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 47f5235371f..fa7f302c4cc 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -117,15 +117,15 @@ tags: - NukeOpsUplink -- type: listing - id: UplinkDisposableTurret - name: uplink-disposable-turret-name - description: uplink-disposable-turret-desc - productEntity: ToolboxElectricalTurretFilled - cost: - Telecrystal: 8 - categories: - - UplinkWeaponry +# - type: listing +# id: UplinkDisposableTurret +# name: uplink-disposable-turret-name +# description: uplink-disposable-turret-desc +# productEntity: ToolboxElectricalTurretFilled +# cost: +# Telecrystal: 8 +# categories: +# - UplinkWeaponry - type: listing id: UplinkSniperBundle @@ -973,16 +973,16 @@ tags: - NukeOpsUplink -- type: listing - id: UplinkBinaryTranslatorKey - name: uplink-binary-translator-key-name - description: uplink-binary-translator-key-desc - icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: rd_label } - productEntity: EncryptionKeyBinary - cost: - Telecrystal: 1 - categories: - - UplinkDisruption +# - type: listing +# id: UplinkBinaryTranslatorKey +# name: uplink-binary-translator-key-name +# description: uplink-binary-translator-key-desc +# icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: rd_label } +# productEntity: EncryptionKeyBinary +# cost: +# Telecrystal: 1 +# categories: +# - UplinkDisruption - type: listing id: UplinkVoiceMask diff --git a/Resources/Prototypes/Corvax/Catalog/Loadout/head.yml b/Resources/Prototypes/Corvax/Catalog/Loadout/head.yml index 07391ab5308..ef56c36134c 100644 --- a/Resources/Prototypes/Corvax/Catalog/Loadout/head.yml +++ b/Resources/Prototypes/Corvax/Catalog/Loadout/head.yml @@ -1,7 +1,8 @@ -- type: loadout - id: ClothingHeadHatFlowerCrownLoadout - entity: ClothingHeadHatFlowerCrown +# Corvax loadouts removed +# - type: loadout +# id: ClothingHeadHatFlowerCrownLoadout +# entity: ClothingHeadHatFlowerCrown -- type: loadout - id: ClothingHeadHatHairflowerLoadout - entity: ClothingHeadHatHairflower +# - type: loadout +# id: ClothingHeadHatHairflowerLoadout +# entity: ClothingHeadHatHairflower diff --git a/Resources/Prototypes/Corvax/Catalog/Loadout/sponsor.yml b/Resources/Prototypes/Corvax/Catalog/Loadout/sponsor.yml index bd48965d537..0301c0713cd 100644 --- a/Resources/Prototypes/Corvax/Catalog/Loadout/sponsor.yml +++ b/Resources/Prototypes/Corvax/Catalog/Loadout/sponsor.yml @@ -1,123 +1,123 @@ -# OopsieDoopsie -- type: loadout - id: ClothingOuterAtmosianBomberJacketLoadout - entity: ClothingOuterAtmosianBomberJacket - sponsorOnly: true - -- type: loadout - id: ClothingMaskGasAtmosianLoadout - entity: ClothingMaskGasAtmosian - sponsorOnly: true - -- type: loadout - id: ClothingCloakAtmosianLoadout - entity: ClothingCloakAtmosian - sponsorOnly: true - -# Fezory -- type: loadout - id: ClothingMaskSkullLoadout - entity: ClothingMaskSkull - sponsorOnly: true - -- type: loadout - id: ClothingCloakGamerLoadout - entity: ClothingCloakGamer - sponsorOnly: true - -- type: loadout - id: ClothingUniformJumpsuitSkeletonLoadout - entity: ClothingUniformJumpsuitSkeleton - sponsorOnly: true - -# NEKISH -- type: loadout - id: OldHoSJumpsuitLoadout - entity: ClothingUniformJumpsuitHoSOld - sponsorOnly: true - whitelistJobs: [HeadOfSecurity] - -- type: loadout - id: OldHoSCoatLoadout - entity: ClothingOuterCoatHoSOvercoat - sponsorOnly: true - whitelistJobs: [HeadOfSecurity] - -- type: loadout - id: OldHoSCapLoadout - entity: ClothingHeadHatCapHoS - sponsorOnly: true - whitelistJobs: [HeadOfSecurity] - -- type: loadout - id: OldHoSGlovesLoadout - entity: ClothingHandsGlovesLeatherHoS - sponsorOnly: true - whitelistJobs: [HeadOfSecurity] - -- type: loadout - id: OldHoSBeltLoadout - entity: ClothingBeltHoS - sponsorOnly: true - whitelistJobs: [HeadOfSecurity] - -- type: loadout - id: OldHoSBackpackLoadout - entity: ClothingBackpackSatchelHoS - sponsorOnly: true - whitelistJobs: [HeadOfSecurity] - -- type: loadout - id: OldHoSBootsLoadout - entity: ClothingShoesBootsJack - sponsorOnly: true - whitelistJobs: [HeadOfSecurity] - -- type: loadout - id: OldHoSHeadsetLoadout - entity: ClothingHeadsetSecurity - sponsorOnly: true - whitelistJobs: [HeadOfSecurity] - -# ken41k -- type: loadout - id: DivineWatchLoadout - entity: ClothingHandsWatchDivine - sponsorOnly: true - -# jesuisunfou -- type: loadout - id: OldUSSPGlovesLoadout - entity: ClothingHandsGlovesLeatherUSSPBlack - sponsorOnly: true - whitelistJobs: [HeadOfSecurity, IAA] - -- type: loadout - id: OldUSSPCapLoadout - entity: ClothingHeadHatCapUSSPBlack - sponsorOnly: true - whitelistJobs: [HeadOfSecurity, IAA] - -- type: loadout - id: OldUSSPOvercoatLoadout - entity: ClothingOuterCoatUSSPOvercoatBlack - sponsorOnly: true - whitelistJobs: [HeadOfSecurity, IAA] - -- type: loadout - id: OldUSSPJumpsuitLoadout - entity: ClothingUniformJumpsuitUSSPBlack - sponsorOnly: true - whitelistJobs: [HeadOfSecurity, IAA] - -- type: loadout - id: OldUSSPShoesLoadout - entity: ClothingShoesUSSPBlack - sponsorOnly: true - whitelistJobs: [HeadOfSecurity, IAA] - -# ondapapers -- type: loadout - id: FancyCrownLoadout - entity: ClothingHeadHatFancyCrown - sponsorOnly: true +# # OopsieDoopsie +# - type: loadout +# id: ClothingOuterAtmosianBomberJacketLoadout +# entity: ClothingOuterAtmosianBomberJacket +# sponsorOnly: true + +# - type: loadout +# id: ClothingMaskGasAtmosianLoadout +# entity: ClothingMaskGasAtmosian +# sponsorOnly: true + +# - type: loadout +# id: ClothingCloakAtmosianLoadout +# entity: ClothingCloakAtmosian +# sponsorOnly: true + +# # Fezory +# - type: loadout +# id: ClothingMaskSkullLoadout +# entity: ClothingMaskSkull +# sponsorOnly: true + +# - type: loadout +# id: ClothingCloakGamerLoadout +# entity: ClothingCloakGamer +# sponsorOnly: true + +# - type: loadout +# id: ClothingUniformJumpsuitSkeletonLoadout +# entity: ClothingUniformJumpsuitSkeleton +# sponsorOnly: true + +# # NEKISH +# - type: loadout +# id: OldHoSJumpsuitLoadout +# entity: ClothingUniformJumpsuitHoSOld +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity] + +# - type: loadout +# id: OldHoSCoatLoadout +# entity: ClothingOuterCoatHoSOvercoat +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity] + +# - type: loadout +# id: OldHoSCapLoadout +# entity: ClothingHeadHatCapHoS +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity] + +# - type: loadout +# id: OldHoSGlovesLoadout +# entity: ClothingHandsGlovesLeatherHoS +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity] + +# - type: loadout +# id: OldHoSBeltLoadout +# entity: ClothingBeltHoS +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity] + +# - type: loadout +# id: OldHoSBackpackLoadout +# entity: ClothingBackpackSatchelHoS +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity] + +# - type: loadout +# id: OldHoSBootsLoadout +# entity: ClothingShoesBootsJack +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity] + +# - type: loadout +# id: OldHoSHeadsetLoadout +# entity: ClothingHeadsetSecurity +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity] + +# # ken41k +# - type: loadout +# id: DivineWatchLoadout +# entity: ClothingHandsWatchDivine +# sponsorOnly: true + +# # jesuisunfou +# - type: loadout +# id: OldUSSPGlovesLoadout +# entity: ClothingHandsGlovesLeatherUSSPBlack +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity, IAA] + +# - type: loadout +# id: OldUSSPCapLoadout +# entity: ClothingHeadHatCapUSSPBlack +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity, IAA] + +# - type: loadout +# id: OldUSSPOvercoatLoadout +# entity: ClothingOuterCoatUSSPOvercoatBlack +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity, IAA] + +# - type: loadout +# id: OldUSSPJumpsuitLoadout +# entity: ClothingUniformJumpsuitUSSPBlack +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity, IAA] + +# - type: loadout +# id: OldUSSPShoesLoadout +# entity: ClothingShoesUSSPBlack +# sponsorOnly: true +# whitelistJobs: [HeadOfSecurity, IAA] + +# # ondapapers +# - type: loadout +# id: FancyCrownLoadout +# entity: ClothingHeadHatFancyCrown +# sponsorOnly: true diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/mantles.yml index 69582b3afd8..cc4b1eb3989 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Neck/mantles.yml @@ -1,13 +1,13 @@ -- type: entity - parent: ClothingNeckBase - id: ClothingNeckMantleQM - name: quartermaster's mantle - description: A snug and comfortable looking shoulder covering garment, it has an air of rebellion and independence. Or annoyance and delusions, your call. - components: - - type: Sprite - sprite: Corvax/Clothing/Neck/Mantles/qm.rsi - - type: Clothing - sprite: Corvax/Clothing/Neck/Mantles/qm.rsi +# - type: entity +# parent: ClothingNeckBase +# id: ClothingNeckMantleQM +# name: quartermaster's mantle +# description: A snug and comfortable looking shoulder covering garment, it has an air of rebellion and independence. Or annoyance and delusions, your call. +# components: +# - type: Sprite +# sprite: Corvax/Clothing/Neck/Mantles/qm.rsi +# - type: Clothing +# sprite: Corvax/Clothing/Neck/Mantles/qm.rsi - type: entity parent: ClothingNeckBase diff --git a/Resources/Prototypes/Damage/types.yml b/Resources/Prototypes/Damage/types.yml index 1dee0508da3..7e035603b0e 100644 --- a/Resources/Prototypes/Damage/types.yml +++ b/Resources/Prototypes/Damage/types.yml @@ -90,5 +90,6 @@ # Used by certain armor to counter stun weaponry. - type: damageType id: Stun + name: damage-type-stun armorCoefficientPrice: 5 armorFlatPrice: 20 diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index c001d8dfa87..e0f52c61dbc 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -61,7 +61,6 @@ - type: FlashImmunity - type: EyeProtection protectionTime: 5 - - type: ShowSecurityIcons - type: Tag tags: - HudSecurity @@ -260,7 +259,6 @@ - type: ShowHealthBars damageContainers: - Biological - - type: ShowSecurityIcons - type: FlashImmunity - type: EyeProtection protectionTime: 5 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml index 51745db4bb7..206ce71e4ce 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml @@ -38,7 +38,7 @@ default: ClothingUniformJumpsuitColorBlack - type: UserInterface interfaces: - - key: enum.ChameleonUiKey.Key + enum.ChameleonUiKey.Key: type: ChameleonBoundUserInterface # Corvax-HiddenDesc-Start - type: HiddenDescription diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index b35e8153e7a..24f347dcff8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -644,8 +644,8 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: Hands - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index 213a892949f..f916d00427e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -132,8 +132,6 @@ speechSounds: Slime - type: TTS # Corvax-TTS voice: Baya - - type: TypingIndicator - proto: slime - type: LanguageSpeaker # Frontier speaks: - Bubblish diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 7c7284cfa0a..62051852d32 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -101,10 +101,10 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - - key: enum.SiliconLawsUiKey.Key - type: SiliconLawBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface + enum.SiliconLawsUiKey.Key: + type: SiliconLawBoundUserInterface #- type: GhostRole # makeSentient: true # name: Maintenance Drone @@ -234,8 +234,8 @@ - id: WeaponXrayCannon - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: GhostRole makeSentient: true name: ghost-role-information-onestar-mecha-name diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index d1d7f5af583..e9ad7195f4e 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -210,7 +210,7 @@ type: HumanoidMarkingModifierBoundUserInterface enum.StrippingUiKey.Key: type: StrippableBoundUserInterface - - key: enum.StoreUiKey.Key + enum.StoreUiKey.Key: type: StoreBoundUserInterface - type: Puller - type: Speech @@ -223,7 +223,6 @@ Unsexed: MaleHuman - type: Emoting - type: EmoteAnimation - - type: EmotePanel - type: BodyEmotes soundsId: GeneralBodyEmotes - type: Grammar diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index df3cf70b854..63725c107cd 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -37,6 +37,10 @@ type: HumanoidMarkingModifierBoundUserInterface enum.StrippingUiKey.Key: type: StrippableBoundUserInterface + enum.SlimeHairUiKey.Key: + type: SlimeHairBoundUserInterface + enum.StoreUiKey.Key: # Чтобы не ломался генокрад + type: StoreBoundUserInterface # Чтобы не ломался генокрад # to prevent bag open/honk spam - type: UseDelay delay: 0.5 @@ -132,17 +136,6 @@ short: true shortscale: 0.85 - type: SlimeHair # TODO: Исправить проблему с генокрадом. ## Done. Мейби стоит чуть подредактировать позже, но это потом, когда у меня сил побольше будет. - - type: UserInterface # upd: БЛЯТЬ! Так и надо было, почему? Почему это такая неудобная лапша?? - interfaces: - - key: enum.SlimeHairUiKey.Key - type: SlimeHairBoundUserInterface - - key: enum.StoreUiKey.Key # Чтобы не ломался генокрад - type: StoreBoundUserInterface # Чтобы не ломался генокрад - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - #- key: enum.HumanoidMarkingModifierKey.Key # sure, this can go here too - # type: HumanoidMarkingModifierBoundUserInterface - - type: entity parent: MobHumanDummy diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml index eb7058f1038..85a3fb2dc20 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml @@ -462,21 +462,33 @@ suffix: random visual, random story components: - type: PaperRandomStory - template: GenericStory - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book2 - - type: MeleeWeapon - wideAnimationRotation: 180 - damage: - types: - Blunt: 6 - - type: Paper - content: book-text-escalation - - type: Construction - graph: SecretBook - node: startescalation + storySegments: + - "This is a " + - book_genre + - " about a " + - book_character_trait + - " " + - book_character + - " and " + - book_character_trait + - " " + - book_character + - ". Due to " + - book_event + - ", they " + - book_action_trait + - " " + - book_action + - " " + - book_character + - " " + - book_location + - ". \n\n" + - book_story_element + - " is " + - book_story_element_trait + - "." + storySeparator: "" - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 7131ef78d28..750050f23d0 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -787,7 +787,7 @@ inHandsOnly: true - type: UserInterface interfaces: - - key: enum.AgentIDCardUiKey.Key + enum.AgentIDCardUiKey.Key: type: AgentIDCardBoundUserInterface - type: Access tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index bc1db808ce0..cb5479ff967 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -145,7 +145,6 @@ sprite: Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi - type: BallisticAmmoProvider - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - - type: BallisticAmmoProvider - type: Gun # Corvax-Guns soundGunshot: path: /Audio/Corvax/Weapons/Guns/Gunshots/shotgun_metal.ogg diff --git a/Resources/Prototypes/Entities/Structures/Machines/bluespace_harvester.yml b/Resources/Prototypes/Entities/Structures/Machines/bluespace_harvester.yml index fbdc7075f72..277754114f3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/bluespace_harvester.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/bluespace_harvester.yml @@ -55,8 +55,8 @@ key: enum.BluespaceHarvesterUiKey.Key - type: UserInterface interfaces: - - key: enum.BluespaceHarvesterUiKey.Key - type: BluespaceHarvesterBoundUserInterface + enum.BluespaceHarvesterUiKey.Key: + type: BluespaceHarvesterBoundUserInterface - type: Machine board: MachineBluespaceHarvesterCircuitboard - type: NodeContainer diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 61214eaa289..70c65433f8d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1031,9 +1031,6 @@ - HandheldCrewMonitor - ClothingEyesHudMedical - ClothingHandsGlovesNitrile - - CryostasisBeaker - - LargeBeaker - - Dropper - Scalpel - Retractor - Cautery @@ -1042,9 +1039,6 @@ - Hemostat - ClothingEyesGlassesChemical - WhiteCane - dynamicRecipes: - - ChemicalPayload - - CryostasisBeaker - BluespaceBeaker - SyringeBluespace - Jug diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index fba4c0652c8..a19a1fb2029 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -60,7 +60,7 @@ resistance: 2 - type: SoundOnGather - type: Gatherable - whitelist: + toolWhitelist: tags: - Pickaxe - type: OreVein diff --git a/Resources/Prototypes/NES/Entities/Mobs/Pets/mobs.yml b/Resources/Prototypes/NES/Entities/Mobs/Pets/mobs.yml index e686c687d7a..a13d4b277bc 100644 --- a/Resources/Prototypes/NES/Entities/Mobs/Pets/mobs.yml +++ b/Resources/Prototypes/NES/Entities/Mobs/Pets/mobs.yml @@ -71,8 +71,8 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface - type: DamageStateVisuals states: Alive: diff --git a/Resources/Prototypes/NES/Entities/Mobs/SpeciesSound/vulpkanin_voice.yml b/Resources/Prototypes/NES/Entities/Mobs/SpeciesSound/vulpkanin_voice.yml index 9beadd5ba58..c4a0ac6e740 100644 --- a/Resources/Prototypes/NES/Entities/Mobs/SpeciesSound/vulpkanin_voice.yml +++ b/Resources/Prototypes/NES/Entities/Mobs/SpeciesSound/vulpkanin_voice.yml @@ -2,6 +2,7 @@ - type: emote id: VulpHeckaet + name: emote-vulpHeckaet category: Vocal chatMessages: [хекает] chatTriggers: @@ -14,6 +15,7 @@ - type: emote id: VulpHowl + name: emote-vulpHowl category: Vocal chatMessages: [воет] chatTriggers: @@ -23,6 +25,7 @@ - type: emote id: VulpWhine + name: emote-vulpWhine category: Vocal chatMessages: [скулит] chatTriggers: @@ -35,6 +38,7 @@ - type: emote id: VulpBark + name: emote-vulpBark category: Vocal chatMessages: [лает] chatTriggers: diff --git a/Resources/Prototypes/NES/Ivents/frostpunk.yml b/Resources/Prototypes/NES/Ivents/frostpunk.yml deleted file mode 100644 index 0831c719e2e..00000000000 --- a/Resources/Prototypes/NES/Ivents/frostpunk.yml +++ /dev/null @@ -1,252 +0,0 @@ -#NES фростпанк - -- type: entity - name: паровой реактор - description: |- - A flexible backup generator for powering a variety of equipment. - Runs off solid plasma sheets and is rated for up to 30 kW. - parent: PortableGeneratorSwitchableBase - id: NesFrostpunkGenerator - suffix: Фростпанк - components: - - type: IgnoreWeather - - type: SpriteFade - - type: Sprite - noRot: true - drawdepth: Overdoors - sprite: NES/Frostpunk/ParGenik.rsi - layers: - - state: portgen0 - offset: 0,1.8 - scale: 2, 2 - map: [ "enum.GeneratorVisualLayers.Body" ] - - state: portgen_on_unlit - offset: 0,1.8 - scale: 2, 2 - map: [ "enum.GeneratorVisualLayers.Unlit" ] - visible: false - - type: GenericVisualizer - visuals: - enum.GeneratorVisuals.Running: - enum.GeneratorVisualLayers.Body: - True: { state: portgen0on } - False: { state: portgen0 } - enum.GeneratorVisualLayers.Unlit: - True: { visible: true } - False: { visible: false } - - - type: Machine - board: NesFrostpunkGeneratorMachineCircuitboard - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-1,-1,1,1" - density: 1000 - layer: - - WallLayer - - type: Physics - bodyType: Static - - type: FuelGenerator - minTargetPower: 5000 - maxTargetPower: 60000 - targetPower: 60000 - optimalPower: 60000 - # 15 minutes at max output - optimalBurnRate: 0.0333333 - # a decent curve that goes up to about an hour at 5 kW. - fuelEfficiencyConstant: 0.9 - - type: SolidFuelGeneratorAdapter - fuelMaterial: Plasma - multiplier: 0.003 - - type: MaterialStorage - storageLimit: 3000 - materialWhiteList: [Plasma] - - type: PortableGenerator - startChance: 0.4 - - type: Transform - anchored: True - - type: AmbientSound - range: 10 - volume: 30 - sound: - path: /Audio/Ambience/Objects/engine_hum.ogg - - type: GeneratorExhaustGas - gasType: CarbonDioxide - moleRatio: 100 - temperature: 1300 - - type: PointLight - radius: 15 - energy: 5 - color: "#e0a634" - -- type: entity - id: NesFrostpunkGeneratorMachineCircuitboard - parent: BaseMachineCircuitboard - name: паровое ядро - suffix: Фростпанк - description: Самая ценная вещь на этой планете. - components: - - type: Sprite - sprite: NES/Frostpunk/ParCore.rsi - state: ParReactor - - type: PointLight - radius: 1 - energy: 3 - color: "#e0a634" - - type: TemperatureProtection - coefficient: 0.3 - - type: Armor - modifiers: - coefficients: - Slash: 0.1 - Heat: 0.1 - - type: MachineBoard - prototype: NesFrostpunkGenerator - requirements: - Capacitor: 4 - Manipulator: 2 - materialRequirements: - CableHV: 10 - Steel: 10 - Plasteel: 20 - - type: Clothing - quickEquip: false - slots: - - Belt - - type: PhysicalComposition - materialComposition: - Glass: 200 - chemicalComposition: - Silicon: 20 - -- type: entity - id: NesGenikFrame - name: каркас парового реактора - suffix: Фростпанк - placement: - mode: SnapgridCenter - components: - - type: Transform - anchored: true - - type: Physics - bodyType: Static - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-1,-1,1,1" - density: 1000 - mask: - - MachineMask - layer: - - MachineLayer - - type: Clickable - - type: InteractionOutline - - type: Anchorable - - type: Rotatable - - type: Pullable - - type: Construction - graph: Machine - node: machineFrame - defaultTarget: machine - containers: - - machine_board - - machine_parts - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:ChangeConstructionNodeBehavior - node: missingWires - - !type:DoActsBehavior - acts: ["Destruction"] - - type: MachineFrame - - type: ContainerContainer - containers: - machine_board: !type:Container - machine_parts: !type:Container - - type: Sprite - noRot: true - drawdepth: Overdoors - sprite: NES/Frostpunk/ParGenik.rsi - state: box_1 - snapCardinals: true - offset: 0,1.8 - scale: 2, 2 - - type: Appearance - - type: ItemMapper - mapLayers: - box_2: - minCount: 1 - whitelist: - components: - - MachineBoard - -- type: entity - id: NesIisysWallRockSnow - name: снежный камень - suffix: Фростпанк - parent: NesIisysWallRock - components: - - type: Sprite - sprite: Structures/Walls/rock.rsi - layers: - - state: rock_snow - - map: [ "enum.EdgeLayer.South" ] - state: rock_snow_south - - map: [ "enum.EdgeLayer.East" ] - state: rock_snow_east - - map: [ "enum.EdgeLayer.North" ] - state: rock_snow_north - - map: [ "enum.EdgeLayer.West" ] - state: rock_snow_west - -- type: entity - id: NesIisysWallRock - parent: BaseStructure - name: Бедрок - description: Коренная горная порода. Слишком крепкая, чтобы её можно было разрушить ручными инструментами. - suffix: Неразрушимый - components: - - type: PlacementReplacement - key: walls - - type: Occluder - - type: Airtight - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.5,-0.5,0.5,0.5" - density: 100 - mask: - - FullTileMask - layer: - - WallLayer - - type: IconSmooth - key: walls - mode: NoSprite - - type: SmoothEdge - - type: Sprite - sprite: Structures/Walls/rock.rsi - layers: - - state: rock - - map: [ "enum.EdgeLayer.South" ] - state: rock_south - - map: [ "enum.EdgeLayer.East" ] - state: rock_east - - map: [ "enum.EdgeLayer.North" ] - state: rock_north - - map: [ "enum.EdgeLayer.West" ] - state: rock_west - - type: RadiationBlocker - resistance: 2 - diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 1036b58f298..c5897412e6e 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -551,19 +551,19 @@ - !type:SatiateThirst factor: 0.6 -- type: reagent - id: WhiteGilgamesh - name: reagent-name-white-gilgamesh - parent: BaseDrink - desc: reagent-desc-white-gilgamesh - physicalDesc: reagent-physical-desc-creamy - flavor: white-gilgamesh - color: "#e5d27e" - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 1 +# - type: reagent +# id: WhiteGilgamesh +# name: reagent-name-white-gilgamesh +# parent: BaseDrink +# desc: reagent-desc-white-gilgamesh +# physicalDesc: reagent-physical-desc-creamy +# flavor: white-gilgamesh +# color: "#e5d27e" +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 1 - type: reagent diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 1692a950f12..117fee5a013 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -793,17 +793,6 @@ Cloth: 200 Durathread: 150 -- type: latheRecipe # Corvax-Resprite: Old HOS mantle - id: ClothingNeckMantleHOSShoulder - icon: - sprite: Clothing/Neck/mantles/hosmantle_shoulder.rsi - state: icon - result: ClothingNeckMantleHOSShoulder - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 - - type: latheRecipe id: ClothingNeckMantleRD result: ClothingNeckMantleRD diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index c2e98c0c66d..c62854b7a6e 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -967,49 +967,49 @@ Steel: 100 Glass: 500 -- type: latheRecipe - id: ShuttleGunSvalinnMachineGunCircuitboard - result: ShuttleGunSvalinnMachineGunCircuitboard - completetime: 6 - materials: - Steel: 100 - - Glass: 500 - -- type: latheRecipe - id: ShuttleGunPerforatorCircuitboard - result: ShuttleGunPerforatorCircuitboard - completetime: 10 - materials: - Steel: 100 - Glass: 500 - Gold: 100 - -- type: latheRecipe - id: ShuttleGunKineticCircuitboard - result: ShuttleGunKineticCircuitboard - completetime: 6 - materials: - Steel: 100 - Glass: 500 - -- type: latheRecipe - id: ShuttleGunFriendshipCircuitboard - result: ShuttleGunFriendshipCircuitboard - completetime: 8 - materials: - Steel: 100 - Glass: 500 - Gold: 50 - -- type: latheRecipe - id: ShuttleGunDusterCircuitboard - result: ShuttleGunDusterCircuitboard - completetime: 12 - materials: - Steel: 100 - Glass: 500 - Gold: 100 +# - type: latheRecipe +# id: ShuttleGunSvalinnMachineGunCircuitboard +# result: ShuttleGunSvalinnMachineGunCircuitboard +# completetime: 6 +# materials: +# Steel: 100 + +# Glass: 500 + +# - type: latheRecipe +# id: ShuttleGunPerforatorCircuitboard +# result: ShuttleGunPerforatorCircuitboard +# completetime: 10 +# materials: +# Steel: 100 +# Glass: 500 +# Gold: 100 + +# - type: latheRecipe +# id: ShuttleGunKineticCircuitboard +# result: ShuttleGunKineticCircuitboard +# completetime: 6 +# materials: +# Steel: 100 +# Glass: 500 + +# - type: latheRecipe +# id: ShuttleGunFriendshipCircuitboard +# result: ShuttleGunFriendshipCircuitboard +# completetime: 8 +# materials: +# Steel: 100 +# Glass: 500 +# Gold: 50 + +# - type: latheRecipe +# id: ShuttleGunDusterCircuitboard +# result: ShuttleGunDusterCircuitboard +# completetime: 12 +# materials: +# Steel: 100 +# Glass: 500 +# Gold: 100 - type: latheRecipe id: ReagentGrinderIndustrialMachineCircuitboard diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 1c3496d027e..d2becfd8c64 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -260,20 +260,20 @@ #Brigmedic -- type: startingGear - id: BrigmedicGear - equipment: - jumpsuit: ClothingUniformJumpsuitBrigmedic - outerClothing: ClothingOuterCoatAMG - back: ClothingBackpackBrigmedic - shoes: ClothingShoesColorRed - gloves: ClothingHandsGlovesNitrile - eyes: ClothingEyesHudMedical - head: ClothingHeadHatBeretBrigmedic - id: BrigmedicPDA - ears: ClothingHeadsetBrigmedic - mask: ClothingMaskBreathMedicalSecurity - belt: ClothingBeltMedicalFilled +# - type: startingGear // see Resources\Prototypes\Roles\Jobs\Security\brigmedic.yml +# id: BrigmedicGear +# equipment: +# jumpsuit: ClothingUniformJumpsuitBrigmedic +# outerClothing: ClothingOuterCoatAMG +# back: ClothingBackpackBrigmedic +# shoes: ClothingShoesColorRed +# gloves: ClothingHandsGlovesNitrile +# eyes: ClothingEyesHudMedical +# head: ClothingHeadHatBeretBrigmedic +# id: BrigmedicPDA +# ears: ClothingHeadsetBrigmedic +# mask: ClothingMaskBreathMedicalSecurity +# belt: ClothingBeltMedicalFilled # Aghost - type: startingGear diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/ipc.yml index c2e02d5755b..a423d03c04e 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/ipc.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/ipc.yml @@ -90,7 +90,6 @@ - type: IntrinsicRadioTransmitter - type: SSDIndicator # - type: UnblockableSpeech - - type: EmotePanel - type: ContentEye maxZoom: 1.0,1.0 - type: LightningTarget diff --git a/Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/silicon_base.yml b/Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/silicon_base.yml index 259619061eb..867fe909b46 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/silicon_base.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/silicon_base.yml @@ -290,11 +290,11 @@ - type: Strippable - type: UserInterface interfaces: - - key: enum.VoiceMaskUIKey.Key + enum.VoiceMaskUIKey.Key: type: VoiceMaskBoundUserInterface - - key: enum.HumanoidMarkingModifierKey.Key + enum.HumanoidMarkingModifierKey.Key: type: HumanoidMarkingModifierBoundUserInterface - - key: enum.StrippingUiKey.Key + enum.StrippingUiKey.Key: type: StrippableBoundUserInterface - type: Emoting - type: Grammar diff --git a/Resources/Prototypes/Sirena/Actions/emotes.yml b/Resources/Prototypes/Sirena/Actions/emotes.yml index 604d2ca751e..37bd5db5094 100644 --- a/Resources/Prototypes/Sirena/Actions/emotes.yml +++ b/Resources/Prototypes/Sirena/Actions/emotes.yml @@ -57,6 +57,7 @@ # Using EmoteAnimation from IC action chat - type: emote id: EmoteFlip + name: emote-flip icon: Interface/Emotes/somersaults.png category: Animations chatMessages: [делает сальто] @@ -69,6 +70,7 @@ - type: emote id: EmoteJump + name: emote-jump icon: Interface/Emotes/jump.png category: Animations chatMessages: [прыгает] @@ -82,6 +84,7 @@ - type: emote id: EmoteTurn + name: emote-turn-action-name icon: Interface/Emotes/spin.png category: Animations chatMessages: [кружится] @@ -95,6 +98,7 @@ # Using EmoteAnimation from IC action chat - type: emote id: EmoteStopTail + name: emote-stop-tail category: Animations chatMessages: [хвост замирает] chatTriggers: @@ -106,6 +110,7 @@ - type: emote id: EmoteStartTail + name: emote-start-tail category: Animations chatMessages: [двигает хвостом] chatTriggers: diff --git a/Resources/Prototypes/Sirena/Entities/Structures/stalagmities.yml b/Resources/Prototypes/Sirena/Entities/Structures/stalagmities.yml index 26128914714..c4ef693c286 100644 --- a/Resources/Prototypes/Sirena/Entities/Structures/stalagmities.yml +++ b/Resources/Prototypes/Sirena/Entities/Structures/stalagmities.yml @@ -31,7 +31,7 @@ acts: [ "Destruction" ] - type: SoundOnGather - type: Gatherable - whitelist: + toolWhitelist: tags: - Pickaxe diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml index a3de5b54af3..1894a0365bf 100644 --- a/Resources/Prototypes/Voice/disease_emotes.yml +++ b/Resources/Prototypes/Voice/disease_emotes.yml @@ -6,6 +6,7 @@ - type: emote id: Cough + name: chat-emote-name-cough icon: Interface/Emotes/coughs.png category: Vocal chatMessages: [кашляет] # Corvax-Localization @@ -43,6 +44,7 @@ - type: emote id: Yawn + name: chat-emote-name-yawn icon: Interface/Emotes/yawns.png category: Vocal chatMessages: [зевает] # Corvax-Localization diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 449f3c8bf33..6216f4bfadf 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -1,9 +1,16 @@ # vocal emotes - type: emote id: Scream - icon: Interface/Emotes/scream.png + name: chat-emote-name-scream category: Vocal - chatMessages: [кричит!] # Corvax-Localization + icon: Interface/Actions/scream.png + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-scream"] chatTriggers: - scream - screams @@ -43,9 +50,16 @@ - type: emote id: Laugh - icon: Interface/Emotes/laugh.png + name: chat-emote-name-laugh category: Vocal - chatMessages: [смеётся] # Corvax-Localization + icon: Interface/Emotes/laugh.png + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-laugh"] chatTriggers: - laugh - laughs @@ -65,6 +79,15 @@ - giggles! - giggling - giggled + - chortle + - chortle. + - chortle! + - chortles + - chortles. + - chortles! + - chortling + - chortling. + - chortling! # Corvax-Localization-Start - смеется - смеется. @@ -87,13 +110,44 @@ id: Honk name: chat-emote-name-honk category: Vocal - chatMessages: [хонкает] # Corvax-Localization + icon: Interface/Emotes/honk.png + whitelist: + requireAll: true + components: + - Vocal + - BorgChassis + chatMessages: ["chat-emote-msg-honk"] + chatTriggers: + - honk + - honk. + - honk! + - honks + - honks. + - honks! + - honked + - honked. + - honked! + - honking + - honking. + - honking! + # Corvax-Localization-Start + - хонк + - хонк. + - хонк! + # Corvax-Localization-End - type: emote id: Sigh - icon: Interface/Emotes/sighn.png + name: chat-emote-name-sigh category: Vocal - chatMessages: [вздыхает] # Corvax-Localization + icon: Interface/Emotes/sigh.png + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-sigh"] chatTriggers: - sigh - sighs @@ -112,9 +166,16 @@ - type: emote id: Whistle - icon: Interface/Emotes/whistle.png + name: chat-emote-name-whistle category: Vocal - chatMessages: [свистит] # Corvax-Localization + icon: Interface/Emotes/whistle.png + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-whistle"] chatTriggers: - whistle - whistle. @@ -136,9 +197,16 @@ - type: emote id: Crying - icon: Interface/Emotes/crying.png + name: chat-emote-name-crying category: Vocal - chatMessages: [плачет] # Corvax-Localization + icon: Interface/Emotes/cry.png + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-crying"] chatTriggers: - cry - cry. @@ -149,6 +217,14 @@ - cries - cries. - cries! + - sob + - sob. + - sobs + - sobs. + - sobs! + - sobbing + - sobbing. + - sobbing! # Corvax-Localization-Start - плачет - плачет. @@ -162,7 +238,15 @@ id: Squish name: chat-emote-name-squish category: Vocal - chatMessages: [хлюпает] # Corvax-Localization + available: false + icon: Interface/Emotes/squish.png + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-squish"] chatTriggers: - squish - squish. @@ -183,7 +267,15 @@ id: Chitter name: chat-emote-name-chitter category: Vocal - chatMessages: [стрекочет] # Corvax-Localization + available: false + icon: Interface/Emotes/chitter.png + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-chitter"] chatTriggers: - chitter - chitter. @@ -204,7 +296,15 @@ id: Squeak name: chat-emote-name-squeak category: Vocal - chatMessages: [пищит] # Corvax-Localization + available: false + icon: Interface/Emotes/squeak.png + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-squeak"] chatTriggers: - squeak - squeak. @@ -241,13 +341,28 @@ - clicks - clicks. - clicks! + # Corvax-Localization-Start + - клац + - клац. + - клац! + - клацает + - клацает. + - клацает! + # Corvax-Localization-End # hand emotes - type: emote id: Clap - icon: Interface/Emotes/claps.png + name: chat-emote-name-clap category: Hands - chatMessages: [хлопает!] # Corvax-Localization + icon: Interface/Emotes/clap.png + whitelist: + components: + - Hands + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-clap"] chatTriggers: - clap - claps @@ -273,9 +388,16 @@ - type: emote id: Snap - icon: Interface/Emotes/snaps-fingers.png + name: chat-emote-name-snap category: Hands - chatMessages: [щёлкает пальцами] # Corvax-Localization + icon: Interface/Emotes/snap.png + whitelist: + components: + - Hands + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-snap"] # snaps <{THEIR($ent)}> fingers? chatTriggers: - snap - snaps @@ -315,9 +437,16 @@ - type: emote id: Salute - icon: Interface/Emotes/salute.png + name: chat-emote-name-salute category: Hands - chatMessages: [салютует] # Corvax-Localization + icon: Interface/Emotes/salute.png + whitelist: + components: + - Hands + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-salute"] chatTriggers: - salute - salute. @@ -369,8 +498,6 @@ - Vocal chatMessages: ["chat-emote-msg-buzz"] chatTriggers: - - жужжит - - жужжит. - buzzing - buzzing! - buzzing. @@ -383,13 +510,24 @@ - buzzes - buzzes. - buzzes! + # Corvax-Localization-Start + - жужжит! + - жужжит. + - жужжит + - зажужжал + - зажужжал. + - зажужжал! + - зажужжала + - зажужжала. + - зажужжала! + # Corvax-Localization-End - type: emote id: Weh name: chat-emote-name-weh category: Vocal icon: Interface/Emotes/weh.png - chatMessages: [Wehs!] + chatMessages: [издаёт вех!] - type: emote id: Chirp @@ -414,6 +552,11 @@ - chirping - chirping. - chirping! + # Corvax-Localization-Start + - чирикает + - чирикает. + - чирикает! + # Corvax-Localization-End # Machine Emotes - type: emote @@ -440,6 +583,11 @@ - beeping - beeping. - beeping! + # Corvax-Localization-Start + - бип + - бип. + - бип! + # Corvax-Localization-End - type: emote id: Chime @@ -465,6 +613,11 @@ - chiming - chiming, - chiming! + # Corvax-Localization-Start + - дзынь + - дзынь. + - дзынь! + # Corvax-Localization-End - type: emote id: Buzz-Two @@ -508,6 +661,26 @@ - buzzed twice - buzzed twice. - buzzed twice! + # Corvax-Localization-Start + - бипбуп + - бипбуп. + - бипбуп! + - бип буп + - бип буп. + - бип буп! + - бип-буп + - бип-буп. + - бип-буп! + - бипбип + - бипбип. + - бипбип! + - бип бип + - бип бип. + - бип бип! + - бип-бип + - бип-бип. + - бип-бип! + # Corvax-Localization-End - type: emote id: Ping @@ -533,3 +706,8 @@ - pinging - pinging. - pinging! + # Corvax-Localization-Start + - пинг + - пинг. + - пинг! + # Corvax-Localization-End diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/meta.json index 3b5d02aff6a..5a9100512cb 100644 --- a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", + "copyright": "Created by Hanzdegloker", "size": { "x": 32, "y": 32 @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-HAND", + "name": "equipped-HELMET", "directions": 4 }, { diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json index f6bd1d5e6e3..a3decab7a3a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json @@ -6,6 +6,7 @@ "x": 32, "y": 32 }, + "states": [ { "name": "equipped-OUTERCLOTHING", "directions": 4