From daffcf9a2d8cc9efbe79bf35d65bc61125094531 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Sun, 24 Mar 2024 18:43:51 +0900 Subject: [PATCH 01/11] Fixes and stuff (#229) * - add: Add rites description. * - fix: Fix fuel tank explosion. * - tweak: Jug can attack now. * - tweak: Less material size. * - fix: Translation fix. * - tweak: Dead people are collideable. * - tweak: Less small mobs damage. * - add: You can now shoot yourself. * - add: Mood effect for felinids. * Revert "- fix: Fix fuel tank explosion." This reverts commit 72d9d6d2c5a3e579c50e8fa63a58e6d989dbe9e9. * - fix: Keyhole fixes. * - tweak: Doors now cost less material. * - fix: Change loc. --- .../Interaction/InteractionPopupSystem.cs | 1 + .../_White/Construction/DoorUnlocked.cs | 33 +++++++++ .../_White/Keyhole/KeyholeSystem.cs | 68 ++++++++++--------- .../Systems/MobStateSystem.Subscribers.cs | 12 ---- .../Projectiles/SharedProjectileSystem.cs | 6 +- .../_White/Cult/Systems/BloodSpearSystem.cs | 7 ++ .../_White/Cult/Systems/BoltBarrageSystem.cs | 9 ++- .../Keyhole/Components/KeyBaseComponent.cs | 2 +- .../_White/Keyhole/KeyInsertEvent.cs | 10 ++- Resources/Locale/ru-RU/cult/blood-spear.ftl | 1 + Resources/Locale/ru-RU/cult/bolt-barrage.ftl | 1 + .../ru-RU/mind/components/mind-component.ftl | 5 +- .../ru-RU/white/object/tools/keyhole.ftl | 4 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 13 ++-- .../Entities/Objects/Materials/materials.yml | 2 +- .../Objects/Specific/chemical-containers.yml | 6 ++ .../Construction/Graphs/structures/doors.yml | 38 +++++++---- .../_White/Entities/Cult/Items/tome_craft.yml | 2 +- .../_White/Mood/generic_positveEffects.yml | 9 ++- 19 files changed, 159 insertions(+), 70 deletions(-) create mode 100644 Content.Server/_White/Construction/DoorUnlocked.cs create mode 100644 Resources/Locale/ru-RU/cult/blood-spear.ftl diff --git a/Content.Server/Interaction/InteractionPopupSystem.cs b/Content.Server/Interaction/InteractionPopupSystem.cs index 1115f2c0d8..0d21d92a2d 100644 --- a/Content.Server/Interaction/InteractionPopupSystem.cs +++ b/Content.Server/Interaction/InteractionPopupSystem.cs @@ -91,6 +91,7 @@ public sealed class InteractionPopupSystem : EntitySystem { var ev = new MoodEffectEvent("PetAnimal"); RaiseLocalEvent(user, ev); + RaiseLocalEvent(uid, new MoodEffectEvent("BeingPet")); } //WD end } diff --git a/Content.Server/_White/Construction/DoorUnlocked.cs b/Content.Server/_White/Construction/DoorUnlocked.cs new file mode 100644 index 0000000000..6016a82959 --- /dev/null +++ b/Content.Server/_White/Construction/DoorUnlocked.cs @@ -0,0 +1,33 @@ +using Content.Shared._White.Keyhole.Components; +using Content.Shared.Construction; +using Content.Shared.Examine; +using JetBrains.Annotations; + +namespace Content.Server._White.Construction; + +[UsedImplicitly, DataDefinition] +public sealed partial class DoorUnlocked : IGraphCondition +{ + public bool Condition(EntityUid uid, IEntityManager entityManager) + { + return !entityManager.TryGetComponent(uid, out KeyholeComponent? keyhole) || !keyhole.Locked; + } + + public bool DoExamine(ExaminedEvent args) + { + if (Condition(args.Examined, IoCManager.Resolve())) + return false; + + args.PushMarkup(Loc.GetString("construction-examine-condition-door-locked")); + return true; + + } + + public IEnumerable GenerateGuideEntry() + { + yield return new ConstructionGuideEntry + { + Localization = "construction-examine-condition-door-locked" + }; + } +} diff --git a/Content.Server/_White/Keyhole/KeyholeSystem.cs b/Content.Server/_White/Keyhole/KeyholeSystem.cs index 8a6c92f0cb..1a5d09ad1c 100644 --- a/Content.Server/_White/Keyhole/KeyholeSystem.cs +++ b/Content.Server/_White/Keyhole/KeyholeSystem.cs @@ -1,4 +1,6 @@ -using Content.Shared._White.Keyhole.Components; +using System.Diagnostics; +using Content.Server._White.Cult.Structures; +using Content.Shared._White.Keyhole.Components; using Content.Shared._White.Keyhole; using Content.Shared.DoAfter; using Content.Shared.Doors.Components; @@ -10,10 +12,7 @@ using Robust.Shared.Random; namespace Content.Server._White.Keyhole; -// TODO: Исправить, что дверь на замке можно разобрать через ее id: DoorGraph -// TODO: Исправить, что при прерывании закрытия девственной двери форма замка принимает форму ключа, хотя закрытия не произошло - -public sealed partial class KeyholeSystem : EntitySystem +public sealed class KeyholeSystem : EntitySystem { [Dependency] private readonly IRobustRandom _random = default!; @@ -37,52 +36,55 @@ public sealed partial class KeyholeSystem : EntitySystem private void OnKeyInsert(EntityUid uid, KeyComponent component, AfterInteractEvent ev) { + Debug.Assert(component.FormId != null); + if (TryComp(ev.Target, out var keyformComponent)) - OnKeyInsertForm(uid, component, keyformComponent, ev); + { + OnKeyInsertForm(uid, component, keyformComponent, ev.Target.Value, ev.User); + return; + } - if (!TryComp(ev.Target, out var keyholeComponent)) + if (!TryComp(ev.Target, out var keyholeComponent) || !CanLock(ev.Target.Value)) return; - keyholeComponent.FormId ??= component.FormId; - - if (!CanLock(keyholeComponent.Owner, keyholeComponent, component)) + if (keyholeComponent.FormId != null && keyholeComponent.FormId != component.FormId) + { + _popupSystem.PopupEntity(Loc.GetString("door-keyhole-different-form"), ev.Target.Value); return; + } var doAfterEventArgs = - new DoAfterArgs(EntityManager, ev.User, keyholeComponent.Delay, new KeyInsertDoAfterEvent(), ev.Target, ev.Used) - { - BreakOnTargetMove = true, - BreakOnUserMove = true, - BreakOnDamage = true - }; + new DoAfterArgs(EntityManager, ev.User, keyholeComponent.Delay, + new KeyInsertDoAfterEvent(component.FormId.Value), ev.Target, ev.Used) + { + BreakOnTargetMove = true, + BreakOnUserMove = true, + BreakOnDamage = true + }; + _doAfter.TryStartDoAfter(doAfterEventArgs); } - private bool CanLock(EntityUid uid, KeyholeComponent keyholeComponent, KeyComponent keyComponent) + private bool CanLock(EntityUid uid) { - var can = TryComp(uid, out var doorComponent) && - keyholeComponent.FormId == keyComponent.FormId && - doorComponent.State == DoorState.Closed; - - return can; + return !HasComp(uid) && TryComp(uid, out var doorComponent) && + doorComponent.State == DoorState.Closed; } private void OnDoAfter(EntityUid uid, KeyholeComponent component, KeyInsertDoAfterEvent args) { - if (args.Handled || args.Cancelled || IsStateChanging(uid)) + if (args.Handled || args.Cancelled || !CanLock(uid)) return; + Debug.Assert(component.FormId == null || component.FormId == args.FormId); + + component.FormId = args.FormId; + Lock(uid, component, args.User); args.Handled = true; } - private bool IsStateChanging(EntityUid uid) - { - return TryComp(uid, out var doorComponent) && - (doorComponent.State == DoorState.Closing || doorComponent.State == DoorState.Opening); - } - private void Lock(EntityUid uid, KeyholeComponent component, EntityUid user) { var sound = component.Locked ? component.UnlockSound : component.LockSound; @@ -96,22 +98,22 @@ public sealed partial class KeyholeSystem : EntitySystem component.Locked = !component.Locked; } - private void OnKeyInsertForm(EntityUid uid, KeyComponent keyComponent, KeyformComponent keyformComponent, AfterInteractEvent args) + private void OnKeyInsertForm(EntityUid uid, KeyComponent keyComponent, KeyformComponent keyformComponent, EntityUid keyform, EntityUid user) { if (!keyformComponent.IsUsed) { keyformComponent.FormId ??= keyComponent.FormId; - _appearance.SetData(keyformComponent.Owner, KeyformVisuals.IsUsed, true); + _appearance.SetData(keyform, KeyformVisuals.IsUsed, true); _audio.PlayPvs(keyformComponent.PressSound, uid); - _popupSystem.PopupEntity(Loc.GetString("key-pressed-in-keyform-message-first", ("user", args.User), ("key", uid)), uid); + _popupSystem.PopupEntity(Loc.GetString("key-pressed-in-keyform-message-first", ("user", user), ("key", uid)), uid); keyformComponent.IsUsed = true; } else { keyComponent.FormId = keyformComponent.FormId; - _popupSystem.PopupEntity(Loc.GetString("key-pressed-in-keyform-message", ("user", args.User), ("key", uid)), uid); + _popupSystem.PopupEntity(Loc.GetString("key-pressed-in-keyform-message", ("user", user), ("key", uid)), uid); } } diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs index 5199133253..576fea8943 100644 --- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs +++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs @@ -15,7 +15,6 @@ using Content.Shared.Speech; using Content.Shared.Standing; using Content.Shared.Strip.Components; using Content.Shared.Throwing; -using Robust.Shared.Physics.Components; namespace Content.Shared.Mobs.Systems; @@ -56,12 +55,7 @@ public partial class MobStateSystem _standing.Stand(target); break; case MobState.Dead: - RemComp(target); _standing.Stand(target); - if (!_standing.IsDown(target) && TryComp(target, out var physics)) - { - _physics.SetCanCollide(target, true, body: physics); - } break; case MobState.Invalid: @@ -91,14 +85,8 @@ public partial class MobStateSystem _appearance.SetData(target, MobStateVisuals.State, MobState.Critical); break; case MobState.Dead: - EnsureComp(target); _standing.Down(target); - if (_standing.IsDown(target) && TryComp(target, out var physics)) - { - _physics.SetCanCollide(target, false, body: physics); - } - _appearance.SetData(target, MobStateVisuals.State, MobState.Dead); break; case MobState.Invalid: diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs index d331f00e78..bd93142433 100644 --- a/Content.Shared/Projectiles/SharedProjectileSystem.cs +++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs @@ -190,6 +190,10 @@ public abstract partial class SharedProjectileSystem : EntitySystem private void PreventCollision(EntityUid uid, ProjectileComponent component, ref PreventCollideEvent args) { + // Shoot yourself! + if (args.OtherEntity == component.Target) // WD + return; + if (component.IgnoreShooter && (args.OtherEntity == component.Shooter || args.OtherEntity == component.Weapon)) { args.Cancelled = true; @@ -356,4 +360,4 @@ public record struct ProjectileHitEvent(DamageSpecifier Damage, EntityUid Target /// Raised after a projectile has dealt it's damage. /// [ByRefEvent] -public record struct AfterProjectileHitEvent(DamageSpecifier Damage, EntityUid Target, Fixture Fixture); \ No newline at end of file +public record struct AfterProjectileHitEvent(DamageSpecifier Damage, EntityUid Target, Fixture Fixture); diff --git a/Content.Shared/_White/Cult/Systems/BloodSpearSystem.cs b/Content.Shared/_White/Cult/Systems/BloodSpearSystem.cs index 308be30e70..35be109b81 100644 --- a/Content.Shared/_White/Cult/Systems/BloodSpearSystem.cs +++ b/Content.Shared/_White/Cult/Systems/BloodSpearSystem.cs @@ -1,5 +1,6 @@ using Content.Shared._White.Cult.Components; using Content.Shared.Actions; +using Content.Shared.Examine; using Content.Shared.Hands; using Content.Shared.StatusEffect; using Content.Shared.Stunnable; @@ -23,6 +24,12 @@ public sealed class BloodSpearSystem : EntitySystem SubscribeLocalEvent(OnRemove); SubscribeLocalEvent(OnEquip); SubscribeLocalEvent(OnThrowDoHit); + SubscribeLocalEvent(OnExamine); + } + + private void OnExamine(Entity ent, ref ExaminedEvent args) + { + args.PushMarkup(Loc.GetString("blood-spear-component-extra-desc")); } private void OnThrowDoHit(Entity ent, ref ThrowDoHitEvent args) diff --git a/Content.Shared/_White/Cult/Systems/BoltBarrageSystem.cs b/Content.Shared/_White/Cult/Systems/BoltBarrageSystem.cs index e2fb4947a3..696605f99a 100644 --- a/Content.Shared/_White/Cult/Systems/BoltBarrageSystem.cs +++ b/Content.Shared/_White/Cult/Systems/BoltBarrageSystem.cs @@ -1,5 +1,6 @@ using System.Linq; using Content.Shared._White.Cult.Components; +using Content.Shared.Examine; using Content.Shared.Ghost; using Content.Shared.Hands; using Content.Shared.Hands.Components; @@ -29,6 +30,12 @@ public sealed class BoltBarrageSystem : EntitySystem SubscribeLocalEvent(OnUnequipHand); SubscribeLocalEvent(OnRemoveAttempt); SubscribeLocalEvent(OnEmptyShot); + SubscribeLocalEvent(OnExamine); + } + + private void OnExamine(Entity ent, ref ExaminedEvent args) + { + args.PushMarkup(Loc.GetString("bolt-barrage-component-extra-desc")); } private void OnUnequipHand(Entity ent, ref UnequippedHandEvent args) @@ -51,7 +58,7 @@ public sealed class BoltBarrageSystem : EntitySystem private void OnDrop(Entity ent, ref DroppedEvent args) { - if (_net.IsServer) + if (_net.IsServer && ent.Comp.Unremoveable) QueueDel(ent); } diff --git a/Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs b/Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs index 8a6b818cab..861e1315cf 100644 --- a/Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs +++ b/Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs @@ -1,6 +1,6 @@ namespace Content.Shared._White.Keyhole.Components; -[RegisterComponent] +[RegisterComponent, Virtual] public partial class KeyBaseComponent : Component { [ViewVariables(VVAccess.ReadWrite)] diff --git a/Content.Shared/_White/Keyhole/KeyInsertEvent.cs b/Content.Shared/_White/Keyhole/KeyInsertEvent.cs index 48a6f2c049..cb7bb684fb 100644 --- a/Content.Shared/_White/Keyhole/KeyInsertEvent.cs +++ b/Content.Shared/_White/Keyhole/KeyInsertEvent.cs @@ -4,5 +4,13 @@ using Robust.Shared.Serialization; namespace Content.Shared._White.Keyhole; [Serializable, NetSerializable] -public sealed partial class KeyInsertDoAfterEvent : SimpleDoAfterEvent {} +public sealed partial class KeyInsertDoAfterEvent : SimpleDoAfterEvent +{ + public int FormId; + + public KeyInsertDoAfterEvent(int formId) + { + FormId = formId; + } +} diff --git a/Resources/Locale/ru-RU/cult/blood-spear.ftl b/Resources/Locale/ru-RU/cult/blood-spear.ftl new file mode 100644 index 0000000000..85e9bee270 --- /dev/null +++ b/Resources/Locale/ru-RU/cult/blood-spear.ftl @@ -0,0 +1 @@ +blood-spear-component-extra-desc = [color=darkgray]Кровавое копьё можно бросить, что заставит его разбиться и оглушить любого, кого оно поразит.[/color] diff --git a/Resources/Locale/ru-RU/cult/bolt-barrage.ftl b/Resources/Locale/ru-RU/cult/bolt-barrage.ftl index b6e870093d..0aa68a47a8 100644 --- a/Resources/Locale/ru-RU/cult/bolt-barrage.ftl +++ b/Resources/Locale/ru-RU/cult/bolt-barrage.ftl @@ -1,2 +1,3 @@ bolt-barrage-component-no-empty-hand = Вам нужно иметь свободную руку, чтобы стрелять. bolt-barrage-component-not-cultist = Вы не умеете пользоваться магией. +bolt-barrage-component-extra-desc = [color=darkgray]Для стрельбы залпом необходимо иметь свободную руку. Вобросите залп, чтобы навсегда избавиться от него.[/color] diff --git a/Resources/Locale/ru-RU/mind/components/mind-component.ftl b/Resources/Locale/ru-RU/mind/components/mind-component.ftl index fda48cb119..41a5de8e61 100644 --- a/Resources/Locale/ru-RU/mind/components/mind-component.ftl +++ b/Resources/Locale/ru-RU/mind/components/mind-component.ftl @@ -7,7 +7,10 @@ comp-mind-ghosting-prevented = Вы не можете стать призрак comp-mind-examined-catatonic = { CAPITALIZE(SUBJECT($ent)) } в кататоническом ступоре. Стрессы жизни в глубоком космосе, должно быть, оказались слишком тяжелы для { OBJECT($ent) }. Восстановление маловероятно. comp-mind-examined-dead = { CAPITALIZE(POSS-PRONOUN($ent)) } душа покинула тело. comp-mind-examined-ssd = { CAPITALIZE(SUBJECT($ent)) } рассеяно смотрит в пустоту и ни на что не реагирует. { CAPITALIZE(SUBJECT($ent)) } может скоро придти в себя. -comp-mind-examined-dead-and-ssd = Душа { CAPITALIZE(POSS-ADJ($ent)) } ушла и улетела. Любое восстановление маловероятно. +comp-mind-examined-dead-and-ssd = { CAPITALIZE(POSS-ADJ($ent)) } душа дремлет и может скоро вернуться. +comp-mind-examined-dead-and-irrecoverable = { CAPITALIZE(POSS-ADJ($ent)) } душа покинула тело и пропала. Восстановление маловероятно. + mind-component-no-mind-and-alive-text = { CAPITALIZE(SUBJECT($ent)) } в кататоническом ступоре. Стрессы жизни в глубоком космосе, должно быть, оказались слишком тяжелы для него. Восстановление маловероятно. mind-component-no-mind-and-dead-text = { CAPITALIZE(POSS-PRONOUN($ent)) } душа покинула тело и пропала. Восстановление маловероятно. mind-component-mind-and-no-session-text = { CAPITALIZE(SUBJECT($ent)) } рассеяно смотрит в пустоту и ни на что не реагирует. { CAPITALIZE(SUBJECT($ent)) } может скоро придти в себя. + diff --git a/Resources/Locale/ru-RU/white/object/tools/keyhole.ftl b/Resources/Locale/ru-RU/white/object/tools/keyhole.ftl index 788328b305..3966ca0bcc 100644 --- a/Resources/Locale/ru-RU/white/object/tools/keyhole.ftl +++ b/Resources/Locale/ru-RU/white/object/tools/keyhole.ftl @@ -1 +1,3 @@ -door-locked-via-key = {$door} закрыта +door-locked-via-key = {$door} закрыта +door-keyhole-different-form = Форма замка этой двери не совпадает с формой ключа. +construction-examine-condition-door-locked = Дверь не должна быть закрыта на ключ. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 4f45453c3c..fcadccdc1a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -61,6 +61,11 @@ - type: Tag tags: - VimPilot + - type: MobThresholds + thresholds: + 0: Alive + 20: Critical + 30: Dead - type: entity name: bee @@ -466,8 +471,8 @@ - type: MobThresholds thresholds: 0: Alive - 40: Critical - 60: Dead + 20: Critical + 30: Dead - type: MovementSpeedModifier baseWalkSpeed : 2.5 baseSprintSpeed : 4 @@ -2965,8 +2970,8 @@ - type: MobThresholds thresholds: 0: Alive - 40: Critical - 60: Dead + 20: Critical + 30: Dead - type: MovementSpeedModifier baseWalkSpeed : 4 baseSprintSpeed : 4 diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index 2de5716f4f..2e476346ab 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -8,7 +8,7 @@ sprite: Objects/Materials/materials.rsi - type: Item sprite: Objects/Materials/materials.rsi - size: Normal + size: Small - type: Tag tags: - DroneUsable diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index 29ee0d6fe1..2656e80943 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -77,6 +77,12 @@ acts: [ "Destruction" ] - type: Label originalName: jug + - type: MeleeWeapon + soundNoDamage: + path: "/Audio/Effects/Fluids/splat.ogg" + damage: + types: + Blunt: 0 - type: entity parent: Jug diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml index e15f4a644a..6c58f840da 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml @@ -11,35 +11,35 @@ - !type:SnapToGrid { } steps: - material: Steel - amount: 20 + amount: 5 doAfter: 15 - to: woodDoor completed: - !type:SnapToGrid { } steps: - material: WoodPlank - amount: 20 + amount: 5 doAfter: 15 - to: plasmaDoor completed: - !type:SnapToGrid { } steps: - material: Plasma - amount: 20 + amount: 5 doAfter: 15 - to: goldDoor completed: - !type:SnapToGrid { } steps: - material: Gold - amount: 20 + amount: 5 doAfter: 15 - to: silverDoor completed: - !type:SnapToGrid { } steps: - material: Silver - amount: 20 + amount: 5 doAfter: 15 - to: bananiumDoor completed: @@ -53,7 +53,7 @@ - !type:SnapToGrid { } steps: - material: Paper - amount: 20 + amount: 5 doAfter: 15 - node: metalDoor entity: MetalDoor @@ -62,7 +62,9 @@ completed: - !type:SpawnPrototype prototype: SheetSteel1 - amount: 20 + amount: 5 + conditions: + - !type:DoorUnlocked steps: - tool: Anchoring doAfter: 15 @@ -73,7 +75,9 @@ completed: - !type:SpawnPrototype prototype: MaterialWoodPlank1 - amount: 20 + amount: 5 + conditions: + - !type:DoorUnlocked steps: - tool: Anchoring doAfter: 15 @@ -84,7 +88,9 @@ completed: - !type:SpawnPrototype prototype: SheetPlasma - amount: 20 + amount: 5 + conditions: + - !type:DoorUnlocked steps: - tool: Anchoring doAfter: 15 @@ -95,7 +101,9 @@ completed: - !type:SpawnPrototype prototype: IngotGold1 - amount: 20 + amount: 5 + conditions: + - !type:DoorUnlocked steps: - tool: Anchoring doAfter: 15 @@ -106,7 +114,9 @@ completed: - !type:SpawnPrototype prototype: IngotSilver1 - amount: 20 + amount: 5 + conditions: + - !type:DoorUnlocked steps: - tool: Anchoring doAfter: 15 @@ -117,7 +127,9 @@ completed: - !type:SpawnPrototype prototype: SheetPaper1 - amount: 20 + amount: 5 + conditions: + - !type:DoorUnlocked steps: - tool: Anchoring doAfter: 15 @@ -129,6 +141,8 @@ - !type:SpawnPrototype prototype: MaterialBananium1 amount: 5 + conditions: + - !type:DoorUnlocked steps: - tool: Anchoring doAfter: 15 diff --git a/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml b/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml index 3816ff0208..3397ed86dc 100644 --- a/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml +++ b/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml @@ -172,7 +172,7 @@ - key: enum.CultStructureCraftUiKey.Key type: StructureCraftBoundUserInterface - type: Item - size: Normal + size: Small - type: CultItem - type: entity diff --git a/Resources/Prototypes/_White/Mood/generic_positveEffects.yml b/Resources/Prototypes/_White/Mood/generic_positveEffects.yml index 539b9a2a68..856879bdc2 100644 --- a/Resources/Prototypes/_White/Mood/generic_positveEffects.yml +++ b/Resources/Prototypes/_White/Mood/generic_positveEffects.yml @@ -1,10 +1,17 @@ -- type: moodEffect +- type: moodEffect id: BeingHugged desc: "Обнимашки - круто." moodChange: enum.MoodChangeLevel.Small positiveEffect: true timeout: 2 +- type: moodEffect + id: BeingPet + desc: "Меня погладили!" + moodChange: enum.MoodChangeLevel.Small + positiveEffect: true + timeout: 2 + - type: moodEffect id: ArcadePlay desc: "Я весело поиграл в интересную аркаду." From 38555fb999c4212bf1040762874c96fd44e94943 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 24 Mar 2024 09:44:54 +0000 Subject: [PATCH 02/11] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 51 ++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 01a3ad1d49..ff09ad7e72 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -2809,3 +2809,54 @@ id: 218 time: '2024-03-24T09:31:43.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/238 +- author: Aviu + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u043F\u0438\ + \u0441\u0430\u043D\u0438\u0435 \u043A\u0440\u043E\u0432\u0430\u0432\u043E\u043C\ + \u0443 \u043A\u043E\u043F\u044C\u044E \u0438 \u0437\u0430\u043B\u043F\u0443." + type: Add + - message: "\u0424\u0435\u043B\u0438\u043D\u0438\u0434\u044B \u0442\u0435\u043F\u0435\ + \u0440\u044C \u043F\u043E\u043B\u0443\u0447\u0430\u044E\u0442 \u0431\u0430\u0444\ + \u0444 \u043A \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043D\u0438\u044E,\ + \ \u043A\u043E\u0433\u0434\u0430 \u0438\u0445 \u0433\u043B\u0430\u0434\u044F\ + \u0442." + type: Add + - message: "\u041A\u0443\u0432\u0448\u0438\u043D\u043E\u043C \u043C\u043E\u0436\u043D\ + \u043E \u0442\u0435\u043F\u0435\u0440\u044C \u0431\u0438\u0442\u044C." + type: Add + - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0435\u0441\u043B\u0438 \u043D\ + \u0430\u0432\u0435\u0441\u0442\u0438 \u043D\u0430 \u0441\u0435\u0431\u044F \u043A\ + \u0443\u0440\u0441\u043E\u0440, \u0442\u043E \u043C\u043E\u0436\u043D\u043E\ + \ \u0437\u0430\u0441\u0442\u0440\u0435\u043B\u0438\u0442\u044C\u0441\u044F." + type: Add + - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D \u0440\u0430\u0437\u043C\ + \u0435\u0440 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u043E\u0432." + type: Tweak + - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043E \u0437\u0434\u043E\ + \u0440\u043E\u0432\u044C\u0435 \u0443 \u043B\u0435\u0442\u0443\u0447\u0435\u0439\ + \ \u043C\u044B\u0448\u0438, \u0445\u043E\u043C\u044F\u043A\u0430 \u0438 \u0442\ + \u0430\u0440\u0430\u043A\u0430\u043D\u043E\u043C\u043E\u043B\u0438." + type: Tweak + - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u0430 \u0441\u0442\u043E\ + \u0438\u043C\u043E\u0441\u0442\u044C \u043C\u0430\u0442\u0435\u0440\u0438\u0430\ + \u043B\u043E\u0432 \u0434\u043B\u044F \u043F\u043E\u0441\u0442\u0440\u043E\u0439\ + \u043A\u0438 \u0434\u0435\u0440\u0435\u0439 20 -> 5." + type: Tweak + - message: "\u0424\u0438\u043A\u0441 \u043F\u0435\u0440\u0435\u0432\u043E\u0434\u0430\ + \ \u043E\u043F\u0438\u0441\u0430\u043D\u0438\u044F \u0442\u0440\u0443\u043F\u0430\ + ." + type: Fix + - message: "\u041F\u043E \u0442\u0440\u0443\u043F\u0430\u043C \u043C\u043E\u0436\ + \u043D\u043E \u043F\u043E\u043F\u0430\u0441\u0442\u044C, \u0435\u0441\u043B\u0438\ + \ \u043D\u0430\u0432\u0435\u0441\u0442\u0438\u0441\u044C \u043D\u0430 \u043D\ + \u0438\u0445." + type: Fix + - message: "\u0417\u0430\u043A\u0440\u044B\u0442\u044B\u0435 \u043D\u0430 \u043A\ + \u043B\u044E\u0447 \u0434\u0432\u0435\u0440\u0438 \u0431\u043E\u043B\u044C\u0448\ + \u0435 \u043D\u0435 \u0440\u0430\u0437\u0431\u0438\u0440\u0430\u044E\u0442\u0441\ + \u044F \u0433\u0430\u0435\u0447\u043D\u044B\u043C \u043A\u043B\u044E\u0447\u043E\ + \u043C." + type: Fix + id: 219 + time: '2024-03-24T09:43:51.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/229 From f1f92b642ffae625152e0545830c3a9a8acc0455 Mon Sep 17 00:00:00 2001 From: rhailrake <49613070+rhailrake@users.noreply.github.com> Date: Sun, 24 Mar 2024 14:45:16 +0500 Subject: [PATCH 03/11] Revert "add: new cargo items by Armenian (#238)" This reverts commit 91d3d40be56fcaf6160b870463682d1b09ddbcf4. --- .../Catalog/Cargo/cargo_materials.yml | 48 ---- .../{_White => White}/Actions/catears.yml | 0 .../{_White => White}/Actions/emotes.yml | 0 .../{_White => White}/Actions/petsummon.yml | 0 .../{_White => White}/Actions/types.yml | 0 .../{_White => White}/Alerts/alerts.yml | 0 .../{_White => White}/Aspects/Aspects.yml | 0 .../Body/Prototypes/felinid.yml | 0 .../Body/Prototypes/harpy.yml | 0 .../Catalog/Fills/Boxes/security.yml | 0 .../{_White => White}/Catalog/Fills/misc.yml | 0 Resources/Prototypes/White/Catalog/cargo.yml | 9 + .../Catalog/seniors_fills.yml | 0 .../{_White => White}/Catalog/uplink.yml | 0 .../Construction/Paperworks/graphs.yml | 0 .../Construction/Paperworks/structures.yml | 0 .../Construction/Surgery/body_surgery.yml | 0 .../Construction/Wallmount/graphs.yml | 0 .../Construction/Wallmount/structures.yml | 0 .../Damage/modifier_sets.yml | 0 .../{_White => White}/Decals/drydock.yml | 0 .../{_White => White}/Economy/card.yml | 0 .../{_White => White}/Economy/eftpos.yml | 0 .../{_White => White}/Economy/salary.yml | 0 .../Emotes/felinid_emotes.yml | 0 .../{_White => White}/Emotes/harpy_emotes.yml | 0 .../Entities/Clothing/Belt/paramedwebbing.yml | 0 .../Clothing/Head/chaplain_helmets.yml | 0 .../Clothing/Head/night_vision_goggle.yml | 0 .../Entities/Clothing/Neck/necklace.yml | 0 .../Clothing/OuterClothing/chaplain_armor.yml | 0 .../Clothing/OuterClothing/seniors_outer.yml | 0 .../Entities/Clothing/Underwear/Bottom.yml | 0 .../Entities/Clothing/Underwear/Socks.yml | 0 .../Entities/Clothing/Underwear/Top.yml | 0 .../Entities/Clothing/nigger.yml | 0 .../Entities/Clothing/seniors_other.yml | 0 .../Entities/Hampter/barmen.yml | 0 .../Entities/Hampter/cap_hampter.yml | 0 .../Entities/Hampter/centcom.yml | 0 .../Entities/Hampter/clown_humpter.yml | 0 .../Entities/Hampter/comisar.yml | 0 .../Entities/Hampter/deadth.yml | 0 .../Entities/Hampter/emergency.yml | 0 .../Entities/Hampter/golden_hampter.yml | 0 .../Entities/Hampter/grey.yml | 0 .../Entities/Hampter/greywave.yml | 0 .../Entities/Hampter/hamhell.yml | 0 .../Entities/Hampter/krah.yml | 0 .../Entities/Hampter/lgbthampter.yml | 0 .../Entities/Hampter/med_hampter.yml | 0 .../Entities/Hampter/nuke_hampter.yml | 0 .../Entities/Hampter/sb_hampter.yml | 0 .../Entities/Hampter/shrek.yml | 0 .../Entities/Hampter/spu_hampter.yml | 0 .../Entities/Hampter/virusolog.yml | 0 .../Entities/Markers/Spawners/ERT.yml | 0 .../Objects/CargoCrates/weaponcrates.yml} | 237 +++++++++++++----- .../Circuitboards/wallmount_consoles.yml | 0 .../Objects/Misc/armaments_beacon.yml | 0 .../Entities/Objects/Misc/books.yml | 0 .../Entities/Objects/Misc/cartridges.yml | 0 .../Entities/Objects/Misc/implanters.yml | 0 .../Objects/Misc/improvised_parts.yml | 0 .../Entities/Objects/Misc/paper.yml | 0 .../Objects/Misc/subdermal_implants.yml | 0 .../Entities/Objects/Misc/ziplock.yml | 0 .../Specific/Medical/expanded_medkit.yml | 0 .../Entities/Objects/Tools/seniors_tools.yml | 0 .../Entities/Objects/Tools/tricorder.yml | 0 .../Projectiles/flamethrower_projectile.yml | 0 .../Objects/Weapons/Guns/crossbow.yml | 0 .../Objects/Weapons/Guns/flamethrower.yml | 0 .../Entities/Objects/Weapons/Guns/tempgun.yml | 0 .../Objects/Weapons/chaplain_weapons.yml | 0 .../Entities/Objects/Weapons/energy_axe.yml | 0 .../Weapons/experimental_stunbaton.yml | 0 .../Objects/Weapons/hardlight_spear.yml | 0 .../Entities/Objects/Weapons/snatcherprod.yml | 0 .../Entities}/Structures/Airlocks/qm.yml | 0 .../Structures/Furniture/benches.yml | 0 .../Structures/Machines/doc_printer.yml | 0 .../Structures/Supermatter/supermatter.yml | 0 .../Entities}/Structures/Wallmounts/auth.yml | 0 .../Structures/Wallmounts/consoles.yml | 0 .../{_White => White}/Fluff/centurion.yml | 0 .../{_White => White}/Fluff/fluff.yml | 0 .../{_White => White}/Fluff/fluff1.yml | 0 .../{_White => White}/Fluff/serbwo.yml | 0 .../{_White => White}/Fluff/sponsor.yml | 0 .../{_White => White}/Fluff/waggier.yml | 0 .../Ghosts/custom_ghosts.yml | 0 .../JukeboxAndStuff/jukebox_stuff.yml | 0 .../JukeboxAndStuff/tapes.yml | 0 .../Customization/Markings/2shonka-parts.yml | 0 .../Mobs/Customization/Markings/cat_parts.yml | 0 .../Markings/egoruch17_markings.yml | 0 .../Mobs/Customization/Markings/felinid.yml | 0 .../Markings/fox_parts-vtergot.yml | 0 .../Mobs/Customization/Markings/fox_parts.yml | 0 .../Customization/Markings/harpy-parts.yml | 0 .../Customization/Markings/human_hair.yml | 0 .../Markings/imercuryi-parts.yml | 0 .../Markings/knifeCappy_parts.yml | 0 .../Customization/Markings/reider207_tail.yml | 0 .../Markings/tajaran-tail-fluff.yml | 0 .../Customization/Markings/warete_parts.yml | 0 .../Customization/Markings/wolf_parts.yml | 0 .../{_White => White}/Mobs/Pets/pets.yml | 0 .../{_White => White}/Mobs/Player/felinid.yml | 0 .../{_White => White}/Mobs/Player/harpy.yml | 0 .../{_White => White}/Mobs/Player/human.yml | 0 .../Mobs/Species/felinid.yml | 0 .../{_White => White}/Mobs/Species/harpy.yml | 0 .../Mood/generic_negativeEffects.yml | 0 .../Mood/generic_positveEffects.yml | 0 .../Mood/moodEffects_needs.yml | 0 .../NonPeacefulRoundItems.yml | 0 .../Objects/Scrolls/magic.yml | 0 .../Objects/Scrolls/scrolls.yml | 0 .../Objects/Specific/Species/felinid.yml | 0 .../Objects/Tools/crafts.yml | 0 .../{_White => White}/Objects/Tools/form.yml | 0 .../{_White => White}/Objects/Tools/key.yml | 0 .../{_White => White}/Recipes/crafts.yml | 0 .../Recipes/hidden_crafts.yml | 0 .../Recipes/lathe_recipes.yml | 0 .../{_White => White}/Research/arsenal.yml | 0 .../Research/experimental.yml | 0 .../SoundCollections/coindrop.yml | 0 .../SoundCollections/felinid.yml | 0 .../SoundCollections/harpy.yml | 0 .../SoundCollections/web.yml | 0 .../{_White => White}/Species/actions.yml | 0 .../{_White => White}/Species/felinid.yml | 0 .../{_White => White}/Species/harpy.yml | 0 .../StatusEffects/criminal_records.yml | 0 .../Structures/Machines/atm.yml | 0 .../Structures/Windows/paper.yml | 0 .../{_White => White}/Tiles/floors.yml | 0 .../{_White => White}/event_prototypes.yml | 0 .../{_White => White}/polymorphs.yml | 0 .../{_White => White}/store_categories.yml | 0 .../Prototypes/{_White => White}/tags.yml | 0 .../{_White => White}/tts-voices.yml | 0 .../Objects/CargoCrates/materialcrates.yml | 39 --- .../Objects/CargoCrates/weaponcrates.yml | 223 ---------------- 147 files changed, 177 insertions(+), 379 deletions(-) rename Resources/Prototypes/{_White => White}/Actions/catears.yml (100%) rename Resources/Prototypes/{_White => White}/Actions/emotes.yml (100%) rename Resources/Prototypes/{_White => White}/Actions/petsummon.yml (100%) rename Resources/Prototypes/{_White => White}/Actions/types.yml (100%) rename Resources/Prototypes/{_White => White}/Alerts/alerts.yml (100%) rename Resources/Prototypes/{_White => White}/Aspects/Aspects.yml (100%) rename Resources/Prototypes/{_White => White}/Body/Prototypes/felinid.yml (100%) rename Resources/Prototypes/{_White => White}/Body/Prototypes/harpy.yml (100%) rename Resources/Prototypes/{_White => White}/Catalog/Fills/Boxes/security.yml (100%) rename Resources/Prototypes/{_White => White}/Catalog/Fills/misc.yml (100%) create mode 100644 Resources/Prototypes/White/Catalog/cargo.yml rename Resources/Prototypes/{_White => White}/Catalog/seniors_fills.yml (100%) rename Resources/Prototypes/{_White => White}/Catalog/uplink.yml (100%) rename Resources/Prototypes/{_White => White}/Construction/Paperworks/graphs.yml (100%) rename Resources/Prototypes/{_White => White}/Construction/Paperworks/structures.yml (100%) rename Resources/Prototypes/{_White => White}/Construction/Surgery/body_surgery.yml (100%) rename Resources/Prototypes/{_White => White}/Construction/Wallmount/graphs.yml (100%) rename Resources/Prototypes/{_White => White}/Construction/Wallmount/structures.yml (100%) rename Resources/Prototypes/{_White => White}/Damage/modifier_sets.yml (100%) rename Resources/Prototypes/{_White => White}/Decals/drydock.yml (100%) rename Resources/Prototypes/{_White => White}/Economy/card.yml (100%) rename Resources/Prototypes/{_White => White}/Economy/eftpos.yml (100%) rename Resources/Prototypes/{_White => White}/Economy/salary.yml (100%) rename Resources/Prototypes/{_White => White}/Emotes/felinid_emotes.yml (100%) rename Resources/Prototypes/{_White => White}/Emotes/harpy_emotes.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Clothing/Belt/paramedwebbing.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Clothing/Head/chaplain_helmets.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Clothing/Head/night_vision_goggle.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Clothing/Neck/necklace.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Clothing/OuterClothing/chaplain_armor.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Clothing/OuterClothing/seniors_outer.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Clothing/Underwear/Bottom.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Clothing/Underwear/Socks.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Clothing/Underwear/Top.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Clothing/nigger.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Clothing/seniors_other.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/barmen.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/cap_hampter.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/centcom.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/clown_humpter.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/comisar.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/deadth.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/emergency.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/golden_hampter.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/grey.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/greywave.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/hamhell.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/krah.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/lgbthampter.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/med_hampter.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/nuke_hampter.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/sb_hampter.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/shrek.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/spu_hampter.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Hampter/virusolog.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Markers/Spawners/ERT.yml (100%) rename Resources/Prototypes/{_White/Catalog/Cargo/cargo.yml => White/Entities/Objects/CargoCrates/weaponcrates.yml} (62%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Misc/armaments_beacon.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Misc/books.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Misc/cartridges.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Misc/implanters.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Misc/improvised_parts.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Misc/paper.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Misc/subdermal_implants.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Misc/ziplock.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Specific/Medical/expanded_medkit.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Tools/seniors_tools.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Tools/tricorder.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Weapons/Guns/crossbow.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Weapons/Guns/flamethrower.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Weapons/Guns/tempgun.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Weapons/chaplain_weapons.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Weapons/energy_axe.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Weapons/experimental_stunbaton.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Weapons/hardlight_spear.yml (100%) rename Resources/Prototypes/{_White => White}/Entities/Objects/Weapons/snatcherprod.yml (100%) rename Resources/Prototypes/{_White => White/Entities}/Structures/Airlocks/qm.yml (100%) rename Resources/Prototypes/{_White => White/Entities}/Structures/Furniture/benches.yml (100%) rename Resources/Prototypes/{_White => White/Entities}/Structures/Machines/doc_printer.yml (100%) rename Resources/Prototypes/{_White => White/Entities}/Structures/Supermatter/supermatter.yml (100%) rename Resources/Prototypes/{_White => White/Entities}/Structures/Wallmounts/auth.yml (100%) rename Resources/Prototypes/{_White => White/Entities}/Structures/Wallmounts/consoles.yml (100%) rename Resources/Prototypes/{_White => White}/Fluff/centurion.yml (100%) rename Resources/Prototypes/{_White => White}/Fluff/fluff.yml (100%) rename Resources/Prototypes/{_White => White}/Fluff/fluff1.yml (100%) rename Resources/Prototypes/{_White => White}/Fluff/serbwo.yml (100%) rename Resources/Prototypes/{_White => White}/Fluff/sponsor.yml (100%) rename Resources/Prototypes/{_White => White}/Fluff/waggier.yml (100%) rename Resources/Prototypes/{_White => White}/Ghosts/custom_ghosts.yml (100%) rename Resources/Prototypes/{_White => White}/JukeboxAndStuff/jukebox_stuff.yml (100%) rename Resources/Prototypes/{_White => White}/JukeboxAndStuff/tapes.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/2shonka-parts.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/cat_parts.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/egoruch17_markings.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/felinid.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/fox_parts-vtergot.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/fox_parts.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/harpy-parts.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/human_hair.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/imercuryi-parts.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/knifeCappy_parts.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/reider207_tail.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/tajaran-tail-fluff.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/warete_parts.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Customization/Markings/wolf_parts.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Pets/pets.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Player/felinid.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Player/harpy.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Player/human.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Species/felinid.yml (100%) rename Resources/Prototypes/{_White => White}/Mobs/Species/harpy.yml (100%) rename Resources/Prototypes/{_White => White}/Mood/generic_negativeEffects.yml (100%) rename Resources/Prototypes/{_White => White}/Mood/generic_positveEffects.yml (100%) rename Resources/Prototypes/{_White => White}/Mood/moodEffects_needs.yml (100%) rename Resources/Prototypes/{_White => White}/NonPeacefulRound/NonPeacefulRoundItems.yml (100%) rename Resources/Prototypes/{_White => White}/Objects/Scrolls/magic.yml (100%) rename Resources/Prototypes/{_White => White}/Objects/Scrolls/scrolls.yml (100%) rename Resources/Prototypes/{_White => White}/Objects/Specific/Species/felinid.yml (100%) rename Resources/Prototypes/{_White => White}/Objects/Tools/crafts.yml (100%) rename Resources/Prototypes/{_White => White}/Objects/Tools/form.yml (100%) rename Resources/Prototypes/{_White => White}/Objects/Tools/key.yml (100%) rename Resources/Prototypes/{_White => White}/Recipes/crafts.yml (100%) rename Resources/Prototypes/{_White => White}/Recipes/hidden_crafts.yml (100%) rename Resources/Prototypes/{_White => White}/Recipes/lathe_recipes.yml (100%) rename Resources/Prototypes/{_White => White}/Research/arsenal.yml (100%) rename Resources/Prototypes/{_White => White}/Research/experimental.yml (100%) rename Resources/Prototypes/{_White => White}/SoundCollections/coindrop.yml (100%) rename Resources/Prototypes/{_White => White}/SoundCollections/felinid.yml (100%) rename Resources/Prototypes/{_White => White}/SoundCollections/harpy.yml (100%) rename Resources/Prototypes/{_White => White}/SoundCollections/web.yml (100%) rename Resources/Prototypes/{_White => White}/Species/actions.yml (100%) rename Resources/Prototypes/{_White => White}/Species/felinid.yml (100%) rename Resources/Prototypes/{_White => White}/Species/harpy.yml (100%) rename Resources/Prototypes/{_White => White}/StatusEffects/criminal_records.yml (100%) rename Resources/Prototypes/{_White => White}/Structures/Machines/atm.yml (100%) rename Resources/Prototypes/{_White => White}/Structures/Windows/paper.yml (100%) rename Resources/Prototypes/{_White => White}/Tiles/floors.yml (100%) rename Resources/Prototypes/{_White => White}/event_prototypes.yml (100%) rename Resources/Prototypes/{_White => White}/polymorphs.yml (100%) rename Resources/Prototypes/{_White => White}/store_categories.yml (100%) rename Resources/Prototypes/{_White => White}/tags.yml (100%) rename Resources/Prototypes/{_White => White}/tts-voices.yml (100%) delete mode 100644 Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml delete mode 100644 Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index 7cde7fbccd..e23a756ca0 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -97,51 +97,3 @@ cost: 1000 category: Materials group: market - -- type: cargoProduct - name: Ящик с ураном - description: Ящик с 30 листами урана. - id: MaterialUranium - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: uranium - product: CrateMaterialUranium - cost: 3000 - category: Materials - group: market - -- type: cargoProduct - name: ящик с золотом - description: Ящик с 30 слитками золота. - id: MaterialGold - icon: - sprite: Objects/Materials/ingots.rsi - state: gold - product: CrateMaterialGold - cost: 4000 - category: Materials - group: market - -- type: cargoProduct - name: ящик с серебром - description: Ящик с 30 слитками серебра. - id: MaterialSilver - icon: - sprite: Objects/Materials/ingots.rsi - state: silver - product: CrateMaterialSilver - cost: 3000 - category: Materials - group: market - -- type: cargoProduct - name: ящик с бананиумом - description: Ящик с 30 кусочками бананиума. - id: MaterialBananium - icon: - sprite: Objects/Materials/ore.rsi - state: bananium - product: CrateMaterialBananium - cost: 3000 - category: Materials - group: market diff --git a/Resources/Prototypes/_White/Actions/catears.yml b/Resources/Prototypes/White/Actions/catears.yml similarity index 100% rename from Resources/Prototypes/_White/Actions/catears.yml rename to Resources/Prototypes/White/Actions/catears.yml diff --git a/Resources/Prototypes/_White/Actions/emotes.yml b/Resources/Prototypes/White/Actions/emotes.yml similarity index 100% rename from Resources/Prototypes/_White/Actions/emotes.yml rename to Resources/Prototypes/White/Actions/emotes.yml diff --git a/Resources/Prototypes/_White/Actions/petsummon.yml b/Resources/Prototypes/White/Actions/petsummon.yml similarity index 100% rename from Resources/Prototypes/_White/Actions/petsummon.yml rename to Resources/Prototypes/White/Actions/petsummon.yml diff --git a/Resources/Prototypes/_White/Actions/types.yml b/Resources/Prototypes/White/Actions/types.yml similarity index 100% rename from Resources/Prototypes/_White/Actions/types.yml rename to Resources/Prototypes/White/Actions/types.yml diff --git a/Resources/Prototypes/_White/Alerts/alerts.yml b/Resources/Prototypes/White/Alerts/alerts.yml similarity index 100% rename from Resources/Prototypes/_White/Alerts/alerts.yml rename to Resources/Prototypes/White/Alerts/alerts.yml diff --git a/Resources/Prototypes/_White/Aspects/Aspects.yml b/Resources/Prototypes/White/Aspects/Aspects.yml similarity index 100% rename from Resources/Prototypes/_White/Aspects/Aspects.yml rename to Resources/Prototypes/White/Aspects/Aspects.yml diff --git a/Resources/Prototypes/_White/Body/Prototypes/felinid.yml b/Resources/Prototypes/White/Body/Prototypes/felinid.yml similarity index 100% rename from Resources/Prototypes/_White/Body/Prototypes/felinid.yml rename to Resources/Prototypes/White/Body/Prototypes/felinid.yml diff --git a/Resources/Prototypes/_White/Body/Prototypes/harpy.yml b/Resources/Prototypes/White/Body/Prototypes/harpy.yml similarity index 100% rename from Resources/Prototypes/_White/Body/Prototypes/harpy.yml rename to Resources/Prototypes/White/Body/Prototypes/harpy.yml diff --git a/Resources/Prototypes/_White/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml similarity index 100% rename from Resources/Prototypes/_White/Catalog/Fills/Boxes/security.yml rename to Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml diff --git a/Resources/Prototypes/_White/Catalog/Fills/misc.yml b/Resources/Prototypes/White/Catalog/Fills/misc.yml similarity index 100% rename from Resources/Prototypes/_White/Catalog/Fills/misc.yml rename to Resources/Prototypes/White/Catalog/Fills/misc.yml diff --git a/Resources/Prototypes/White/Catalog/cargo.yml b/Resources/Prototypes/White/Catalog/cargo.yml new file mode 100644 index 0000000000..34ea2aeba9 --- /dev/null +++ b/Resources/Prototypes/White/Catalog/cargo.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: CratePaper + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: paper + product: CratePaper + cost: 1000 + category: Materials + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_White/Catalog/seniors_fills.yml b/Resources/Prototypes/White/Catalog/seniors_fills.yml similarity index 100% rename from Resources/Prototypes/_White/Catalog/seniors_fills.yml rename to Resources/Prototypes/White/Catalog/seniors_fills.yml diff --git a/Resources/Prototypes/_White/Catalog/uplink.yml b/Resources/Prototypes/White/Catalog/uplink.yml similarity index 100% rename from Resources/Prototypes/_White/Catalog/uplink.yml rename to Resources/Prototypes/White/Catalog/uplink.yml diff --git a/Resources/Prototypes/_White/Construction/Paperworks/graphs.yml b/Resources/Prototypes/White/Construction/Paperworks/graphs.yml similarity index 100% rename from Resources/Prototypes/_White/Construction/Paperworks/graphs.yml rename to Resources/Prototypes/White/Construction/Paperworks/graphs.yml diff --git a/Resources/Prototypes/_White/Construction/Paperworks/structures.yml b/Resources/Prototypes/White/Construction/Paperworks/structures.yml similarity index 100% rename from Resources/Prototypes/_White/Construction/Paperworks/structures.yml rename to Resources/Prototypes/White/Construction/Paperworks/structures.yml diff --git a/Resources/Prototypes/_White/Construction/Surgery/body_surgery.yml b/Resources/Prototypes/White/Construction/Surgery/body_surgery.yml similarity index 100% rename from Resources/Prototypes/_White/Construction/Surgery/body_surgery.yml rename to Resources/Prototypes/White/Construction/Surgery/body_surgery.yml diff --git a/Resources/Prototypes/_White/Construction/Wallmount/graphs.yml b/Resources/Prototypes/White/Construction/Wallmount/graphs.yml similarity index 100% rename from Resources/Prototypes/_White/Construction/Wallmount/graphs.yml rename to Resources/Prototypes/White/Construction/Wallmount/graphs.yml diff --git a/Resources/Prototypes/_White/Construction/Wallmount/structures.yml b/Resources/Prototypes/White/Construction/Wallmount/structures.yml similarity index 100% rename from Resources/Prototypes/_White/Construction/Wallmount/structures.yml rename to Resources/Prototypes/White/Construction/Wallmount/structures.yml diff --git a/Resources/Prototypes/_White/Damage/modifier_sets.yml b/Resources/Prototypes/White/Damage/modifier_sets.yml similarity index 100% rename from Resources/Prototypes/_White/Damage/modifier_sets.yml rename to Resources/Prototypes/White/Damage/modifier_sets.yml diff --git a/Resources/Prototypes/_White/Decals/drydock.yml b/Resources/Prototypes/White/Decals/drydock.yml similarity index 100% rename from Resources/Prototypes/_White/Decals/drydock.yml rename to Resources/Prototypes/White/Decals/drydock.yml diff --git a/Resources/Prototypes/_White/Economy/card.yml b/Resources/Prototypes/White/Economy/card.yml similarity index 100% rename from Resources/Prototypes/_White/Economy/card.yml rename to Resources/Prototypes/White/Economy/card.yml diff --git a/Resources/Prototypes/_White/Economy/eftpos.yml b/Resources/Prototypes/White/Economy/eftpos.yml similarity index 100% rename from Resources/Prototypes/_White/Economy/eftpos.yml rename to Resources/Prototypes/White/Economy/eftpos.yml diff --git a/Resources/Prototypes/_White/Economy/salary.yml b/Resources/Prototypes/White/Economy/salary.yml similarity index 100% rename from Resources/Prototypes/_White/Economy/salary.yml rename to Resources/Prototypes/White/Economy/salary.yml diff --git a/Resources/Prototypes/_White/Emotes/felinid_emotes.yml b/Resources/Prototypes/White/Emotes/felinid_emotes.yml similarity index 100% rename from Resources/Prototypes/_White/Emotes/felinid_emotes.yml rename to Resources/Prototypes/White/Emotes/felinid_emotes.yml diff --git a/Resources/Prototypes/_White/Emotes/harpy_emotes.yml b/Resources/Prototypes/White/Emotes/harpy_emotes.yml similarity index 100% rename from Resources/Prototypes/_White/Emotes/harpy_emotes.yml rename to Resources/Prototypes/White/Emotes/harpy_emotes.yml diff --git a/Resources/Prototypes/_White/Entities/Clothing/Belt/paramedwebbing.yml b/Resources/Prototypes/White/Entities/Clothing/Belt/paramedwebbing.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Clothing/Belt/paramedwebbing.yml rename to Resources/Prototypes/White/Entities/Clothing/Belt/paramedwebbing.yml diff --git a/Resources/Prototypes/_White/Entities/Clothing/Head/chaplain_helmets.yml b/Resources/Prototypes/White/Entities/Clothing/Head/chaplain_helmets.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Clothing/Head/chaplain_helmets.yml rename to Resources/Prototypes/White/Entities/Clothing/Head/chaplain_helmets.yml diff --git a/Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml b/Resources/Prototypes/White/Entities/Clothing/Head/night_vision_goggle.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml rename to Resources/Prototypes/White/Entities/Clothing/Head/night_vision_goggle.yml diff --git a/Resources/Prototypes/_White/Entities/Clothing/Neck/necklace.yml b/Resources/Prototypes/White/Entities/Clothing/Neck/necklace.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Clothing/Neck/necklace.yml rename to Resources/Prototypes/White/Entities/Clothing/Neck/necklace.yml diff --git a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/chaplain_armor.yml b/Resources/Prototypes/White/Entities/Clothing/OuterClothing/chaplain_armor.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Clothing/OuterClothing/chaplain_armor.yml rename to Resources/Prototypes/White/Entities/Clothing/OuterClothing/chaplain_armor.yml diff --git a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/seniors_outer.yml b/Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Clothing/OuterClothing/seniors_outer.yml rename to Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml diff --git a/Resources/Prototypes/_White/Entities/Clothing/Underwear/Bottom.yml b/Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Clothing/Underwear/Bottom.yml rename to Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml diff --git a/Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml b/Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml rename to Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml diff --git a/Resources/Prototypes/_White/Entities/Clothing/Underwear/Top.yml b/Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Clothing/Underwear/Top.yml rename to Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml diff --git a/Resources/Prototypes/_White/Entities/Clothing/nigger.yml b/Resources/Prototypes/White/Entities/Clothing/nigger.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Clothing/nigger.yml rename to Resources/Prototypes/White/Entities/Clothing/nigger.yml diff --git a/Resources/Prototypes/_White/Entities/Clothing/seniors_other.yml b/Resources/Prototypes/White/Entities/Clothing/seniors_other.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Clothing/seniors_other.yml rename to Resources/Prototypes/White/Entities/Clothing/seniors_other.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/barmen.yml b/Resources/Prototypes/White/Entities/Hampter/barmen.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/barmen.yml rename to Resources/Prototypes/White/Entities/Hampter/barmen.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/cap_hampter.yml b/Resources/Prototypes/White/Entities/Hampter/cap_hampter.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/cap_hampter.yml rename to Resources/Prototypes/White/Entities/Hampter/cap_hampter.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/centcom.yml b/Resources/Prototypes/White/Entities/Hampter/centcom.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/centcom.yml rename to Resources/Prototypes/White/Entities/Hampter/centcom.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/clown_humpter.yml b/Resources/Prototypes/White/Entities/Hampter/clown_humpter.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/clown_humpter.yml rename to Resources/Prototypes/White/Entities/Hampter/clown_humpter.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/comisar.yml b/Resources/Prototypes/White/Entities/Hampter/comisar.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/comisar.yml rename to Resources/Prototypes/White/Entities/Hampter/comisar.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/deadth.yml b/Resources/Prototypes/White/Entities/Hampter/deadth.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/deadth.yml rename to Resources/Prototypes/White/Entities/Hampter/deadth.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/emergency.yml b/Resources/Prototypes/White/Entities/Hampter/emergency.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/emergency.yml rename to Resources/Prototypes/White/Entities/Hampter/emergency.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/golden_hampter.yml b/Resources/Prototypes/White/Entities/Hampter/golden_hampter.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/golden_hampter.yml rename to Resources/Prototypes/White/Entities/Hampter/golden_hampter.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/grey.yml b/Resources/Prototypes/White/Entities/Hampter/grey.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/grey.yml rename to Resources/Prototypes/White/Entities/Hampter/grey.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/greywave.yml b/Resources/Prototypes/White/Entities/Hampter/greywave.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/greywave.yml rename to Resources/Prototypes/White/Entities/Hampter/greywave.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/hamhell.yml b/Resources/Prototypes/White/Entities/Hampter/hamhell.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/hamhell.yml rename to Resources/Prototypes/White/Entities/Hampter/hamhell.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/krah.yml b/Resources/Prototypes/White/Entities/Hampter/krah.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/krah.yml rename to Resources/Prototypes/White/Entities/Hampter/krah.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/lgbthampter.yml b/Resources/Prototypes/White/Entities/Hampter/lgbthampter.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/lgbthampter.yml rename to Resources/Prototypes/White/Entities/Hampter/lgbthampter.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/med_hampter.yml b/Resources/Prototypes/White/Entities/Hampter/med_hampter.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/med_hampter.yml rename to Resources/Prototypes/White/Entities/Hampter/med_hampter.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/nuke_hampter.yml b/Resources/Prototypes/White/Entities/Hampter/nuke_hampter.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/nuke_hampter.yml rename to Resources/Prototypes/White/Entities/Hampter/nuke_hampter.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/sb_hampter.yml b/Resources/Prototypes/White/Entities/Hampter/sb_hampter.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/sb_hampter.yml rename to Resources/Prototypes/White/Entities/Hampter/sb_hampter.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/shrek.yml b/Resources/Prototypes/White/Entities/Hampter/shrek.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/shrek.yml rename to Resources/Prototypes/White/Entities/Hampter/shrek.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/spu_hampter.yml b/Resources/Prototypes/White/Entities/Hampter/spu_hampter.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/spu_hampter.yml rename to Resources/Prototypes/White/Entities/Hampter/spu_hampter.yml diff --git a/Resources/Prototypes/_White/Entities/Hampter/virusolog.yml b/Resources/Prototypes/White/Entities/Hampter/virusolog.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Hampter/virusolog.yml rename to Resources/Prototypes/White/Entities/Hampter/virusolog.yml diff --git a/Resources/Prototypes/_White/Entities/Markers/Spawners/ERT.yml b/Resources/Prototypes/White/Entities/Markers/Spawners/ERT.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Markers/Spawners/ERT.yml rename to Resources/Prototypes/White/Entities/Markers/Spawners/ERT.yml diff --git a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml b/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml similarity index 62% rename from Resources/Prototypes/_White/Catalog/Cargo/cargo.yml rename to Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml index 20014d0bda..4457d0be07 100644 --- a/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml +++ b/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml @@ -1,13 +1,3 @@ -- type: cargoProduct - id: CratePaper - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: paper - product: CratePaper - cost: 1000 - category: Materials - group: market - - type: cargoProduct name: ящик магазинов для ПП description: ящик с магазинами для пистолетов-пулеметов, заполненными патронами. @@ -20,6 +10,16 @@ category: Security group: market +- type: entity + id: CrateSubMachineGunCrateAmmo + parent: CrateWeaponSecure + name: ящик с магазинами для ПП + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGun + amount: 2 + - type: cargoProduct name: ящик магазинов для WT-550 description: ящик с магазинами для пистолетов-пулеметов WT-550, заполненными патронами. @@ -32,6 +32,16 @@ category: Security group: market +- type: entity + id: CrateWT550Magazines + parent: CrateWeaponSecure + name: ящик с магазинами для WT-550 + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGunTopMounted + amount: 2 + - type: cargoProduct name: ящик магазинов для Лектера description: ящик с магазинами для Лектора, заполненными патронами. @@ -44,6 +54,16 @@ category: Security group: market +- type: entity + id: CrateLecterMagazines + parent: CrateWeaponSecure + name: ящик с магазинами для Лектера + components: + - type: StorageFill + contents: + - id: MagazineRifle + amount: 2 + - type: cargoProduct name: ящик магазинов для пистолетов description: ящик с магазинами для пистолетов, заполненными патронами. @@ -56,6 +76,16 @@ category: Security group: market +- type: entity + id: CratePistolMagazines + parent: CrateWeaponSecure + name: ящик с магазинами для пистолетов + components: + - type: StorageFill + contents: + - id: MagazinePistol + amount: 3 + - type: cargoProduct name: ящик магазинов для CV-47 description: ящик с магазинами для CV-47, заполненными патронами. @@ -68,6 +98,16 @@ category: Security group: market +- type: entity + id: CrateAKmagazines + parent: CrateWeaponSecure + name: ящик с магазинами для CV-47 + components: + - type: StorageFill + contents: + - id: MagazineLightRifle + amount: 2 + - type: cargoProduct name: ящик патронов .35 авто description: ящик с упаковками патронов .35 авто @@ -80,6 +120,16 @@ category: Security group: market +- type: entity + id: Crate35auto + parent: CrateWeaponSecure + name: ящик патронов .35 авто + components: + - type: StorageFill + contents: + - id: MagazineBoxPistol + amount: 2 + - type: cargoProduct name: ящик патронов .30 description: ящик с упаковками патронов калибра .30 @@ -92,6 +142,16 @@ category: Security group: market +- type: entity + id: Crate30normal + parent: CrateWeaponSecure + name: ящик патронов .30 + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifle + amount: 2 + - type: cargoProduct name: ящик с большой коробкой патронов .30 description: ящик с патронами калибра .30 в большой коробке @@ -104,6 +164,15 @@ category: Security group: market +- type: entity + id: crate30big + parent: CrateWeaponSecure + name: ящик с большой коробкой патронов .30 + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifleBig + amount: 1 - type: cargoProduct name: пачки патронов .20 @@ -117,6 +186,16 @@ category: Security group: market +- type: entity + id: Crate20normal + parent: CrateWeaponSecure + name: ящик с пачками патронов калибра .20 + components: + - type: StorageFill + contents: + - id: MagazineBoxRifle + amount: 2 + - type: cargoProduct name: ящик с большой коробкой патронов .20 description: ящик с патронами калибра .20 в большой коробке @@ -129,6 +208,15 @@ category: Security group: market +- type: entity + id: Crate20big + parent: CrateWeaponSecure + name: ящик с большой коробкой патронов .20 + components: + - type: StorageFill + contents: + - id: MagazineBoxRifleBig + amount: 1 - type: cargoProduct name: ящик патронов .40 магнум @@ -142,6 +230,15 @@ category: Security group: market +- type: entity + id: Crate40magnum + parent: CrateWeaponSecure + name: ящик патронов .40 магнум + components: + - type: StorageFill + contents: + - id: MagazineBoxMagnum + amount: 1 - type: cargoProduct name: коробки с дробью для дробовика @@ -155,6 +252,16 @@ category: Security group: market +- type: entity + id: CrateShotgunShell + parent: CrateWeaponSecure + name: ящик с дробью для дробовика + components: + - type: StorageFill + contents: + - id: MagazineShotgun + amount: 3 + - type: cargoProduct name: коробки с травматическими патронами для дробовика description: ящик с магазинами травматических патронов для дробовика @@ -167,6 +274,16 @@ category: Security group: market +- type: entity + id: CrateShotgunShellTrauma + parent: CrateWeaponSecure + name: ящик с травматическими патронами для дробовика + components: + - type: StorageFill + contents: + - id: MagazineShotgunBeanbag + amount: 4 + - type: cargoProduct name: ящик с дробовиками Каммерер description: набор стандартных дробовиков, поставляемых на станции НаноТрейзен. @@ -179,6 +296,16 @@ category: Security group: market +- type: entity + id: CrateKammerer + parent: CrateWeaponSecure + name: ящик с дробовиками Каммерер + components: + - type: StorageFill + contents: + - id: WeaponShotgunKammerer + amount: 2 + - type: cargoProduct name: ящик с CV-47 description: проверенная временем автоматическая винтовка. @@ -191,6 +318,17 @@ category: Security group: market +- type: entity + id: CrateCV47 + parent: CrateWeaponSecure + name: ящик с CV-47 + components: + - type: StorageFill + contents: + - id: MagazineLightRifle + amount: 2 + - id: WeaponRifleAk + amount: 1 - type: cargoProduct name: ящик с Лектером @@ -204,6 +342,17 @@ category: Security group: market +- type: entity + id: CrateLecter + parent: CrateWeaponSecure + name: ящик с Лектером + components: + - type: StorageFill + contents: + - id: MagazineRifle + amount: 2 + - id: WeaponRifleLecter + amount: 1 - type: cargoProduct name: ящик с винтовками Мосина @@ -217,62 +366,12 @@ category: Security group: market -- type: cargoProduct - name: ящик нелетальных магазинов для пистолетов - description: ящик с с тремя нелетальными магазинами для пистолетов. - id: cargoPistolRubberMagazines - icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi - state: rubber - product: CratePistolRubberMagazines - cost: 300 - category: Security - group: market - -- type: cargoProduct - name: ящик нелетальных магазинов для лектора - description: Ящик с тремя обоймами нелетальных магазинов для лектора. - id: CargoLecterRubberMagazines - icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi - state: rubber - product: CrateLecterRubberMagazines - cost: 500 - category: Security - group: market - -- type: cargoProduct - name: ящик нелетальных магазинов для ПП - description: Ящик с с тремя нелетальными магазинами для ПП. - id: cargoSubMachineGunRubberAmmo - icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi - state: rubber - product: CrateSubMachineGunRubberMagazines - cost: 400 - category: Security - group: market - -- type: cargoProduct - name: ящик нелетальных магазинов для CV-47 - description: Ящик с с тремя нелетальными магазинами для CV-47. - id: cargoRifleRubberMagazines - icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi - state: rubber - product: CrateRifleRubberMagazines - cost: 600 - category: Security - group: market - -- type: cargoProduct - name: Ящик скафандров СБ. - description: Ящик с двумя скафандрами СБ. Отлично подходит для прогулки в вакууме. - id: cargoSecurityVoidsuit - icon: - sprite: Clothing/Head/Hardsuits/security.rsi - state: icon-flash - product: CrateSecurityVoidsuit - cost: 4000 - category: Security - group: market +- type: entity + id: CrateMosin + parent: CrateWeaponSecure + name: ящик с Лектером + components: + - type: StorageFill + contents: + - id: WeaponSniperMosin + amount: 2 diff --git a/Resources/Prototypes/_White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml b/Resources/Prototypes/White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml rename to Resources/Prototypes/White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/armaments_beacon.yml b/Resources/Prototypes/White/Entities/Objects/Misc/armaments_beacon.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Misc/armaments_beacon.yml rename to Resources/Prototypes/White/Entities/Objects/Misc/armaments_beacon.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/books.yml b/Resources/Prototypes/White/Entities/Objects/Misc/books.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Misc/books.yml rename to Resources/Prototypes/White/Entities/Objects/Misc/books.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/cartridges.yml b/Resources/Prototypes/White/Entities/Objects/Misc/cartridges.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Misc/cartridges.yml rename to Resources/Prototypes/White/Entities/Objects/Misc/cartridges.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/White/Entities/Objects/Misc/implanters.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml rename to Resources/Prototypes/White/Entities/Objects/Misc/implanters.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/improvised_parts.yml b/Resources/Prototypes/White/Entities/Objects/Misc/improvised_parts.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Misc/improvised_parts.yml rename to Resources/Prototypes/White/Entities/Objects/Misc/improvised_parts.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/White/Entities/Objects/Misc/paper.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Misc/paper.yml rename to Resources/Prototypes/White/Entities/Objects/Misc/paper.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/White/Entities/Objects/Misc/subdermal_implants.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml rename to Resources/Prototypes/White/Entities/Objects/Misc/subdermal_implants.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/ziplock.yml b/Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Misc/ziplock.yml rename to Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml b/Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml rename to Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml b/Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml rename to Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Tools/tricorder.yml b/Resources/Prototypes/White/Entities/Objects/Tools/tricorder.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Tools/tricorder.yml rename to Resources/Prototypes/White/Entities/Objects/Tools/tricorder.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml rename to Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/crossbow.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/crossbow.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/crossbow.yml rename to Resources/Prototypes/White/Entities/Objects/Weapons/Guns/crossbow.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/flamethrower.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/flamethrower.yml rename to Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/tempgun.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml rename to Resources/Prototypes/White/Entities/Objects/Weapons/Guns/tempgun.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml rename to Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/energy_axe.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml rename to Resources/Prototypes/White/Entities/Objects/Weapons/energy_axe.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/experimental_stunbaton.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Weapons/experimental_stunbaton.yml rename to Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/hardlight_spear.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml rename to Resources/Prototypes/White/Entities/Objects/Weapons/hardlight_spear.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/snatcherprod.yml b/Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml similarity index 100% rename from Resources/Prototypes/_White/Entities/Objects/Weapons/snatcherprod.yml rename to Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml diff --git a/Resources/Prototypes/_White/Structures/Airlocks/qm.yml b/Resources/Prototypes/White/Entities/Structures/Airlocks/qm.yml similarity index 100% rename from Resources/Prototypes/_White/Structures/Airlocks/qm.yml rename to Resources/Prototypes/White/Entities/Structures/Airlocks/qm.yml diff --git a/Resources/Prototypes/_White/Structures/Furniture/benches.yml b/Resources/Prototypes/White/Entities/Structures/Furniture/benches.yml similarity index 100% rename from Resources/Prototypes/_White/Structures/Furniture/benches.yml rename to Resources/Prototypes/White/Entities/Structures/Furniture/benches.yml diff --git a/Resources/Prototypes/_White/Structures/Machines/doc_printer.yml b/Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml similarity index 100% rename from Resources/Prototypes/_White/Structures/Machines/doc_printer.yml rename to Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml diff --git a/Resources/Prototypes/_White/Structures/Supermatter/supermatter.yml b/Resources/Prototypes/White/Entities/Structures/Supermatter/supermatter.yml similarity index 100% rename from Resources/Prototypes/_White/Structures/Supermatter/supermatter.yml rename to Resources/Prototypes/White/Entities/Structures/Supermatter/supermatter.yml diff --git a/Resources/Prototypes/_White/Structures/Wallmounts/auth.yml b/Resources/Prototypes/White/Entities/Structures/Wallmounts/auth.yml similarity index 100% rename from Resources/Prototypes/_White/Structures/Wallmounts/auth.yml rename to Resources/Prototypes/White/Entities/Structures/Wallmounts/auth.yml diff --git a/Resources/Prototypes/_White/Structures/Wallmounts/consoles.yml b/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml similarity index 100% rename from Resources/Prototypes/_White/Structures/Wallmounts/consoles.yml rename to Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml diff --git a/Resources/Prototypes/_White/Fluff/centurion.yml b/Resources/Prototypes/White/Fluff/centurion.yml similarity index 100% rename from Resources/Prototypes/_White/Fluff/centurion.yml rename to Resources/Prototypes/White/Fluff/centurion.yml diff --git a/Resources/Prototypes/_White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml similarity index 100% rename from Resources/Prototypes/_White/Fluff/fluff.yml rename to Resources/Prototypes/White/Fluff/fluff.yml diff --git a/Resources/Prototypes/_White/Fluff/fluff1.yml b/Resources/Prototypes/White/Fluff/fluff1.yml similarity index 100% rename from Resources/Prototypes/_White/Fluff/fluff1.yml rename to Resources/Prototypes/White/Fluff/fluff1.yml diff --git a/Resources/Prototypes/_White/Fluff/serbwo.yml b/Resources/Prototypes/White/Fluff/serbwo.yml similarity index 100% rename from Resources/Prototypes/_White/Fluff/serbwo.yml rename to Resources/Prototypes/White/Fluff/serbwo.yml diff --git a/Resources/Prototypes/_White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml similarity index 100% rename from Resources/Prototypes/_White/Fluff/sponsor.yml rename to Resources/Prototypes/White/Fluff/sponsor.yml diff --git a/Resources/Prototypes/_White/Fluff/waggier.yml b/Resources/Prototypes/White/Fluff/waggier.yml similarity index 100% rename from Resources/Prototypes/_White/Fluff/waggier.yml rename to Resources/Prototypes/White/Fluff/waggier.yml diff --git a/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/White/Ghosts/custom_ghosts.yml similarity index 100% rename from Resources/Prototypes/_White/Ghosts/custom_ghosts.yml rename to Resources/Prototypes/White/Ghosts/custom_ghosts.yml diff --git a/Resources/Prototypes/_White/JukeboxAndStuff/jukebox_stuff.yml b/Resources/Prototypes/White/JukeboxAndStuff/jukebox_stuff.yml similarity index 100% rename from Resources/Prototypes/_White/JukeboxAndStuff/jukebox_stuff.yml rename to Resources/Prototypes/White/JukeboxAndStuff/jukebox_stuff.yml diff --git a/Resources/Prototypes/_White/JukeboxAndStuff/tapes.yml b/Resources/Prototypes/White/JukeboxAndStuff/tapes.yml similarity index 100% rename from Resources/Prototypes/_White/JukeboxAndStuff/tapes.yml rename to Resources/Prototypes/White/JukeboxAndStuff/tapes.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/2shonka-parts.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/2shonka-parts.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/2shonka-parts.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/2shonka-parts.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/cat_parts.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/cat_parts.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/cat_parts.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/egoruch17_markings.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/egoruch17_markings.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/egoruch17_markings.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/egoruch17_markings.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/felinid.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/felinid.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/felinid.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts-vtergot.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts-vtergot.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts-vtergot.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts-vtergot.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/harpy-parts.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/harpy-parts.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/harpy-parts.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/harpy-parts.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/human_hair.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/human_hair.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/human_hair.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/imercuryi-parts.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/imercuryi-parts.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/imercuryi-parts.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/imercuryi-parts.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/knifeCappy_parts.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/knifeCappy_parts.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/knifeCappy_parts.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/knifeCappy_parts.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/reider207_tail.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/reider207_tail.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/reider207_tail.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/reider207_tail.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/tajaran-tail-fluff.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/tajaran-tail-fluff.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/tajaran-tail-fluff.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/tajaran-tail-fluff.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/warete_parts.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/warete_parts.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/warete_parts.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/warete_parts.yml diff --git a/Resources/Prototypes/_White/Mobs/Customization/Markings/wolf_parts.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/wolf_parts.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Customization/Markings/wolf_parts.yml rename to Resources/Prototypes/White/Mobs/Customization/Markings/wolf_parts.yml diff --git a/Resources/Prototypes/_White/Mobs/Pets/pets.yml b/Resources/Prototypes/White/Mobs/Pets/pets.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Pets/pets.yml rename to Resources/Prototypes/White/Mobs/Pets/pets.yml diff --git a/Resources/Prototypes/_White/Mobs/Player/felinid.yml b/Resources/Prototypes/White/Mobs/Player/felinid.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Player/felinid.yml rename to Resources/Prototypes/White/Mobs/Player/felinid.yml diff --git a/Resources/Prototypes/_White/Mobs/Player/harpy.yml b/Resources/Prototypes/White/Mobs/Player/harpy.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Player/harpy.yml rename to Resources/Prototypes/White/Mobs/Player/harpy.yml diff --git a/Resources/Prototypes/_White/Mobs/Player/human.yml b/Resources/Prototypes/White/Mobs/Player/human.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Player/human.yml rename to Resources/Prototypes/White/Mobs/Player/human.yml diff --git a/Resources/Prototypes/_White/Mobs/Species/felinid.yml b/Resources/Prototypes/White/Mobs/Species/felinid.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Species/felinid.yml rename to Resources/Prototypes/White/Mobs/Species/felinid.yml diff --git a/Resources/Prototypes/_White/Mobs/Species/harpy.yml b/Resources/Prototypes/White/Mobs/Species/harpy.yml similarity index 100% rename from Resources/Prototypes/_White/Mobs/Species/harpy.yml rename to Resources/Prototypes/White/Mobs/Species/harpy.yml diff --git a/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml b/Resources/Prototypes/White/Mood/generic_negativeEffects.yml similarity index 100% rename from Resources/Prototypes/_White/Mood/generic_negativeEffects.yml rename to Resources/Prototypes/White/Mood/generic_negativeEffects.yml diff --git a/Resources/Prototypes/_White/Mood/generic_positveEffects.yml b/Resources/Prototypes/White/Mood/generic_positveEffects.yml similarity index 100% rename from Resources/Prototypes/_White/Mood/generic_positveEffects.yml rename to Resources/Prototypes/White/Mood/generic_positveEffects.yml diff --git a/Resources/Prototypes/_White/Mood/moodEffects_needs.yml b/Resources/Prototypes/White/Mood/moodEffects_needs.yml similarity index 100% rename from Resources/Prototypes/_White/Mood/moodEffects_needs.yml rename to Resources/Prototypes/White/Mood/moodEffects_needs.yml diff --git a/Resources/Prototypes/_White/NonPeacefulRound/NonPeacefulRoundItems.yml b/Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml similarity index 100% rename from Resources/Prototypes/_White/NonPeacefulRound/NonPeacefulRoundItems.yml rename to Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml diff --git a/Resources/Prototypes/_White/Objects/Scrolls/magic.yml b/Resources/Prototypes/White/Objects/Scrolls/magic.yml similarity index 100% rename from Resources/Prototypes/_White/Objects/Scrolls/magic.yml rename to Resources/Prototypes/White/Objects/Scrolls/magic.yml diff --git a/Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml b/Resources/Prototypes/White/Objects/Scrolls/scrolls.yml similarity index 100% rename from Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml rename to Resources/Prototypes/White/Objects/Scrolls/scrolls.yml diff --git a/Resources/Prototypes/_White/Objects/Specific/Species/felinid.yml b/Resources/Prototypes/White/Objects/Specific/Species/felinid.yml similarity index 100% rename from Resources/Prototypes/_White/Objects/Specific/Species/felinid.yml rename to Resources/Prototypes/White/Objects/Specific/Species/felinid.yml diff --git a/Resources/Prototypes/_White/Objects/Tools/crafts.yml b/Resources/Prototypes/White/Objects/Tools/crafts.yml similarity index 100% rename from Resources/Prototypes/_White/Objects/Tools/crafts.yml rename to Resources/Prototypes/White/Objects/Tools/crafts.yml diff --git a/Resources/Prototypes/_White/Objects/Tools/form.yml b/Resources/Prototypes/White/Objects/Tools/form.yml similarity index 100% rename from Resources/Prototypes/_White/Objects/Tools/form.yml rename to Resources/Prototypes/White/Objects/Tools/form.yml diff --git a/Resources/Prototypes/_White/Objects/Tools/key.yml b/Resources/Prototypes/White/Objects/Tools/key.yml similarity index 100% rename from Resources/Prototypes/_White/Objects/Tools/key.yml rename to Resources/Prototypes/White/Objects/Tools/key.yml diff --git a/Resources/Prototypes/_White/Recipes/crafts.yml b/Resources/Prototypes/White/Recipes/crafts.yml similarity index 100% rename from Resources/Prototypes/_White/Recipes/crafts.yml rename to Resources/Prototypes/White/Recipes/crafts.yml diff --git a/Resources/Prototypes/_White/Recipes/hidden_crafts.yml b/Resources/Prototypes/White/Recipes/hidden_crafts.yml similarity index 100% rename from Resources/Prototypes/_White/Recipes/hidden_crafts.yml rename to Resources/Prototypes/White/Recipes/hidden_crafts.yml diff --git a/Resources/Prototypes/_White/Recipes/lathe_recipes.yml b/Resources/Prototypes/White/Recipes/lathe_recipes.yml similarity index 100% rename from Resources/Prototypes/_White/Recipes/lathe_recipes.yml rename to Resources/Prototypes/White/Recipes/lathe_recipes.yml diff --git a/Resources/Prototypes/_White/Research/arsenal.yml b/Resources/Prototypes/White/Research/arsenal.yml similarity index 100% rename from Resources/Prototypes/_White/Research/arsenal.yml rename to Resources/Prototypes/White/Research/arsenal.yml diff --git a/Resources/Prototypes/_White/Research/experimental.yml b/Resources/Prototypes/White/Research/experimental.yml similarity index 100% rename from Resources/Prototypes/_White/Research/experimental.yml rename to Resources/Prototypes/White/Research/experimental.yml diff --git a/Resources/Prototypes/_White/SoundCollections/coindrop.yml b/Resources/Prototypes/White/SoundCollections/coindrop.yml similarity index 100% rename from Resources/Prototypes/_White/SoundCollections/coindrop.yml rename to Resources/Prototypes/White/SoundCollections/coindrop.yml diff --git a/Resources/Prototypes/_White/SoundCollections/felinid.yml b/Resources/Prototypes/White/SoundCollections/felinid.yml similarity index 100% rename from Resources/Prototypes/_White/SoundCollections/felinid.yml rename to Resources/Prototypes/White/SoundCollections/felinid.yml diff --git a/Resources/Prototypes/_White/SoundCollections/harpy.yml b/Resources/Prototypes/White/SoundCollections/harpy.yml similarity index 100% rename from Resources/Prototypes/_White/SoundCollections/harpy.yml rename to Resources/Prototypes/White/SoundCollections/harpy.yml diff --git a/Resources/Prototypes/_White/SoundCollections/web.yml b/Resources/Prototypes/White/SoundCollections/web.yml similarity index 100% rename from Resources/Prototypes/_White/SoundCollections/web.yml rename to Resources/Prototypes/White/SoundCollections/web.yml diff --git a/Resources/Prototypes/_White/Species/actions.yml b/Resources/Prototypes/White/Species/actions.yml similarity index 100% rename from Resources/Prototypes/_White/Species/actions.yml rename to Resources/Prototypes/White/Species/actions.yml diff --git a/Resources/Prototypes/_White/Species/felinid.yml b/Resources/Prototypes/White/Species/felinid.yml similarity index 100% rename from Resources/Prototypes/_White/Species/felinid.yml rename to Resources/Prototypes/White/Species/felinid.yml diff --git a/Resources/Prototypes/_White/Species/harpy.yml b/Resources/Prototypes/White/Species/harpy.yml similarity index 100% rename from Resources/Prototypes/_White/Species/harpy.yml rename to Resources/Prototypes/White/Species/harpy.yml diff --git a/Resources/Prototypes/_White/StatusEffects/criminal_records.yml b/Resources/Prototypes/White/StatusEffects/criminal_records.yml similarity index 100% rename from Resources/Prototypes/_White/StatusEffects/criminal_records.yml rename to Resources/Prototypes/White/StatusEffects/criminal_records.yml diff --git a/Resources/Prototypes/_White/Structures/Machines/atm.yml b/Resources/Prototypes/White/Structures/Machines/atm.yml similarity index 100% rename from Resources/Prototypes/_White/Structures/Machines/atm.yml rename to Resources/Prototypes/White/Structures/Machines/atm.yml diff --git a/Resources/Prototypes/_White/Structures/Windows/paper.yml b/Resources/Prototypes/White/Structures/Windows/paper.yml similarity index 100% rename from Resources/Prototypes/_White/Structures/Windows/paper.yml rename to Resources/Prototypes/White/Structures/Windows/paper.yml diff --git a/Resources/Prototypes/_White/Tiles/floors.yml b/Resources/Prototypes/White/Tiles/floors.yml similarity index 100% rename from Resources/Prototypes/_White/Tiles/floors.yml rename to Resources/Prototypes/White/Tiles/floors.yml diff --git a/Resources/Prototypes/_White/event_prototypes.yml b/Resources/Prototypes/White/event_prototypes.yml similarity index 100% rename from Resources/Prototypes/_White/event_prototypes.yml rename to Resources/Prototypes/White/event_prototypes.yml diff --git a/Resources/Prototypes/_White/polymorphs.yml b/Resources/Prototypes/White/polymorphs.yml similarity index 100% rename from Resources/Prototypes/_White/polymorphs.yml rename to Resources/Prototypes/White/polymorphs.yml diff --git a/Resources/Prototypes/_White/store_categories.yml b/Resources/Prototypes/White/store_categories.yml similarity index 100% rename from Resources/Prototypes/_White/store_categories.yml rename to Resources/Prototypes/White/store_categories.yml diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/White/tags.yml similarity index 100% rename from Resources/Prototypes/_White/tags.yml rename to Resources/Prototypes/White/tags.yml diff --git a/Resources/Prototypes/_White/tts-voices.yml b/Resources/Prototypes/White/tts-voices.yml similarity index 100% rename from Resources/Prototypes/_White/tts-voices.yml rename to Resources/Prototypes/White/tts-voices.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml deleted file mode 100644 index 2095696cd8..0000000000 --- a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml +++ /dev/null @@ -1,39 +0,0 @@ -- type: entity - id: CrateMaterialBananium - parent: CrateGenericSteel - name: ящик с бананиумом - components: - - type: StorageFill - contents: - - id: MaterialBananium - amount: 3 - -- type: entity - id: CrateMaterialSilver - parent: CrateGenericSteel - name: ящик с серебром - components: - - type: StorageFill - contents: - - id: IngotSilver - amount: 1 - -- type: entity - id: CrateMaterialGold - parent: CrateGenericSteel - name: ящик с золотом - components: - - type: StorageFill - contents: - - id: IngotGold - amount: 1 - -- type: entity - id: CrateMaterialUranium - parent: CrateGenericSteel - name: ящик урана - components: - - type: StorageFill - contents: - - id: SheetUranium - amount: 1 diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml deleted file mode 100644 index b39dca5408..0000000000 --- a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml +++ /dev/null @@ -1,223 +0,0 @@ -- type: entity - id: CrateSubMachineGunCrateAmmo - parent: CrateWeaponSecure - name: ящик с магазинами для ПП - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGun - amount: 2 - -- type: entity - id: CrateWT550Magazines - parent: CrateWeaponSecure - name: ящик с магазинами для WT-550 - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGunTopMounted - amount: 2 - -- type: entity - id: CrateLecterMagazines - parent: CrateWeaponSecure - name: ящик с магазинами для Лектера - components: - - type: StorageFill - contents: - - id: MagazineRifle - amount: 2 - -- type: entity - id: CratePistolMagazines - parent: CrateWeaponSecure - name: ящик с магазинами для пистолетов - components: - - type: StorageFill - contents: - - id: MagazinePistol - amount: 3 - -- type: entity - id: CrateAKmagazines - parent: CrateWeaponSecure - name: ящик с магазинами для CV-47 - components: - - type: StorageFill - contents: - - id: MagazineLightRifle - amount: 2 - -- type: entity - id: Crate35auto - parent: CrateWeaponSecure - name: ящик патронов .35 авто - components: - - type: StorageFill - contents: - - id: MagazineBoxPistol - amount: 2 - -- type: entity - id: Crate30normal - parent: CrateWeaponSecure - name: ящик патронов .30 - components: - - type: StorageFill - contents: - - id: MagazineBoxLightRifle - amount: 2 - -- type: entity - id: crate30big - parent: CrateWeaponSecure - name: ящик с большой коробкой патронов .30 - components: - - type: StorageFill - contents: - - id: MagazineBoxLightRifleBig - amount: 1 - -- type: entity - id: Crate20normal - parent: CrateWeaponSecure - name: ящик с пачками патронов калибра .20 - components: - - type: StorageFill - contents: - - id: MagazineBoxRifle - amount: 2 - -- type: entity - id: Crate20big - parent: CrateWeaponSecure - name: ящик с большой коробкой патронов .20 - components: - - type: StorageFill - contents: - - id: MagazineBoxRifleBig - amount: 1 - -- type: entity - id: Crate40magnum - parent: CrateWeaponSecure - name: ящик патронов .40 магнум - components: - - type: StorageFill - contents: - - id: MagazineBoxMagnum - amount: 1 - -- type: entity - id: CrateShotgunShell - parent: CrateWeaponSecure - name: ящик с дробью для дробовика - components: - - type: StorageFill - contents: - - id: MagazineShotgun - amount: 3 - -- type: entity - id: CrateShotgunShellTrauma - parent: CrateWeaponSecure - name: ящик с травматическими патронами для дробовика - components: - - type: StorageFill - contents: - - id: MagazineShotgunBeanbag - amount: 4 - -- type: entity - id: CrateKammerer - parent: CrateWeaponSecure - name: ящик с дробовиками Каммерер - components: - - type: StorageFill - contents: - - id: WeaponShotgunKammerer - amount: 2 - -- type: entity - id: CrateCV47 - parent: CrateWeaponSecure - name: ящик с CV-47 - components: - - type: StorageFill - contents: - - id: MagazineLightRifle - amount: 2 - - id: WeaponRifleAk - amount: 1 - -- type: entity - id: CrateLecter - parent: CrateWeaponSecure - name: ящик с Лектером - components: - - type: StorageFill - contents: - - id: MagazineRifle - amount: 2 - - id: WeaponRifleLecter - amount: 1 - -- type: entity - id: CrateMosin - parent: CrateWeaponSecure - name: ящик с Лектером - components: - - type: StorageFill - contents: - - id: WeaponSniperMosin - amount: 2 - -- type: entity - id: CratePistolRubberMagazines - parent: CrateWeaponSecure - name: ящик с нелетальными магазинами для пистолетов - components: - - type: StorageFill - contents: - - id: BoxMagazinePistolRubber - amount: 1 - -- type: entity - id: CrateLecterRubberMagazines - parent: CrateWeaponSecure - name: ящик с нелетальными магазинами для лектора - components: - - type: StorageFill - contents: - - id: BoxMagazineRifleRubber - amount: 1 - -- type: entity - id: CrateSubMachineGunRubberMagazines - parent: CrateWeaponSecure - name: ящик с нелетальными магазинами для ПП - components: - - type: StorageFill - contents: - - id: BoxMagazinePistolSubMachineGunRubber - amount: 1 - -- type: entity - id: CrateRifleRubberMagazines - parent: CrateWeaponSecure - name: ящик с нелетальными магазинами для CV-47 - components: - - type: StorageFill - contents: - - id: BoxMagazineLightRifleRubber - amount: 1 - -- type: entity - id: CrateSecurityVoidsuit - parent: CrateWeaponSecure - name: ящик с скафандрами СБ - components: - - type: StorageFill - contents: - - id: ClothingOuterHardsuitSecurity - amount: 2 From 4e8dc6531a8fb24fd56d1ffc700280e651a916e2 Mon Sep 17 00:00:00 2001 From: rhailrake <49613070+rhailrake@users.noreply.github.com> Date: Sun, 24 Mar 2024 14:45:43 +0500 Subject: [PATCH 04/11] fluff --- Resources/Prototypes/White/Fluff/waggier.yml | 16 +++++++++++----- .../Prototypes/White/Ghosts/custom_ghosts.yml | 16 ++++++++-------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/White/Fluff/waggier.yml b/Resources/Prototypes/White/Fluff/waggier.yml index 4273dc47b3..2ee1ae6f3d 100644 --- a/Resources/Prototypes/White/Fluff/waggier.yml +++ b/Resources/Prototypes/White/Fluff/waggier.yml @@ -1,14 +1,14 @@ - type: entity - parent: ClothingHeadHatBeretSecurity + parent: ClothingHeadHatBeretHoS id: ClothingHeadHatBeretWaggier - name: security beret - description: "На нем вышито слово Waggier... Наверное это название фирмы?" + name: потрепанный берет + description: "На нем вышито слово 'Waggier'. Наверное это название фирмы?" - type: entity - name: experimental stun baton + name: встанислав шишкин parent: ExperimentalStunbaton id: ExperimentalStunbatonWaggier - description: "Литая сталь. Прочный пластик. Дубинка Ветерана-СБ Регины Хьюи" + description: "Литая сталь. Прочный пластик. Дубинка Ветерана СБ Регины Хьюи." - type: loadout id: WaggierBeretLoadout @@ -45,3 +45,9 @@ entity: ExperimentalStunbatonWaggier sponsorOnly: true whitelistJobs: [ Detective, HeadOfSecurity, SecurityCadet, SecurityOfficer, Warden, SeniorOfficer ] + +- type: loadout + id: WaggierOuterCoatLoadout + entity: ClothingOuterCoatHoSTrench + sponsorOnly: true + whitelistJobs: [ Detective, HeadOfSecurity, SecurityCadet, SecurityOfficer, Warden, SeniorOfficer ] diff --git a/Resources/Prototypes/White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/White/Ghosts/custom_ghosts.yml index 444949561f..62612cff1d 100644 --- a/Resources/Prototypes/White/Ghosts/custom_ghosts.yml +++ b/Resources/Prototypes/White/Ghosts/custom_ghosts.yml @@ -366,14 +366,14 @@ ghostDescription: Летающее бирюзовое существо, напоминающее кота, с пушистым телом, грациозными движениями и глазами, сверкающими с загадочным блеском. #waggier -- type: customGhost - id: waggier-ghost - ckey: waggier - sprite: White/Ghosts/waggier-ghost.rsi - alpha: 0.9 - ghostName: Ветеранка СБ - ghostDescription: Вы нарушили правила действующего закона.... "перечисление статей" - size: 0.6, 0.6 +#- type: customGhost +# id: waggier-ghost +# ckey: waggier +# sprite: White/Ghosts/waggier-ghost.rsi +# alpha: 0.9 +# ghostName: Ветеранка СБ +# ghostDescription: Вы нарушили правила действующего закона.... "перечисление статей" +# size: 0.6, 0.6 #krokozyabra - type: customGhost From bfb38ec0309f80aea6bf00c2d85120c263cc507f Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Sun, 24 Mar 2024 12:57:41 +0300 Subject: [PATCH 05/11] add: add new cargo items by Armenian (#239) --- .../Catalog/Cargo/cargo_materials.yml | 48 +++ .../Prototypes/White/Catalog/Cargo/cargo.yml | 278 ++++++++++++++++++ Resources/Prototypes/White/Catalog/cargo.yml | 9 - .../Objects/CargoCrates/materialcrates.yml | 39 +++ .../Objects/CargoCrates/weaponcrates.yml | 224 ++++++++++++++ 5 files changed, 589 insertions(+), 9 deletions(-) create mode 100644 Resources/Prototypes/White/Catalog/Cargo/cargo.yml delete mode 100644 Resources/Prototypes/White/Catalog/cargo.yml create mode 100644 Resources/Prototypes/White/Entities/Objects/CargoCrates/materialcrates.yml diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index e23a756ca0..7cde7fbccd 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -97,3 +97,51 @@ cost: 1000 category: Materials group: market + +- type: cargoProduct + name: Ящик с ураном + description: Ящик с 30 листами урана. + id: MaterialUranium + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: uranium + product: CrateMaterialUranium + cost: 3000 + category: Materials + group: market + +- type: cargoProduct + name: ящик с золотом + description: Ящик с 30 слитками золота. + id: MaterialGold + icon: + sprite: Objects/Materials/ingots.rsi + state: gold + product: CrateMaterialGold + cost: 4000 + category: Materials + group: market + +- type: cargoProduct + name: ящик с серебром + description: Ящик с 30 слитками серебра. + id: MaterialSilver + icon: + sprite: Objects/Materials/ingots.rsi + state: silver + product: CrateMaterialSilver + cost: 3000 + category: Materials + group: market + +- type: cargoProduct + name: ящик с бананиумом + description: Ящик с 30 кусочками бананиума. + id: MaterialBananium + icon: + sprite: Objects/Materials/ore.rsi + state: bananium + product: CrateMaterialBananium + cost: 3000 + category: Materials + group: market diff --git a/Resources/Prototypes/White/Catalog/Cargo/cargo.yml b/Resources/Prototypes/White/Catalog/Cargo/cargo.yml new file mode 100644 index 0000000000..20014d0bda --- /dev/null +++ b/Resources/Prototypes/White/Catalog/Cargo/cargo.yml @@ -0,0 +1,278 @@ +- type: cargoProduct + id: CratePaper + icon: + sprite: Objects/Materials/Sheets/other.rsi + state: paper + product: CratePaper + cost: 1000 + category: Materials + group: market + +- type: cargoProduct + name: ящик магазинов для ПП + description: ящик с магазинами для пистолетов-пулеметов, заполненными патронами. + id: cargoSubMachineGunCrateAmmo + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi + state: base + product: CrateSubMachineGunCrateAmmo + cost: 2500 + category: Security + group: market + +- type: cargoProduct + name: ящик магазинов для WT-550 + description: ящик с магазинами для пистолетов-пулеметов WT-550, заполненными патронами. + id: cargoWT550Magazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi + state: base + product: CrateWT550Magazines + cost: 2500 + category: Security + group: market + +- type: cargoProduct + name: ящик магазинов для Лектера + description: ящик с магазинами для Лектора, заполненными патронами. + id: cargoLecterMagazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + state: base + product: CrateLecterMagazines + cost: 2500 + category: Security + group: market + +- type: cargoProduct + name: ящик магазинов для пистолетов + description: ящик с магазинами для пистолетов, заполненными патронами. + id: cargoPistolMagazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi + state: base + product: CratePistolMagazines + cost: 1000 + category: Security + group: market + +- type: cargoProduct + name: ящик магазинов для CV-47 + description: ящик с магазинами для CV-47, заполненными патронами. + id: cargoAKmagazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi + state: base + product: CrateAKmagazines + cost: 2500 + category: Security + group: market + +- type: cargoProduct + name: ящик патронов .35 авто + description: ящик с упаковками патронов .35 авто + id: cargo35auto + icon: + sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi + state: base + product: Crate35auto + cost: 2500 + category: Security + group: market + +- type: cargoProduct + name: ящик патронов .30 + description: ящик с упаковками патронов калибра .30 + id: cargo30normal + icon: + sprite: Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi + state: base + product: Crate30normal + cost: 2500 + category: Security + group: market + +- type: cargoProduct + name: ящик с большой коробкой патронов .30 + description: ящик с патронами калибра .30 в большой коробке + id: cargo30big + icon: + sprite: Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi + state: base-b + product: crate30big + cost: 3500 + category: Security + group: market + + +- type: cargoProduct + name: пачки патронов .20 + description: ящик с пачками патронов калибра .20 + id: cargo20normal + icon: + sprite: Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi + state: base + product: Crate20normal + cost: 2500 + category: Security + group: market + +- type: cargoProduct + name: ящик с большой коробкой патронов .20 + description: ящик с патронами калибра .20 в большой коробке + id: cargo20big + icon: + sprite: Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi + state: base-b + product: Crate20big + cost: 3500 + category: Security + group: market + + +- type: cargoProduct + name: ящик патронов .40 магнум + description: ящик с коробкой патронов .40 магнум + id: cargo40magnum + icon: + sprite: Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi + state: base-b + product: Crate40magnum + cost: 3000 + category: Security + group: market + + +- type: cargoProduct + name: коробки с дробью для дробовика + description: ящик с магазинами дроби для дробовика + id: cargoShotgunShell + icon: + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: base + product: CrateShotgunShell + cost: 2000 + category: Security + group: market + +- type: cargoProduct + name: коробки с травматическими патронами для дробовика + description: ящик с магазинами травматических патронов для дробовика + id: cargoShotgunShellTrauma + icon: + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: base + product: CrateShotgunShellTrauma + cost: 1000 + category: Security + group: market + +- type: cargoProduct + name: ящик с дробовиками Каммерер + description: набор стандартных дробовиков, поставляемых на станции НаноТрейзен. + id: cargoKammerer + icon: + sprite: Objects/Weapons/Guns/Shotguns/pump.rsi + state: icon + product: CrateKammerer + cost: 5000 + category: Security + group: market + +- type: cargoProduct + name: ящик с CV-47 + description: проверенная временем автоматическая винтовка. + id: cargoCV47 + icon: + sprite: Objects/Weapons/Guns/Rifles/ak.rsi + state: icon + product: CrateCV47 + cost: 10000 + category: Security + group: market + + +- type: cargoProduct + name: ящик с Лектером + description: ящик, содержащий надежный штурмовой автомат и 2 магазина. + id: cargoLecter + icon: + sprite: Objects/Weapons/Guns/Rifles/lecter.rsi + state: icon + product: CrateLecter + cost: 7000 + category: Security + group: market + + +- type: cargoProduct + name: ящик с винтовками Мосина + description: набор списанного устаревшего вооружения. + id: cargoMosin + icon: + sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi + state: base + product: CrateMosin + cost: 3000 + category: Security + group: market + +- type: cargoProduct + name: ящик нелетальных магазинов для пистолетов + description: ящик с с тремя нелетальными магазинами для пистолетов. + id: cargoPistolRubberMagazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi + state: rubber + product: CratePistolRubberMagazines + cost: 300 + category: Security + group: market + +- type: cargoProduct + name: ящик нелетальных магазинов для лектора + description: Ящик с тремя обоймами нелетальных магазинов для лектора. + id: CargoLecterRubberMagazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + state: rubber + product: CrateLecterRubberMagazines + cost: 500 + category: Security + group: market + +- type: cargoProduct + name: ящик нелетальных магазинов для ПП + description: Ящик с с тремя нелетальными магазинами для ПП. + id: cargoSubMachineGunRubberAmmo + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi + state: rubber + product: CrateSubMachineGunRubberMagazines + cost: 400 + category: Security + group: market + +- type: cargoProduct + name: ящик нелетальных магазинов для CV-47 + description: Ящик с с тремя нелетальными магазинами для CV-47. + id: cargoRifleRubberMagazines + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + state: rubber + product: CrateRifleRubberMagazines + cost: 600 + category: Security + group: market + +- type: cargoProduct + name: Ящик скафандров СБ. + description: Ящик с двумя скафандрами СБ. Отлично подходит для прогулки в вакууме. + id: cargoSecurityVoidsuit + icon: + sprite: Clothing/Head/Hardsuits/security.rsi + state: icon-flash + product: CrateSecurityVoidsuit + cost: 4000 + category: Security + group: market diff --git a/Resources/Prototypes/White/Catalog/cargo.yml b/Resources/Prototypes/White/Catalog/cargo.yml deleted file mode 100644 index 34ea2aeba9..0000000000 --- a/Resources/Prototypes/White/Catalog/cargo.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: CratePaper - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: paper - product: CratePaper - cost: 1000 - category: Materials - group: market \ No newline at end of file diff --git a/Resources/Prototypes/White/Entities/Objects/CargoCrates/materialcrates.yml b/Resources/Prototypes/White/Entities/Objects/CargoCrates/materialcrates.yml new file mode 100644 index 0000000000..2095696cd8 --- /dev/null +++ b/Resources/Prototypes/White/Entities/Objects/CargoCrates/materialcrates.yml @@ -0,0 +1,39 @@ +- type: entity + id: CrateMaterialBananium + parent: CrateGenericSteel + name: ящик с бананиумом + components: + - type: StorageFill + contents: + - id: MaterialBananium + amount: 3 + +- type: entity + id: CrateMaterialSilver + parent: CrateGenericSteel + name: ящик с серебром + components: + - type: StorageFill + contents: + - id: IngotSilver + amount: 1 + +- type: entity + id: CrateMaterialGold + parent: CrateGenericSteel + name: ящик с золотом + components: + - type: StorageFill + contents: + - id: IngotGold + amount: 1 + +- type: entity + id: CrateMaterialUranium + parent: CrateGenericSteel + name: ящик урана + components: + - type: StorageFill + contents: + - id: SheetUranium + amount: 1 diff --git a/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml b/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml index 4457d0be07..d1852eb431 100644 --- a/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml +++ b/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml @@ -375,3 +375,227 @@ contents: - id: WeaponSniperMosin amount: 2 + +- type: entity + id: CrateSubMachineGunCrateAmmo + parent: CrateWeaponSecure + name: ящик с магазинами для ПП + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGun + amount: 2 + +- type: entity + id: CrateWT550Magazines + parent: CrateWeaponSecure + name: ящик с магазинами для WT-550 + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGunTopMounted + amount: 2 + +- type: entity + id: CrateLecterMagazines + parent: CrateWeaponSecure + name: ящик с магазинами для Лектера + components: + - type: StorageFill + contents: + - id: MagazineRifle + amount: 2 + +- type: entity + id: CratePistolMagazines + parent: CrateWeaponSecure + name: ящик с магазинами для пистолетов + components: + - type: StorageFill + contents: + - id: MagazinePistol + amount: 3 + +- type: entity + id: CrateAKmagazines + parent: CrateWeaponSecure + name: ящик с магазинами для CV-47 + components: + - type: StorageFill + contents: + - id: MagazineLightRifle + amount: 2 + +- type: entity + id: Crate35auto + parent: CrateWeaponSecure + name: ящик патронов .35 авто + components: + - type: StorageFill + contents: + - id: MagazineBoxPistol + amount: 2 + +- type: entity + id: Crate30normal + parent: CrateWeaponSecure + name: ящик патронов .30 + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifle + amount: 2 + +- type: entity + id: crate30big + parent: CrateWeaponSecure + name: ящик с большой коробкой патронов .30 + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifleBig + amount: 1 + +- type: entity + id: Crate20normal + parent: CrateWeaponSecure + name: ящик с пачками патронов калибра .20 + components: + - type: StorageFill + contents: + - id: MagazineBoxRifle + amount: 2 + +- type: entity + id: Crate20big + parent: CrateWeaponSecure + name: ящик с большой коробкой патронов .20 + components: + - type: StorageFill + contents: + - id: MagazineBoxRifleBig + amount: 1 + +- type: entity + id: Crate40magnum + parent: CrateWeaponSecure + name: ящик патронов .40 магнум + components: + - type: StorageFill + contents: + - id: MagazineBoxMagnum + amount: 1 + +- type: entity + id: CrateShotgunShell + parent: CrateWeaponSecure + name: ящик с дробью для дробовика + components: + - type: StorageFill + contents: + - id: MagazineShotgun + amount: 3 + +- type: entity + id: CrateShotgunShellTrauma + parent: CrateWeaponSecure + name: ящик с травматическими патронами для дробовика + components: + - type: StorageFill + contents: + - id: MagazineShotgunBeanbag + amount: 4 + +- type: entity + id: CrateKammerer + parent: CrateWeaponSecure + name: ящик с дробовиками Каммерер + components: + - type: StorageFill + contents: + - id: WeaponShotgunKammerer + amount: 2 + +- type: entity + id: CrateCV47 + parent: CrateWeaponSecure + name: ящик с CV-47 + components: + - type: StorageFill + contents: + - id: MagazineLightRifle + amount: 2 + - id: WeaponRifleAk + amount: 1 + +- type: entity + id: CrateLecter + parent: CrateWeaponSecure + name: ящик с Лектером + components: + - type: StorageFill + contents: + - id: MagazineRifle + amount: 2 + - id: WeaponRifleLecter + amount: 1 + +- type: entity + id: CrateMosin + parent: CrateWeaponSecure + name: ящик с Лектером + components: + - type: StorageFill + contents: + - id: WeaponSniperMosin + amount: 2 + +- type: entity + id: CratePistolRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для пистолетов + components: + - type: StorageFill + contents: + - id: BoxMagazinePistolRubber + amount: 1 + +- type: entity + id: CrateLecterRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для лектора + components: + - type: StorageFill + contents: + - id: BoxMagazineRifleRubber + amount: 1 + +- type: entity + id: CrateSubMachineGunRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для ПП + components: + - type: StorageFill + contents: + - id: BoxMagazinePistolSubMachineGunRubber + amount: 1 + +- type: entity + id: CrateRifleRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для CV-47 + components: + - type: StorageFill + contents: + - id: BoxMagazineLightRifleRubber + amount: 1 + +- type: entity + id: CrateSecurityVoidsuit + parent: CrateWeaponSecure + name: ящик с скафандрами СБ + components: + - type: StorageFill + contents: + - id: ClothingOuterHardsuitSecurity + amount: 2 From 4132216e5db65cb1e463a04b6114d121561ce750 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 24 Mar 2024 09:58:44 +0000 Subject: [PATCH 06/11] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index ff09ad7e72..4cb21a1119 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -2860,3 +2860,21 @@ id: 219 time: '2024-03-24T09:43:51.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/229 +- author: Armenian + changes: + - message: "\u0412\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0437\ + \u0430\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0440\u0435\u0441\u0443\ + \u0440\u0441\u044B \u0432 \u043A\u0430\u0440\u0433\u043E" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0437\u0430\u043A\u0430\ + \u0437 \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u043E\u0432 \u0421\u0411\ + \ \u0432 \u043A\u0430\u0440\u0433\u043E" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0437\u0430\u043A\u0430\ + \u0437 \u043D\u0435\u043B\u0435\u0442\u0430\u043B\u044C\u043D\u044B\u0445 \u043F\ + \u0430\u0442\u0440\u043E\u043D \u043F\u043E \u043F\u0440\u0438\u0435\u043C\u043B\ + \u0435\u043C\u044B\u043C \u0446\u0435\u043D\u0430\u043C." + type: Add + id: 220 + time: '2024-03-24T09:57:41.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/239 From afe44c7b954567beed0116c3074efec2f8ca9609 Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Sun, 24 Mar 2024 13:26:53 +0300 Subject: [PATCH 07/11] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D1=81=20=D0=B2=D0=B0=D0=B9=D1=82=20=D0=B4=D1=80=D0=B8=D0=BC=20?= =?UTF-8?q?=D0=B2=20=5F=D0=B2=D0=B0=D0=B9=D1=82=20=D0=B4=D1=80=D0=B8=D0=BC?= =?UTF-8?q?=20(#240)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * remove white dream, glory to _white dream * fix missing white dream * fix: fix me * add cargo, remove cargo --- .../Objects/CargoCrates/weaponcrates.yml | 601 ------------------ .../{White => _White}/Actions/catears.yml | 0 .../{White => _White}/Actions/emotes.yml | 0 .../{White => _White}/Actions/petsummon.yml | 0 .../{White => _White}/Actions/types.yml | 0 .../{White => _White}/Alerts/alerts.yml | 0 .../{White => _White}/Aspects/Aspects.yml | 0 .../Biomes/gulag_biomes.yml | 0 .../Body/Prototypes/felinid.yml | 0 .../Body/Prototypes/harpy.yml | 0 .../{White => _White}/Catalog/Cargo/cargo.yml | 0 .../Catalog/Fills/Boxes/security.yml | 0 .../{White => _White}/Catalog/Fills/misc.yml | 0 .../Catalog/seniors_fills.yml | 0 .../{White => _White}/Catalog/uplink.yml | 0 .../Construction/Paperworks/graphs.yml | 0 .../Construction/Paperworks/structures.yml | 0 .../Construction/Surgery/body_surgery.yml | 0 .../Construction/Wallmount/graphs.yml | 0 .../Construction/Wallmount/structures.yml | 0 .../Damage/modifier_sets.yml | 0 .../{White => _White}/Decals/drydock.yml | 0 .../{White => _White}/Economy/card.yml | 0 .../{White => _White}/Economy/eftpos.yml | 0 .../{White => _White}/Economy/salary.yml | 0 .../Emotes/felinid_emotes.yml | 0 .../{White => _White}/Emotes/harpy_emotes.yml | 0 .../Entities/Clothing/Belt/paramedwebbing.yml | 0 .../Clothing/Head/chaplain_helmets.yml | 0 .../Clothing/Head/night_vision_goggle.yml | 0 .../Entities/Clothing/Neck/necklace.yml | 0 .../Clothing/OuterClothing/chaplain_armor.yml | 0 .../Clothing/OuterClothing/seniors_outer.yml | 0 .../Entities/Clothing/Underwear/Bottom.yml | 0 .../Entities/Clothing/Underwear/Socks.yml | 0 .../Entities/Clothing/Underwear/Top.yml | 0 .../Entities/Clothing/nigger.yml | 0 .../Entities/Clothing/seniors_other.yml | 0 .../Entities/Containers/gulag.yml | 0 .../Entities/Hampter/barmen.yml | 0 .../Entities/Hampter/cap_hampter.yml | 0 .../Entities/Hampter/centcom.yml | 0 .../Entities/Hampter/clown_humpter.yml | 0 .../Entities/Hampter/comisar.yml | 0 .../Entities/Hampter/deadth.yml | 0 .../Entities/Hampter/emergency.yml | 0 .../Entities/Hampter/golden_hampter.yml | 0 .../Entities/Hampter/grey.yml | 0 .../Entities/Hampter/greywave.yml | 0 .../Entities/Hampter/hamhell.yml | 0 .../Entities/Hampter/krah.yml | 0 .../Entities/Hampter/lgbthampter.yml | 0 .../Entities/Hampter/med_hampter.yml | 0 .../Entities/Hampter/nuke_hampter.yml | 0 .../Entities/Hampter/sb_hampter.yml | 0 .../Entities/Hampter/shrek.yml | 0 .../Entities/Hampter/spu_hampter.yml | 0 .../Entities/Hampter/virusolog.yml | 0 .../Entities/Markers/Spawners/ERT.yml | 0 .../Objects/CargoCrates/materialcrates.yml | 0 .../Objects/CargoCrates/weaponcrates.yml | 223 +++++++ .../Circuitboards/wallmount_consoles.yml | 0 .../Objects/Misc/armaments_beacon.yml | 0 .../Entities/Objects/Misc/books.yml | 0 .../Entities/Objects/Misc/cartridges.yml | 0 .../Entities/Objects/Misc/implanters.yml | 0 .../Objects/Misc/improvised_parts.yml | 0 .../Entities/Objects/Misc/paper.yml | 0 .../Objects/Misc/subdermal_implants.yml | 0 .../Entities/Objects/Misc/ziplock.yml | 0 .../Specific/Medical/expanded_medkit.yml | 0 .../Entities/Objects/Tools/seniors_tools.yml | 0 .../Entities/Objects/Tools/tricorder.yml | 0 .../Projectiles/flamethrower_projectile.yml | 0 .../Objects/Weapons/Guns/crossbow.yml | 0 .../Objects/Weapons/Guns/flamethrower.yml | 0 .../Entities/Objects/Weapons/Guns/tempgun.yml | 0 .../Objects/Weapons/chaplain_weapons.yml | 0 .../Entities/Objects/Weapons/energy_axe.yml | 0 .../Weapons/experimental_stunbaton.yml | 0 .../Objects/Weapons/hardlight_spear.yml | 0 .../Entities/Objects/Weapons/snatcherprod.yml | 0 .../Entities/Structures/Airlocks/qm.yml | 0 .../Entities/Structures/Furniture/benches.yml | 0 .../Structures/Machine/gulag_machines.yml | 0 .../Structures/Machines/doc_printer.yml | 0 .../Structures/Supermatter/supermatter.yml | 0 .../Entities/Structures/Wallmounts/auth.yml | 0 .../Structures/Wallmounts/consoles.yml | 0 .../{White => _White}/Fluff/centurion.yml | 0 .../{White => _White}/Fluff/fluff.yml | 0 .../{White => _White}/Fluff/fluff1.yml | 0 .../{White => _White}/Fluff/serbwo.yml | 0 .../{White => _White}/Fluff/sponsor.yml | 0 .../{White => _White}/Fluff/waggier.yml | 0 .../Ghosts/custom_ghosts.yml | 0 .../JukeboxAndStuff/jukebox_stuff.yml | 0 .../JukeboxAndStuff/tapes.yml | 0 .../Customization/Markings/2shonka-parts.yml | 0 .../Mobs/Customization/Markings/cat_parts.yml | 0 .../Markings/egoruch17_markings.yml | 0 .../Mobs/Customization/Markings/felinid.yml | 0 .../Markings/fox_parts-vtergot.yml | 0 .../Mobs/Customization/Markings/fox_parts.yml | 0 .../Customization/Markings/harpy-parts.yml | 0 .../Customization/Markings/human_hair.yml | 0 .../Markings/imercuryi-parts.yml | 0 .../Markings/knifeCappy_parts.yml | 0 .../Customization/Markings/reider207_tail.yml | 0 .../Markings/tajaran-tail-fluff.yml | 0 .../Customization/Markings/warete_parts.yml | 0 .../Customization/Markings/wolf_parts.yml | 0 .../{White => _White}/Mobs/Pets/pets.yml | 0 .../{White => _White}/Mobs/Player/felinid.yml | 0 .../{White => _White}/Mobs/Player/harpy.yml | 0 .../{White => _White}/Mobs/Player/human.yml | 0 .../Mobs/Species/felinid.yml | 0 .../{White => _White}/Mobs/Species/harpy.yml | 0 .../Mood/generic_negativeEffects.yml | 0 .../Mood/generic_positveEffects.yml | 0 .../Mood/moodEffects_needs.yml | 0 .../NonPeacefulRoundItems.yml | 0 .../Objects/Scrolls/magic.yml | 0 .../Objects/Scrolls/scrolls.yml | 0 .../Objects/Specific/Species/felinid.yml | 0 .../Objects/Tools/crafts.yml | 0 .../{White => _White}/Objects/Tools/form.yml | 0 .../{White => _White}/Objects/Tools/key.yml | 0 .../{White => _White}/Recipes/crafts.yml | 0 .../Recipes/hidden_crafts.yml | 0 .../Recipes/lathe_recipes.yml | 0 .../{White => _White}/Research/arsenal.yml | 0 .../Research/experimental.yml | 0 .../SoundCollections/coindrop.yml | 0 .../SoundCollections/felinid.yml | 0 .../SoundCollections/harpy.yml | 0 .../SoundCollections/web.yml | 0 .../{White => _White}/Species/actions.yml | 0 .../{White => _White}/Species/felinid.yml | 0 .../{White => _White}/Species/harpy.yml | 0 .../StatusEffects/criminal_records.yml | 0 .../Structures/Machines/atm.yml | 0 .../Structures/Windows/paper.yml | 0 .../{White => _White}/Tiles/floors.yml | 0 .../{White => _White}/event_prototypes.yml | 0 .../{White => _White}/polymorphs.yml | 0 .../{White => _White}/store_categories.yml | 0 .../Prototypes/{White => _White}/tags.yml | 0 .../{White => _White}/tts-voices.yml | 0 149 files changed, 223 insertions(+), 601 deletions(-) delete mode 100644 Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml rename Resources/Prototypes/{White => _White}/Actions/catears.yml (100%) rename Resources/Prototypes/{White => _White}/Actions/emotes.yml (100%) rename Resources/Prototypes/{White => _White}/Actions/petsummon.yml (100%) rename Resources/Prototypes/{White => _White}/Actions/types.yml (100%) rename Resources/Prototypes/{White => _White}/Alerts/alerts.yml (100%) rename Resources/Prototypes/{White => _White}/Aspects/Aspects.yml (100%) rename Resources/Prototypes/{_Miracle => _White}/Biomes/gulag_biomes.yml (100%) rename Resources/Prototypes/{White => _White}/Body/Prototypes/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/Body/Prototypes/harpy.yml (100%) rename Resources/Prototypes/{White => _White}/Catalog/Cargo/cargo.yml (100%) rename Resources/Prototypes/{White => _White}/Catalog/Fills/Boxes/security.yml (100%) rename Resources/Prototypes/{White => _White}/Catalog/Fills/misc.yml (100%) rename Resources/Prototypes/{White => _White}/Catalog/seniors_fills.yml (100%) rename Resources/Prototypes/{White => _White}/Catalog/uplink.yml (100%) rename Resources/Prototypes/{White => _White}/Construction/Paperworks/graphs.yml (100%) rename Resources/Prototypes/{White => _White}/Construction/Paperworks/structures.yml (100%) rename Resources/Prototypes/{White => _White}/Construction/Surgery/body_surgery.yml (100%) rename Resources/Prototypes/{White => _White}/Construction/Wallmount/graphs.yml (100%) rename Resources/Prototypes/{White => _White}/Construction/Wallmount/structures.yml (100%) rename Resources/Prototypes/{White => _White}/Damage/modifier_sets.yml (100%) rename Resources/Prototypes/{White => _White}/Decals/drydock.yml (100%) rename Resources/Prototypes/{White => _White}/Economy/card.yml (100%) rename Resources/Prototypes/{White => _White}/Economy/eftpos.yml (100%) rename Resources/Prototypes/{White => _White}/Economy/salary.yml (100%) rename Resources/Prototypes/{White => _White}/Emotes/felinid_emotes.yml (100%) rename Resources/Prototypes/{White => _White}/Emotes/harpy_emotes.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Belt/paramedwebbing.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Head/chaplain_helmets.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Head/night_vision_goggle.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Neck/necklace.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/OuterClothing/chaplain_armor.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/OuterClothing/seniors_outer.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Underwear/Bottom.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Underwear/Socks.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/Underwear/Top.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/nigger.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Clothing/seniors_other.yml (100%) rename Resources/Prototypes/{_Miracle => _White}/Entities/Containers/gulag.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/barmen.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/cap_hampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/centcom.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/clown_humpter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/comisar.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/deadth.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/emergency.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/golden_hampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/grey.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/greywave.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/hamhell.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/krah.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/lgbthampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/med_hampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/nuke_hampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/sb_hampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/shrek.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/spu_hampter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Hampter/virusolog.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Markers/Spawners/ERT.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/CargoCrates/materialcrates.yml (100%) create mode 100644 Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml rename Resources/Prototypes/{White => _White}/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/armaments_beacon.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/books.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/cartridges.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/implanters.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/improvised_parts.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/paper.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/subdermal_implants.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Misc/ziplock.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Specific/Medical/expanded_medkit.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Tools/seniors_tools.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Tools/tricorder.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/Guns/crossbow.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/Guns/flamethrower.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/Guns/tempgun.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/chaplain_weapons.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/energy_axe.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/experimental_stunbaton.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/hardlight_spear.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Objects/Weapons/snatcherprod.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Structures/Airlocks/qm.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Structures/Furniture/benches.yml (100%) rename Resources/Prototypes/{_Miracle => _White}/Entities/Structures/Machine/gulag_machines.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Structures/Machines/doc_printer.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Structures/Supermatter/supermatter.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Structures/Wallmounts/auth.yml (100%) rename Resources/Prototypes/{White => _White}/Entities/Structures/Wallmounts/consoles.yml (100%) rename Resources/Prototypes/{White => _White}/Fluff/centurion.yml (100%) rename Resources/Prototypes/{White => _White}/Fluff/fluff.yml (100%) rename Resources/Prototypes/{White => _White}/Fluff/fluff1.yml (100%) rename Resources/Prototypes/{White => _White}/Fluff/serbwo.yml (100%) rename Resources/Prototypes/{White => _White}/Fluff/sponsor.yml (100%) rename Resources/Prototypes/{White => _White}/Fluff/waggier.yml (100%) rename Resources/Prototypes/{White => _White}/Ghosts/custom_ghosts.yml (100%) rename Resources/Prototypes/{White => _White}/JukeboxAndStuff/jukebox_stuff.yml (100%) rename Resources/Prototypes/{White => _White}/JukeboxAndStuff/tapes.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/2shonka-parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/cat_parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/egoruch17_markings.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/fox_parts-vtergot.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/fox_parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/harpy-parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/human_hair.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/imercuryi-parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/knifeCappy_parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/reider207_tail.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/tajaran-tail-fluff.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/warete_parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Customization/Markings/wolf_parts.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Pets/pets.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Player/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Player/harpy.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Player/human.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Species/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/Mobs/Species/harpy.yml (100%) rename Resources/Prototypes/{White => _White}/Mood/generic_negativeEffects.yml (100%) rename Resources/Prototypes/{White => _White}/Mood/generic_positveEffects.yml (100%) rename Resources/Prototypes/{White => _White}/Mood/moodEffects_needs.yml (100%) rename Resources/Prototypes/{White => _White}/NonPeacefulRound/NonPeacefulRoundItems.yml (100%) rename Resources/Prototypes/{White => _White}/Objects/Scrolls/magic.yml (100%) rename Resources/Prototypes/{White => _White}/Objects/Scrolls/scrolls.yml (100%) rename Resources/Prototypes/{White => _White}/Objects/Specific/Species/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/Objects/Tools/crafts.yml (100%) rename Resources/Prototypes/{White => _White}/Objects/Tools/form.yml (100%) rename Resources/Prototypes/{White => _White}/Objects/Tools/key.yml (100%) rename Resources/Prototypes/{White => _White}/Recipes/crafts.yml (100%) rename Resources/Prototypes/{White => _White}/Recipes/hidden_crafts.yml (100%) rename Resources/Prototypes/{White => _White}/Recipes/lathe_recipes.yml (100%) rename Resources/Prototypes/{White => _White}/Research/arsenal.yml (100%) rename Resources/Prototypes/{White => _White}/Research/experimental.yml (100%) rename Resources/Prototypes/{White => _White}/SoundCollections/coindrop.yml (100%) rename Resources/Prototypes/{White => _White}/SoundCollections/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/SoundCollections/harpy.yml (100%) rename Resources/Prototypes/{White => _White}/SoundCollections/web.yml (100%) rename Resources/Prototypes/{White => _White}/Species/actions.yml (100%) rename Resources/Prototypes/{White => _White}/Species/felinid.yml (100%) rename Resources/Prototypes/{White => _White}/Species/harpy.yml (100%) rename Resources/Prototypes/{White => _White}/StatusEffects/criminal_records.yml (100%) rename Resources/Prototypes/{White => _White}/Structures/Machines/atm.yml (100%) rename Resources/Prototypes/{White => _White}/Structures/Windows/paper.yml (100%) rename Resources/Prototypes/{White => _White}/Tiles/floors.yml (100%) rename Resources/Prototypes/{White => _White}/event_prototypes.yml (100%) rename Resources/Prototypes/{White => _White}/polymorphs.yml (100%) rename Resources/Prototypes/{White => _White}/store_categories.yml (100%) rename Resources/Prototypes/{White => _White}/tags.yml (100%) rename Resources/Prototypes/{White => _White}/tts-voices.yml (100%) diff --git a/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml b/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml deleted file mode 100644 index d1852eb431..0000000000 --- a/Resources/Prototypes/White/Entities/Objects/CargoCrates/weaponcrates.yml +++ /dev/null @@ -1,601 +0,0 @@ -- type: cargoProduct - name: ящик магазинов для ПП - description: ящик с магазинами для пистолетов-пулеметов, заполненными патронами. - id: cargoSubMachineGunCrateAmmo - icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi - state: base - product: CrateSubMachineGunCrateAmmo - cost: 2500 - category: Security - group: market - -- type: entity - id: CrateSubMachineGunCrateAmmo - parent: CrateWeaponSecure - name: ящик с магазинами для ПП - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGun - amount: 2 - -- type: cargoProduct - name: ящик магазинов для WT-550 - description: ящик с магазинами для пистолетов-пулеметов WT-550, заполненными патронами. - id: cargoWT550Magazines - icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi - state: base - product: CrateWT550Magazines - cost: 2500 - category: Security - group: market - -- type: entity - id: CrateWT550Magazines - parent: CrateWeaponSecure - name: ящик с магазинами для WT-550 - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGunTopMounted - amount: 2 - -- type: cargoProduct - name: ящик магазинов для Лектера - description: ящик с магазинами для Лектора, заполненными патронами. - id: cargoLecterMagazines - icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi - state: base - product: CrateLecterMagazines - cost: 2500 - category: Security - group: market - -- type: entity - id: CrateLecterMagazines - parent: CrateWeaponSecure - name: ящик с магазинами для Лектера - components: - - type: StorageFill - contents: - - id: MagazineRifle - amount: 2 - -- type: cargoProduct - name: ящик магазинов для пистолетов - description: ящик с магазинами для пистолетов, заполненными патронами. - id: cargoPistolMagazines - icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi - state: base - product: CratePistolMagazines - cost: 1000 - category: Security - group: market - -- type: entity - id: CratePistolMagazines - parent: CrateWeaponSecure - name: ящик с магазинами для пистолетов - components: - - type: StorageFill - contents: - - id: MagazinePistol - amount: 3 - -- type: cargoProduct - name: ящик магазинов для CV-47 - description: ящик с магазинами для CV-47, заполненными патронами. - id: cargoAKmagazines - icon: - sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi - state: base - product: CrateAKmagazines - cost: 2500 - category: Security - group: market - -- type: entity - id: CrateAKmagazines - parent: CrateWeaponSecure - name: ящик с магазинами для CV-47 - components: - - type: StorageFill - contents: - - id: MagazineLightRifle - amount: 2 - -- type: cargoProduct - name: ящик патронов .35 авто - description: ящик с упаковками патронов .35 авто - id: cargo35auto - icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi - state: base - product: Crate35auto - cost: 2500 - category: Security - group: market - -- type: entity - id: Crate35auto - parent: CrateWeaponSecure - name: ящик патронов .35 авто - components: - - type: StorageFill - contents: - - id: MagazineBoxPistol - amount: 2 - -- type: cargoProduct - name: ящик патронов .30 - description: ящик с упаковками патронов калибра .30 - id: cargo30normal - icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi - state: base - product: Crate30normal - cost: 2500 - category: Security - group: market - -- type: entity - id: Crate30normal - parent: CrateWeaponSecure - name: ящик патронов .30 - components: - - type: StorageFill - contents: - - id: MagazineBoxLightRifle - amount: 2 - -- type: cargoProduct - name: ящик с большой коробкой патронов .30 - description: ящик с патронами калибра .30 в большой коробке - id: cargo30big - icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi - state: base-b - product: crate30big - cost: 3500 - category: Security - group: market - -- type: entity - id: crate30big - parent: CrateWeaponSecure - name: ящик с большой коробкой патронов .30 - components: - - type: StorageFill - contents: - - id: MagazineBoxLightRifleBig - amount: 1 - -- type: cargoProduct - name: пачки патронов .20 - description: ящик с пачками патронов калибра .20 - id: cargo20normal - icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi - state: base - product: Crate20normal - cost: 2500 - category: Security - group: market - -- type: entity - id: Crate20normal - parent: CrateWeaponSecure - name: ящик с пачками патронов калибра .20 - components: - - type: StorageFill - contents: - - id: MagazineBoxRifle - amount: 2 - -- type: cargoProduct - name: ящик с большой коробкой патронов .20 - description: ящик с патронами калибра .20 в большой коробке - id: cargo20big - icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi - state: base-b - product: Crate20big - cost: 3500 - category: Security - group: market - -- type: entity - id: Crate20big - parent: CrateWeaponSecure - name: ящик с большой коробкой патронов .20 - components: - - type: StorageFill - contents: - - id: MagazineBoxRifleBig - amount: 1 - -- type: cargoProduct - name: ящик патронов .40 магнум - description: ящик с коробкой патронов .40 магнум - id: cargo40magnum - icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi - state: base-b - product: Crate40magnum - cost: 3000 - category: Security - group: market - -- type: entity - id: Crate40magnum - parent: CrateWeaponSecure - name: ящик патронов .40 магнум - components: - - type: StorageFill - contents: - - id: MagazineBoxMagnum - amount: 1 - -- type: cargoProduct - name: коробки с дробью для дробовика - description: ящик с магазинами дроби для дробовика - id: cargoShotgunShell - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi - state: base - product: CrateShotgunShell - cost: 2000 - category: Security - group: market - -- type: entity - id: CrateShotgunShell - parent: CrateWeaponSecure - name: ящик с дробью для дробовика - components: - - type: StorageFill - contents: - - id: MagazineShotgun - amount: 3 - -- type: cargoProduct - name: коробки с травматическими патронами для дробовика - description: ящик с магазинами травматических патронов для дробовика - id: cargoShotgunShellTrauma - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi - state: base - product: CrateShotgunShellTrauma - cost: 1000 - category: Security - group: market - -- type: entity - id: CrateShotgunShellTrauma - parent: CrateWeaponSecure - name: ящик с травматическими патронами для дробовика - components: - - type: StorageFill - contents: - - id: MagazineShotgunBeanbag - amount: 4 - -- type: cargoProduct - name: ящик с дробовиками Каммерер - description: набор стандартных дробовиков, поставляемых на станции НаноТрейзен. - id: cargoKammerer - icon: - sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - state: icon - product: CrateKammerer - cost: 5000 - category: Security - group: market - -- type: entity - id: CrateKammerer - parent: CrateWeaponSecure - name: ящик с дробовиками Каммерер - components: - - type: StorageFill - contents: - - id: WeaponShotgunKammerer - amount: 2 - -- type: cargoProduct - name: ящик с CV-47 - description: проверенная временем автоматическая винтовка. - id: cargoCV47 - icon: - sprite: Objects/Weapons/Guns/Rifles/ak.rsi - state: icon - product: CrateCV47 - cost: 10000 - category: Security - group: market - -- type: entity - id: CrateCV47 - parent: CrateWeaponSecure - name: ящик с CV-47 - components: - - type: StorageFill - contents: - - id: MagazineLightRifle - amount: 2 - - id: WeaponRifleAk - amount: 1 - -- type: cargoProduct - name: ящик с Лектером - description: ящик, содержащий надежный штурмовой автомат и 2 магазина. - id: cargoLecter - icon: - sprite: Objects/Weapons/Guns/Rifles/lecter.rsi - state: icon - product: CrateLecter - cost: 7000 - category: Security - group: market - -- type: entity - id: CrateLecter - parent: CrateWeaponSecure - name: ящик с Лектером - components: - - type: StorageFill - contents: - - id: MagazineRifle - amount: 2 - - id: WeaponRifleLecter - amount: 1 - -- type: cargoProduct - name: ящик с винтовками Мосина - description: набор списанного устаревшего вооружения. - id: cargoMosin - icon: - sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi - state: base - product: CrateMosin - cost: 3000 - category: Security - group: market - -- type: entity - id: CrateMosin - parent: CrateWeaponSecure - name: ящик с Лектером - components: - - type: StorageFill - contents: - - id: WeaponSniperMosin - amount: 2 - -- type: entity - id: CrateSubMachineGunCrateAmmo - parent: CrateWeaponSecure - name: ящик с магазинами для ПП - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGun - amount: 2 - -- type: entity - id: CrateWT550Magazines - parent: CrateWeaponSecure - name: ящик с магазинами для WT-550 - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGunTopMounted - amount: 2 - -- type: entity - id: CrateLecterMagazines - parent: CrateWeaponSecure - name: ящик с магазинами для Лектера - components: - - type: StorageFill - contents: - - id: MagazineRifle - amount: 2 - -- type: entity - id: CratePistolMagazines - parent: CrateWeaponSecure - name: ящик с магазинами для пистолетов - components: - - type: StorageFill - contents: - - id: MagazinePistol - amount: 3 - -- type: entity - id: CrateAKmagazines - parent: CrateWeaponSecure - name: ящик с магазинами для CV-47 - components: - - type: StorageFill - contents: - - id: MagazineLightRifle - amount: 2 - -- type: entity - id: Crate35auto - parent: CrateWeaponSecure - name: ящик патронов .35 авто - components: - - type: StorageFill - contents: - - id: MagazineBoxPistol - amount: 2 - -- type: entity - id: Crate30normal - parent: CrateWeaponSecure - name: ящик патронов .30 - components: - - type: StorageFill - contents: - - id: MagazineBoxLightRifle - amount: 2 - -- type: entity - id: crate30big - parent: CrateWeaponSecure - name: ящик с большой коробкой патронов .30 - components: - - type: StorageFill - contents: - - id: MagazineBoxLightRifleBig - amount: 1 - -- type: entity - id: Crate20normal - parent: CrateWeaponSecure - name: ящик с пачками патронов калибра .20 - components: - - type: StorageFill - contents: - - id: MagazineBoxRifle - amount: 2 - -- type: entity - id: Crate20big - parent: CrateWeaponSecure - name: ящик с большой коробкой патронов .20 - components: - - type: StorageFill - contents: - - id: MagazineBoxRifleBig - amount: 1 - -- type: entity - id: Crate40magnum - parent: CrateWeaponSecure - name: ящик патронов .40 магнум - components: - - type: StorageFill - contents: - - id: MagazineBoxMagnum - amount: 1 - -- type: entity - id: CrateShotgunShell - parent: CrateWeaponSecure - name: ящик с дробью для дробовика - components: - - type: StorageFill - contents: - - id: MagazineShotgun - amount: 3 - -- type: entity - id: CrateShotgunShellTrauma - parent: CrateWeaponSecure - name: ящик с травматическими патронами для дробовика - components: - - type: StorageFill - contents: - - id: MagazineShotgunBeanbag - amount: 4 - -- type: entity - id: CrateKammerer - parent: CrateWeaponSecure - name: ящик с дробовиками Каммерер - components: - - type: StorageFill - contents: - - id: WeaponShotgunKammerer - amount: 2 - -- type: entity - id: CrateCV47 - parent: CrateWeaponSecure - name: ящик с CV-47 - components: - - type: StorageFill - contents: - - id: MagazineLightRifle - amount: 2 - - id: WeaponRifleAk - amount: 1 - -- type: entity - id: CrateLecter - parent: CrateWeaponSecure - name: ящик с Лектером - components: - - type: StorageFill - contents: - - id: MagazineRifle - amount: 2 - - id: WeaponRifleLecter - amount: 1 - -- type: entity - id: CrateMosin - parent: CrateWeaponSecure - name: ящик с Лектером - components: - - type: StorageFill - contents: - - id: WeaponSniperMosin - amount: 2 - -- type: entity - id: CratePistolRubberMagazines - parent: CrateWeaponSecure - name: ящик с нелетальными магазинами для пистолетов - components: - - type: StorageFill - contents: - - id: BoxMagazinePistolRubber - amount: 1 - -- type: entity - id: CrateLecterRubberMagazines - parent: CrateWeaponSecure - name: ящик с нелетальными магазинами для лектора - components: - - type: StorageFill - contents: - - id: BoxMagazineRifleRubber - amount: 1 - -- type: entity - id: CrateSubMachineGunRubberMagazines - parent: CrateWeaponSecure - name: ящик с нелетальными магазинами для ПП - components: - - type: StorageFill - contents: - - id: BoxMagazinePistolSubMachineGunRubber - amount: 1 - -- type: entity - id: CrateRifleRubberMagazines - parent: CrateWeaponSecure - name: ящик с нелетальными магазинами для CV-47 - components: - - type: StorageFill - contents: - - id: BoxMagazineLightRifleRubber - amount: 1 - -- type: entity - id: CrateSecurityVoidsuit - parent: CrateWeaponSecure - name: ящик с скафандрами СБ - components: - - type: StorageFill - contents: - - id: ClothingOuterHardsuitSecurity - amount: 2 diff --git a/Resources/Prototypes/White/Actions/catears.yml b/Resources/Prototypes/_White/Actions/catears.yml similarity index 100% rename from Resources/Prototypes/White/Actions/catears.yml rename to Resources/Prototypes/_White/Actions/catears.yml diff --git a/Resources/Prototypes/White/Actions/emotes.yml b/Resources/Prototypes/_White/Actions/emotes.yml similarity index 100% rename from Resources/Prototypes/White/Actions/emotes.yml rename to Resources/Prototypes/_White/Actions/emotes.yml diff --git a/Resources/Prototypes/White/Actions/petsummon.yml b/Resources/Prototypes/_White/Actions/petsummon.yml similarity index 100% rename from Resources/Prototypes/White/Actions/petsummon.yml rename to Resources/Prototypes/_White/Actions/petsummon.yml diff --git a/Resources/Prototypes/White/Actions/types.yml b/Resources/Prototypes/_White/Actions/types.yml similarity index 100% rename from Resources/Prototypes/White/Actions/types.yml rename to Resources/Prototypes/_White/Actions/types.yml diff --git a/Resources/Prototypes/White/Alerts/alerts.yml b/Resources/Prototypes/_White/Alerts/alerts.yml similarity index 100% rename from Resources/Prototypes/White/Alerts/alerts.yml rename to Resources/Prototypes/_White/Alerts/alerts.yml diff --git a/Resources/Prototypes/White/Aspects/Aspects.yml b/Resources/Prototypes/_White/Aspects/Aspects.yml similarity index 100% rename from Resources/Prototypes/White/Aspects/Aspects.yml rename to Resources/Prototypes/_White/Aspects/Aspects.yml diff --git a/Resources/Prototypes/_Miracle/Biomes/gulag_biomes.yml b/Resources/Prototypes/_White/Biomes/gulag_biomes.yml similarity index 100% rename from Resources/Prototypes/_Miracle/Biomes/gulag_biomes.yml rename to Resources/Prototypes/_White/Biomes/gulag_biomes.yml diff --git a/Resources/Prototypes/White/Body/Prototypes/felinid.yml b/Resources/Prototypes/_White/Body/Prototypes/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Body/Prototypes/felinid.yml rename to Resources/Prototypes/_White/Body/Prototypes/felinid.yml diff --git a/Resources/Prototypes/White/Body/Prototypes/harpy.yml b/Resources/Prototypes/_White/Body/Prototypes/harpy.yml similarity index 100% rename from Resources/Prototypes/White/Body/Prototypes/harpy.yml rename to Resources/Prototypes/_White/Body/Prototypes/harpy.yml diff --git a/Resources/Prototypes/White/Catalog/Cargo/cargo.yml b/Resources/Prototypes/_White/Catalog/Cargo/cargo.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/Cargo/cargo.yml rename to Resources/Prototypes/_White/Catalog/Cargo/cargo.yml diff --git a/Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/_White/Catalog/Fills/Boxes/security.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/Fills/Boxes/security.yml rename to Resources/Prototypes/_White/Catalog/Fills/Boxes/security.yml diff --git a/Resources/Prototypes/White/Catalog/Fills/misc.yml b/Resources/Prototypes/_White/Catalog/Fills/misc.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/Fills/misc.yml rename to Resources/Prototypes/_White/Catalog/Fills/misc.yml diff --git a/Resources/Prototypes/White/Catalog/seniors_fills.yml b/Resources/Prototypes/_White/Catalog/seniors_fills.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/seniors_fills.yml rename to Resources/Prototypes/_White/Catalog/seniors_fills.yml diff --git a/Resources/Prototypes/White/Catalog/uplink.yml b/Resources/Prototypes/_White/Catalog/uplink.yml similarity index 100% rename from Resources/Prototypes/White/Catalog/uplink.yml rename to Resources/Prototypes/_White/Catalog/uplink.yml diff --git a/Resources/Prototypes/White/Construction/Paperworks/graphs.yml b/Resources/Prototypes/_White/Construction/Paperworks/graphs.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Paperworks/graphs.yml rename to Resources/Prototypes/_White/Construction/Paperworks/graphs.yml diff --git a/Resources/Prototypes/White/Construction/Paperworks/structures.yml b/Resources/Prototypes/_White/Construction/Paperworks/structures.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Paperworks/structures.yml rename to Resources/Prototypes/_White/Construction/Paperworks/structures.yml diff --git a/Resources/Prototypes/White/Construction/Surgery/body_surgery.yml b/Resources/Prototypes/_White/Construction/Surgery/body_surgery.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Surgery/body_surgery.yml rename to Resources/Prototypes/_White/Construction/Surgery/body_surgery.yml diff --git a/Resources/Prototypes/White/Construction/Wallmount/graphs.yml b/Resources/Prototypes/_White/Construction/Wallmount/graphs.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Wallmount/graphs.yml rename to Resources/Prototypes/_White/Construction/Wallmount/graphs.yml diff --git a/Resources/Prototypes/White/Construction/Wallmount/structures.yml b/Resources/Prototypes/_White/Construction/Wallmount/structures.yml similarity index 100% rename from Resources/Prototypes/White/Construction/Wallmount/structures.yml rename to Resources/Prototypes/_White/Construction/Wallmount/structures.yml diff --git a/Resources/Prototypes/White/Damage/modifier_sets.yml b/Resources/Prototypes/_White/Damage/modifier_sets.yml similarity index 100% rename from Resources/Prototypes/White/Damage/modifier_sets.yml rename to Resources/Prototypes/_White/Damage/modifier_sets.yml diff --git a/Resources/Prototypes/White/Decals/drydock.yml b/Resources/Prototypes/_White/Decals/drydock.yml similarity index 100% rename from Resources/Prototypes/White/Decals/drydock.yml rename to Resources/Prototypes/_White/Decals/drydock.yml diff --git a/Resources/Prototypes/White/Economy/card.yml b/Resources/Prototypes/_White/Economy/card.yml similarity index 100% rename from Resources/Prototypes/White/Economy/card.yml rename to Resources/Prototypes/_White/Economy/card.yml diff --git a/Resources/Prototypes/White/Economy/eftpos.yml b/Resources/Prototypes/_White/Economy/eftpos.yml similarity index 100% rename from Resources/Prototypes/White/Economy/eftpos.yml rename to Resources/Prototypes/_White/Economy/eftpos.yml diff --git a/Resources/Prototypes/White/Economy/salary.yml b/Resources/Prototypes/_White/Economy/salary.yml similarity index 100% rename from Resources/Prototypes/White/Economy/salary.yml rename to Resources/Prototypes/_White/Economy/salary.yml diff --git a/Resources/Prototypes/White/Emotes/felinid_emotes.yml b/Resources/Prototypes/_White/Emotes/felinid_emotes.yml similarity index 100% rename from Resources/Prototypes/White/Emotes/felinid_emotes.yml rename to Resources/Prototypes/_White/Emotes/felinid_emotes.yml diff --git a/Resources/Prototypes/White/Emotes/harpy_emotes.yml b/Resources/Prototypes/_White/Emotes/harpy_emotes.yml similarity index 100% rename from Resources/Prototypes/White/Emotes/harpy_emotes.yml rename to Resources/Prototypes/_White/Emotes/harpy_emotes.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Belt/paramedwebbing.yml b/Resources/Prototypes/_White/Entities/Clothing/Belt/paramedwebbing.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Belt/paramedwebbing.yml rename to Resources/Prototypes/_White/Entities/Clothing/Belt/paramedwebbing.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Head/chaplain_helmets.yml b/Resources/Prototypes/_White/Entities/Clothing/Head/chaplain_helmets.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Head/chaplain_helmets.yml rename to Resources/Prototypes/_White/Entities/Clothing/Head/chaplain_helmets.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Head/night_vision_goggle.yml b/Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Head/night_vision_goggle.yml rename to Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Neck/necklace.yml b/Resources/Prototypes/_White/Entities/Clothing/Neck/necklace.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Neck/necklace.yml rename to Resources/Prototypes/_White/Entities/Clothing/Neck/necklace.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/OuterClothing/chaplain_armor.yml b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/chaplain_armor.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/OuterClothing/chaplain_armor.yml rename to Resources/Prototypes/_White/Entities/Clothing/OuterClothing/chaplain_armor.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/seniors_outer.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/OuterClothing/seniors_outer.yml rename to Resources/Prototypes/_White/Entities/Clothing/OuterClothing/seniors_outer.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml b/Resources/Prototypes/_White/Entities/Clothing/Underwear/Bottom.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Underwear/Bottom.yml rename to Resources/Prototypes/_White/Entities/Clothing/Underwear/Bottom.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml b/Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Underwear/Socks.yml rename to Resources/Prototypes/_White/Entities/Clothing/Underwear/Socks.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml b/Resources/Prototypes/_White/Entities/Clothing/Underwear/Top.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/Underwear/Top.yml rename to Resources/Prototypes/_White/Entities/Clothing/Underwear/Top.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/nigger.yml b/Resources/Prototypes/_White/Entities/Clothing/nigger.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/nigger.yml rename to Resources/Prototypes/_White/Entities/Clothing/nigger.yml diff --git a/Resources/Prototypes/White/Entities/Clothing/seniors_other.yml b/Resources/Prototypes/_White/Entities/Clothing/seniors_other.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Clothing/seniors_other.yml rename to Resources/Prototypes/_White/Entities/Clothing/seniors_other.yml diff --git a/Resources/Prototypes/_Miracle/Entities/Containers/gulag.yml b/Resources/Prototypes/_White/Entities/Containers/gulag.yml similarity index 100% rename from Resources/Prototypes/_Miracle/Entities/Containers/gulag.yml rename to Resources/Prototypes/_White/Entities/Containers/gulag.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/barmen.yml b/Resources/Prototypes/_White/Entities/Hampter/barmen.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/barmen.yml rename to Resources/Prototypes/_White/Entities/Hampter/barmen.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/cap_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/cap_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/cap_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/cap_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/centcom.yml b/Resources/Prototypes/_White/Entities/Hampter/centcom.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/centcom.yml rename to Resources/Prototypes/_White/Entities/Hampter/centcom.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/clown_humpter.yml b/Resources/Prototypes/_White/Entities/Hampter/clown_humpter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/clown_humpter.yml rename to Resources/Prototypes/_White/Entities/Hampter/clown_humpter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/comisar.yml b/Resources/Prototypes/_White/Entities/Hampter/comisar.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/comisar.yml rename to Resources/Prototypes/_White/Entities/Hampter/comisar.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/deadth.yml b/Resources/Prototypes/_White/Entities/Hampter/deadth.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/deadth.yml rename to Resources/Prototypes/_White/Entities/Hampter/deadth.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/emergency.yml b/Resources/Prototypes/_White/Entities/Hampter/emergency.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/emergency.yml rename to Resources/Prototypes/_White/Entities/Hampter/emergency.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/golden_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/golden_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/golden_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/golden_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/grey.yml b/Resources/Prototypes/_White/Entities/Hampter/grey.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/grey.yml rename to Resources/Prototypes/_White/Entities/Hampter/grey.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/greywave.yml b/Resources/Prototypes/_White/Entities/Hampter/greywave.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/greywave.yml rename to Resources/Prototypes/_White/Entities/Hampter/greywave.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/hamhell.yml b/Resources/Prototypes/_White/Entities/Hampter/hamhell.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/hamhell.yml rename to Resources/Prototypes/_White/Entities/Hampter/hamhell.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/krah.yml b/Resources/Prototypes/_White/Entities/Hampter/krah.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/krah.yml rename to Resources/Prototypes/_White/Entities/Hampter/krah.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/lgbthampter.yml b/Resources/Prototypes/_White/Entities/Hampter/lgbthampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/lgbthampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/lgbthampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/med_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/med_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/med_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/med_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/nuke_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/nuke_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/nuke_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/nuke_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/sb_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/sb_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/sb_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/sb_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/shrek.yml b/Resources/Prototypes/_White/Entities/Hampter/shrek.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/shrek.yml rename to Resources/Prototypes/_White/Entities/Hampter/shrek.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/spu_hampter.yml b/Resources/Prototypes/_White/Entities/Hampter/spu_hampter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/spu_hampter.yml rename to Resources/Prototypes/_White/Entities/Hampter/spu_hampter.yml diff --git a/Resources/Prototypes/White/Entities/Hampter/virusolog.yml b/Resources/Prototypes/_White/Entities/Hampter/virusolog.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Hampter/virusolog.yml rename to Resources/Prototypes/_White/Entities/Hampter/virusolog.yml diff --git a/Resources/Prototypes/White/Entities/Markers/Spawners/ERT.yml b/Resources/Prototypes/_White/Entities/Markers/Spawners/ERT.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Markers/Spawners/ERT.yml rename to Resources/Prototypes/_White/Entities/Markers/Spawners/ERT.yml diff --git a/Resources/Prototypes/White/Entities/Objects/CargoCrates/materialcrates.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/CargoCrates/materialcrates.yml rename to Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml diff --git a/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml new file mode 100644 index 0000000000..b39dca5408 --- /dev/null +++ b/Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml @@ -0,0 +1,223 @@ +- type: entity + id: CrateSubMachineGunCrateAmmo + parent: CrateWeaponSecure + name: ящик с магазинами для ПП + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGun + amount: 2 + +- type: entity + id: CrateWT550Magazines + parent: CrateWeaponSecure + name: ящик с магазинами для WT-550 + components: + - type: StorageFill + contents: + - id: MagazinePistolSubMachineGunTopMounted + amount: 2 + +- type: entity + id: CrateLecterMagazines + parent: CrateWeaponSecure + name: ящик с магазинами для Лектера + components: + - type: StorageFill + contents: + - id: MagazineRifle + amount: 2 + +- type: entity + id: CratePistolMagazines + parent: CrateWeaponSecure + name: ящик с магазинами для пистолетов + components: + - type: StorageFill + contents: + - id: MagazinePistol + amount: 3 + +- type: entity + id: CrateAKmagazines + parent: CrateWeaponSecure + name: ящик с магазинами для CV-47 + components: + - type: StorageFill + contents: + - id: MagazineLightRifle + amount: 2 + +- type: entity + id: Crate35auto + parent: CrateWeaponSecure + name: ящик патронов .35 авто + components: + - type: StorageFill + contents: + - id: MagazineBoxPistol + amount: 2 + +- type: entity + id: Crate30normal + parent: CrateWeaponSecure + name: ящик патронов .30 + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifle + amount: 2 + +- type: entity + id: crate30big + parent: CrateWeaponSecure + name: ящик с большой коробкой патронов .30 + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifleBig + amount: 1 + +- type: entity + id: Crate20normal + parent: CrateWeaponSecure + name: ящик с пачками патронов калибра .20 + components: + - type: StorageFill + contents: + - id: MagazineBoxRifle + amount: 2 + +- type: entity + id: Crate20big + parent: CrateWeaponSecure + name: ящик с большой коробкой патронов .20 + components: + - type: StorageFill + contents: + - id: MagazineBoxRifleBig + amount: 1 + +- type: entity + id: Crate40magnum + parent: CrateWeaponSecure + name: ящик патронов .40 магнум + components: + - type: StorageFill + contents: + - id: MagazineBoxMagnum + amount: 1 + +- type: entity + id: CrateShotgunShell + parent: CrateWeaponSecure + name: ящик с дробью для дробовика + components: + - type: StorageFill + contents: + - id: MagazineShotgun + amount: 3 + +- type: entity + id: CrateShotgunShellTrauma + parent: CrateWeaponSecure + name: ящик с травматическими патронами для дробовика + components: + - type: StorageFill + contents: + - id: MagazineShotgunBeanbag + amount: 4 + +- type: entity + id: CrateKammerer + parent: CrateWeaponSecure + name: ящик с дробовиками Каммерер + components: + - type: StorageFill + contents: + - id: WeaponShotgunKammerer + amount: 2 + +- type: entity + id: CrateCV47 + parent: CrateWeaponSecure + name: ящик с CV-47 + components: + - type: StorageFill + contents: + - id: MagazineLightRifle + amount: 2 + - id: WeaponRifleAk + amount: 1 + +- type: entity + id: CrateLecter + parent: CrateWeaponSecure + name: ящик с Лектером + components: + - type: StorageFill + contents: + - id: MagazineRifle + amount: 2 + - id: WeaponRifleLecter + amount: 1 + +- type: entity + id: CrateMosin + parent: CrateWeaponSecure + name: ящик с Лектером + components: + - type: StorageFill + contents: + - id: WeaponSniperMosin + amount: 2 + +- type: entity + id: CratePistolRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для пистолетов + components: + - type: StorageFill + contents: + - id: BoxMagazinePistolRubber + amount: 1 + +- type: entity + id: CrateLecterRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для лектора + components: + - type: StorageFill + contents: + - id: BoxMagazineRifleRubber + amount: 1 + +- type: entity + id: CrateSubMachineGunRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для ПП + components: + - type: StorageFill + contents: + - id: BoxMagazinePistolSubMachineGunRubber + amount: 1 + +- type: entity + id: CrateRifleRubberMagazines + parent: CrateWeaponSecure + name: ящик с нелетальными магазинами для CV-47 + components: + - type: StorageFill + contents: + - id: BoxMagazineLightRifleRubber + amount: 1 + +- type: entity + id: CrateSecurityVoidsuit + parent: CrateWeaponSecure + name: ящик с скафандрами СБ + components: + - type: StorageFill + contents: + - id: ClothingOuterHardsuitSecurity + amount: 2 diff --git a/Resources/Prototypes/White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml b/Resources/Prototypes/_White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml rename to Resources/Prototypes/_White/Entities/Objects/Devices/Circuitboards/wallmount_consoles.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/armaments_beacon.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/armaments_beacon.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/armaments_beacon.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/armaments_beacon.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/books.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/books.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/books.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/books.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/cartridges.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/cartridges.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/cartridges.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/cartridges.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/implanters.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/improvised_parts.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/improvised_parts.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/improvised_parts.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/improvised_parts.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/paper.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/paper.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/paper.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/subdermal_implants.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/ziplock.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Misc/ziplock.yml rename to Resources/Prototypes/_White/Entities/Objects/Misc/ziplock.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml b/Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Specific/Medical/expanded_medkit.yml rename to Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml b/Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Tools/seniors_tools.yml rename to Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Tools/tricorder.yml b/Resources/Prototypes/_White/Entities/Objects/Tools/tricorder.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Tools/tricorder.yml rename to Resources/Prototypes/_White/Entities/Objects/Tools/tricorder.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/crossbow.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/crossbow.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/Guns/crossbow.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/crossbow.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/flamethrower.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/Guns/flamethrower.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/flamethrower.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/Guns/tempgun.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/Guns/tempgun.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/chaplain_weapons.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/energy_axe.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/energy_axe.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/experimental_stunbaton.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/experimental_stunbaton.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/experimental_stunbaton.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/hardlight_spear.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/hardlight_spear.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml diff --git a/Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/snatcherprod.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Objects/Weapons/snatcherprod.yml rename to Resources/Prototypes/_White/Entities/Objects/Weapons/snatcherprod.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Airlocks/qm.yml b/Resources/Prototypes/_White/Entities/Structures/Airlocks/qm.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Airlocks/qm.yml rename to Resources/Prototypes/_White/Entities/Structures/Airlocks/qm.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Furniture/benches.yml b/Resources/Prototypes/_White/Entities/Structures/Furniture/benches.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Furniture/benches.yml rename to Resources/Prototypes/_White/Entities/Structures/Furniture/benches.yml diff --git a/Resources/Prototypes/_Miracle/Entities/Structures/Machine/gulag_machines.yml b/Resources/Prototypes/_White/Entities/Structures/Machine/gulag_machines.yml similarity index 100% rename from Resources/Prototypes/_Miracle/Entities/Structures/Machine/gulag_machines.yml rename to Resources/Prototypes/_White/Entities/Structures/Machine/gulag_machines.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml b/Resources/Prototypes/_White/Entities/Structures/Machines/doc_printer.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml rename to Resources/Prototypes/_White/Entities/Structures/Machines/doc_printer.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Supermatter/supermatter.yml b/Resources/Prototypes/_White/Entities/Structures/Supermatter/supermatter.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Supermatter/supermatter.yml rename to Resources/Prototypes/_White/Entities/Structures/Supermatter/supermatter.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Wallmounts/auth.yml b/Resources/Prototypes/_White/Entities/Structures/Wallmounts/auth.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Wallmounts/auth.yml rename to Resources/Prototypes/_White/Entities/Structures/Wallmounts/auth.yml diff --git a/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml b/Resources/Prototypes/_White/Entities/Structures/Wallmounts/consoles.yml similarity index 100% rename from Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml rename to Resources/Prototypes/_White/Entities/Structures/Wallmounts/consoles.yml diff --git a/Resources/Prototypes/White/Fluff/centurion.yml b/Resources/Prototypes/_White/Fluff/centurion.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/centurion.yml rename to Resources/Prototypes/_White/Fluff/centurion.yml diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/_White/Fluff/fluff.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/fluff.yml rename to Resources/Prototypes/_White/Fluff/fluff.yml diff --git a/Resources/Prototypes/White/Fluff/fluff1.yml b/Resources/Prototypes/_White/Fluff/fluff1.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/fluff1.yml rename to Resources/Prototypes/_White/Fluff/fluff1.yml diff --git a/Resources/Prototypes/White/Fluff/serbwo.yml b/Resources/Prototypes/_White/Fluff/serbwo.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/serbwo.yml rename to Resources/Prototypes/_White/Fluff/serbwo.yml diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/_White/Fluff/sponsor.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/sponsor.yml rename to Resources/Prototypes/_White/Fluff/sponsor.yml diff --git a/Resources/Prototypes/White/Fluff/waggier.yml b/Resources/Prototypes/_White/Fluff/waggier.yml similarity index 100% rename from Resources/Prototypes/White/Fluff/waggier.yml rename to Resources/Prototypes/_White/Fluff/waggier.yml diff --git a/Resources/Prototypes/White/Ghosts/custom_ghosts.yml b/Resources/Prototypes/_White/Ghosts/custom_ghosts.yml similarity index 100% rename from Resources/Prototypes/White/Ghosts/custom_ghosts.yml rename to Resources/Prototypes/_White/Ghosts/custom_ghosts.yml diff --git a/Resources/Prototypes/White/JukeboxAndStuff/jukebox_stuff.yml b/Resources/Prototypes/_White/JukeboxAndStuff/jukebox_stuff.yml similarity index 100% rename from Resources/Prototypes/White/JukeboxAndStuff/jukebox_stuff.yml rename to Resources/Prototypes/_White/JukeboxAndStuff/jukebox_stuff.yml diff --git a/Resources/Prototypes/White/JukeboxAndStuff/tapes.yml b/Resources/Prototypes/_White/JukeboxAndStuff/tapes.yml similarity index 100% rename from Resources/Prototypes/White/JukeboxAndStuff/tapes.yml rename to Resources/Prototypes/_White/JukeboxAndStuff/tapes.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/2shonka-parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/2shonka-parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/2shonka-parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/2shonka-parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/cat_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/cat_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/cat_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/egoruch17_markings.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/egoruch17_markings.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/egoruch17_markings.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/egoruch17_markings.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/felinid.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/felinid.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts-vtergot.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts-vtergot.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts-vtergot.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts-vtergot.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/fox_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/fox_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/harpy-parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/harpy-parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/harpy-parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/harpy-parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/human_hair.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/human_hair.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/human_hair.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/imercuryi-parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/imercuryi-parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/imercuryi-parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/imercuryi-parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/knifeCappy_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/knifeCappy_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/knifeCappy_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/knifeCappy_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/reider207_tail.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/reider207_tail.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/reider207_tail.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/reider207_tail.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/tajaran-tail-fluff.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/tajaran-tail-fluff.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/tajaran-tail-fluff.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/tajaran-tail-fluff.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/warete_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/warete_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/warete_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/warete_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/wolf_parts.yml b/Resources/Prototypes/_White/Mobs/Customization/Markings/wolf_parts.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Customization/Markings/wolf_parts.yml rename to Resources/Prototypes/_White/Mobs/Customization/Markings/wolf_parts.yml diff --git a/Resources/Prototypes/White/Mobs/Pets/pets.yml b/Resources/Prototypes/_White/Mobs/Pets/pets.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Pets/pets.yml rename to Resources/Prototypes/_White/Mobs/Pets/pets.yml diff --git a/Resources/Prototypes/White/Mobs/Player/felinid.yml b/Resources/Prototypes/_White/Mobs/Player/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Player/felinid.yml rename to Resources/Prototypes/_White/Mobs/Player/felinid.yml diff --git a/Resources/Prototypes/White/Mobs/Player/harpy.yml b/Resources/Prototypes/_White/Mobs/Player/harpy.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Player/harpy.yml rename to Resources/Prototypes/_White/Mobs/Player/harpy.yml diff --git a/Resources/Prototypes/White/Mobs/Player/human.yml b/Resources/Prototypes/_White/Mobs/Player/human.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Player/human.yml rename to Resources/Prototypes/_White/Mobs/Player/human.yml diff --git a/Resources/Prototypes/White/Mobs/Species/felinid.yml b/Resources/Prototypes/_White/Mobs/Species/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Species/felinid.yml rename to Resources/Prototypes/_White/Mobs/Species/felinid.yml diff --git a/Resources/Prototypes/White/Mobs/Species/harpy.yml b/Resources/Prototypes/_White/Mobs/Species/harpy.yml similarity index 100% rename from Resources/Prototypes/White/Mobs/Species/harpy.yml rename to Resources/Prototypes/_White/Mobs/Species/harpy.yml diff --git a/Resources/Prototypes/White/Mood/generic_negativeEffects.yml b/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml similarity index 100% rename from Resources/Prototypes/White/Mood/generic_negativeEffects.yml rename to Resources/Prototypes/_White/Mood/generic_negativeEffects.yml diff --git a/Resources/Prototypes/White/Mood/generic_positveEffects.yml b/Resources/Prototypes/_White/Mood/generic_positveEffects.yml similarity index 100% rename from Resources/Prototypes/White/Mood/generic_positveEffects.yml rename to Resources/Prototypes/_White/Mood/generic_positveEffects.yml diff --git a/Resources/Prototypes/White/Mood/moodEffects_needs.yml b/Resources/Prototypes/_White/Mood/moodEffects_needs.yml similarity index 100% rename from Resources/Prototypes/White/Mood/moodEffects_needs.yml rename to Resources/Prototypes/_White/Mood/moodEffects_needs.yml diff --git a/Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml b/Resources/Prototypes/_White/NonPeacefulRound/NonPeacefulRoundItems.yml similarity index 100% rename from Resources/Prototypes/White/NonPeacefulRound/NonPeacefulRoundItems.yml rename to Resources/Prototypes/_White/NonPeacefulRound/NonPeacefulRoundItems.yml diff --git a/Resources/Prototypes/White/Objects/Scrolls/magic.yml b/Resources/Prototypes/_White/Objects/Scrolls/magic.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Scrolls/magic.yml rename to Resources/Prototypes/_White/Objects/Scrolls/magic.yml diff --git a/Resources/Prototypes/White/Objects/Scrolls/scrolls.yml b/Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Scrolls/scrolls.yml rename to Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml diff --git a/Resources/Prototypes/White/Objects/Specific/Species/felinid.yml b/Resources/Prototypes/_White/Objects/Specific/Species/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Specific/Species/felinid.yml rename to Resources/Prototypes/_White/Objects/Specific/Species/felinid.yml diff --git a/Resources/Prototypes/White/Objects/Tools/crafts.yml b/Resources/Prototypes/_White/Objects/Tools/crafts.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Tools/crafts.yml rename to Resources/Prototypes/_White/Objects/Tools/crafts.yml diff --git a/Resources/Prototypes/White/Objects/Tools/form.yml b/Resources/Prototypes/_White/Objects/Tools/form.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Tools/form.yml rename to Resources/Prototypes/_White/Objects/Tools/form.yml diff --git a/Resources/Prototypes/White/Objects/Tools/key.yml b/Resources/Prototypes/_White/Objects/Tools/key.yml similarity index 100% rename from Resources/Prototypes/White/Objects/Tools/key.yml rename to Resources/Prototypes/_White/Objects/Tools/key.yml diff --git a/Resources/Prototypes/White/Recipes/crafts.yml b/Resources/Prototypes/_White/Recipes/crafts.yml similarity index 100% rename from Resources/Prototypes/White/Recipes/crafts.yml rename to Resources/Prototypes/_White/Recipes/crafts.yml diff --git a/Resources/Prototypes/White/Recipes/hidden_crafts.yml b/Resources/Prototypes/_White/Recipes/hidden_crafts.yml similarity index 100% rename from Resources/Prototypes/White/Recipes/hidden_crafts.yml rename to Resources/Prototypes/_White/Recipes/hidden_crafts.yml diff --git a/Resources/Prototypes/White/Recipes/lathe_recipes.yml b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml similarity index 100% rename from Resources/Prototypes/White/Recipes/lathe_recipes.yml rename to Resources/Prototypes/_White/Recipes/lathe_recipes.yml diff --git a/Resources/Prototypes/White/Research/arsenal.yml b/Resources/Prototypes/_White/Research/arsenal.yml similarity index 100% rename from Resources/Prototypes/White/Research/arsenal.yml rename to Resources/Prototypes/_White/Research/arsenal.yml diff --git a/Resources/Prototypes/White/Research/experimental.yml b/Resources/Prototypes/_White/Research/experimental.yml similarity index 100% rename from Resources/Prototypes/White/Research/experimental.yml rename to Resources/Prototypes/_White/Research/experimental.yml diff --git a/Resources/Prototypes/White/SoundCollections/coindrop.yml b/Resources/Prototypes/_White/SoundCollections/coindrop.yml similarity index 100% rename from Resources/Prototypes/White/SoundCollections/coindrop.yml rename to Resources/Prototypes/_White/SoundCollections/coindrop.yml diff --git a/Resources/Prototypes/White/SoundCollections/felinid.yml b/Resources/Prototypes/_White/SoundCollections/felinid.yml similarity index 100% rename from Resources/Prototypes/White/SoundCollections/felinid.yml rename to Resources/Prototypes/_White/SoundCollections/felinid.yml diff --git a/Resources/Prototypes/White/SoundCollections/harpy.yml b/Resources/Prototypes/_White/SoundCollections/harpy.yml similarity index 100% rename from Resources/Prototypes/White/SoundCollections/harpy.yml rename to Resources/Prototypes/_White/SoundCollections/harpy.yml diff --git a/Resources/Prototypes/White/SoundCollections/web.yml b/Resources/Prototypes/_White/SoundCollections/web.yml similarity index 100% rename from Resources/Prototypes/White/SoundCollections/web.yml rename to Resources/Prototypes/_White/SoundCollections/web.yml diff --git a/Resources/Prototypes/White/Species/actions.yml b/Resources/Prototypes/_White/Species/actions.yml similarity index 100% rename from Resources/Prototypes/White/Species/actions.yml rename to Resources/Prototypes/_White/Species/actions.yml diff --git a/Resources/Prototypes/White/Species/felinid.yml b/Resources/Prototypes/_White/Species/felinid.yml similarity index 100% rename from Resources/Prototypes/White/Species/felinid.yml rename to Resources/Prototypes/_White/Species/felinid.yml diff --git a/Resources/Prototypes/White/Species/harpy.yml b/Resources/Prototypes/_White/Species/harpy.yml similarity index 100% rename from Resources/Prototypes/White/Species/harpy.yml rename to Resources/Prototypes/_White/Species/harpy.yml diff --git a/Resources/Prototypes/White/StatusEffects/criminal_records.yml b/Resources/Prototypes/_White/StatusEffects/criminal_records.yml similarity index 100% rename from Resources/Prototypes/White/StatusEffects/criminal_records.yml rename to Resources/Prototypes/_White/StatusEffects/criminal_records.yml diff --git a/Resources/Prototypes/White/Structures/Machines/atm.yml b/Resources/Prototypes/_White/Structures/Machines/atm.yml similarity index 100% rename from Resources/Prototypes/White/Structures/Machines/atm.yml rename to Resources/Prototypes/_White/Structures/Machines/atm.yml diff --git a/Resources/Prototypes/White/Structures/Windows/paper.yml b/Resources/Prototypes/_White/Structures/Windows/paper.yml similarity index 100% rename from Resources/Prototypes/White/Structures/Windows/paper.yml rename to Resources/Prototypes/_White/Structures/Windows/paper.yml diff --git a/Resources/Prototypes/White/Tiles/floors.yml b/Resources/Prototypes/_White/Tiles/floors.yml similarity index 100% rename from Resources/Prototypes/White/Tiles/floors.yml rename to Resources/Prototypes/_White/Tiles/floors.yml diff --git a/Resources/Prototypes/White/event_prototypes.yml b/Resources/Prototypes/_White/event_prototypes.yml similarity index 100% rename from Resources/Prototypes/White/event_prototypes.yml rename to Resources/Prototypes/_White/event_prototypes.yml diff --git a/Resources/Prototypes/White/polymorphs.yml b/Resources/Prototypes/_White/polymorphs.yml similarity index 100% rename from Resources/Prototypes/White/polymorphs.yml rename to Resources/Prototypes/_White/polymorphs.yml diff --git a/Resources/Prototypes/White/store_categories.yml b/Resources/Prototypes/_White/store_categories.yml similarity index 100% rename from Resources/Prototypes/White/store_categories.yml rename to Resources/Prototypes/_White/store_categories.yml diff --git a/Resources/Prototypes/White/tags.yml b/Resources/Prototypes/_White/tags.yml similarity index 100% rename from Resources/Prototypes/White/tags.yml rename to Resources/Prototypes/_White/tags.yml diff --git a/Resources/Prototypes/White/tts-voices.yml b/Resources/Prototypes/_White/tts-voices.yml similarity index 100% rename from Resources/Prototypes/White/tts-voices.yml rename to Resources/Prototypes/_White/tts-voices.yml From e40185d843feabf27c1a64080933963c058baf12 Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Sun, 24 Mar 2024 13:31:18 +0300 Subject: [PATCH 08/11] tweak: new prices for cargo materials (#241) * tweak: new prices for cargo materials * fix: fix missing zero --- Resources/Prototypes/Catalog/Cargo/cargo_materials.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index 7cde7fbccd..a8b186182d 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -106,7 +106,7 @@ sprite: Objects/Materials/Sheets/other.rsi state: uranium product: CrateMaterialUranium - cost: 3000 + cost: 23000 category: Materials group: market @@ -118,7 +118,7 @@ sprite: Objects/Materials/ingots.rsi state: gold product: CrateMaterialGold - cost: 4000 + cost: 17000 category: Materials group: market @@ -130,7 +130,7 @@ sprite: Objects/Materials/ingots.rsi state: silver product: CrateMaterialSilver - cost: 3000 + cost: 12000 category: Materials group: market @@ -142,6 +142,6 @@ sprite: Objects/Materials/ore.rsi state: bananium product: CrateMaterialBananium - cost: 3000 + cost: 35000 category: Materials group: market From ad8a73eff00b6a66cdebbd408d33cccbed342335 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 24 Mar 2024 10:32:21 +0000 Subject: [PATCH 09/11] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 4cb21a1119..fce3c4c798 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -2878,3 +2878,14 @@ id: 220 time: '2024-03-24T09:57:41.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/239 +- author: ThereDrD + changes: + - message: "\u0420\u0435\u0434\u043A\u0438\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\ + \u0430\u043B\u044B \u0432 \u043A\u0430\u0440\u0433\u043E \u0442\u0435\u043F\u0435\ + \u0440\u044C \u0441\u0442\u043E\u044F\u0442 \u0433\u043E\u0440\u0430\u0437\u0434\ + \u043E \u0431\u043E\u043B\u044C\u0448\u0435 \u0434\u043B\u044F \u043F\u043E\u043A\ + \u0443\u043F\u043A\u0438" + type: Fix + id: 221 + time: '2024-03-24T10:31:18.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/241 From 1a284b4b406ce59e053391d4f0c28e0cc79621f1 Mon Sep 17 00:00:00 2001 From: Valtos Date: Sun, 24 Mar 2024 15:03:24 +0300 Subject: [PATCH 10/11] nuck figgers --- Tools/actions_changelogs_since_last_run.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tools/actions_changelogs_since_last_run.py b/Tools/actions_changelogs_since_last_run.py index 6521b6946d..9447baf663 100755 --- a/Tools/actions_changelogs_since_last_run.py +++ b/Tools/actions_changelogs_since_last_run.py @@ -130,6 +130,9 @@ def send_to_discord(entries: Iterable[ChangelogEntry]) -> None: print(f"No discord webhook URL found, skipping discord send") return + # Temporary until github publishing working to avoid spamming cl + return + message_content = io.StringIO() # We need to manually split messages to avoid discord's character limit # With that being said this isn't entirely robust From 5f01622a0746c690d2975b2ae3de014152e8cc03 Mon Sep 17 00:00:00 2001 From: Valtos Date: Sun, 24 Mar 2024 15:04:07 +0300 Subject: [PATCH 11/11] nill kiggers --- Tools/actions_changelogs_since_last_run.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/Tools/actions_changelogs_since_last_run.py b/Tools/actions_changelogs_since_last_run.py index 9447baf663..6521b6946d 100755 --- a/Tools/actions_changelogs_since_last_run.py +++ b/Tools/actions_changelogs_since_last_run.py @@ -130,9 +130,6 @@ def send_to_discord(entries: Iterable[ChangelogEntry]) -> None: print(f"No discord webhook URL found, skipping discord send") return - # Temporary until github publishing working to avoid spamming cl - return - message_content = io.StringIO() # We need to manually split messages to avoid discord's character limit # With that being said this isn't entirely robust