From 06d136698c93466f03a89330980d9d52dc37e940 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Wed, 24 Jul 2024 22:31:54 -0400 Subject: [PATCH 01/23] Perma escape crate fills and spawner (#29497) * perma escape crate fills and spawner * also include maints closets because thats easy. * oopsie daisys * green glowsticks * mindshield * base folder * mob traps. * I skill issued a ctrl+F and wrote garabge into yml * re work syndicate gift crate, remove ability to get syndicate guns randomly. * Do mob traps differently to hopefully appease tests. * mindshield probability decrease. * lower mob chance since I forgor there are crabs in the walls * Suffixes * mob chance was definitely too low. * still too low * still a bit low * that feels right. * too many mk's * increase hatchet chance since you need a cutting impliment to logs. * alphabetize --- .../Catalog/Fills/Crates/permaescape.yml | 372 ++++++++++++++++++ 1 file changed, 372 insertions(+) create mode 100644 Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml diff --git a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml new file mode 100644 index 0000000000..4505a8cc7b --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml @@ -0,0 +1,372 @@ +- type: entity + name: Perma Escape Crate Spawner + id: CratePermaEscapeSpawner + parent: CrateEmptySpawner + components: + - type: RandomSpawner + prototypes: + # Please note any duplicates & alphabetize <3 + - CrateEngineeringMiniJetpack + - CratePermaEscapeBureaucracy + - CratePermaEscapeEVA + - CratePermaEscapeGiftsFromSyndicate + - CratePermaEscapeGun + - CratePermaEscapeLights + - CratePermaEscapeMerc + - CrateServiceCustomSmokable + - CrateTrashCartFilled + - CratePermaEscapeComs # x2 + - CratePermaEscapeComs + - CratePermaEscapeDigging # x2 + - CratePermaEscapeDigging + - CratePermaEscapeMats #x2 + - CratePermaEscapeMats + - CratePermaEscapeTowercap # x2 + - CratePermaEscapeTowercap + - ClosetMaintenanceFilledRandom # x3 + - ClosetMaintenanceFilledRandom + - ClosetMaintenanceFilledRandom + rarePrototypes: + - MobTick # These need to be killable by one dude with a shovel. + rareChance: .30 + chance: 1 + offset: 0.0 + +- type: entity + id: CratePermaEscapeDigging + parent: CrateGenericSteel + suffix: Digging + components: + - type: StorageFill + contents: + - id: Shovel + - id: Pickaxe + prob: 0.90 + - id: Pickaxe + prob: 0.40 + - id: Pickaxe + prob: 0.10 + - id: Shovel + prob: 0.50 + - id: Shovel + prob: 0.20 + - id: HydroponicsToolSpade + prob: 0.10 + - id: HydroponicsToolHatchet + prob: 0.05 + +- type: entity + id: CratePermaEscapeEVA + parent: CrateGenericSteel + suffix: EVAs + components: + - type: StorageFill + contents: + - id: ClothingHeadHelmetEVALarge + - id: ClothingOuterHardsuitEVAPrisoner + - id: ClothingHeadHelmetEVALarge + prob: 0.80 + - id: ClothingOuterHardsuitEVAPrisoner + prob: 0.80 + - id: ClothingOuterHardsuitVoidParamed + prob: 0.10 + - id: ClothingOuterRedRacoon + prob: 0.10 + - id: ClothingOuterSanta + prob: 0.10 + - id: ClothingOuterHardsuitSyndicate + prob: 0.20 + - id: EmergencyOxygenTankFilled + prob: 0.25 + - id: EmergencyOxygenTank + prob: 0.25 + - id: OxygenTankFilled + prob: 0.05 + +- type: entity + id: CratePermaEscapeGun + parent: CrateGenericSteel + suffix: Gun + components: + - type: StorageFill + contents: + - id: WeaponPistolMk58 + prob: 0.15 + orGroup: gun + - id: FoamCrossbow + prob: 0.10 + orGroup: gun + - id: WeaponRifleFoam + prob: 0.05 + orGroup: gun + - id: WeaponPistolFlintlock + prob: 0.20 + orGroup: gun + - id: WeaponShotgunBlunderbuss + prob: 0.10 + orGroup: gun + - id: WeaponShotgunBlunderbuss + prob: 0.15 + orGroup: gun + - id: WeaponRevolverPirate + prob: 0.15 + orGroup: gun + - id: WeaponProtoKineticAccelerator + prob: 0.20 + orGroup: gun + +- type: entity + id: CratePermaEscapeBureaucracy + parent: CrateGenericSteel + suffix: Writing + components: + - type: StorageFill + contents: + - id: RubberStampApproved + - id: RubberStampDenied + - id: Pen + - id: Pen + - id: Pen + - id: BoxFolderBase + orGroup: folderA + - id: BoxFolderBlack + orGroup: folderA + - id: BoxFolderBlue + orGroup: folderA + - id: BoxFolderGreen + orGroup: folderA + - id: BoxFolderGrey + orGroup: folderA + - id: BoxFolderRed + orGroup: folderA + - id: BoxFolderWhite + orGroup: folderA + - id: BoxFolderYellow + orGroup: folderA + - id: BoxFolderBase + orGroup: folderB + - id: BoxFolderBlack + orGroup: folderB + - id: BoxFolderBlue + orGroup: folderB + - id: BoxFolderGreen + orGroup: folderB + - id: BoxFolderGrey + orGroup: folderB + - id: BoxFolderRed + orGroup: folderB + - id: BoxFolderWhite + orGroup: folderB + - id: BoxFolderYellow + orGroup: folderB + - id: CrayonBox + prob: 0.50 + - id: CrayonBox + prob: 0.10 + - id: ClearPDA # change to visitor one day. + prob: 0.10 + - id: PersonalAI + +- type: entity + id: CratePermaEscapeLights + parent: CrateGenericSteel + suffix: Glowsticks + components: + - type: StorageFill + contents: + - id: GlowstickBlue + prob: 0.50 + - id: GlowstickBlue + prob: 0.20 + - id: GlowstickBlue + prob: 0.05 + - id: GlowstickBase + prob: 0.50 + - id: GlowstickBase + prob: 0.20 + - id: GlowstickBase + prob: 0.05 + - id: GlowstickPurple + prob: 0.50 + - id: GlowstickPurple + prob: 0.20 + - id: GlowstickPurple + prob: 0.05 + - id: GlowstickRed + prob: 0.50 + - id: GlowstickRed + prob: 0.20 + - id: GlowstickRed + prob: 0.05 + - id: GlowstickYellow + prob: 0.50 + - id: GlowstickYellow + prob: 0.20 + - id: GlowstickYellow + prob: 0.05 + +- type: entity + id: CratePermaEscapeMats + parent: CrateGenericSteel + suffix: Mats + components: + - type: StorageFill + contents: + - id: SheetSteel + orGroup: matA + - id: PartRodMetal + orGroup: matA + - id: SheetSteel + orGroup: matB + - id: PartRodMetal + orGroup: matB + +- type: entity + id: CratePermaEscapeGiftsFromSyndicate + parent: CrateGenericSteel + suffix: Syndi Gifts + components: + - type: StorageFill + contents: + - id: ClothingEyesGlassesOutlawGlasses + - id: ClothingHeadHatOutlawHat + - id: HappyHonkNukieSnacks + # - id: BaseUplinkRadio # too spicy I think. + # prob: 0.50 + # - id: Telecrystal + # prob: 0.80 + # - id: Telecrystal + # prob: 0.80 + # - id: Telecrystal + # prob: 0.70 + # - id: Telecrystal + # prob: 0.50 + # - id: Telecrystal + # prob: 0.20 + # - id: Telecrystal + # prob: 0.10 + # - id: Telecrystal + # prob: 0.05 + # - id: Telecrystal + # prob: 0.01 + # - id: Telecrystal5 + # prob: 0.01 + - id: CyberPen + prob: 0.10 + - id: CockroachCube + orGroup: cube + - id: AbominationCube + prob: 0.20 + orGroup: cube + - id: SpaceCarpCube + prob: 0.20 + orGroup: cube + - id: SyndicateSponge + prob: 0.20 + orGroup: cube + - id: MindShieldImplanter + prob: 0.20 + - id: ClothingHandsGlovesConducting # funny + prob: 0.30 + - id: CigPackSyndicate + prob: 0.80 + - id: StimpackMini + prob: 0.20 + - id: StimpackMini + prob: 0.10 + - id: CombatMedipen + prob: 0.05 + - id: MedkitCombatFilled + prob: 0.01 + - id: SoapSyndie + prob: 0.15 + - id: DnaScramblerImplanter + prob: 0.005 + + +- type: entity + id: CratePermaEscapeMerc + parent: CrateGenericSteel + suffix: Merc + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitMercenary + - id: ClothingHeadBandMerc + prob: 0.50 + - id: ClothingHeadHatBeretMerc + prob: 0.20 + - id: ClothingHeadHelmetMerc + prob: 0.05 + - id: ClothingEyesGlassesMercenary + prob: 0.20 + - id: ClothingMaskGasMerc + prob: 0.10 + - id: ClothingHandsGlovesMercFingerless + prob: 0.20 + - id: ClothingHandsMercGlovesCombat + prob: 0.05 + - id: ClothingBackpackMerc + prob: 0.50 + - id: ClothingShoesBootsMerc + prob: 0.50 + - id: ClothingOuterVestWebMerc + prob: 0.25 + - id: ClothingBeltMercWebbing + prob: 0.05 + +- type: entity + id: CratePermaEscapeComs + parent: CrateGenericSteel + suffix: Coms + components: + - type: StorageFill + contents: + - id: ClothingHeadsetMining + orGroup: coms + - id: ClothingHeadsetMining + orGroup: coms + - id: ClothingHeadsetMining + orGroup: coms + - id: ClothingHeadsetGrey + orGroup: coms + - id: ClothingHeadsetScience + orGroup: coms + - id: ClothingHeadsetService + orGroup: coms + - id: ClothingHeadsetEngineering + orGroup: coms + - id: ClothingHeadsetMedical + orGroup: coms + - id: EncryptionKeyCargo + prob: 0.05 + - id: EncryptionKeyScience + prob: 0.05 + - id: EncryptionKeyService + prob: 0.05 + - id: EncryptionKeyMedical + prob: 0.05 + - id: EncryptionKeyEngineering + prob: 0.05 + - id: EncryptionKeySecurity + prob: 0.01 + +- type: entity + id: CratePermaEscapeTowercap + parent: CrateGenericSteel + suffix: Towercap + components: + - type: StorageFill + contents: + - id: TowercapSeeds + - id: TowercapSeeds + prob: 0.80 + - id: TowercapSeeds + prob: 0.50 + - id: TowercapSeeds + prob: 0.20 + - id: SteelcapSeeds + prob: 0.10 + - id: SteelLog + - id: HydroponicsToolHatchet + prob: 0.75 From b6811d35703ab14b3748bbaf9c29fd4cfe97e680 Mon Sep 17 00:00:00 2001 From: marbow <152051971+marboww@users.noreply.github.com> Date: Thu, 25 Jul 2024 10:49:32 +0700 Subject: [PATCH 02/23] Medical borg add chem glasses (#27843) * Update borg_chassis.yml * Update borg_chassis.yml * fix * Removing unnecessary components and adapting changes (#28391) for the syndicate --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 3a17869dc8..215cb4c188 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -265,6 +265,7 @@ access: [["Medical"], ["Command"], ["Research"]] - type: Inventory templateId: borgDutch + - type: SolutionScanner - type: FootstepModifier footstepSoundCollection: collection: FootstepHoverBorg @@ -363,7 +364,7 @@ - type: entity id: BorgChassisSyndicateMedical - parent: BaseBorgChassisSyndicate + parent: [BaseBorgChassisSyndicate, ShowMedicalIcons] name: syndicate medical cyborg description: A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities. components: @@ -397,6 +398,12 @@ interactFailureString: petting-failure-syndicate-cyborg interactSuccessSound: path: /Audio/Ambience/Objects/periodic_beep.ogg + - type: SolutionScanner + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepHoverBorg + params: + volume: -6 - type: entity id: BorgChassisSyndicateSaboteur From 8f6326c3e0b04af30171d2435962b89105d67f31 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 25 Jul 2024 03:54:51 +0000 Subject: [PATCH 03/23] prevent borgs unlocking eachother and robotics console (#27888) * prevent borgs from using locks * e * bru * a * blacklist borgs and robotics console * frogro * add IsAllowed to EntityWhitelistSystem * use IsAllowed * move thing to new LockingWhitelistSystem * :trollface: * review * use renamed CheckBoth in locking whitelist * remove unused stuff and add more to doc * Use target entity instead to remove self check * Rename to _whitelistSystem * Add deny lock toggle popup * Prevent duplicate checks and popups * Fix wrong entity in popup when toggling another borg * Make new event * Update comment to user for new event --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> --- Content.Shared/Lock/LockComponent.cs | 7 +++++ Content.Shared/Lock/LockSystem.cs | 8 ++++-- .../Lock/LockingWhitelistComponent.cs | 18 ++++++++++++ Content.Shared/Lock/LockingWhitelistSystem.cs | 28 +++++++++++++++++++ .../Whitelist/EntityWhitelistSystem.cs | 17 +++++++++++ .../lock/locking-whitelist-component.ftl | 1 + .../Mobs/Cyborgs/base_borg_chassis.yml | 5 ++++ 7 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 Content.Shared/Lock/LockingWhitelistComponent.cs create mode 100644 Content.Shared/Lock/LockingWhitelistSystem.cs create mode 100644 Resources/Locale/en-US/lock/locking-whitelist-component.ftl diff --git a/Content.Shared/Lock/LockComponent.cs b/Content.Shared/Lock/LockComponent.cs index e3e2bc6df1..070d5801c1 100644 --- a/Content.Shared/Lock/LockComponent.cs +++ b/Content.Shared/Lock/LockComponent.cs @@ -86,6 +86,13 @@ public sealed partial class LockComponent : Component [ByRefEvent] public record struct LockToggleAttemptEvent(EntityUid User, bool Silent = false, bool Cancelled = false); +/// +/// Event raised on the user when a toggle is attempted. +/// Can be cancelled to prevent it. +/// +[ByRefEvent] +public record struct UserLockToggleAttemptEvent(EntityUid Target, bool Silent = false, bool Cancelled = false); + /// /// Event raised on a lock after it has been toggled. /// diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs index 22a90aa0a6..8dde767224 100644 --- a/Content.Shared/Lock/LockSystem.cs +++ b/Content.Shared/Lock/LockSystem.cs @@ -232,7 +232,12 @@ public sealed class LockSystem : EntitySystem var ev = new LockToggleAttemptEvent(user, quiet); RaiseLocalEvent(uid, ref ev, true); - return !ev.Cancelled; + if (ev.Cancelled) + return false; + + var userEv = new UserLockToggleAttemptEvent(uid, quiet); + RaiseLocalEvent(user, ref userEv, true); + return !userEv.Cancelled; } // TODO: this should be a helper on AccessReaderSystem since so many systems copy paste it @@ -377,4 +382,3 @@ public sealed class LockSystem : EntitySystem _activatableUI.CloseAll(uid); } } - diff --git a/Content.Shared/Lock/LockingWhitelistComponent.cs b/Content.Shared/Lock/LockingWhitelistComponent.cs new file mode 100644 index 0000000000..4ac832e438 --- /dev/null +++ b/Content.Shared/Lock/LockingWhitelistComponent.cs @@ -0,0 +1,18 @@ +using Content.Shared.Whitelist; +using Robust.Shared.GameStates; + +namespace Content.Shared.Lock; + +/// +/// Adds whitelist and blacklist for this mob to lock things. +/// The whitelist and blacklist are checked against the object being locked, not the mob. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(LockingWhitelistSystem))] +public sealed partial class LockingWhitelistComponent : Component +{ + [DataField] + public EntityWhitelist? Whitelist; + + [DataField] + public EntityWhitelist? Blacklist; +} diff --git a/Content.Shared/Lock/LockingWhitelistSystem.cs b/Content.Shared/Lock/LockingWhitelistSystem.cs new file mode 100644 index 0000000000..ba495fba90 --- /dev/null +++ b/Content.Shared/Lock/LockingWhitelistSystem.cs @@ -0,0 +1,28 @@ +using Content.Shared.Popups; +using Content.Shared.Whitelist; + +namespace Content.Shared.Lock; + +public sealed class LockingWhitelistSystem : EntitySystem +{ + [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnUserLockToggleAttempt); + } + + private void OnUserLockToggleAttempt(Entity ent, ref UserLockToggleAttemptEvent args) + { + if (_whitelistSystem.CheckBoth(args.Target, ent.Comp.Blacklist, ent.Comp.Whitelist)) + return; + + if (!args.Silent) + _popupSystem.PopupClient(Loc.GetString("locking-whitelist-component-lock-toggle-deny"), ent.Owner); + + args.Cancelled = true; + } +} diff --git a/Content.Shared/Whitelist/EntityWhitelistSystem.cs b/Content.Shared/Whitelist/EntityWhitelistSystem.cs index f311946cf9..57fdb523dd 100644 --- a/Content.Shared/Whitelist/EntityWhitelistSystem.cs +++ b/Content.Shared/Whitelist/EntityWhitelistSystem.cs @@ -23,6 +23,23 @@ public sealed class EntityWhitelistSystem : EntitySystem return uid != null && IsValid(list, uid.Value); } + /// + /// Checks whether a given entity is allowed by a whitelist and not blocked by a blacklist. + /// If a blacklist is provided and it matches then this returns false. + /// If a whitelist is provided and it does not match then this returns false. + /// If either list is null it does not get checked. + /// + public bool CheckBoth([NotNullWhen(true)] EntityUid? uid, EntityWhitelist? blacklist = null, EntityWhitelist? whitelist = null) + { + if (uid == null) + return false; + + if (blacklist != null && IsValid(blacklist, uid)) + return false; + + return whitelist == null || IsValid(whitelist, uid); + } + /// /// Checks whether a given entity satisfies a whitelist. /// diff --git a/Resources/Locale/en-US/lock/locking-whitelist-component.ftl b/Resources/Locale/en-US/lock/locking-whitelist-component.ftl new file mode 100644 index 0000000000..182814c2c5 --- /dev/null +++ b/Resources/Locale/en-US/lock/locking-whitelist-component.ftl @@ -0,0 +1 @@ +locking-whitelist-component-lock-toggle-deny = You can't toggle the lock. diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 2618207b7a..f9422acd72 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -99,6 +99,11 @@ doAfterDelay: 10 allowSelfRepair: false - type: BorgChassis + - type: LockingWhitelist + blacklist: + components: + - BorgChassis + - RoboticsConsole - type: WiresPanel - type: ActivatableUIRequiresPanel - type: NameIdentifier From 0d12ce54d4938862b729605441bca985053d1dff Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 25 Jul 2024 03:55:58 +0000 Subject: [PATCH 04/23] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 76058bdc1a..f29ae6c265 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,14 +1,4 @@ Entries: -- author: exincore - changes: - - message: Fax machines now copy the labels attached to papers. - type: Add - - message: Fax machine "Print File" functionality now applies the first line of - the file as a label when it begins with `#`. - type: Add - id: 6478 - time: '2024-04-28T06:12:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25979 - author: Plykiya changes: - message: Hardsuits, EVA suits, firesuits and other things now protect your feet @@ -3780,3 +3770,10 @@ id: 6977 time: '2024-07-24T20:57:45.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30332 +- author: deltanedas + changes: + - message: Borgs can no longer unlock the robotics console or other borgs. + type: Tweak + id: 6978 + time: '2024-07-25T03:54:52.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/27888 From b0cc97fb0429e5316d960c674c635e4b5683c2e6 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Thu, 25 Jul 2024 01:23:52 -0400 Subject: [PATCH 05/23] Fix Ripley control panel (#30325) --- Content.Client/Mech/Ui/MechMenu.xaml.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Client/Mech/Ui/MechMenu.xaml.cs b/Content.Client/Mech/Ui/MechMenu.xaml.cs index 6f39bc386e..7ce863b7cd 100644 --- a/Content.Client/Mech/Ui/MechMenu.xaml.cs +++ b/Content.Client/Mech/Ui/MechMenu.xaml.cs @@ -12,7 +12,7 @@ public sealed partial class MechMenu : FancyWindow { [Dependency] private readonly IEntityManager _ent = default!; - private readonly EntityUid _mech; + private EntityUid _mech; public event Action? OnRemoveButtonPressed; @@ -25,6 +25,7 @@ public sealed partial class MechMenu : FancyWindow public void SetEntity(EntityUid uid) { MechView.SetEntity(uid); + _mech = uid; } public void UpdateMechStats() From 61efd1201e9fe08b5f9b45627f4d2327e0fa4535 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 25 Jul 2024 05:24:58 +0000 Subject: [PATCH 06/23] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f29ae6c265..d929c1c27d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: Hardsuits, EVA suits, firesuits and other things now protect your feet - from dangerous glass shards. - type: Tweak - id: 6479 - time: '2024-04-28T07:11:46.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26764 - author: FungiFellow changes: - message: Bows now fit in Exosuit slot. @@ -3777,3 +3769,10 @@ id: 6978 time: '2024-07-25T03:54:52.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/27888 +- author: themias + changes: + - message: Fixed the ripley control panel not loading + type: Fix + id: 6979 + time: '2024-07-25T05:23:53.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30325 From 2d124c5c292f3be572a5a3cf40ac792e6bc41838 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Thu, 25 Jul 2024 05:29:50 +0000 Subject: [PATCH 07/23] fix(train): Anchor botany machine, add second artifact spawner. (#30309) https://www.peoplesworld.org/article/free-college-was-once-the-norm-all-over-america/ --- Resources/Maps/train.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/Maps/train.yml b/Resources/Maps/train.yml index 8bcbf97b86..60f562e5c7 100644 --- a/Resources/Maps/train.yml +++ b/Resources/Maps/train.yml @@ -74144,7 +74144,7 @@ entities: pos: 8.5,-176.5 parent: 2 - type: Door - secondsUntilStateChange: -141100.73 + secondsUntilStateChange: -141260.94 state: Closing - uid: 11227 components: @@ -81637,6 +81637,11 @@ entities: - type: Transform pos: -8.5,-314.5 parent: 2 + - uid: 16962 + components: + - type: Transform + pos: -5.5,-382.5 + parent: 2 - proto: RandomArtifactSpawner20 entities: - uid: 12481 @@ -84582,7 +84587,7 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-338.5 parent: 2 -- proto: SignAtmosMinsky +- proto: SignAtmos entities: - uid: 12994 components: @@ -90882,11 +90887,8 @@ entities: - uid: 13995 components: - type: Transform - anchored: False - pos: -5.4964814,-84.54825 + pos: -5.5,-84.5 parent: 2 - - type: Physics - bodyType: Dynamic - proto: VendingMachineSeedsUnlocked entities: - uid: 13996 From 8de6b74e0809ed91ee9cb6496b92939ca4508515 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 25 Jul 2024 05:30:17 +0000 Subject: [PATCH 08/23] fix borg light being on by default (#30342) Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index f9422acd72..1110b3869b 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -118,7 +118,9 @@ cellSlotId: cell_slot fitsInCharger: true - type: ItemToggle + activated: false # gets activated when a mind is added onUse: false # no item-borg toggling sorry + toggleLight: false - type: AccessToggle # TODO: refactor movement to just be based on toggle like speedboots but for the boots themselves # TODO: or just have sentient speedboots be fast idk From 50ba20c76658132075fecdb17c581f80b90085a0 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Thu, 25 Jul 2024 05:33:22 +0000 Subject: [PATCH 09/23] fix(bounties): Make winter counts count as a single warm item. (#30306) https://news.stanford.edu/stories/2020/05/veil-darkness-reduces-racial-bias-traffic-stops --- Resources/Prototypes/Catalog/Bounties/bounties.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml index f656eb1962..2099d0e2a8 100644 --- a/Resources/Prototypes/Catalog/Bounties/bounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml @@ -502,6 +502,9 @@ - TemperatureProtection tags: - Scarf + blacklist: + components: + - ToggleableClothing - type: cargoBounty id: BountyBattery From f56e4f6624cbcd26eed68cc92a716a63f6065e74 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 25 Jul 2024 10:04:03 +0200 Subject: [PATCH 10/23] Replace some to do with TODO (#30346) Replace to do with TODO --- Content.Server/Anomaly/AnomalySynchronizerSystem.cs | 2 +- .../Anomaly/Effects/ReagentProducerAnomalySystem.cs | 2 +- Content.Server/Flash/DamagedByFlashingSystem.cs | 2 +- Content.Server/Lightning/LightningSystem.cs | 6 +++--- .../Catalog/VendingMachines/Inventories/magivend.yml | 2 +- Resources/Prototypes/Entities/Objects/Tools/toolbox.yml | 4 ++-- .../Entities/Structures/Power/Generation/Tesla/coil.yml | 4 ++-- .../Structures/Power/Generation/Tesla/generator.yml | 4 ++-- Resources/Prototypes/Maps/train.yml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs index 434a3fef66..9f18a41292 100644 --- a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs +++ b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs @@ -122,7 +122,7 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem _audio.PlayPvs(ent.Comp.ConnectedSound, ent); } - //TO DO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer. + //TODO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer. //Currently only bluespace anomaly can do this, but for some reason it is the only one that cannot be connected to the synchronizer. private void DisconneсtFromAnomaly(Entity ent, AnomalyComponent anomaly) { diff --git a/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs b/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs index 0e49c5ee56..d289fdabff 100644 --- a/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs @@ -76,7 +76,7 @@ public sealed class ReagentProducerAnomalySystem : EntitySystem if (anomaly.Severity >= 0.97) reagentProducingAmount *= component.SupercriticalReagentProducingModifier; newSol.AddReagent(component.ProducingReagent, reagentProducingAmount); - _solutionContainer.TryAddSolution(component.Solution.Value, newSol); //TO DO - the container is not fully filled. + _solutionContainer.TryAddSolution(component.Solution.Value, newSol); // TODO - the container is not fully filled. component.AccumulatedFrametime = 0; diff --git a/Content.Server/Flash/DamagedByFlashingSystem.cs b/Content.Server/Flash/DamagedByFlashingSystem.cs index cf0368ca42..5b4c19b8e5 100644 --- a/Content.Server/Flash/DamagedByFlashingSystem.cs +++ b/Content.Server/Flash/DamagedByFlashingSystem.cs @@ -16,7 +16,7 @@ public sealed class DamagedByFlashingSystem : EntitySystem { _damageable.TryChangeDamage(ent, ent.Comp.FlashDamage); - //To Do: It would be more logical if different flashes had different power, + //TODO: It would be more logical if different flashes had different power, //and the damage would be inflicted depending on the strength of the flash. } } diff --git a/Content.Server/Lightning/LightningSystem.cs b/Content.Server/Lightning/LightningSystem.cs index 2147ac80f2..94f3ab8802 100644 --- a/Content.Server/Lightning/LightningSystem.cs +++ b/Content.Server/Lightning/LightningSystem.cs @@ -71,9 +71,9 @@ public sealed class LightningSystem : SharedLightningSystem /// if the lightnings being fired should trigger lightning events. public void ShootRandomLightnings(EntityUid user, float range, int boltCount, string lightningPrototype = "Lightning", int arcDepth = 0, bool triggerLightningEvents = true) { - //To Do: add support to different priority target tablem for different lightning types - //To Do: Remove Hardcode LightningTargetComponent (this should be a parameter of the SharedLightningComponent) - //To Do: This is still pretty bad for perf but better than before and at least it doesn't re-allocate + //TODO: add support to different priority target tablem for different lightning types + //TODO: Remove Hardcode LightningTargetComponent (this should be a parameter of the SharedLightningComponent) + //TODO: This is still pretty bad for perf but better than before and at least it doesn't re-allocate // several hashsets every time var targets = _lookup.GetComponentsInRange(_transform.GetMapCoordinates(user), range).ToList(); diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml index 7617186dd9..821c916353 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml @@ -9,6 +9,6 @@ ClothingHeadHatVioletwizard: 3 ClothingOuterWizardViolet: 3 ClothingShoesWizard: 9 - #TO DO: + #TODO: #only missing staff #and if wizarditis reagent when hacked if we want this. diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 0a0c702324..db31911857 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -155,10 +155,10 @@ state: icon - type: ThiefUndeterminedBackpack possibleSets: - # - TO DO Thief pinpointer needed + # TODO Thief pinpointer needed - ChemistrySet - ToolsSet - - ChameleonSet # - TO DO Chameleon stump PR needed + - ChameleonSet # TODO Chameleon stump PR needed - SyndieSet - SleeperSet - CommunicatorSet diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml index b63f131a7f..dc2ad1687a 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml @@ -101,7 +101,7 @@ SheetSteel1: min: 2 max: 4 - #- type: GuideHelp # To Do - add Tesla Guide + #- type: GuideHelp # TODO - add Tesla Guide - type: entity id: TeslaGroundingRod @@ -184,5 +184,5 @@ SheetSteel1: min: 2 max: 4 - #- type: GuideHelp # To Do - add Tesla Guide + #- type: GuideHelp # TODO - add Tesla Guide diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml index a8c61634df..d45e6c58ea 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml @@ -8,7 +8,7 @@ noRot: true sprite: Structures/Power/Generation/Tesla/generator.rsi state: icon - - type: SingularityGenerator #To do: rename the generator + - type: SingularityGenerator # TODO: rename the generator spawnId: TeslaEnergyBall - type: InteractionOutline - type: Fixtures @@ -25,5 +25,5 @@ layer: - Opaque - type: Anchorable - #- type: GuideHelp # To Do - add Tesla Guide + #- type: GuideHelp # TODO - add Tesla Guide diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml index a93c455888..0925b5ead1 100644 --- a/Resources/Prototypes/Maps/train.yml +++ b/Resources/Prototypes/Maps/train.yml @@ -16,7 +16,7 @@ !type:NanotrasenNameGenerator prefixCreator: 'ED' - type: StationEmergencyShuttle - emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml # To do - add railway station + emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml # TODO - add railway station - type: StationJobs availableJobs: #service From bcd7a7ad00160aedf31b7c279a6f9f7202c1e64c Mon Sep 17 00:00:00 2001 From: timur2011 <16829159+timurjavid@users.noreply.github.com> Date: Thu, 25 Jul 2024 05:52:18 -0500 Subject: [PATCH 11/23] Space adder now butcherable, snake drops snake meat (#29629) --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 4 +++- Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index a79fbfbf24..f24c066911 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2143,11 +2143,13 @@ states: Alive: Base: snake + Critical: + Base: dead Dead: Base: dead - type: Butcherable spawned: - - id: FoodMeat + - id: FoodMeatSnake amount: 1 - type: InteractionPopup successChance: 0.6 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 4bcee8beb4..23d3e838e2 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -378,6 +378,10 @@ Base: dead_purple_snake Dead: Base: dead_purple_snake + - type: Butcherable + spawned: + - id: FoodMeatSnake + amount: 4 - type: Grammar attributes: proper: true @@ -444,5 +448,9 @@ Base: dead_small_purple_snake Dead: Base: dead_small_purple_snake + - type: Butcherable + spawned: + - id: FoodMeatSnake + amount: 2 - type: SolutionTransfer maxTransferAmount: 1 From e95aaef839bec57468db4c16c6cc8b5073be8f22 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 25 Jul 2024 10:53:26 +0000 Subject: [PATCH 12/23] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index d929c1c27d..e49f71b9f0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: FungiFellow - changes: - - message: Bows now fit in Exosuit slot. - type: Tweak - id: 6480 - time: '2024-04-28T08:23:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27433 - author: osjarw changes: - message: Fixed some anomaly behaviours pulsing at wrong rates. @@ -3776,3 +3769,14 @@ id: 6979 time: '2024-07-25T05:23:53.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30325 +- author: Timur2011 + changes: + - message: Space adders are now butcherable. + type: Add + - message: Snakes now drop snake meat when butchered. + type: Fix + - message: Snakes now appear lying when in critical state. + type: Tweak + id: 6980 + time: '2024-07-25T10:52:18.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29629 From 7388b91ef5bb3be77093aefb1eef313abf761d47 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Thu, 25 Jul 2024 05:24:00 -0700 Subject: [PATCH 13/23] Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100) * NOW THAT'S A LOT OF FILES * categorization --------- Co-authored-by: plykiya --- .../Tests/GameRules/FailAndStartPresetTest.cs | 6 +- .../Prototypes/Body/Organs/Animal/animal.yml | 14 ++-- .../Body/Organs/Animal/bloodsucker.yml | 8 +- .../Body/Organs/Animal/ruminant.yml | 4 +- Resources/Prototypes/Body/Organs/arachnid.yml | 4 +- Resources/Prototypes/Body/Organs/diona.yml | 12 +-- Resources/Prototypes/Body/Organs/moth.yml | 4 +- .../Prototypes/Body/Organs/reptilian.yml | 2 +- Resources/Prototypes/Body/Parts/animal.yml | 8 +- Resources/Prototypes/Body/Parts/rat.yml | 2 +- .../Catalog/Fills/Crates/salvage.yml | 2 +- .../Prototypes/Entities/Clothing/Eyes/hud.yml | 4 +- .../Clothing/Head/base_clothinghead.yml | 8 +- .../Clothing/Head/hardsuit-helmets.yml | 2 +- .../Entities/Clothing/Head/hoods.yml | 58 +++++++------- .../Entities/Clothing/Head/misc.yml | 2 +- .../Clothing/OuterClothing/wintercoats.yml | 2 +- .../Entities/Debugging/clicktest.yml | 4 +- .../Entities/Debugging/debug_sweps.yml | 2 +- .../Prototypes/Entities/Debugging/tippy.yml | 2 +- .../Entities/Effects/ambient_sounds.yml | 2 +- .../Entities/Effects/bluespace_flash.yml | 2 +- .../Entities/Effects/chemistry_effects.yml | 10 +-- .../Entities/Effects/emp_effects.yml | 4 +- .../Entities/Effects/exclamation.yml | 4 +- .../Entities/Effects/explosion_light.yml | 2 +- .../Prototypes/Entities/Effects/hearts.yml | 2 +- .../Prototypes/Entities/Effects/lightning.yml | 12 +-- .../Prototypes/Entities/Effects/mobspawn.yml | 12 +-- .../Prototypes/Entities/Effects/radiation.yml | 2 +- Resources/Prototypes/Entities/Effects/rcd.yml | 22 +++--- .../Prototypes/Entities/Effects/shuttle.yml | 2 +- .../Prototypes/Entities/Effects/sparks.yml | 4 +- .../Prototypes/Entities/Effects/wallspawn.yml | 18 ++--- .../Entities/Effects/weapon_arc.yml | 22 +++--- .../Entities/Markers/Spawners/ghost_roles.yml | 14 ++-- .../Entities/Markers/clientsideclone.yml | 2 +- .../Entities/Markers/construction_ghost.yml | 2 +- .../Entities/Markers/drag_shadow.yml | 2 +- .../Entities/Markers/hover_entity.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 2 +- .../Entities/Mobs/NPCs/regalrat.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 2 +- .../Entities/Mobs/Player/admin_ghost.yml | 2 +- .../Prototypes/Entities/Mobs/Player/diona.yml | 2 +- .../Entities/Mobs/Player/dragon.yml | 2 +- .../Prototypes/Entities/Mobs/Player/human.yml | 4 +- .../Entities/Mobs/Player/observer.yml | 2 +- .../Entities/Mobs/Player/replay_observer.yml | 2 +- .../Entities/Mobs/Species/arachnid.yml | 2 +- .../Entities/Mobs/Species/diona.yml | 2 +- .../Entities/Mobs/Species/dwarf.yml | 2 +- .../Entities/Mobs/Species/gingerbread.yml | 2 +- .../Entities/Mobs/Species/human.yml | 5 +- .../Prototypes/Entities/Mobs/Species/moth.yml | 2 +- .../Entities/Mobs/Species/reptilian.yml | 2 +- .../Entities/Mobs/Species/skeleton.yml | 2 +- .../Entities/Mobs/Species/slime.yml | 2 +- .../Prototypes/Entities/Mobs/Species/vox.yml | 2 +- .../Consumable/Food/Containers/box.yml | 2 +- .../Objects/Consumable/Food/snacks.yml | 36 ++++----- .../Entities/Objects/Decoration/present.yml | 2 +- .../Objects/Devices/chameleon_projector.yml | 2 +- .../Objects/Fun/Tabletop/backgammon.yml | 2 +- .../Entities/Objects/Fun/Tabletop/base.yml | 2 +- .../Objects/Fun/Tabletop/checkers.yml | 2 +- .../Entities/Objects/Fun/Tabletop/chess.yml | 2 +- .../Entities/Objects/Fun/Tabletop/dnd.yml | 10 +-- .../Entities/Objects/Fun/Tabletop/parchis.yml | 2 +- .../Entities/Objects/Misc/buffering.yml | 2 +- .../Objects/Misc/fire_extinguisher.yml | 2 +- .../Entities/Objects/Misc/paper.yml | 2 +- .../Objects/Misc/subdermal_implants.yml | 30 ++++---- .../Objects/Specific/Janitorial/soap.yml | 2 +- .../Objects/Specific/Janitorial/spray.yml | 4 +- .../Objects/Specific/chemical-containers.yml | 48 ++++++------ .../Entities/Objects/Tools/fulton.yml | 2 +- .../Entities/Objects/Tools/glowstick.yml | 12 +-- .../Entities/Objects/Tools/jetpacks.yml | 2 +- .../Entities/Objects/Weapons/Bombs/funny.yml | 2 +- .../Ammunition/Projectiles/antimateriel.yml | 2 +- .../Ammunition/Projectiles/caseless_rifle.yml | 4 +- .../Guns/Ammunition/Projectiles/grenade.yml | 6 +- .../Ammunition/Projectiles/heavy_rifle.yml | 4 +- .../Ammunition/Projectiles/light_rifle.yml | 8 +- .../Guns/Ammunition/Projectiles/magnum.yml | 10 +-- .../Guns/Ammunition/Projectiles/pistol.yml | 8 +- .../Guns/Ammunition/Projectiles/rifle.yml | 8 +- .../Guns/Ammunition/Projectiles/shotgun.yml | 22 +++--- .../Weapons/Guns/Projectiles/hitscan.yml | 2 +- .../Weapons/Guns/Projectiles/impacts.yml | 8 +- .../Weapons/Guns/Projectiles/magic.yml | 24 +++--- .../Weapons/Guns/Projectiles/projectiles.yml | 76 +++++++++---------- .../Objects/Weapons/Throwable/grenades.yml | 4 +- .../Entities/Stations/nanotrasen.yml | 6 +- .../Entities/Stations/syndicate.yml | 2 +- .../Prototypes/Entities/Stations/test.yml | 2 +- .../Structures/Piping/Disposal/pipes.yml | 2 +- .../Power/Generation/PA/particles.yml | 4 +- .../Structures/Power/Generation/ame.yml | 2 +- .../Power/Generation/generators.yml | 2 +- .../Structures/Power/Generation/solar.yml | 2 +- .../Structures/Power/Generation/teg.yml | 2 +- .../Entities/Structures/Power/apc.yml | 4 +- .../Entities/Structures/Power/substation.yml | 4 +- .../Storage/Canisters/gas_canisters.yml | 22 +++--- .../Storage/Crates/base_structurecrates.yml | 4 +- .../Structures/Wallmounts/Signs/bar_sign.yml | 2 +- .../Entities/Structures/Wallmounts/switch.yml | 4 +- .../Entities/Structures/Wallmounts/timer.yml | 2 +- .../Prototypes/Entities/Virtual/beam.yml | 2 +- .../Entities/Virtual/electrocution.yml | 6 +- .../Entities/Virtual/stripping_hidden.yml | 2 +- .../Prototypes/Entities/Virtual/tether.yml | 2 +- .../Entities/Virtual/virtual_item.yml | 2 +- .../Entities/World/Debris/asteroids.yml | 18 ++--- .../Entities/World/Debris/wrecks.yml | 6 +- Resources/Prototypes/Entities/World/chunk.yml | 2 +- 118 files changed, 398 insertions(+), 399 deletions(-) diff --git a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs index 518166ed86..3109df890a 100644 --- a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using Content.Server.GameTicking; using Content.Server.GameTicking.Presets; using Content.Shared.CCVar; @@ -36,7 +36,7 @@ public sealed class FailAndStartPresetTest - type: entity id: TestRule parent: BaseGameRule - noSpawn: true + categories: [ GameRules ] components: - type: GameRule minPlayers: 0 @@ -45,7 +45,7 @@ public sealed class FailAndStartPresetTest - type: entity id: TestRuleTenPlayers parent: BaseGameRule - noSpawn: true + categories: [ GameRules ] components: - type: GameRule minPlayers: 10 diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml index 2f50821df3..8384e006df 100644 --- a/Resources/Prototypes/Body/Organs/Animal/animal.yml +++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BaseAnimalOrganUnGibbable parent: BaseItem abstract: true @@ -34,7 +34,7 @@ id: OrganAnimalLungs parent: BaseAnimalOrgan name: lungs - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -65,7 +65,7 @@ id: OrganAnimalStomach parent: BaseAnimalOrgan name: stomach - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: stomach @@ -91,7 +91,7 @@ id: OrganMouseStomach parent: OrganAnimalStomach name: stomach - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SolutionContainerManager solutions: @@ -102,7 +102,7 @@ id: OrganAnimalLiver parent: BaseAnimalOrgan name: liver - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: liver @@ -118,7 +118,7 @@ id: OrganAnimalHeart parent: BaseAnimalOrgan name: heart - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: heart-on @@ -135,7 +135,7 @@ id: OrganAnimalKidneys parent: BaseAnimalOrgan name: kidneys - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml b/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml index 8a1afc37bb..e360f362d8 100644 --- a/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml +++ b/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml @@ -1,8 +1,8 @@ -- type: entity +- type: entity id: OrganBloodsuckerStomach parent: OrganAnimalStomach name: stomach - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Metabolizer metabolizerTypes: [ Bloodsucker ] @@ -11,7 +11,7 @@ id: OrganBloodsuckerLiver parent: OrganAnimalLiver name: liver - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Metabolizer metabolizerTypes: [ Bloodsucker ] @@ -20,7 +20,7 @@ id: OrganBloodsuckerHeart parent: OrganAnimalHeart name: heart - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Metabolizer metabolizerTypes: [ Bloodsucker ] diff --git a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml index 3c3062ddec..3b00e1a223 100644 --- a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml +++ b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml @@ -1,8 +1,8 @@ -- type: entity +- type: entity id: OrganAnimalRuminantStomach parent: OrganAnimalStomach name: ruminant stomach - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml index c1e199e112..29ca393d13 100644 --- a/Resources/Prototypes/Body/Organs/arachnid.yml +++ b/Resources/Prototypes/Body/Organs/arachnid.yml @@ -105,7 +105,7 @@ parent: BaseHumanOrgan name: liver description: "Pairing suggestion: chianti and fava beans." - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: liver @@ -122,7 +122,7 @@ parent: BaseHumanOrgan name: kidneys description: "Filters toxins from the bloodstream." - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml index 69fc630b9e..e248355df2 100644 --- a/Resources/Prototypes/Body/Organs/diona.yml +++ b/Resources/Prototypes/Body/Organs/diona.yml @@ -126,7 +126,7 @@ - type: entity id: OrganDionaBrainNymph parent: OrganDionaBrain - noSpawn: true + categories: [ HideSpawnMenu ] name: brain description: "The source of incredible, unending intelligence. Honk." components: @@ -138,7 +138,7 @@ - type: entity id: OrganDionaStomachNymph parent: OrganDionaStomach - noSpawn: true + categories: [ HideSpawnMenu ] name: stomach description: "Gross. This is hard to stomach." components: @@ -148,7 +148,7 @@ - type: entity id: OrganDionaLungsNymph parent: OrganDionaLungs - noSpawn: true + categories: [ HideSpawnMenu ] name: lungs description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier." components: @@ -159,7 +159,7 @@ - type: entity id: OrganDionaNymphBrain parent: MobDionaNymph - noSpawn: true + categories: [ HideSpawnMenu ] name: diona nymph suffix: Brain description: Contains the brain of a formerly fully-formed Diona. Killing this would kill the Diona forever. You monster. @@ -171,7 +171,7 @@ - type: entity id: OrganDionaNymphStomach parent: MobDionaNymphAccent - noSpawn: true + categories: [ HideSpawnMenu ] name: diona nymph suffix: Stomach description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. @@ -183,7 +183,7 @@ - type: entity id: OrganDionaNymphLungs parent: MobDionaNymphAccent - noSpawn: true + categories: [ HideSpawnMenu ] name: diona nymph suffix: Lungs description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml index aef5576048..535c25c9d3 100644 --- a/Resources/Prototypes/Body/Organs/moth.yml +++ b/Resources/Prototypes/Body/Organs/moth.yml @@ -1,7 +1,7 @@ -- type: entity +- type: entity id: OrganMothStomach parent: [OrganAnimalStomach, OrganHumanStomach] - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Stomach specialDigestible: diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml index f8423582cc..34c736aec8 100644 --- a/Resources/Prototypes/Body/Organs/reptilian.yml +++ b/Resources/Prototypes/Body/Organs/reptilian.yml @@ -1,7 +1,7 @@ - type: entity id: OrganReptilianStomach parent: OrganAnimalStomach - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Stomach specialDigestible: diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml index 4db026b40f..347b052c8b 100644 --- a/Resources/Prototypes/Body/Parts/animal.yml +++ b/Resources/Prototypes/Body/Parts/animal.yml @@ -36,7 +36,7 @@ id: HandsAnimal name: animal hands parent: PartAnimal - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -50,7 +50,7 @@ id: LegsAnimal name: animal legs parent: PartAnimal - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -64,7 +64,7 @@ id: FeetAnimal name: animal feet parent: PartAnimal - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -77,7 +77,7 @@ id: TorsoAnimal name: animal torso parent: PartAnimal - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Body/Parts/rat.yml b/Resources/Prototypes/Body/Parts/rat.yml index 6a66eecc48..bd51e006f7 100644 --- a/Resources/Prototypes/Body/Parts/rat.yml +++ b/Resources/Prototypes/Body/Parts/rat.yml @@ -4,7 +4,7 @@ id: TorsoRat name: "animal torso" parent: PartAnimal - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: BodyPart partType: Torso diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 84526d46d1..7bae4ecd77 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -26,7 +26,7 @@ - type: entity id: CrateSalvageAssortedGoodies suffix: Filled, Salvage Random - noSpawn: true # You should use SalvageMaterialCrateSpawner instead + categories: [ HideSpawnMenu ] # You should use SalvageMaterialCrateSpawner instead parent: CrateGenericSteel components: - type: StorageFill diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 0c7fc5b2a1..b22320a82f 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -1,7 +1,7 @@ - type: entity id: ShowSecurityIcons abstract: true - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: ShowJobIcons - type: ShowMindShieldIcons @@ -10,7 +10,7 @@ - type: entity id: ShowMedicalIcons abstract: true - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: ShowHealthBars damageContainers: diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 462032547b..66356afacf 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -59,7 +59,7 @@ parent: ClothingHeadBase id: ClothingHeadLightBase name: base helmet with light - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -151,7 +151,7 @@ # No parent since we aren't actually an item. id: ClothingHeadHardsuitBase name: base hardsuit helmet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: BreathMask - type: Sprite @@ -195,7 +195,7 @@ parent: ClothingHeadHardsuitBase id: ClothingHeadHardsuitWithLightBase name: base hardsuit helmet with light - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -247,7 +247,7 @@ id: ClothingHeadHatHoodWinterBase name: base winter coat hood description: A hood, made to keep your head warm. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: icon diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index ffa5747e87..a9785ef928 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -138,7 +138,7 @@ - type: entity parent: ClothingHeadHardsuitBase id: ClothingHeadHelmetHardsuitMaxim - noSpawn: true + categories: [ HideSpawnMenu ] name: salvager maxim helmet description: A predication of decay washes over your mind. components: diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 4dec89e75a..fc079c30fe 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -89,7 +89,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoodChaplainHood - noSpawn: true + categories: [ HideSpawnMenu ] name: chaplain's hood description: Maximum piety in this star system. components: @@ -183,7 +183,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoodIan - noSpawn: true + categories: [ HideSpawnMenu ] name: ian hood description: A hood to complete the 'Good boy' look. components: @@ -198,7 +198,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoodCarp - noSpawn: true + categories: [ HideSpawnMenu ] name: carp hood description: A gnarly hood adorned with plastic space carp teeth. components: @@ -213,7 +213,7 @@ - type: entity parent: ClothingHeadHatHoodCarp id: ClothingHeadHelmetHardsuitCarp - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PressureProtection highPressureMultiplier: 0.6 @@ -251,7 +251,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterDefault - noSpawn: true + categories: [ HideSpawnMenu ] name: default winter coat hood components: - type: Sprite @@ -262,7 +262,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterBartender - noSpawn: true + categories: [ HideSpawnMenu ] name: bartender winter coat hood components: - type: Sprite @@ -273,7 +273,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCaptain - noSpawn: true + categories: [ HideSpawnMenu ] name: captain's winter coat hood description: An expensive hood, to keep the captain's head warm. components: @@ -285,7 +285,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCargo - noSpawn: true + categories: [ HideSpawnMenu ] name: cargo winter coat hood components: - type: Sprite @@ -296,7 +296,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCE - noSpawn: true + categories: [ HideSpawnMenu ] name: chief engineer's winter coat hood components: - type: Sprite @@ -307,7 +307,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCentcom - noSpawn: true + categories: [ HideSpawnMenu ] name: Centcom winter coat hood description: A hood for keeping the central comander's head warm. components: @@ -319,7 +319,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterChem - noSpawn: true + categories: [ HideSpawnMenu ] name: chemist winter coat hood components: - type: Sprite @@ -330,7 +330,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCMO - noSpawn: true + categories: [ HideSpawnMenu ] name: chief medical officer's winter coat hood components: - type: Sprite @@ -341,7 +341,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterEngineer - noSpawn: true + categories: [ HideSpawnMenu ] name: engineer winter coat hood components: - type: Sprite @@ -352,7 +352,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHOP - noSpawn: true + categories: [ HideSpawnMenu ] name: head of personel's winter coat hood components: - type: Sprite @@ -363,7 +363,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHOS - noSpawn: true + categories: [ HideSpawnMenu ] name: head of security's winter coat hood components: - type: Sprite @@ -374,7 +374,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHydro - noSpawn: true + categories: [ HideSpawnMenu ] name: hydroponics coat hood components: - type: Sprite @@ -385,7 +385,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterJani - noSpawn: true + categories: [ HideSpawnMenu ] name: janitor coat hood components: - type: Sprite @@ -396,7 +396,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterMed - noSpawn: true + categories: [ HideSpawnMenu ] name: medic coat hood components: - type: Sprite @@ -407,7 +407,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterMime - noSpawn: true + categories: [ HideSpawnMenu ] name: mime coat hood components: - type: Sprite @@ -418,7 +418,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterMiner - noSpawn: true + categories: [ HideSpawnMenu ] name: miner coat hood components: - type: Sprite @@ -429,7 +429,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterPara - noSpawn: true + categories: [ HideSpawnMenu ] name: paramedic coat hood components: - type: Sprite @@ -440,7 +440,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterQM - noSpawn: true + categories: [ HideSpawnMenu ] name: quartermaster's coat hood components: - type: Sprite @@ -451,7 +451,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterRD - noSpawn: true + categories: [ HideSpawnMenu ] name: research director's coat hood components: - type: Sprite @@ -462,7 +462,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterRobo - noSpawn: true + categories: [ HideSpawnMenu ] name: robotics coat hood components: - type: Sprite @@ -473,7 +473,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterSci - noSpawn: true + categories: [ HideSpawnMenu ] name: scientist coat hood components: - type: Sprite @@ -484,7 +484,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterSec - noSpawn: true + categories: [ HideSpawnMenu ] name: security coat hood components: - type: Sprite @@ -495,7 +495,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterSyndie - noSpawn: true + categories: [ HideSpawnMenu ] name: syndicate coat hood components: - type: Sprite @@ -506,7 +506,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterWarden - noSpawn: true + categories: [ HideSpawnMenu ] name: warden's coat hood components: - type: Sprite @@ -517,7 +517,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterWeb - noSpawn: true + categories: [ HideSpawnMenu ] name: web coat hood components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index c32f485f9c..651f80a3a9 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -205,7 +205,7 @@ accent: OwOAccent - type: entity - noSpawn: true + categories: [ Actions, HideSpawnMenu ] id: ActionBecomeValid name: Become Valid description: "*notices your killsign* owo whats this" diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 207532c5dd..9b943de36a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -38,7 +38,7 @@ parent: ClothingOuterWinterCoat id: ClothingOuterWinterCoatToggleable name: winter coat with hood - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterDefault diff --git a/Resources/Prototypes/Entities/Debugging/clicktest.yml b/Resources/Prototypes/Entities/Debugging/clicktest.yml index 4e9caaa14d..7eb0a06330 100644 --- a/Resources/Prototypes/Entities/Debugging/clicktest.yml +++ b/Resources/Prototypes/Entities/Debugging/clicktest.yml @@ -1,11 +1,11 @@ -# Entities specifically for testing click detection with ClickableComponent. +# Entities specifically for testing click detection with ClickableComponent. # # Each entity has a bounding box AND texture equivalent. # Note that bounding box versions still have dots on the outside or center to make it possible to... see them. # These dots' texture detection should not interfere with the actual bounding box being tested. - type: entity - noSpawn: true + categories: [ Debug, HideSpawnMenu ] id: ClickTestBase suffix: DEBUG components: diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml index e3289569a2..9ba7c85e1e 100644 --- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml +++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml @@ -60,7 +60,7 @@ id: BulletDebug name: bang, ded bullet parent: BaseBullet - noSpawn: true + categories: [ Debug, HideSpawnMenu ] suffix: DEBUG components: - type: Tag diff --git a/Resources/Prototypes/Entities/Debugging/tippy.yml b/Resources/Prototypes/Entities/Debugging/tippy.yml index 292cbed0f1..7f149c3b5d 100644 --- a/Resources/Prototypes/Entities/Debugging/tippy.yml +++ b/Resources/Prototypes/Entities/Debugging/tippy.yml @@ -1,6 +1,6 @@ - type: entity id: Tippy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite netsync: false diff --git a/Resources/Prototypes/Entities/Effects/ambient_sounds.yml b/Resources/Prototypes/Entities/Effects/ambient_sounds.yml index f686779b3e..81f7bbfc8a 100644 --- a/Resources/Prototypes/Entities/Effects/ambient_sounds.yml +++ b/Resources/Prototypes/Entities/Effects/ambient_sounds.yml @@ -1,6 +1,6 @@ - type: entity id: AmbientSoundSourceFlies - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: AmbientSound volume: -5 diff --git a/Resources/Prototypes/Entities/Effects/bluespace_flash.yml b/Resources/Prototypes/Entities/Effects/bluespace_flash.yml index 3421f0d9a6..42cdfbd297 100644 --- a/Resources/Prototypes/Entities/Effects/bluespace_flash.yml +++ b/Resources/Prototypes/Entities/Effects/bluespace_flash.yml @@ -1,6 +1,6 @@ - type: entity id: EffectFlashBluespace - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight radius: 10.5 diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml index 4f925ed311..28e5a239ef 100644 --- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml +++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml @@ -36,7 +36,7 @@ parent: BaseFoam id: Smoke name: smoke - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Occluder - type: Sprite @@ -52,7 +52,7 @@ parent: BaseFoam id: Foam name: foam - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite color: "#ffffffcc" @@ -83,7 +83,7 @@ - type: entity id: MetalFoam name: metal foam - noSpawn: true + categories: [ HideSpawnMenu ] parent: Foam components: - type: Sprite @@ -109,7 +109,7 @@ - type: entity id: IronMetalFoam name: iron metal foam - noSpawn: true + categories: [ HideSpawnMenu ] parent: MetalFoam components: - type: SpawnOnDespawn @@ -118,7 +118,7 @@ - type: entity id: AluminiumMetalFoam name: aluminium metal foam - noSpawn: true + categories: [ HideSpawnMenu ] parent: MetalFoam components: - type: SpawnOnDespawn diff --git a/Resources/Prototypes/Entities/Effects/emp_effects.yml b/Resources/Prototypes/Entities/Effects/emp_effects.yml index 890dd24d43..d1096b85f5 100644 --- a/Resources/Prototypes/Entities/Effects/emp_effects.yml +++ b/Resources/Prototypes/Entities/Effects/emp_effects.yml @@ -1,6 +1,6 @@ - type: entity id: EffectEmpPulse - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.8 @@ -23,7 +23,7 @@ - type: entity id: EffectEmpDisabled - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.4 diff --git a/Resources/Prototypes/Entities/Effects/exclamation.yml b/Resources/Prototypes/Entities/Effects/exclamation.yml index cfe1cbc7f2..d1f3e3ad06 100644 --- a/Resources/Prototypes/Entities/Effects/exclamation.yml +++ b/Resources/Prototypes/Entities/Effects/exclamation.yml @@ -1,7 +1,7 @@ - type: entity id: Exclamation name: exclamation - noSpawn: true + categories: [ HideSpawnMenu ] save: false components: - type: Transform @@ -22,7 +22,7 @@ - type: entity id: WhistleExclamation name: exclamation - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Structures/Storage/closet.rsi diff --git a/Resources/Prototypes/Entities/Effects/explosion_light.yml b/Resources/Prototypes/Entities/Effects/explosion_light.yml index b4b980dd1a..d5e7452a79 100644 --- a/Resources/Prototypes/Entities/Effects/explosion_light.yml +++ b/Resources/Prototypes/Entities/Effects/explosion_light.yml @@ -1,5 +1,5 @@ - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] id: ExplosionLight name: explosion light components: diff --git a/Resources/Prototypes/Entities/Effects/hearts.yml b/Resources/Prototypes/Entities/Effects/hearts.yml index 042fdb5e8a..18f72c95d4 100644 --- a/Resources/Prototypes/Entities/Effects/hearts.yml +++ b/Resources/Prototypes/Entities/Effects/hearts.yml @@ -1,6 +1,6 @@ - type: entity id: EffectHearts - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.85 diff --git a/Resources/Prototypes/Entities/Effects/lightning.yml b/Resources/Prototypes/Entities/Effects/lightning.yml index 7afd1c07a0..f85f28d3b8 100644 --- a/Resources/Prototypes/Entities/Effects/lightning.yml +++ b/Resources/Prototypes/Entities/Effects/lightning.yml @@ -33,7 +33,7 @@ name: lightning id: Lightning parent: BaseLightning - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Lightning canArc: true @@ -42,7 +42,7 @@ name: spooky lightning id: LightningRevenant parent: BaseLightning - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: /Textures/Effects/lightning.rsi @@ -66,7 +66,7 @@ name: charged lightning id: ChargedLightning parent: BaseLightning - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: /Textures/Effects/lightning.rsi @@ -85,7 +85,7 @@ name: lightning id: Spark parent: BaseLightning - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: /Textures/Effects/lightning.rsi @@ -112,7 +112,7 @@ name: supercharged lightning id: SuperchargedLightning parent: ChargedLightning - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: /Textures/Effects/lightning.rsi @@ -138,7 +138,7 @@ name: hypercharged lightning id: HyperchargedLightning parent: ChargedLightning - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: /Textures/Effects/lightning.rsi diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml index 2fad68d7f2..c4396a775d 100644 --- a/Resources/Prototypes/Entities/Effects/mobspawn.yml +++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml @@ -1,7 +1,7 @@ -- type: entity +- type: entity id: MobSpawnCrabQuartz name: mobspawner quartzcrab - noSpawn: True + categories: [ HideSpawnMenu, Spawner ] components: - type: Transform anchored: True @@ -31,7 +31,7 @@ id: MobSpawnCrabIron parent: MobSpawnCrabQuartz name: mobspawner ironcrab - noSpawn: True + categories: [ HideSpawnMenu, Spawner ] components: - type: Sprite sprite: /Textures/Effects/mobspawn.rsi @@ -43,7 +43,7 @@ id: MobSpawnCrabSilver parent: MobSpawnCrabQuartz name: mobspawner silvercrab - noSpawn: True + categories: [ HideSpawnMenu, Spawner ] components: - type: Sprite sprite: /Textures/Effects/mobspawn.rsi @@ -55,7 +55,7 @@ id: MobSpawnCrabUranium parent: MobSpawnCrabQuartz name: mobspawner uraniumcrab - noSpawn: True + categories: [ HideSpawnMenu, Spawner ] components: - type: Sprite sprite: /Textures/Effects/mobspawn.rsi @@ -65,7 +65,7 @@ - type: entity id: EffectAnomalyFloraBulb - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.4 diff --git a/Resources/Prototypes/Entities/Effects/radiation.yml b/Resources/Prototypes/Entities/Effects/radiation.yml index 143ffa8559..82828582cf 100644 --- a/Resources/Prototypes/Entities/Effects/radiation.yml +++ b/Resources/Prototypes/Entities/Effects/radiation.yml @@ -1,7 +1,7 @@ - type: entity name: shimmering anomaly id: RadiationPulse - noSpawn: true + categories: [ HideSpawnMenu ] description: Looking at this anomaly makes you feel strange, like something is pushing at your eyes. components: - type: RadiationSource diff --git a/Resources/Prototypes/Entities/Effects/rcd.yml b/Resources/Prototypes/Entities/Effects/rcd.yml index 902429818e..a663add9ca 100644 --- a/Resources/Prototypes/Entities/Effects/rcd.yml +++ b/Resources/Prototypes/Entities/Effects/rcd.yml @@ -1,7 +1,7 @@ - type: entity id: EffectRCDBase abstract: true - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Transform anchored: True @@ -19,7 +19,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDDeconstructPreview - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: deconstructPreview @@ -27,7 +27,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDConstruct0 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: construct0 @@ -37,7 +37,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDConstruct1 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: construct1 @@ -47,7 +47,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDConstruct2 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: construct2 @@ -57,7 +57,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDConstruct3 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: construct3 @@ -67,7 +67,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDConstruct4 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: construct4 @@ -77,7 +77,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDDeconstruct2 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: deconstruct2 @@ -87,7 +87,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDDeconstruct4 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: deconstruct4 @@ -97,7 +97,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDDeconstruct6 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: deconstruct6 @@ -107,7 +107,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDDeconstruct8 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: deconstruct8 diff --git a/Resources/Prototypes/Entities/Effects/shuttle.yml b/Resources/Prototypes/Entities/Effects/shuttle.yml index d4538116ac..72cc04cba1 100644 --- a/Resources/Prototypes/Entities/Effects/shuttle.yml +++ b/Resources/Prototypes/Entities/Effects/shuttle.yml @@ -1,6 +1,6 @@ - type: entity id: FtlVisualizerEntity - noSpawn: true + categories: [ HideSpawnMenu ] description: Visualizer for shuttles arriving. You shouldn't see this! components: - type: FtlVisualizer diff --git a/Resources/Prototypes/Entities/Effects/sparks.yml b/Resources/Prototypes/Entities/Effects/sparks.yml index d86522a971..c12e3b0eca 100644 --- a/Resources/Prototypes/Entities/Effects/sparks.yml +++ b/Resources/Prototypes/Entities/Effects/sparks.yml @@ -1,6 +1,6 @@ - type: entity id: EffectSparks - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.5 @@ -20,7 +20,7 @@ - type: entity id: EffectTeslaSparks - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.5 diff --git a/Resources/Prototypes/Entities/Effects/wallspawn.yml b/Resources/Prototypes/Entities/Effects/wallspawn.yml index 7213763c46..44afe80e97 100644 --- a/Resources/Prototypes/Entities/Effects/wallspawn.yml +++ b/Resources/Prototypes/Entities/Effects/wallspawn.yml @@ -1,6 +1,6 @@ - type: entity id: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: Transform anchored: True @@ -29,7 +29,7 @@ - type: entity id: WallSpawnAsteroidUraniumCrab parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockUraniumCrab @@ -37,7 +37,7 @@ - type: entity id: WallSpawnAsteroidUranium parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockUranium @@ -45,7 +45,7 @@ - type: entity id: WallSpawnAsteroidQuartzCrab parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockQuartzCrab @@ -53,7 +53,7 @@ - type: entity id: WallSpawnAsteroidQuartz parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockQuartz @@ -61,7 +61,7 @@ - type: entity id: WallSpawnAsteroidSilverCrab parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockSilverCrab @@ -69,7 +69,7 @@ - type: entity id: WallSpawnAsteroidSilver parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockSilver @@ -77,7 +77,7 @@ - type: entity id: WallSpawnAsteroidIronCrab parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockTinCrab @@ -85,7 +85,7 @@ - type: entity id: WallSpawnAsteroidIron parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockTin \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Effects/weapon_arc.yml b/Resources/Prototypes/Entities/Effects/weapon_arc.yml index 25cd6e84ff..0f3fab0e87 100644 --- a/Resources/Prototypes/Entities/Effects/weapon_arc.yml +++ b/Resources/Prototypes/Entities/Effects/weapon_arc.yml @@ -1,7 +1,7 @@ - type: entity # Just fades out with no movement animation id: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 2.0 @@ -18,7 +18,7 @@ - type: entity # Plays the state animation then disappears with no fade or swing id: WeaponArcAnimated - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Effects/arcs.rsi @@ -34,7 +34,7 @@ - type: entity id: WeaponArcThrust parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals animation: Thrust @@ -42,7 +42,7 @@ - type: entity id: WeaponArcSlash parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals animation: Slash @@ -51,7 +51,7 @@ - type: entity id: WeaponArcBite parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals fadeOut: false @@ -63,7 +63,7 @@ - type: entity id: WeaponArcClaw parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals fadeOut: false @@ -75,7 +75,7 @@ - type: entity id: WeaponArcDisarm parent: WeaponArcAnimated - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals fadeOut: false @@ -87,7 +87,7 @@ - type: entity id: WeaponArcFist parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: fist @@ -95,7 +95,7 @@ - type: entity id: WeaponArcPunch parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals fadeOut: false @@ -107,7 +107,7 @@ - type: entity id: WeaponArcKick parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals fadeOut: false @@ -119,7 +119,7 @@ - type: entity id: WeaponArcSmash parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals fadeOut: false diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index b8cf755d0f..573ddf0398 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -73,7 +73,7 @@ state: narsian - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] id: SpawnPointGhostNukeOperative name: ghost role spawn point suffix: nukeops @@ -93,7 +93,7 @@ state: radiation - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] parent: BaseAntagSpawner id: SpawnPointLoneNukeOperative components: @@ -109,7 +109,7 @@ state: radiation - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] parent: SpawnPointLoneNukeOperative id: SpawnPointNukeopsCommander components: @@ -118,7 +118,7 @@ description: roles-antag-nuclear-operative-commander-objective - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] parent: SpawnPointLoneNukeOperative id: SpawnPointNukeopsMedic components: @@ -127,7 +127,7 @@ description: roles-antag-nuclear-operative-agent-objective - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] parent: SpawnPointLoneNukeOperative id: SpawnPointNukeopsOperative components: @@ -136,7 +136,7 @@ description: roles-antag-nuclear-operative-objective - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] parent: BaseAntagSpawner id: SpawnPointGhostDragon components: @@ -151,7 +151,7 @@ state: alive - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] parent: BaseAntagSpawner id: SpawnPointGhostSpaceNinja components: diff --git a/Resources/Prototypes/Entities/Markers/clientsideclone.yml b/Resources/Prototypes/Entities/Markers/clientsideclone.yml index 56875c4414..39b9ee48fd 100644 --- a/Resources/Prototypes/Entities/Markers/clientsideclone.yml +++ b/Resources/Prototypes/Entities/Markers/clientsideclone.yml @@ -1,7 +1,7 @@ - type: entity name: clientsideclone id: clientsideclone - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite - type: AnimationPlayer diff --git a/Resources/Prototypes/Entities/Markers/construction_ghost.yml b/Resources/Prototypes/Entities/Markers/construction_ghost.yml index be9cc915d9..04a8a09502 100644 --- a/Resources/Prototypes/Entities/Markers/construction_ghost.yml +++ b/Resources/Prototypes/Entities/Markers/construction_ghost.yml @@ -1,7 +1,7 @@ - type: entity name: construction ghost id: constructionghost - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite color: '#3F38' diff --git a/Resources/Prototypes/Entities/Markers/drag_shadow.yml b/Resources/Prototypes/Entities/Markers/drag_shadow.yml index a1badb60bc..19ffb6c36a 100644 --- a/Resources/Prototypes/Entities/Markers/drag_shadow.yml +++ b/Resources/Prototypes/Entities/Markers/drag_shadow.yml @@ -1,7 +1,7 @@ - type: entity name: drag shadow id: dragshadow - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Markers/hover_entity.yml b/Resources/Prototypes/Entities/Markers/hover_entity.yml index 8421a9d8c9..2e8e1edb29 100644 --- a/Resources/Prototypes/Entities/Markers/hover_entity.yml +++ b/Resources/Prototypes/Entities/Markers/hover_entity.yml @@ -1,7 +1,7 @@ - type: entity name: hover entity id: hoverentity - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index f24c066911..c044256bb8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1492,7 +1492,7 @@ - type: entity name: guidebook monkey parent: MobMonkey - noSpawn: true + categories: [ HideSpawnMenu ] id: MobGuidebookMonkey description: A hopefully helpful monkey whose only purpose in life is for you to click on. Does this count as having a monkey give you a tutorial? components: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 004e091c15..e478a9492f 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -162,7 +162,7 @@ id: MobRatServant parent: [ SimpleMobBase, MobCombat ] description: He's da mini rat. He don't make da roolz. - noSpawn: true #Must be configured to a King or the AI breaks. + categories: [ HideSpawnMenu ] #Must be configured to a King or the AI breaks. components: - type: CombatMode - type: MovementSpeedModifier diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index d68415992a..b5929620ee 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -148,7 +148,7 @@ description: A geras of a slime - the name is ironic, isn't it? id: MobSlimesGeras parent: BaseMobAdultSlimes - noSpawn: true + categories: [ HideSpawnMenu ] components: # they portable... - type: MovementSpeedModifier diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index 0c814e08f7..d213cf5f46 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -2,7 +2,7 @@ parent: [MobObserver, InventoryBase] id: AdminObserver name: admin observer - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: ContentEye maxZoom: 8.916104, 8.916104 diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml index 4153250bbf..bcb602bbd6 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml @@ -15,7 +15,7 @@ # Reformed Diona - type: entity parent: MobDiona - noSpawn: true + categories: [ HideSpawnMenu ] id: MobDionaReformed name: Reformed Diona components: diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index 8bf9bfab41..0b21f0d735 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -154,7 +154,7 @@ - MinorAntagonists - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] id: DragonsBreathGun name: dragon's lung description: For dragon's breathing diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 0b718746e1..ad72f2e065 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -68,7 +68,7 @@ # Nuclear Operative - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] name: Nuclear Operative parent: MobHuman id: MobHumanNukeOp @@ -77,7 +77,7 @@ - type: RandomHumanoidAppearance - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: MobHuman id: MobHumanLoneNuclearOperative name: Lone Operative diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index 85be42cc02..cf3cf10436 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -3,7 +3,7 @@ id: MobObserver name: observer description: Boo! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: CargoSellBlacklist - type: Sprite diff --git a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml index ad9b37f63e..ffbc46e94c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml @@ -1,7 +1,7 @@ - type: entity parent: MobObserver id: ReplayObserver - noSpawn: true + categories: [ HideSpawnMenu ] save: false components: - type: MovementSpeedModifier diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index fa0f5356a6..2682d38715 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -117,7 +117,7 @@ - type: entity parent: BaseSpeciesDummy id: MobArachnidDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: Arachnid diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index d6597ce65d..5bda66d635 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -111,7 +111,7 @@ - type: entity parent: BaseSpeciesDummy id: MobDionaDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: Diona diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index 932eda879e..6ce9c80a25 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml @@ -67,7 +67,7 @@ - type: entity parent: BaseSpeciesDummy id: MobDwarfDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite scale: 1, 0.8 diff --git a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml index d0b065bc21..406aa920c1 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml @@ -52,7 +52,7 @@ - type: entity parent: BaseSpeciesDummy id: MobGingerbreadDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: Gingerbread diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 392185ef77..bf357e1f10 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -32,7 +32,7 @@ - type: entity parent: BaseSpeciesDummy id: MobHumanDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Inventory femaleDisplacements: @@ -40,5 +40,4 @@ sizeMaps: 32: sprite: Mobs/Species/Human/displacement.rsi - state: jumpsuit-female - + state: jumpsuit-female \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index f3eaeb32c7..153d5cccd3 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -120,7 +120,7 @@ - type: entity parent: BaseSpeciesDummy id: MobMothDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: Moth diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 6f0705635a..1c9eaa2ec6 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -73,7 +73,7 @@ - type: entity parent: BaseSpeciesDummy id: MobReptilianDummy - noSpawn: true + categories: [ HideSpawnMenu ] description: A dummy reptilian meant to be used in character setup. components: - type: HumanoidAppearance diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml index 659bf7467e..229c2da027 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml @@ -113,7 +113,7 @@ - type: entity parent: BaseSpeciesDummy id: MobSkeletonPersonDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: Skeleton diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 0420452ce9..c423a42688 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -120,7 +120,7 @@ - type: entity parent: MobHumanDummy id: MobSlimePersonDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: SlimePerson diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index 5f4d471939..4bcd068d9d 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -127,7 +127,7 @@ - type: entity parent: BaseSpeciesDummy id: MobVoxDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: Vox diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 5d9ddca94d..bb80079d2e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -669,7 +669,7 @@ id: FoodMealHappyHonkClown parent: HappyHonk suffix: random food spawner meal - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index d620dbda6f..e8a646e8c9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -483,7 +483,7 @@ # Trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseItem id: FoodPacketTrash description: This is rubbish. @@ -506,7 +506,7 @@ price: 0 - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketBoritosTrash name: boritos bag @@ -515,7 +515,7 @@ state: boritos-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketCnDsTrash name: C&Ds bag @@ -524,7 +524,7 @@ state: cnds-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketCheesieTrash name: cheesie honkers @@ -533,7 +533,7 @@ state: cheesiehonkers-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketChipsTrash name: chips @@ -542,7 +542,7 @@ state: chips-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketChocolateTrash name: chocolate wrapper @@ -551,7 +551,7 @@ state: chocolatebar-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketEnergyTrash name: energybar wrapper @@ -560,7 +560,7 @@ state: energybar-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketPistachioTrash name: pistachios packet @@ -569,7 +569,7 @@ state: pistachio-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketPopcornTrash name: popcorn box @@ -578,7 +578,7 @@ state: popcorn-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketRaisinsTrash name: 4no raisins @@ -587,7 +587,7 @@ state: raisins-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketSemkiTrash name: semki packet @@ -596,7 +596,7 @@ state: semki-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketSusTrash name: sus jerky @@ -605,7 +605,7 @@ state: susjerky-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketSyndiTrash name: syndi-cakes box @@ -614,7 +614,7 @@ state: syndicakes-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketCupRamenTrash name: empty cup ramen @@ -623,7 +623,7 @@ state: ramen - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketChowMeinTrash name: empty chow mein box @@ -632,7 +632,7 @@ state: chinese1 - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketDanDanTrash name: empty dan dan box @@ -641,7 +641,7 @@ state: chinese2 - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodCookieFortune name: cookie fortune @@ -654,7 +654,7 @@ descriptionSegments: [CookieFortuneDescriptions] - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketMRETrash name: MRE wrapper diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 8a4c33d1c4..1240fa3d8f 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -423,7 +423,7 @@ - type: entity id: PresentTrash - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseItem name: wrapping paper description: Carefully folded, taped, and tied with a bow. Then ceremoniously ripped apart and tossed on the floor. diff --git a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml index 20e138f81a..bc17ed455a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml @@ -22,7 +22,7 @@ entity: ChameleonDisguise - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseMob id: ChameleonDisguise name: Urist McKleiner diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml index ab404b88a3..965b25dbc0 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml @@ -18,7 +18,7 @@ id: BackgammonBoardTabletop name: backgammon parent: BaseBoardTabletop - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/backgammon_tabletop.rsi diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml index 64e7d7ace9..f7d9e0973a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml @@ -31,7 +31,7 @@ id: BaseBoardTabletop name: baseboard abstract: true - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml index 69302548d1..6c206ca26f 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml @@ -24,7 +24,7 @@ id: *checkerboard name: checkerboard parent: BaseBoardTabletop - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/chessboard_tabletop.rsi diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml index b31b7803ba..aeba3918c4 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml @@ -20,7 +20,7 @@ id: ChessBoardTabletop name: chessboard parent: BaseBoardTabletop - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/chessboard_tabletop.rsi diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml index 51f17d55b9..9b00ef5e01 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml @@ -86,7 +86,7 @@ parent: BaseBoardTabletop id: GrassBoardTabletop name: grass battlemap - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi @@ -98,7 +98,7 @@ parent: BaseBoardTabletop id: MoonBoardTabletop name: grass battlemap - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/Battlemaps/moonbm_tabletop.rsi @@ -108,7 +108,7 @@ parent: BaseBoardTabletop id: SandBoardTabletop name: sand battlemap - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/Battlemaps/sandbm_tabletop.rsi @@ -118,7 +118,7 @@ parent: BaseBoardTabletop id: SnowBoardTabletop name: snow battlemap - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/Battlemaps/snowbm_tabletop.rsi @@ -128,7 +128,7 @@ parent: BaseBoardTabletop id: ShipBoardTabletop name: ship battlemap - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/Battlemaps/shipbm_tabletop.rsi diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml index bb5fdf1f0b..b608f4e787 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml @@ -20,7 +20,7 @@ id: ParchisBoardTabletop name: parchís parent: BaseBoardTabletop - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/parchis_tabletop.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/buffering.yml b/Resources/Prototypes/Entities/Objects/Misc/buffering.yml index dbd3534459..c97ffe89ed 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/buffering.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/buffering.yml @@ -1,6 +1,6 @@ - type: entity id: BufferingIcon - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/buffering.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml index 89b421c97d..0389db27ea 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml @@ -76,7 +76,7 @@ name: extinguisher spray id: ExtinguisherSpray parent: Vapor - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Effects/extinguisherSpray.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 5dbafa6416..42b850f2b2 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -252,7 +252,7 @@ - type: entity parent: Paper id: PaperWritten - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 9690d0bdfe..2368df7381 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -17,7 +17,7 @@ id: SadTromboneImplant name: sad trombone implant description: This implant plays a sad tune when the user dies. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant whitelist: @@ -37,7 +37,7 @@ id: LightImplant name: light implant description: This implant emits light from the user's skin on activation. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionToggleLight @@ -59,7 +59,7 @@ id: BikeHornImplant name: bike horn implant description: This implant lets the user honk anywhere at any time. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionActivateHonkImplant @@ -80,7 +80,7 @@ id: TrackingImplant name: tracking implant description: This implant has a tracking device attached to the suit sensor network, as well as a condition monitor for the Security radio channel. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant whitelist: @@ -110,7 +110,7 @@ id: StorageImplant name: storage implant description: This implant grants hidden storage within a person's body using bluespace technology. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionOpenStorageImplant @@ -134,7 +134,7 @@ id: FreedomImplant name: freedom implant description: This implant lets the user break out of hand restraints up to three times before ceasing to function anymore. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionActivateFreedomImplant @@ -147,7 +147,7 @@ id: UplinkImplant name: uplink implant description: This implant lets the user access a hidden Syndicate uplink at will. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionOpenUplinkImplant @@ -167,7 +167,7 @@ id: EmpImplant name: EMP implant description: This implant creates an electromagnetic pulse when activated. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionActivateEmpImplant @@ -182,7 +182,7 @@ id: ScramImplant name: scram implant description: This implant randomly teleports the user within a large radius when activated. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionActivateScramImplant @@ -194,7 +194,7 @@ id: DnaScramblerImplant name: DNA scrambler implant description: This implant lets the user randomly change their appearance and name once. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionActivateDnaScramblerImplant @@ -209,7 +209,7 @@ id: MicroBombImplant name: micro-bomb implant description: This implant detonates the user upon activation or upon death. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant permanent: true @@ -239,7 +239,7 @@ id: MacroBombImplant name: macro-bomb implant description: This implant creates a large explosion on death after a preprogrammed countdown. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant permanent: true @@ -274,7 +274,7 @@ id: DeathAcidifierImplant name: death-acidifier implant description: This implant melts the user and their equipment upon death. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant permanent: true @@ -298,7 +298,7 @@ id: DeathRattleImplant name: death rattle implant description: This implant will inform the Syndicate radio channel should the user fall into critical condition or die. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant permanent: true @@ -318,7 +318,7 @@ id: MindShieldImplant name: mindshield implant description: This implant will ensure loyalty to Nanotrasen and prevent mind control devices. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant permanent: true diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml index efb93a8868..8056d1e909 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml @@ -144,7 +144,7 @@ - type: entity name: soaplet id: SoapletSyndie - noSpawn: true + categories: [ HideSpawnMenu ] parent: Soap description: A tiny piece of syndicate soap. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml index cddf7f6075..998d3ecf03 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml @@ -104,7 +104,7 @@ - type: entity id: Vapor name: "vapor" - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SolutionContainerManager solutions: @@ -136,7 +136,7 @@ - type: entity id: BigVapor parent: Vapor - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Effects/chempuff.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index d318c606ad..fd931a05c7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -88,7 +88,7 @@ name: jug suffix: carbon id: JugCarbon - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-carbon @@ -104,7 +104,7 @@ name: jug suffix: iodine id: JugIodine - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-iodine @@ -120,7 +120,7 @@ name: jug suffix: fluorine id: JugFluorine - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-fluorine @@ -136,7 +136,7 @@ name: jug suffix: chlorine id: JugChlorine - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-chlorine @@ -152,7 +152,7 @@ name: jug suffix: aluminium id: JugAluminium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-aluminium @@ -168,7 +168,7 @@ name: jug suffix: phosphorus id: JugPhosphorus - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-phosphorus @@ -184,7 +184,7 @@ name: jug suffix: sulfur id: JugSulfur - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-sulfur @@ -200,7 +200,7 @@ name: jug suffix: silicon id: JugSilicon - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-silicon @@ -216,7 +216,7 @@ name: jug suffix: hydrogen id: JugHydrogen - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-hydrogen @@ -232,7 +232,7 @@ name: jug suffix: lithium id: JugLithium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-lithium @@ -248,7 +248,7 @@ name: jug suffix: sodium id: JugSodium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-sodium @@ -264,7 +264,7 @@ name: jug suffix: potassium id: JugPotassium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-potassium @@ -280,7 +280,7 @@ name: jug suffix: radium id: JugRadium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-radium @@ -296,7 +296,7 @@ name: jug suffix: iron id: JugIron - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-iron @@ -312,7 +312,7 @@ name: jug suffix: copper id: JugCopper - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-copper @@ -328,7 +328,7 @@ name: jug suffix: gold id: JugGold - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-gold @@ -344,7 +344,7 @@ name: jug suffix: mercury id: JugMercury - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-mercury @@ -360,7 +360,7 @@ name: jug suffix: silver id: JugSilver - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-silver @@ -376,7 +376,7 @@ name: jug suffix: ethanol id: JugEthanol - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-ethanol @@ -392,7 +392,7 @@ name: jug suffix: sugar id: JugSugar - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-sugar @@ -408,7 +408,7 @@ name: jug suffix: nitrogen id: JugNitrogen - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-nitrogen @@ -424,7 +424,7 @@ name: jug suffix: oxygen id: JugOxygen - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-oxygen @@ -440,7 +440,7 @@ name: jug suffix: Plant-B-Gone id: JugPlantBGone - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-plant-b-gone @@ -456,7 +456,7 @@ name: jug suffix: welding fuel id: JugWeldingFuel - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-welding-fuel diff --git a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml index cfd0b8f770..3a6d8ffc22 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml @@ -87,7 +87,7 @@ - type: entity id: FultonEffect - noSpawn: true + categories: [ HideSpawnMenu ] name: fulton effect components: - type: TimedDespawn diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index 2320764d9f..3081f60989 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml @@ -115,7 +115,7 @@ name: light pulse test parent: BaseItem id: LightBehaviourTest1 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/glowstick.rsi @@ -146,7 +146,7 @@ name: color cycle test parent: BaseItem id: LightBehaviourTest2 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/glowstick.rsi @@ -178,7 +178,7 @@ name: multi-behaviour light test parent: BaseItem id: LightBehaviourTest3 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/glowstick.rsi @@ -218,7 +218,7 @@ name: light fade in test parent: BaseItem id: LightBehaviourTest4 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/glowstick.rsi @@ -249,7 +249,7 @@ name: light pulse radius test parent: BaseItem id: LightBehaviourTest5 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/glowstick.rsi @@ -280,7 +280,7 @@ name: light randomize radius test parent: BaseItem id: LightBehaviourTest6 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/glowstick.rsi diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index ac0e3b41bf..2c2fc795f2 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -1,6 +1,6 @@ - type: entity id: JetpackEffect - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml index 630354f23d..1aac442414 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml @@ -52,7 +52,7 @@ - type: entity id: HotPotatoEffect - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.6 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml index 31d7b65fe8..65b7dbc165 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml @@ -1,5 +1,5 @@ - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet id: BulletAntiMateriel name: bullet (.60 anti-materiel) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml index 741f0a4e1a..83392d07ef 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml @@ -2,7 +2,7 @@ id: BulletCaselessRifle name: bullet (.25 caseless) parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -13,7 +13,7 @@ id: BulletCaselessRiflePractice name: bullet (.25 caseless practice) parent: BaseBulletPractice - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml index 6646e268d2..873d970214 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml @@ -1,7 +1,7 @@ - type: entity id: PelletClusterRubber name: pellet (ball, rubber) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -20,7 +20,7 @@ - type: entity id: PelletClusterLethal name: pellet (ball, lethal) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -37,7 +37,7 @@ - type: entity id: PelletClusterIncendiary name: pellet (ball, incendiary) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBulletIncendiary components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml index be6a07e486..d37555c344 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml @@ -2,7 +2,7 @@ id: BulletHeavyRifle name: bullet (.20 rifle) parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -13,7 +13,7 @@ id: BulletMinigun name: minigun bullet (.10 rifle) parent: BulletHeavyRifle - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index c6a4808b77..7eac4b53d0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -2,7 +2,7 @@ id: BulletLightRifle name: bullet (.20 rifle) parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -13,7 +13,7 @@ id: BulletLightRiflePractice name: bullet (.20 rifle practice) parent: BaseBulletPractice - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -24,7 +24,7 @@ id: BulletLightRifleIncendiary parent: BaseBulletIncendiary name: bullet (.20 rifle incendiary) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -36,7 +36,7 @@ id: BulletLightRifleUranium parent: BaseBulletUranium name: bullet (.20 rifle uranium) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index 798de9fa85..b4017fd550 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -2,7 +2,7 @@ id: BulletMagnum name: bullet (.45 magnum) parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -13,7 +13,7 @@ id: BulletMagnumPractice name: bullet (.45 magnum practice) parent: BaseBulletPractice - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -24,7 +24,7 @@ id: BulletMagnumIncendiary parent: BaseBulletIncendiary name: bullet (.45 magnum incendiary) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -36,7 +36,7 @@ id: BulletMagnumAP name: bullet (.45 magnum armor-piercing) parent: BaseBulletAP - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -48,7 +48,7 @@ id: BulletMagnumUranium name: bullet (.45 magnum uranium) parent: BaseBulletUranium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 3cfcc0cf20..8d146939b7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -2,7 +2,7 @@ id: BulletPistol name: bullet (.35 auto) parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -13,7 +13,7 @@ id: BulletPistolPractice name: bullet (.35 auto practice) parent: BaseBulletPractice - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -24,7 +24,7 @@ id: BulletPistolIncendiary parent: BaseBulletIncendiary name: bullet (.35 auto incendiary) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -36,7 +36,7 @@ id: BulletPistolUranium parent: BaseBulletUranium name: bullet (.35 auto uranium) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index 6f6fa0f907..e3e26bf9f3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -2,7 +2,7 @@ id: BulletRifle name: bullet (0.20 rifle) parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -13,7 +13,7 @@ id: BulletRiflePractice name: bullet (0.20 rifle practice) parent: BaseBulletPractice - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -24,7 +24,7 @@ id: BulletRifleIncendiary parent: BaseBulletIncendiary name: bullet (0.20 rifle incendiary) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -36,7 +36,7 @@ id: BulletRifleUranium parent: BaseBulletUranium name: bullet (0.20 rifle uranium) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index e119a846c9..6e4570e1a1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -1,7 +1,7 @@ - type: entity id: PelletShotgunSlug name: pellet (.50 slug) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -15,7 +15,7 @@ - type: entity id: PelletShotgunBeanbag name: beanbag (.50) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -31,7 +31,7 @@ - type: entity id: PelletShotgun name: pellet (.50) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -45,7 +45,7 @@ - type: entity id: PelletShotgunIncendiary name: pellet (.50 incendiary) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBulletIncendiary components: - type: Sprite @@ -62,7 +62,7 @@ - type: entity id: PelletShotgunPractice name: pellet (.50 practice) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBulletPractice components: - type: Sprite @@ -76,7 +76,7 @@ - type: entity id: PelletShotgunImprovised name: improvised pellet - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -92,7 +92,7 @@ - type: entity id: PelletShotgunTranquilizer name: pellet (.50 tranquilizer) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBulletPractice components: - type: Sprite @@ -119,7 +119,7 @@ - type: entity id: PelletShotgunFlare name: pellet (.50 flare) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Physics bodyType: Dynamic @@ -166,7 +166,7 @@ - type: entity id: PelletShotgunUranium name: pellet (.50 uranium) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -181,7 +181,7 @@ - type: entity id: PelletGrapeshot #tally fucking ho name: grapeshot pellet - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -200,7 +200,7 @@ id: PelletGlass name: glass shard parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite noRot: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 3f37d308db..89db3240be 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -1,7 +1,7 @@ # Used to animate the hitscan effects because effectsystem doesn't support it - type: entity id: HitscanEffect - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 2.0 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml index d70b05bf61..9be9e43e94 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml @@ -1,6 +1,6 @@ - type: entity id: BulletImpactEffect - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.25 @@ -18,7 +18,7 @@ - type: entity id: BulletImpactEffectDisabler - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.2 @@ -36,7 +36,7 @@ - type: entity id: BulletImpactEffectOrangeDisabler - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.2 @@ -55,7 +55,7 @@ - type: entity id: BulletImpactEffectKinetic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index d0ce0808ac..2f1edfe697 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -3,7 +3,7 @@ name: fireball description: You better GITTAH WEIGH. parent: BulletRocket - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight color: "#E25822" @@ -31,7 +31,7 @@ fireStacks: 0.35 - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBulletTrigger id: ProjectileDragonsBreath name: dragon's breath @@ -68,7 +68,7 @@ name: fireball description: Hovering blob of flame. parent: ProjectileFireball - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 30 @@ -82,7 +82,7 @@ - type: entity id: ProjectilePolyboltBase parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/magic.rsi @@ -99,7 +99,7 @@ parent: ProjectilePolyboltBase name: carp polybolt description: Nooo, I don't wanna be fish! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PolymorphOnCollide polymorph: WizardForcedCarp @@ -112,7 +112,7 @@ parent: ProjectilePolyboltBase name: monkey polybolt description: Nooo, I don't wanna be monkey! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PolymorphOnCollide polymorph: WizardForcedMonkey @@ -125,7 +125,7 @@ parent: ProjectilePolyboltBase name: door polybolt description: Nooo, I don't wanna be door! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/magic.rsi @@ -146,7 +146,7 @@ name: healing bolt description: I COMMAND YOU TO LIVE! parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/magic.rsi @@ -166,7 +166,7 @@ id: BulletInstakillMagic name: magical lead cylinder parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] description: This looks familiar. components: - type: Projectile @@ -180,7 +180,7 @@ parent: ProjectilePolyboltBase name: cluwne polybolt description: knoH KnoH! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PolymorphOnCollide polymorph: WizardForcedCluwne @@ -193,7 +193,7 @@ parent: BaseBullet name: icicle description: Brrrrr. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Structures/Specific/Anomalies/ice_anom.rsi @@ -209,7 +209,7 @@ id: ProjectilePolyboltBread name: bread polybolt description: Nooo, I don't wanna be bread! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PolymorphOnCollide polymorph: BreadMorph diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 5601116009..d2c6497831 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1,6 +1,6 @@ - type: entity id: MuzzleFlashEffect - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.4 @@ -69,7 +69,7 @@ - type: entity id: BaseBulletTrigger # Trigger-on-collide bullets parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TriggerOnCollide fixtureID: projectile @@ -93,7 +93,7 @@ id: BaseBulletPractice name: base bullet practice parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -108,7 +108,7 @@ id: BaseBulletIncendiary name: base bullet incendiary parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -126,7 +126,7 @@ id: BaseBulletAP name: base bullet armor-piercing parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -142,7 +142,7 @@ id: BaseBulletUranium name: base bullet uranium parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -158,7 +158,7 @@ name: taser bolt id: BulletTaser parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: FlyBySound sound: @@ -200,7 +200,7 @@ name : disabler bolt id: BulletDisabler parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Reflective reflective: @@ -243,7 +243,7 @@ name : disabler bolt practice id: BulletDisablerPractice parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: FlyBySound sound: @@ -283,7 +283,7 @@ name: emitter bolt id: EmitterBolt parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Structures/Power/Generation/Singularity/emitter.rsi @@ -320,7 +320,7 @@ name: watcher bolt id: WatcherBolt parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: FlyBySound sound: @@ -360,7 +360,7 @@ name: magmawing watcher bolt id: WatcherBoltMagmawing parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi @@ -379,7 +379,7 @@ id: BulletKinetic name: kinetic bolt parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] description: Not too bad, but you still don't want to get hit by it. components: - type: Reflective @@ -405,7 +405,7 @@ - type: entity id: BulletKineticShuttle parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite noRot: false @@ -433,7 +433,7 @@ id: BulletCharge name: charge bolt parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] description: Marks a target for additional damage. components: - type: Reflective @@ -467,7 +467,7 @@ parent: BaseBullet id: AnomalousParticleDelta name: delta particles - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight enabled: true @@ -508,7 +508,7 @@ - type: entity parent: AnomalousParticleDelta id: AnomalousParticleDeltaStrong - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: AnomalousParticle particleType: Delta @@ -521,7 +521,7 @@ parent: AnomalousParticleDelta id: AnomalousParticleEpsilon name: epsilon particles - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight enabled: true @@ -538,7 +538,7 @@ - type: entity parent: AnomalousParticleEpsilon id: AnomalousParticleEpsilonStrong - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: AnomalousParticle particleType: Epsilon @@ -551,7 +551,7 @@ parent: AnomalousParticleDelta id: AnomalousParticleZeta name: zeta particles - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight enabled: true @@ -568,7 +568,7 @@ - type: entity parent: AnomalousParticleZeta id: AnomalousParticleZetaStrong - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: AnomalousParticle particleType: Zeta @@ -581,7 +581,7 @@ parent: AnomalousParticleDelta id: AnomalousParticleOmegaStrong name: omega particles - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight enabled: true @@ -610,7 +610,7 @@ parent: AnomalousParticleDelta id: AnomalousParticleSigma name: sigma particles - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight enabled: true @@ -628,7 +628,7 @@ parent: AnomalousParticleSigma id: AnomalousParticleSigmaStrong name: sigma particles - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: AnomalousParticle particleType: Sigma @@ -638,7 +638,7 @@ id: BulletRocket name: rocket parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -660,7 +660,7 @@ id: BulletWeakRocket name: weak rocket parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -682,7 +682,7 @@ id: BulletGrenadeBaton name: baton grenade parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -702,7 +702,7 @@ id: BulletGrenadeBlast name: blast grenade parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -719,7 +719,7 @@ id: BulletGrenadeFlash name: flash grenade parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -738,7 +738,7 @@ id: BulletGrenadeFrag name: frag grenade parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -755,7 +755,7 @@ id: BulletGrenadeEMP name: EMP rocket parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -776,7 +776,7 @@ id: BulletCap name: cap bullet parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/toys.rsi @@ -792,7 +792,7 @@ id: BulletAcid name: acid spit parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -808,7 +808,7 @@ - type: entity id: BulletWaterShot name: water - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Clickable - type: Physics @@ -851,7 +851,7 @@ id: BulletCannonBall name: cannonball parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -872,7 +872,7 @@ - type: entity id: GrapplingHook name: grappling hook - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: EmbeddableProjectile deleteOnRemove: true @@ -908,7 +908,7 @@ name : disabler bolt smg id: BulletDisablerSmg parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Reflective reflective: @@ -951,7 +951,7 @@ name: tesla gun lightning id: TeslaGunBullet parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 5 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 79abbd9bc2..1e0125fd49 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -83,7 +83,7 @@ - type: entity id: GrenadeFlashEffect - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight enabled: true @@ -125,7 +125,7 @@ description: Go out on your own terms! parent: GrenadeBase id: SelfDestructSeq - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: ExplodeOnTrigger - type: Explosive diff --git a/Resources/Prototypes/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml index ab885b03e5..613bb1b1f4 100644 --- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml +++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml @@ -25,7 +25,7 @@ - BaseStationSiliconLawCrewsimov - BaseStationAllEventsEligible - BaseStationNanotrasen - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Transform @@ -35,7 +35,7 @@ - BaseStation - BaseStationAlertLevels - BaseStationNanotrasen - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Transform @@ -46,6 +46,6 @@ - BaseStationJobsSpawning - BaseStationRecords - BaseStationNanotrasen - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Transform diff --git a/Resources/Prototypes/Entities/Stations/syndicate.yml b/Resources/Prototypes/Entities/Stations/syndicate.yml index a649416914..c863ef7352 100644 --- a/Resources/Prototypes/Entities/Stations/syndicate.yml +++ b/Resources/Prototypes/Entities/Stations/syndicate.yml @@ -11,6 +11,6 @@ parent: - BaseStation - BaseStationSyndicate - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Transform diff --git a/Resources/Prototypes/Entities/Stations/test.yml b/Resources/Prototypes/Entities/Stations/test.yml index 0f2e40537a..9eec6979e7 100644 --- a/Resources/Prototypes/Entities/Stations/test.yml +++ b/Resources/Prototypes/Entities/Stations/test.yml @@ -6,6 +6,6 @@ - BaseStationJobsSpawning - BaseStationRecords - BaseStationAlertLevels - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Transform diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml index 7aee589647..3c1334169d 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml @@ -61,7 +61,7 @@ - type: entity id: DisposalHolder - noSpawn: true + categories: [ HideSpawnMenu ] name: disposal holder components: - type: DisposalHolder diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml index 8d889ee5cb..9d3ce9c931 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml @@ -3,7 +3,7 @@ description: Accelerated particles. id: ParticlesProjectile parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -54,7 +54,7 @@ description: Accelerated negative particles. id: AntiParticlesProjectile parent: ParticlesProjectile - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml index 4e4ef8bdbc..b7d6b5a128 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml @@ -108,7 +108,7 @@ mediumVoltageNode: ame - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: AmeController id: AmeControllerUnanchored suffix: Unanchored diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml index ed70b31091..1faee965d4 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml @@ -144,7 +144,7 @@ # Construction Frames - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] id: BaseGeneratorWallmountFrame name: wallmount generator frame description: A construction frame for a wallmount generator. diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml index c512266e97..a997dbbf9d 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml @@ -1,6 +1,6 @@ - type: entity id: SolarPanelBasePhysSprite - noSpawn: true + categories: [ HideSpawnMenu ] name: solar panel placement: mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml index 78d979ab8e..b7f43614db 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml @@ -184,7 +184,7 @@ - # Spawned by the client-side circulator examine code to indicate the inlet/outlet direction. type: entity id: TegCirculatorArrow - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Markers/teg_arrow.rsi diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml index 0948cdb4cc..d8f32922c8 100644 --- a/Resources/Prototypes/Entities/Structures/Power/apc.yml +++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml @@ -1,5 +1,5 @@ - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] id: BaseAPC name: APC description: A control terminal for the area's electrical systems. @@ -146,7 +146,7 @@ # APC under construction - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] id: APCFrame name: APC frame description: A control terminal for the area's electrical systems, lacking the electronics. diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml index 692f027386..8f8f752e38 100644 --- a/Resources/Prototypes/Entities/Structures/Power/substation.yml +++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml @@ -112,7 +112,7 @@ # Compact Wall Substation Base - type: entity id: BaseSubstationWall - noSpawn: true + categories: [ HideSpawnMenu ] name: wallmount substation description: A substation designed for compact shuttles and spaces. placement: @@ -256,7 +256,7 @@ # Construction Frame - type: entity id: BaseSubstationWallFrame - noSpawn: true + categories: [ HideSpawnMenu ] name: wallmount substation frame description: A substation frame for construction placement: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index b38ef61791..147e9e5b37 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -697,7 +697,7 @@ - type: entity parent: GasCanisterBrokenBase id: StorageCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: yellow-1 @@ -705,7 +705,7 @@ - type: entity parent: GasCanisterBrokenBase id: AirCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: grey-1 @@ -713,7 +713,7 @@ - type: entity parent: GasCanisterBrokenBase id: OxygenCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: blue-1 @@ -721,7 +721,7 @@ - type: entity parent: GasCanisterBrokenBase id: NitrogenCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: red-1 @@ -729,7 +729,7 @@ - type: entity parent: GasCanisterBrokenBase id: CarbonDioxideCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: black-1 @@ -737,7 +737,7 @@ - type: entity parent: GasCanisterBrokenBase id: PlasmaCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: orange-1 @@ -745,7 +745,7 @@ - type: entity parent: GasCanisterBrokenBase id: TritiumCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: green-1 @@ -754,7 +754,7 @@ parent: GasCanisterBrokenBase id: WaterVaporCanisterBroken name: broken water vapor canister - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: water_vapor-1 @@ -762,7 +762,7 @@ - type: entity parent: GasCanisterBrokenBase id: AmmoniaCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: greenys-1 @@ -770,7 +770,7 @@ - type: entity parent: GasCanisterBrokenBase id: NitrousOxideCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: redws-1 @@ -778,7 +778,7 @@ - type: entity parent: GasCanisterBrokenBase id: FrezonCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: frezon-1 diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml index 2666e8261d..73871cbe9b 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml @@ -1,7 +1,7 @@ - type: entity parent: BaseStructureDynamic id: CrateGeneric - noSpawn: true + categories: [ HideSpawnMenu ] name: crate description: A large container for items. components: @@ -94,7 +94,7 @@ - type: entity parent: CrateGeneric id: CrateBaseWeldable - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Weldable - type: ResistLocker diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml index 5ae5bae085..f749bc599b 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml @@ -48,7 +48,7 @@ #- type: entity # id: LargeBarSign # name: large bar sign -# noSpawn: true +# categories: [ HideSpawnMenu ] # components: # - type: Clickable # - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml index ecf2b0525e..01e3757a2c 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml @@ -236,7 +236,7 @@ id: LockableButton name: lockable button parent: SignalButtonDirectional - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Appearance - type: Lock @@ -496,7 +496,7 @@ - type: entity id: ButtonFrame name: button frame - noSpawn: true + categories: [ HideSpawnMenu ] description: It's a frame to help distinguish switches visually. placement: mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml index 271a9a65cd..ff935055ff 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml @@ -101,7 +101,7 @@ # Construction Frame - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] id: TimerFrame name: timer frame description: A construction frame for a timer. diff --git a/Resources/Prototypes/Entities/Virtual/beam.yml b/Resources/Prototypes/Entities/Virtual/beam.yml index 7ded09c3ff..fa249f0dd3 100644 --- a/Resources/Prototypes/Entities/Virtual/beam.yml +++ b/Resources/Prototypes/Entities/Virtual/beam.yml @@ -2,7 +2,7 @@ - type: entity id: VirtualBeamEntityController name: BEAM ENTITY YOU SHOULD NOT SEE THIS - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Beam - type: TimedDespawn diff --git a/Resources/Prototypes/Entities/Virtual/electrocution.yml b/Resources/Prototypes/Entities/Virtual/electrocution.yml index ac65245191..c45e0b3ca9 100644 --- a/Resources/Prototypes/Entities/Virtual/electrocution.yml +++ b/Resources/Prototypes/Entities/Virtual/electrocution.yml @@ -12,7 +12,7 @@ - type: entity id: VirtualElectrocutionLoadHVPower parent: VirtualElectrocutionLoadBase - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: NodeContainer nodes: @@ -26,7 +26,7 @@ - type: entity id: VirtualElectrocutionLoadMVPower parent: VirtualElectrocutionLoadBase - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: NodeContainer nodes: @@ -40,7 +40,7 @@ - type: entity id: VirtualElectrocutionLoadApc parent: VirtualElectrocutionLoadBase - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: NodeContainer nodes: diff --git a/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml b/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml index 6eb734c1d3..81e8e9866c 100644 --- a/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml +++ b/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml @@ -5,7 +5,7 @@ id: StrippingHiddenEntity name: hidden entity description: There is something in this pocket. #Or maybe they ar... nah... too obvious a joke. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite texture: Interface/VerbIcons/information.svg.192dpi.png diff --git a/Resources/Prototypes/Entities/Virtual/tether.yml b/Resources/Prototypes/Entities/Virtual/tether.yml index ce953854d6..9459fd2088 100644 --- a/Resources/Prototypes/Entities/Virtual/tether.yml +++ b/Resources/Prototypes/Entities/Virtual/tether.yml @@ -1,6 +1,6 @@ - type: entity id: TetherEntity - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Physics bodyType: Dynamic diff --git a/Resources/Prototypes/Entities/Virtual/virtual_item.yml b/Resources/Prototypes/Entities/Virtual/virtual_item.yml index 088de6a6da..21391dbb34 100644 --- a/Resources/Prototypes/Entities/Virtual/virtual_item.yml +++ b/Resources/Prototypes/Entities/Virtual/virtual_item.yml @@ -2,7 +2,7 @@ - type: entity id: VirtualItem name: VIRTUAL ITEM YOU SHOULD NOT SEE THIS - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Item size: Ginormous # no storage insertion visuals diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml index ba0539ac89..bb33801e2d 100644 --- a/Resources/Prototypes/Entities/World/Debris/asteroids.yml +++ b/Resources/Prototypes/Entities/World/Debris/asteroids.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BaseAsteroidDebris parent: BaseDebris name: asteroid debris @@ -58,7 +58,7 @@ id: AsteroidDebrisSmall parent: BaseAsteroidDebris name: asteroid debris small - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -68,7 +68,7 @@ id: AsteroidDebrisMedium parent: BaseAsteroidDebris name: asteroid debris medium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -78,7 +78,7 @@ id: AsteroidDebrisLarge parent: BaseAsteroidDebris name: asteroid debris large - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -88,7 +88,7 @@ id: AsteroidDebrisLarger parent: BaseAsteroidDebris name: asteroid debris larger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -99,7 +99,7 @@ id: AsteroidSalvageSmall parent: BaseAsteroidDebris name: salvage asteroid small - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -111,7 +111,7 @@ id: AsteroidSalvageMedium parent: BaseAsteroidDebris name: salvage asteroid medium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -123,7 +123,7 @@ id: AsteroidSalvageLarge parent: BaseAsteroidDebris name: salvage asteroid large - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -135,7 +135,7 @@ id: AsteroidSalvageHuge parent: BaseAsteroidDebris name: salvage asteroid huge - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder diff --git a/Resources/Prototypes/Entities/World/Debris/wrecks.yml b/Resources/Prototypes/Entities/World/Debris/wrecks.yml index 4512ca7917..7bbeadeb5b 100644 --- a/Resources/Prototypes/Entities/World/Debris/wrecks.yml +++ b/Resources/Prototypes/Entities/World/Debris/wrecks.yml @@ -53,7 +53,7 @@ id: ScrapDebrisSmall parent: BaseScrapDebris name: scrap debris small - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -63,7 +63,7 @@ id: ScrapDebrisMedium parent: BaseScrapDebris name: scrap debris medium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -73,7 +73,7 @@ id: ScrapDebrisLarge parent: BaseScrapDebris name: scrap debris large - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder diff --git a/Resources/Prototypes/Entities/World/chunk.yml b/Resources/Prototypes/Entities/World/chunk.yml index 8f5f91557b..c7cb09c2a4 100644 --- a/Resources/Prototypes/Entities/World/chunk.yml +++ b/Resources/Prototypes/Entities/World/chunk.yml @@ -5,7 +5,7 @@ description: | It's rude to stare. It's also a bit odd you're looking at the abstract representation of the grid of reality. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WorldChunk - type: Sprite From 2a7883b92e59f3a5464db8602ab589e3ab346097 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Thu, 25 Jul 2024 05:24:40 -0700 Subject: [PATCH 14/23] Update vomit organ smite to not use Component.owner (#29926) * Update vomit organ smite to not use Component.owner * is this what you want...? * am I winning, dad? * update the comment * we love entity --------- Co-authored-by: plykiya --- .../Systems/AdminVerbSystem.Smites.cs | 10 ++++---- .../Body/Systems/SharedBodySystem.Organs.cs | 24 +++++++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs index eb21662719..3328563116 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs @@ -285,18 +285,18 @@ public sealed partial class AdminVerbSystem { Text = "admin-smite-remove-hands-name", Category = VerbCategory.Smite, - Icon = new SpriteSpecifier.Rsi(new ("/Textures/Fluids/vomit_toxin.rsi"), "vomit_toxin-1"), + Icon = new SpriteSpecifier.Rsi(new("/Textures/Fluids/vomit_toxin.rsi"), "vomit_toxin-1"), Act = () => { _vomitSystem.Vomit(args.Target, -1000, -1000); // You feel hollow! - var organs = _bodySystem.GetBodyOrganComponents(args.Target, body); + var organs = _bodySystem.GetBodyOrganEntityComps((args.Target, body)); var baseXform = Transform(args.Target); - foreach (var (xform, organ) in organs) + foreach (var organ in organs) { - if (HasComp(xform.Owner) || HasComp(xform.Owner)) + if (HasComp(organ.Owner) || HasComp(organ.Owner)) continue; - _transformSystem.AttachToGridOrMap(organ.Owner); + _transformSystem.PlaceNextTo((organ.Owner, organ.Comp1), (args.Target, baseXform)); } _popupSystem.PopupEntity(Loc.GetString("admin-smite-vomit-organs-self"), args.Target, diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs index efabebfc85..30fed573b8 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs @@ -183,6 +183,30 @@ public partial class SharedBodySystem return list; } + /// + /// Returns a list of Entity<, > + /// for each organ of the body + /// + /// The component that we want to return + /// The body to check the organs of + public List> GetBodyOrganEntityComps( + Entity entity) + where T : IComponent + { + if (!Resolve(entity, ref entity.Comp)) + return new List>(); + + var query = GetEntityQuery(); + var list = new List>(3); + foreach (var organ in GetBodyOrgans(entity.Owner, entity.Comp)) + { + if (query.TryGetComponent(organ.Id, out var comp)) + list.Add((organ.Id, comp, organ.Component)); + } + + return list; + } + /// /// Tries to get a list of ValueTuples of and OrganComponent on each organs /// in the given body. From e161a021c405ed1ac5c833dfd07d68e9f3983c1f Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:02:15 +0200 Subject: [PATCH 15/23] fix the bigest news admin notification typo in the game (#30349) Fix typo --- Resources/Locale/en-US/mass-media/news-ui.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/mass-media/news-ui.ftl b/Resources/Locale/en-US/mass-media/news-ui.ftl index 1553a24b4a..678f20a81a 100644 --- a/Resources/Locale/en-US/mass-media/news-ui.ftl +++ b/Resources/Locale/en-US/mass-media/news-ui.ftl @@ -34,4 +34,4 @@ news-write-ui-richtext-tooltip = News articles support rich text {"[bullet/]bullet[/color]"} news-pda-notification-header = New news article -news-publish-admin-announcement = {$actor} published news article {$title} by {$author}" +news-publish-admin-announcement = {$actor} published news article {$title} by {$author} From 6f7719011a3a2984be31040339fdb826a5f12132 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 25 Jul 2024 21:15:28 +0200 Subject: [PATCH 16/23] Update Saltern (#30357) fans --- Resources/Maps/saltern.yml | 96 ++++++++++++++++++++++++-------------- 1 file changed, 61 insertions(+), 35 deletions(-) diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index e232aa3272..b407f2a9a5 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -4519,6 +4519,12 @@ entities: - type: Transform pos: -8.5,-42.5 parent: 31 + - uid: 10766 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-16.5 + parent: 31 - proto: AirlockExternalGlassShuttleLocked entities: - uid: 6995 @@ -5740,63 +5746,76 @@ entities: - type: Transform pos: 5.5,-32.5 parent: 31 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: + - uid: 950 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-4.5 + parent: 31 - uid: 5157 components: - type: Transform - pos: -14.5,-4.5 + rot: -1.5707963267948966 rad + pos: -44.5,0.5 parent: 31 - uid: 6694 components: - type: Transform - pos: -44.5,0.5 + rot: -1.5707963267948966 rad + pos: -44.5,2.5 parent: 31 - uid: 7138 components: - type: Transform - pos: -44.5,2.5 + rot: -1.5707963267948966 rad + pos: -44.5,8.5 parent: 31 - uid: 7346 components: - type: Transform - pos: -44.5,8.5 + rot: -1.5707963267948966 rad + pos: -44.5,10.5 parent: 31 - uid: 7566 components: - type: Transform - pos: -44.5,10.5 + rot: 3.141592653589793 rad + pos: 20.5,28.5 parent: 31 - uid: 7567 components: - type: Transform + rot: 3.141592653589793 rad pos: 22.5,28.5 parent: 31 - uid: 7943 components: - type: Transform - pos: 20.5,28.5 + rot: 3.141592653589793 rad + pos: -12.5,-2.5 parent: 31 - uid: 9923 components: - type: Transform - pos: -12.5,-2.5 + pos: -8.5,-42.5 parent: 31 - uid: 10583 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-42.5 + pos: -51.5,-12.5 parent: 31 - uid: 10765 components: - type: Transform pos: -44.5,-12.5 parent: 31 - - uid: 10766 + - uid: 11466 components: - type: Transform - pos: -51.5,-12.5 + rot: 3.141592653589793 rad + pos: 31.5,-16.5 parent: 31 - proto: AtmosFixBlockerMarker entities: @@ -28720,6 +28739,20 @@ entities: parent: 31 - type: NavMapBeacon text: Tesla Storage +- proto: DefaultStationBeaconEscapePod + entities: + - uid: 11467 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-17.5 + parent: 31 + - uid: 11468 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-41.5 + parent: 31 - proto: DefaultStationBeaconEVAStorage entities: - uid: 7640 @@ -56347,8 +56380,6 @@ entities: - type: Transform pos: 18.5,-3.5 parent: 31 -- proto: SignChemistry2 - entities: - uid: 7291 components: - type: Transform @@ -56586,13 +56617,6 @@ entities: rot: 1.5707963267948966 rad pos: -26.497889,6.2645836 parent: 31 -- proto: SignDrones - entities: - - uid: 7224 - components: - - type: Transform - pos: 26.5,2.5 - parent: 31 - proto: SignElectrical entities: - uid: 11377 @@ -56642,7 +56666,7 @@ entities: - type: Transform pos: 50.5,-1.5 parent: 31 -- proto: SignHydro2 +- proto: SignHydro1 entities: - uid: 10545 components: @@ -56685,6 +56709,13 @@ entities: - type: Transform pos: 32.5,23.5 parent: 31 +- proto: SignMaterials + entities: + - uid: 7224 + components: + - type: Transform + pos: 26.5,2.5 + parent: 31 - proto: SignMedical entities: - uid: 4151 @@ -56692,14 +56723,6 @@ entities: - type: Transform pos: 5.5,2.5 parent: 31 -- proto: SignMinerDock - entities: - - uid: 9941 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 34.5,38.5 - parent: 31 - proto: SignMorgue entities: - uid: 4230 @@ -56792,6 +56815,14 @@ entities: - type: Transform pos: 54.5,-10.5 parent: 31 +- proto: SignShipDock + entities: + - uid: 9941 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,38.5 + parent: 31 - proto: SignSomethingOld2 entities: - uid: 1469 @@ -61591,11 +61622,6 @@ entities: - type: Transform pos: 53.5,-12.5 parent: 31 - - uid: 950 - components: - - type: Transform - pos: 31.5,-16.5 - parent: 31 - uid: 951 components: - type: Transform From 769967ac36b4957c8c3b80f8785c4dbb6340a2c6 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 25 Jul 2024 21:15:50 +0200 Subject: [PATCH 17/23] Update Packed (#30358) fans external airlocks --- Resources/Maps/packed.yml | 258 ++++++++++++++++++++++++++++++++------ 1 file changed, 219 insertions(+), 39 deletions(-) diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml index 6954fe7892..2691ed2a78 100644 --- a/Resources/Maps/packed.yml +++ b/Resources/Maps/packed.yml @@ -7294,11 +7294,27 @@ entities: - type: Transform pos: 37.5,-39.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 4391: + - DoorStatus: DoorBolt - uid: 4391 components: - type: Transform pos: 35.5,-37.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 3 + - type: DeviceLinkSource + linkedPorts: + 4385: + - DoorStatus: DoorBolt + 4392: + - DoorStatus: DoorBolt + 4390: + - DoorStatus: DoorBolt - proto: AirlockExternalEngineeringLocked entities: - uid: 69 @@ -7306,21 +7322,45 @@ entities: - type: Transform pos: 11.5,37.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 70: + - DoorStatus: DoorBolt - uid: 70 components: - type: Transform pos: 11.5,35.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 69: + - DoorStatus: DoorBolt - uid: 171 components: - type: Transform pos: 15.5,-41.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 173: + - DoorStatus: DoorBolt - uid: 173 components: - type: Transform pos: 13.5,-43.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 171: + - DoorStatus: DoorBolt - uid: 225 components: - type: Transform @@ -7336,31 +7376,67 @@ entities: - type: Transform pos: 74.5,45.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2128: + - DoorStatus: DoorBolt - uid: 2128 components: - type: Transform pos: 72.5,45.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 1902: + - DoorStatus: DoorBolt - uid: 4385 components: - type: Transform pos: 33.5,-39.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 4391: + - DoorStatus: DoorBolt - uid: 4392 components: - type: Transform pos: 35.5,-41.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 4391: + - DoorStatus: DoorBolt - uid: 12931 components: - type: Transform pos: 33.5,-47.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12932: + - DoorStatus: DoorBolt - uid: 12932 components: - type: Transform pos: 32.5,-49.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12931: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassCargoLocked entities: - uid: 258 @@ -7378,21 +7454,53 @@ entities: - type: Transform pos: 6.5,16.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 7886: + - DoorStatus: DoorBolt + 7881: + - DoorStatus: DoorBolt - uid: 7674 components: - type: Transform pos: 6.5,17.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 3 + - type: DeviceLinkSource + linkedPorts: + 7886: + - DoorStatus: DoorBolt + 7881: + - DoorStatus: DoorBolt - uid: 7881 components: - type: Transform pos: 4.5,17.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 6863: + - DoorStatus: DoorBolt + 7674: + - DoorStatus: DoorBolt - uid: 7886 components: - type: Transform pos: 4.5,16.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 7674: + - DoorStatus: DoorBolt + 6863: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassLocked entities: - uid: 2734 @@ -7400,11 +7508,23 @@ entities: - type: Transform pos: -5.5,-18.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 6839: + - DoorStatus: DoorBolt - uid: 6839 components: - type: Transform pos: -5.5,-15.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2734: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassShuttleArrivals entities: - uid: 1332 @@ -7448,26 +7568,56 @@ entities: - type: Transform pos: 1.5,-35.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 1370: + - DoorStatus: DoorBolt - uid: 1370 components: - type: Transform pos: -0.5,-35.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 1369: + - DoorStatus: DoorBolt - uid: 3202 components: - type: Transform pos: 56.5,49.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2167: + - DoorStatus: Close - uid: 8728 components: - type: Transform pos: 87.5,-20.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 10751: + - DoorStatus: DoorBolt - uid: 10751 components: - type: Transform pos: 84.5,-20.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 8728: + - DoorStatus: DoorBolt - proto: AirlockExternalShuttleLocked entities: - uid: 2167 @@ -7476,6 +7626,12 @@ entities: rot: 3.141592653589793 rad pos: 56.5,51.5 parent: 2 + - type: DeviceLinkSource + linkedPorts: + 3202: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - proto: AirlockFreezer entities: - uid: 10 @@ -9272,47 +9428,61 @@ entities: - type: Transform pos: 36.5,-21.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 136 components: - type: Transform - pos: -2.5,2.5 + rot: 3.141592653589793 rad + pos: -4.5,2.5 parent: 2 - uid: 373 components: - type: Transform + rot: 3.141592653589793 rad pos: -12.5,-10.5 parent: 2 - uid: 608 components: - type: Transform + rot: 3.141592653589793 rad pos: -19.5,-10.5 parent: 2 - uid: 2027 components: - type: Transform - pos: -4.5,2.5 + rot: 3.141592653589793 rad + pos: -2.5,2.5 + parent: 2 + - uid: 5262 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 28.5,-10.5 parent: 2 - uid: 6591 components: - type: Transform + rot: 1.5707963267948966 rad pos: 32.5,-10.5 parent: 2 - uid: 6592 components: - type: Transform - pos: 28.5,-10.5 + rot: -1.5707963267948966 rad + pos: 4.5,26.5 parent: 2 - - uid: 12295 + - uid: 6874 components: - type: Transform + rot: -1.5707963267948966 rad pos: 4.5,24.5 parent: 2 - - uid: 12296 + - uid: 6876 components: - type: Transform - pos: 4.5,26.5 + rot: 1.5707963267948966 rad + pos: 87.5,4.5 parent: 2 - proto: AtmosFixBlockerMarker entities: @@ -10063,7 +10233,7 @@ entities: - type: Transform pos: 114.5,-17.5 parent: 2 -- proto: BookChefGaming +- proto: BookHowToCookForFortySpaceman entities: - uid: 297 components: @@ -21935,6 +22105,16 @@ entities: - type: Transform pos: 16.5,-12.5 parent: 2 + - uid: 6938 + components: + - type: Transform + pos: 116.5,-15.5 + parent: 2 + - uid: 6939 + components: + - type: Transform + pos: 116.5,-17.5 + parent: 2 - uid: 7148 components: - type: Transform @@ -31765,6 +31945,14 @@ entities: - Steel - Glass - Gold +- proto: CleanerDispenser + entities: + - uid: 6875 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-4.5 + parent: 2 - proto: ClosetBombFilled entities: - uid: 12854 @@ -65770,19 +65958,17 @@ entities: pos: 42.47835,25.502422 parent: 2 - proto: SignAtmos - entities: - - uid: 4575 - components: - - type: Transform - pos: 28.5,-26.5 - parent: 2 -- proto: SignAtmosMinsky entities: - uid: 4574 components: - type: Transform pos: 37.5,-38.5 parent: 2 + - uid: 4575 + components: + - type: Transform + pos: 28.5,-26.5 + parent: 2 - proto: SignBar entities: - uid: 11198 @@ -65826,7 +66012,7 @@ entities: - type: Transform pos: 39.519363,4.4919653 parent: 2 -- proto: SignChemistry1 +- proto: SignChem entities: - uid: 6817 components: @@ -65840,13 +66026,6 @@ entities: - type: Transform pos: 25.484035,39.437214 parent: 2 -- proto: SignCourt - entities: - - uid: 13166 - components: - - type: Transform - pos: 24.5,28.5 - parent: 2 - proto: SignCryogenicsMed entities: - uid: 11804 @@ -66195,20 +66374,18 @@ entities: rot: 3.141592653589793 rad pos: 13.5,-2.5 parent: 2 -- proto: SignHydro2 - entities: - - uid: 6651 - components: - - type: Transform - pos: 41.5,-2.5 - parent: 2 -- proto: SignHydro3 +- proto: SignHydro1 entities: - uid: 6648 components: - type: Transform pos: 47.5,-2.5 parent: 2 + - uid: 6651 + components: + - type: Transform + pos: 41.5,-2.5 + parent: 2 - proto: SignInterrogation entities: - uid: 11209 @@ -66246,6 +66423,11 @@ entities: - type: Transform pos: -4.5,-6.5 parent: 2 + - uid: 13166 + components: + - type: Transform + pos: 24.5,28.5 + parent: 2 - proto: SignLibrary entities: - uid: 11201 @@ -66268,13 +66450,6 @@ entities: - type: Transform pos: 53.5,1.5 parent: 2 -- proto: SignMinerDock - entities: - - uid: 7784 - components: - - type: Transform - pos: 6.5,18.5 - parent: 2 - proto: SignMorgue entities: - uid: 11196 @@ -66379,6 +66554,11 @@ entities: parent: 2 - proto: SignShipDock entities: + - uid: 7784 + components: + - type: Transform + pos: 6.5,18.5 + parent: 2 - uid: 9306 components: - type: Transform @@ -66493,7 +66673,7 @@ entities: rot: 1.5707963267948966 rad pos: 28.5,-13.5 parent: 2 -- proto: SignToxins2 +- proto: SignToxins entities: - uid: 12304 components: From d1663cade48c0de9ccd4111730a979ab8b713d39 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 25 Jul 2024 21:48:06 +0200 Subject: [PATCH 18/23] Update Omega (#30356) * Update Omega fans external airlocks tree escape pods * remove invalid --- Resources/Maps/omega.yml | 824 +++++++++++++++++++++++---------------- 1 file changed, 491 insertions(+), 333 deletions(-) diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml index 3cbcd40652..ae09e9e5fd 100644 --- a/Resources/Maps/omega.yml +++ b/Resources/Maps/omega.yml @@ -78,7 +78,7 @@ entities: version: 6 -2,1: ind: -2,1 - tiles: WQAAAAACWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAWQAAAAACWQAAAAABdgAAAAADdgAAAAAAdgAAAAABdgAAAAABdgAAAAADdgAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAADeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAWQAAAAADWQAAAAAAeQAAAAAAdgAAAAABdgAAAAABdgAAAAACdgAAAAACdgAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAWQAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAADWQAAAAADWQAAAAACWQAAAAADWQAAAAACWQAAAAACeQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAADeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAABHQAAAAACHQAAAAAAHQAAAAACHQAAAAADHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAADeQAAAAAAHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAHQAAAAADdgAAAAAAdgAAAAAAdgAAAAACdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAWQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAACeQAAAAAAWQAAAAACWQAAAAADWQAAAAAAeQAAAAAAHQAAAAABdgAAAAABdgAAAAADUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAACdgAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAAAWQAAAAADHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADHQAAAAACeQAAAAAABwAAAAAAAAAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACHQAAAAABeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAA + tiles: WQAAAAACWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAWQAAAAACWQAAAAABdgAAAAADdgAAAAAAdgAAAAABdgAAAAABdgAAAAADdgAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAADeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAWQAAAAADWQAAAAAAeQAAAAAAdgAAAAABdgAAAAABdgAAAAACdgAAAAACdgAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAWQAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAADWQAAAAADWQAAAAACWQAAAAADWQAAAAACWQAAAAACeQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAADeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAABHQAAAAACHQAAAAAAHQAAAAACHQAAAAADHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAADeQAAAAAAHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAHQAAAAADdgAAAAAAdgAAAAAAdgAAAAACdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAWQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAACeQAAAAAAWQAAAAACWQAAAAADWQAAAAAAeQAAAAAAHQAAAAABdgAAAAABdgAAAAADUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAACdgAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAAAWQAAAAADHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADHQAAAAACeQAAAAAABwAAAAAAAAAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACHQAAAAABeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 -2,0: ind: -2,0 @@ -90,7 +90,7 @@ entities: version: 6 -1,2: ind: -1,2 - tiles: BwAAAAAABwAAAAAABwAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADBwAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAAAHQAAAAABBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADHQAAAAADHQAAAAABHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAHQAAAAACHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: BwAAAAAABwAAAAAABwAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADBwAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAAAHQAAAAABBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADHQAAAAADHQAAAAABHQAAAAADeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAHQAAAAACHQAAAAADeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,2: ind: 0,2 @@ -118,7 +118,7 @@ entities: version: 6 -2,2: ind: -2,2 - tiles: WQAAAAACWQAAAAABWQAAAAACWQAAAAACWQAAAAAAWQAAAAAAHQAAAAACeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAABwAAAAAAeQAAAAAAeAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: WQAAAAACWQAAAAABWQAAAAACWQAAAAACWQAAAAAAWQAAAAAAHQAAAAACeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAABwAAAAAFBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,0: ind: 2,0 @@ -142,7 +142,7 @@ entities: version: 6 -1,-3: ind: -1,-3 - tiles: AAAAAAAAeAAAAAAALwAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAADLwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAALwAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABLwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAALwAAAAAAWQAAAAACWQAAAAACWQAAAAADWQAAAAACLwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAADeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAADHQAAAAAAeQAAAAAAWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAADPgAAAAAAPgAAAAAAHQAAAAAAHQAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAABHQAAAAADHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAD + tiles: AAAAAAAAeAAAAAAALwAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAADLwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAALwAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABLwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAALwAAAAAAWQAAAAACWQAAAAACWQAAAAADWQAAAAACLwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAWQAAAAABWQAAAAADeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAADHQAAAAAAeQAAAAAAWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAADPgAAAAAAPgAAAAAAHQAAAAAAHQAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAABHQAAAAADHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAD version: 6 0,-3: ind: 0,-3 @@ -174,7 +174,7 @@ entities: version: 6 -3,-2: ind: -3,-2 - tiles: AAAAAAAAAAAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAABwAAAAAABwAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABdgAAAAACeQAAAAAAdgAAAAACdgAAAAABdgAAAAADdgAAAAABeQAAAAAABwAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAADdgAAAAABeQAAAAAAdgAAAAADdgAAAAACdgAAAAAABwAAAAAABwAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAACdgAAAAADdgAAAAACeQAAAAAAeQAAAAAABwAAAAAABwAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAAABwAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAABBwAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAAA + tiles: AAAAAAAAAAAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAABwAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABdgAAAAACeQAAAAAAdgAAAAACdgAAAAABdgAAAAADdgAAAAABAAAAAAAAAAAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAADdgAAAAABeQAAAAAAdgAAAAADdgAAAAACdgAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAACdgAAAAADdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAAABwAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAABBwAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAAA version: 6 -2,-2: ind: -2,-2 @@ -210,7 +210,7 @@ entities: version: 6 -4,-2: ind: -4,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAA version: 6 -5,-2: ind: -5,-2 @@ -361,6 +361,11 @@ entities: 867: -55,-9 868: -53,-11 1369: -19,-19 + - node: + color: '#FFFFFFFF' + id: Box + decals: + 1607: -13,-39 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE @@ -938,6 +943,12 @@ entities: 1396: -22,-13 1397: -22,-12 1606: 5,-4 + - node: + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: Delivery + decals: + 1609: -49,-26 - node: cleanable: True color: '#FFFFFFFF' @@ -2306,6 +2317,12 @@ entities: id: SpaceStationSign7 decals: 953: 0,-13 + - node: + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: StandClear + decals: + 1608: -13,-40 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale @@ -4280,6 +4297,21 @@ entities: - 12226 - 1853 - 1852 + - uid: 9593 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-38.5 + parent: 4812 + - type: DeviceList + devices: + - 12321 + - 5071 + - 5072 + - 5224 + - 5223 + - 5225 + - 5222 - uid: 12171 components: - type: Transform @@ -4956,21 +4988,6 @@ entities: - 8591 - 8758 - 8770 - - uid: 12322 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-39.5 - parent: 4812 - - type: DeviceList - devices: - - 12321 - - 5072 - - 5071 - - 5223 - - 5222 - - 5224 - - 5225 - uid: 12325 components: - type: Transform @@ -5561,16 +5578,34 @@ entities: - type: Transform pos: 32.5,2.5 parent: 4812 + - uid: 8476 + components: + - type: Transform + pos: -47.5,-24.5 + parent: 4812 - uid: 9614 components: - type: Transform pos: -41.5,-27.5 parent: 4812 + - uid: 9637 + components: + - type: Transform + pos: -17.5,30.5 + parent: 4812 - uid: 9651 components: - type: Transform pos: -11.5,-56.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 12107: + - DoorStatus: Close + 9656: + - DoorStatus: Close - proto: AirlockExternalGlassAtmosphericsLocked entities: - uid: 6362 @@ -5578,11 +5613,23 @@ entities: - type: Transform pos: -47.5,-3.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 6363: + - DoorStatus: DoorBolt - uid: 6363 components: - type: Transform pos: -50.5,-4.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 6362: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassCargoLocked entities: - uid: 2919 @@ -5590,11 +5637,23 @@ entities: - type: Transform pos: 25.5,14.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2920: + - DoorStatus: DoorBolt - uid: 2920 components: - type: Transform pos: 28.5,14.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2919: + - DoorStatus: DoorBolt - uid: 3040 components: - type: Transform @@ -5612,16 +5671,34 @@ entities: - type: Transform pos: -56.5,-22.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 10405: + - DoorStatus: DoorBolt - uid: 11139 components: - type: Transform pos: 38.5,-36.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 11141: + - DoorStatus: DoorBolt - uid: 11141 components: - type: Transform pos: 35.5,-36.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 11139: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassShuttleArrivals entities: - uid: 3760 @@ -5636,6 +5713,25 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,-43.5 parent: 4812 +- proto: AirlockExternalGlassShuttleEscape + entities: + - uid: 3769 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-39.5 + parent: 4812 + - uid: 8492 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,32.5 + parent: 4812 + - uid: 10917 + components: + - type: Transform + pos: -47.5,-26.5 + parent: 4812 - proto: AirlockExternalGlassShuttleLocked entities: - uid: 3190 @@ -5691,11 +5787,23 @@ entities: - type: Transform pos: -10.5,-59.5 parent: 4812 + - type: DeviceLinkSource + linkedPorts: + 9651: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 12107 components: - type: Transform pos: -11.5,-59.5 parent: 4812 + - type: DeviceLinkSource + linkedPorts: + 9651: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - proto: AirlockExternalLocked entities: - uid: 2737 @@ -5703,36 +5811,78 @@ entities: - type: Transform pos: 12.5,31.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2814: + - DoorStatus: DoorBolt - uid: 2814 components: - type: Transform pos: 12.5,33.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2737: + - DoorStatus: DoorBolt - uid: 3349 components: - type: Transform pos: 21.5,10.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3350: + - DoorStatus: DoorBolt - uid: 3350 components: - type: Transform pos: 19.5,10.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3349: + - DoorStatus: DoorBolt - uid: 3686 components: - type: Transform pos: 3.5,44.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3687: + - DoorStatus: DoorBolt - uid: 3687 components: - type: Transform pos: 4.5,45.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3686: + - DoorStatus: DoorBolt - uid: 10405 components: - type: Transform pos: -54.5,-22.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 10406: + - DoorStatus: DoorBolt - proto: AirlockFreezer entities: - uid: 3119 @@ -6237,6 +6387,12 @@ entities: - type: Transform pos: 25.5,-34.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 11676: + - DoorStatus: DoorBolt - uid: 11350 components: - type: Transform @@ -6252,6 +6408,12 @@ entities: - type: Transform pos: 25.5,-37.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 11326: + - DoorStatus: DoorBolt - uid: 11802 components: - type: Transform @@ -6845,6 +7007,9 @@ entities: - type: Transform pos: -10.5,-40.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - uid: 12326 components: - type: Transform @@ -8016,16 +8181,6 @@ entities: - type: Transform pos: 37.5,-21.5 parent: 4812 - - uid: 8458 - components: - - type: Transform - pos: -19.5,36.5 - parent: 4812 - - uid: 8459 - components: - - type: Transform - pos: -19.5,35.5 - parent: 4812 - uid: 8460 components: - type: Transform @@ -8056,31 +8211,6 @@ entities: - type: Transform pos: -20.5,31.5 parent: 4812 - - uid: 8466 - components: - - type: Transform - pos: -19.5,31.5 - parent: 4812 - - uid: 8467 - components: - - type: Transform - pos: -18.5,31.5 - parent: 4812 - - uid: 8468 - components: - - type: Transform - pos: -17.5,31.5 - parent: 4812 - - uid: 8469 - components: - - type: Transform - pos: -16.5,31.5 - parent: 4812 - - uid: 8470 - components: - - type: Transform - pos: -15.5,31.5 - parent: 4812 - uid: 8471 components: - type: Transform @@ -8101,101 +8231,11 @@ entities: - type: Transform pos: -14.5,32.5 parent: 4812 - - uid: 8475 - components: - - type: Transform - pos: -15.5,32.5 - parent: 4812 - - uid: 8476 - components: - - type: Transform - pos: -18.5,32.5 - parent: 4812 - - uid: 8479 - components: - - type: Transform - pos: -19.5,32.5 - parent: 4812 - - uid: 8480 - components: - - type: Transform - pos: -19.5,33.5 - parent: 4812 - - uid: 8483 - components: - - type: Transform - pos: -16.5,33.5 - parent: 4812 - uid: 8484 components: - type: Transform pos: -15.5,33.5 parent: 4812 - - uid: 8485 - components: - - type: Transform - pos: -15.5,34.5 - parent: 4812 - - uid: 8486 - components: - - type: Transform - pos: -16.5,34.5 - parent: 4812 - - uid: 8487 - components: - - type: Transform - pos: -17.5,34.5 - parent: 4812 - - uid: 8488 - components: - - type: Transform - pos: -18.5,34.5 - parent: 4812 - - uid: 8489 - components: - - type: Transform - pos: -19.5,34.5 - parent: 4812 - - uid: 8490 - components: - - type: Transform - pos: -18.5,35.5 - parent: 4812 - - uid: 8491 - components: - - type: Transform - pos: -17.5,35.5 - parent: 4812 - - uid: 8492 - components: - - type: Transform - pos: -16.5,35.5 - parent: 4812 - - uid: 8493 - components: - - type: Transform - pos: -17.5,36.5 - parent: 4812 - - uid: 8494 - components: - - type: Transform - pos: -18.5,36.5 - parent: 4812 - - uid: 8495 - components: - - type: Transform - pos: -18.5,37.5 - parent: 4812 - - uid: 8496 - components: - - type: Transform - pos: -18.5,38.5 - parent: 4812 - - uid: 8497 - components: - - type: Transform - pos: -17.5,38.5 - parent: 4812 - uid: 8498 components: - type: Transform @@ -8356,31 +8396,6 @@ entities: - type: Transform pos: -43.5,-32.5 parent: 4812 - - uid: 9630 - components: - - type: Transform - pos: -46.5,-29.5 - parent: 4812 - - uid: 9631 - components: - - type: Transform - pos: -46.5,-30.5 - parent: 4812 - - uid: 9632 - components: - - type: Transform - pos: -47.5,-29.5 - parent: 4812 - - uid: 9633 - components: - - type: Transform - pos: -46.5,-28.5 - parent: 4812 - - uid: 9637 - components: - - type: Transform - pos: -46.5,-26.5 - parent: 4812 - uid: 9638 components: - type: Transform @@ -9411,11 +9426,6 @@ entities: - type: Transform pos: 35.5,-41.5 parent: 4812 - - uid: 12144 - components: - - type: Transform - pos: -48.5,-25.5 - parent: 4812 - proto: AsteroidRockMining entities: - uid: 12146 @@ -9423,67 +9433,96 @@ entities: - type: Transform pos: -52.5,-3.5 parent: 4812 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 2781 components: - type: Transform - pos: 23.5,25.5 + rot: -1.5707963267948966 rad + pos: -13.5,-39.5 parent: 4812 - - uid: 2845 + - uid: 8478 components: - type: Transform + rot: 1.5707963267948966 rad pos: 23.5,27.5 parent: 4812 - - uid: 3260 + - uid: 8479 components: - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,25.5 + parent: 4812 + - uid: 8480 + components: + - type: Transform + rot: 1.5707963267948966 rad pos: 34.5,-7.5 parent: 4812 - - uid: 3263 - components: - - type: Transform - pos: 34.5,0.5 - parent: 4812 - - uid: 3423 - components: - - type: Transform - pos: 34.5,-5.5 - parent: 4812 - - uid: 3424 + - uid: 8481 components: - type: Transform + rot: 1.5707963267948966 rad pos: 34.5,2.5 parent: 4812 - - uid: 3455 + - uid: 8483 components: - type: Transform - pos: 8.5,-6.5 + rot: 1.5707963267948966 rad + pos: 34.5,-5.5 parent: 4812 - - uid: 3456 + - uid: 8485 components: - type: Transform + rot: 1.5707963267948966 rad + pos: 34.5,0.5 + parent: 4812 + - uid: 8486 + components: + - type: Transform + rot: 3.141592653589793 rad pos: 4.5,-4.5 parent: 4812 - - uid: 3766 + - uid: 8487 components: - type: Transform - pos: -13.5,-50.5 + rot: 1.5707963267948966 rad + pos: 8.5,-6.5 parent: 4812 - - uid: 3767 + - uid: 8488 components: - type: Transform - pos: -8.5,-50.5 + rot: -1.5707963267948966 rad + pos: -14.5,-50.5 parent: 4812 - - uid: 3768 + - uid: 8489 components: - type: Transform - pos: -8.5,-43.5 + rot: 1.5707963267948966 rad + pos: -7.5,-50.5 parent: 4812 - - uid: 3769 + - uid: 8490 components: - type: Transform - pos: -13.5,-43.5 + rot: 1.5707963267948966 rad + pos: -7.5,-43.5 + parent: 4812 + - uid: 8491 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-43.5 + parent: 4812 + - uid: 8494 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,32.5 + parent: 4812 + - uid: 9630 + components: + - type: Transform + pos: -47.5,-26.5 parent: 4812 - proto: AtmosFixBlockerMarker entities: @@ -16869,6 +16908,21 @@ entities: - type: Transform pos: -17.5,28.5 parent: 4812 + - uid: 8458 + components: + - type: Transform + pos: -17.5,31.5 + parent: 4812 + - uid: 8459 + components: + - type: Transform + pos: -17.5,30.5 + parent: 4812 + - uid: 8466 + components: + - type: Transform + pos: -17.5,29.5 + parent: 4812 - uid: 8908 components: - type: Transform @@ -28442,6 +28496,13 @@ entities: - Steel - Glass - Gold +- proto: CleanerDispenser + entities: + - uid: 8493 + components: + - type: Transform + pos: -20.5,-5.5 + parent: 4812 - proto: ClosetBombFilled entities: - uid: 6331 @@ -28633,6 +28694,11 @@ entities: showEnts: False occludes: True ent: null + - uid: 2845 + components: + - type: Transform + pos: -18.5,31.5 + parent: 4812 - uid: 3786 components: - type: Transform @@ -28915,6 +28981,11 @@ entities: showEnts: False occludes: True ent: null + - uid: 9632 + components: + - type: Transform + pos: -48.5,-25.5 + parent: 4812 - uid: 10407 components: - type: Transform @@ -29063,6 +29134,13 @@ entities: showEnts: False occludes: True ent: null +- proto: ClosetEmergencyN2FilledRandom + entities: + - uid: 9631 + components: + - type: Transform + pos: -12.5,-38.5 + parent: 4812 - proto: ClosetFireFilled entities: - uid: 1514 @@ -29236,43 +29314,11 @@ entities: showEnts: False occludes: True ent: null - - uid: 8328 + - uid: 8456 components: - type: Transform - pos: -17.5,29.5 + pos: -16.5,31.5 parent: 4812 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 1.6033952 - - 6.031821 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 9688 components: - type: Transform @@ -30292,16 +30338,16 @@ entities: parent: 4812 - proto: ClothingEyesEyepatch entities: - - uid: 8481 - components: - - type: Transform - pos: -16.839548,32.557995 - parent: 4812 - uid: 9657 components: - type: Transform pos: 25.533524,-9.424093 parent: 4812 + - uid: 12144 + components: + - type: Transform + pos: -14.245123,35.0185 + parent: 473 - proto: ClothingEyesGlasses entities: - uid: 6205 @@ -30522,10 +30568,10 @@ entities: parent: 4812 - proto: ClothingHeadHatPirate entities: - - uid: 11675 + - uid: 11933 components: - type: Transform - pos: -17.677834,32.905758 + pos: -21.445757,35.638134 parent: 4812 - proto: ClothingHeadHatPumpkin entities: @@ -30881,10 +30927,10 @@ entities: parent: 4812 - proto: ClothingOuterCoatPirate entities: - - uid: 8478 + - uid: 11934 components: - type: Transform - pos: -17.511423,32.47987 + pos: -23.764275,32.548626 parent: 4812 - proto: ClothingOuterGhostSheet entities: @@ -32771,6 +32817,23 @@ entities: - type: Transform pos: -31.5,-6.5 parent: 4812 +- proto: DefaultStationBeaconEscapePod + entities: + - uid: 3980 + components: + - type: Transform + pos: -17.5,31.5 + parent: 4812 + - uid: 8475 + components: + - type: Transform + pos: -47.5,-25.5 + parent: 4812 + - uid: 9633 + components: + - type: Transform + pos: -12.5,-39.5 + parent: 4812 - proto: DefaultStationBeaconEvac entities: - uid: 12480 @@ -35718,15 +35781,15 @@ entities: parent: 4812 - proto: DrinkLithiumFlask entities: - - uid: 3611 + - uid: 3423 components: - type: Transform - pos: -18.350801,33.411205 + pos: -21.4602,33.34266 parent: 4812 - - uid: 12466 + - uid: 11675 components: - type: Transform - pos: -18.56759,33.562008 + pos: -21.301329,33.55921 parent: 4812 - proto: DrinkMugBlack entities: @@ -37253,11 +37316,17 @@ entities: - type: Transform pos: -11.5,-36.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - uid: 5072 components: - type: Transform pos: -10.5,-36.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - uid: 5308 components: - type: Transform @@ -51284,6 +51353,9 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-52.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - type: AtmosPipeColor color: '#0335FCFF' - uid: 5225 @@ -51292,6 +51364,9 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,-41.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - type: AtmosPipeColor color: '#0335FCFF' - uid: 5697 @@ -52035,6 +52110,9 @@ entities: rot: 3.141592653589793 rad pos: -11.5,-51.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5224 @@ -52043,6 +52121,9 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,-42.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5699 @@ -53122,11 +53203,28 @@ entities: - type: Transform pos: 22.5,29.5 parent: 4812 + - uid: 3611 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -19.5,38.5 + parent: 4812 - uid: 3701 components: - type: Transform pos: 10.5,54.5 parent: 4812 + - uid: 3767 + components: + - type: Transform + pos: -19.5,37.5 + parent: 4812 + - uid: 3768 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,39.5 + parent: 4812 - uid: 4385 components: - type: Transform @@ -53412,6 +53510,17 @@ entities: - type: Transform pos: 32.5,-12.5 parent: 4812 + - uid: 4693 + components: + - type: Transform + pos: -15.5,35.5 + parent: 4812 + - uid: 4695 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,38.5 + parent: 4812 - uid: 4722 components: - type: Transform @@ -53595,7 +53704,8 @@ entities: - uid: 4768 components: - type: Transform - pos: -12.5,-38.5 + rot: 3.141592653589793 rad + pos: -19.5,39.5 parent: 4812 - uid: 4769 components: @@ -54235,6 +54345,12 @@ entities: - type: Transform pos: -7.5,-27.5 parent: 4812 + - uid: 7635 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,32.5 + parent: 4812 - uid: 7915 components: - type: Transform @@ -54388,6 +54504,30 @@ entities: - type: Transform pos: -23.5,26.5 parent: 4812 + - uid: 8328 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,32.5 + parent: 4812 + - uid: 8467 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -49.5,-29.5 + parent: 4812 + - uid: 8470 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -49.5,-30.5 + parent: 4812 + - uid: 8496 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -48.5,-26.5 + parent: 4812 - uid: 8526 components: - type: Transform @@ -55118,11 +55258,6 @@ entities: - type: Transform pos: -14.5,-59.5 parent: 4812 - - uid: 10609 - components: - - type: Transform - pos: -47.5,-24.5 - parent: 4812 - uid: 10632 components: - type: Transform @@ -55158,6 +55293,11 @@ entities: - type: Transform pos: 11.5,-42.5 parent: 4812 + - uid: 11337 + components: + - type: Transform + pos: -20.5,37.5 + parent: 4812 - uid: 11354 components: - type: Transform @@ -55318,6 +55458,11 @@ entities: - type: Transform pos: 20.5,-39.5 parent: 4812 + - uid: 11935 + components: + - type: Transform + pos: -19.5,33.5 + parent: 4812 - uid: 12108 components: - type: Transform @@ -58288,6 +58433,11 @@ entities: - type: Transform pos: 26.5,-22.5 parent: 4812 + - uid: 8495 + components: + - type: Transform + pos: -46.5,-23.5 + parent: 4812 - uid: 8849 components: - type: Transform @@ -58318,11 +58468,6 @@ entities: - type: Transform pos: -34.5,8.5 parent: 4812 - - uid: 10917 - components: - - type: Transform - pos: -47.5,-23.5 - parent: 4812 - uid: 11787 components: - type: Transform @@ -61322,6 +61467,12 @@ entities: parent: 4812 - type: ApcPowerReceiver powerLoad: 0 + - uid: 3260 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,31.5 + parent: 4812 - uid: 3280 components: - type: Transform @@ -63655,11 +63806,6 @@ entities: - type: Transform pos: -9.5,-54.5 parent: 4812 - - uid: 4695 - components: - - type: Transform - pos: -12.5,-38.5 - parent: 4812 - uid: 4697 components: - type: Transform @@ -64365,6 +64511,12 @@ entities: - type: Transform pos: -21.5,26.5 parent: 4812 + - uid: 8468 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -48.5,-26.5 + parent: 4812 - uid: 8627 components: - type: Transform @@ -64570,11 +64722,6 @@ entities: - type: Transform pos: -43.5,-25.5 parent: 4812 - - uid: 9593 - components: - - type: Transform - pos: -47.5,-24.5 - parent: 4812 - uid: 9599 components: - type: Transform @@ -65636,8 +65783,6 @@ entities: - type: Transform pos: -34.5,0.5 parent: 4812 -- proto: SignAtmosMinsky - entities: - uid: 8721 components: - type: Transform @@ -65690,8 +65835,6 @@ entities: - type: Transform pos: -10.5,-19.5 parent: 4812 -- proto: SignChemistry1 - entities: - uid: 6642 components: - type: Transform @@ -65946,13 +66089,6 @@ entities: - type: Transform pos: -12.5,-41.5 parent: 4812 -- proto: SignDrones - entities: - - uid: 11937 - components: - - type: Transform - pos: -12.5,18.5 - parent: 4812 - proto: SignElectricalMed entities: - uid: 3978 @@ -66043,21 +66179,17 @@ entities: pos: -51.5,-10.5 parent: 4812 - proto: SignHydro1 - entities: - - uid: 1076 - components: - - type: Transform - pos: -7.5,-10.5 - parent: 4812 -- proto: SignHydro2 entities: - uid: 1075 components: - type: Transform pos: -6.5,-4.5 parent: 4812 -- proto: SignHydro3 - entities: + - uid: 1076 + components: + - type: Transform + pos: -7.5,-10.5 + parent: 4812 - uid: 6685 components: - type: Transform @@ -66082,6 +66214,13 @@ entities: - type: Transform pos: -22.5,-13.5 parent: 4812 +- proto: SignMaterials + entities: + - uid: 11937 + components: + - type: Transform + pos: -12.5,18.5 + parent: 4812 - proto: SignMedical entities: - uid: 7299 @@ -66089,13 +66228,6 @@ entities: - type: Transform pos: -7.5,-23.5 parent: 4812 -- proto: SignMinerDock - entities: - - uid: 3344 - components: - - type: Transform - pos: 21.5,16.5 - parent: 4812 - proto: SignMorgue entities: - uid: 5046 @@ -66183,21 +66315,17 @@ entities: pos: 2.5,-24.5 parent: 4812 - proto: SignScience - entities: - - uid: 6176 - components: - - type: Transform - pos: 2.5,-19.5 - parent: 4812 -- proto: SignScience1 entities: - uid: 6175 components: - type: Transform pos: 8.5,-13.5 parent: 4812 -- proto: SignScience2 - entities: + - uid: 6176 + components: + - type: Transform + pos: 2.5,-19.5 + parent: 4812 - uid: 6177 components: - type: Transform @@ -66286,6 +66414,13 @@ entities: - type: Transform pos: -1.5,-30.5 parent: 4812 +- proto: SignShipDock + entities: + - uid: 3344 + components: + - type: Transform + pos: 21.5,16.5 + parent: 4812 - proto: SignSmoking entities: - uid: 8607 @@ -66372,7 +66507,7 @@ entities: - type: Transform pos: -21.5,12.5 parent: 4812 -- proto: SignToxins2 +- proto: SignToxins entities: - uid: 6645 components: @@ -66386,7 +66521,7 @@ entities: - type: Transform pos: -32.5,-32.5 parent: 4812 -- proto: SignXenolab +- proto: SignXenobio entities: - uid: 11143 components: @@ -72263,6 +72398,11 @@ entities: - type: Transform pos: 20.5,9.5 parent: 4812 + - uid: 3263 + components: + - type: Transform + pos: -19.5,31.5 + parent: 4812 - uid: 3288 components: - type: Transform @@ -72293,6 +72433,11 @@ entities: - type: Transform pos: 23.5,6.5 parent: 4812 + - uid: 3424 + components: + - type: Transform + pos: -15.5,31.5 + parent: 4812 - uid: 3428 components: - type: Transform @@ -72328,6 +72473,16 @@ entities: - type: Transform pos: 13.5,31.5 parent: 4812 + - uid: 3455 + components: + - type: Transform + pos: -15.5,32.5 + parent: 4812 + - uid: 3456 + components: + - type: Transform + pos: -19.5,32.5 + parent: 4812 - uid: 3486 components: - type: Transform @@ -72888,6 +73043,11 @@ entities: - type: Transform pos: 22.5,2.5 parent: 4812 + - uid: 3766 + components: + - type: Transform + pos: -13.5,-40.5 + parent: 4812 - uid: 3990 components: - type: Transform @@ -73128,11 +73288,6 @@ entities: - type: Transform pos: -12.5,-53.5 parent: 4812 - - uid: 4693 - components: - - type: Transform - pos: -12.5,-39.5 - parent: 4812 - uid: 4694 components: - type: Transform @@ -74076,11 +74231,6 @@ entities: - type: Transform pos: -23.5,-24.5 parent: 4812 - - uid: 7635 - components: - - type: Transform - pos: -17.5,30.5 - parent: 4812 - uid: 7636 components: - type: Transform @@ -74711,6 +74861,17 @@ entities: - type: Transform pos: -35.5,8.5 parent: 4812 + - uid: 8469 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-26.5 + parent: 4812 + - uid: 8497 + components: + - type: Transform + pos: -13.5,-38.5 + parent: 4812 - uid: 8621 components: - type: Transform @@ -77643,11 +77804,6 @@ entities: - type: Transform pos: 10.5,40.5 parent: 4812 - - uid: 3980 - components: - - type: Transform - pos: -17.5,37.5 - parent: 4812 - uid: 3981 components: - type: Transform @@ -78853,11 +79009,6 @@ entities: - type: Transform pos: -20.5,28.5 parent: 4812 - - uid: 8456 - components: - - type: Transform - pos: -19.5,37.5 - parent: 4812 - uid: 8457 components: - type: Transform @@ -79003,11 +79154,6 @@ entities: - type: Transform pos: -42.5,-22.5 parent: 4812 - - uid: 10404 - components: - - type: Transform - pos: -47.5,-28.5 - parent: 4812 - uid: 10613 components: - type: Transform @@ -80438,6 +80584,18 @@ entities: - type: Transform pos: -28.5,-26.5 parent: 4812 + - uid: 10404 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,32.5 + parent: 4812 + - uid: 10609 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,32.5 + parent: 4812 - proto: WindowDirectional entities: - uid: 890 From 818f43b005de3e42f37beb76f425dad4083cfd66 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 25 Jul 2024 23:58:39 +0200 Subject: [PATCH 19/23] Update Meta (#30348) fans hardsuits --- Resources/Maps/meta.yml | 499 ++++++++++++++++++++++++++++++++++------ 1 file changed, 423 insertions(+), 76 deletions(-) diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index d51ffd3fb1..473cbbb3a8 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -54,6 +54,7 @@ entities: - type: MetaData - type: Transform - type: Map + mapPaused: True - type: PhysicsMap - type: GridTree - type: MovedGrids @@ -358,11 +359,11 @@ entities: version: 6 -3,-5: ind: -3,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 -2,-5: ind: -2,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAABHQAAAAACHQAAAAADHQAAAAADHQAAAAACeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAADHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAABHQAAAAABHQAAAAABeQAAAAAAHQAAAAAAHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACHQAAAAADHQAAAAACHQAAAAADHQAAAAACeQAAAAAAHQAAAAADHQAAAAAAHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAACeQAAAAAAHQAAAAADHQAAAAADeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAABHQAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAABHQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAABHQAAAAACHQAAAAADHQAAAAADHQAAAAACeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAADHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAABHQAAAAABHQAAAAABeQAAAAAAHQAAAAAAHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACHQAAAAADHQAAAAACHQAAAAADHQAAAAACeQAAAAAAHQAAAAADHQAAAAAAHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAACeQAAAAAAHQAAAAADHQAAAAADeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAABHQAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAABHQAAAAAA version: 6 -4,-5: ind: -4,-5 @@ -6442,7 +6443,8 @@ entities: -2,8: 0: 65535 -2,9: - 0: 65535 + 0: 65263 + 2: 272 -2,10: 0: 65535 -2,11: @@ -6875,18 +6877,18 @@ entities: 0: 65535 12,-8: 0: 30591 - 2: 34944 + 3: 34944 13,-8: 0: 17487 - 2: 13104 - 3: 34944 + 3: 13104 + 4: 34944 13,-7: 0: 65535 13,-6: 0: 65535 14,-8: 0: 52431 - 3: 13104 + 4: 13104 14,-7: 0: 65535 14,-6: @@ -6907,44 +6909,44 @@ entities: 0: 65535 16,-4: 0: 32631 - 4: 136 - 5: 32768 + 5: 136 + 6: 32768 16,-3: 0: 32631 - 5: 32904 + 6: 32904 16,-2: 0: 65399 - 5: 136 + 6: 136 16,-1: 0: 13299 17,-4: - 4: 51 + 5: 51 0: 53196 - 5: 12288 + 6: 12288 17,-3: - 5: 12339 + 6: 12339 0: 53196 17,-2: - 5: 51 + 6: 51 0: 65484 16,-7: 0: 65522 16,-6: 0: 32767 - 5: 32768 + 6: 32768 16,-5: 0: 32631 - 5: 136 - 4: 32768 + 6: 136 + 5: 32768 17,-7: 0: 65527 17,-6: 0: 53247 - 5: 12288 + 6: 12288 17,-5: - 5: 51 + 6: 51 0: 53196 - 4: 12288 + 5: 12288 12,-9: 0: 61941 13,-9: @@ -7077,12 +7079,12 @@ entities: 0: 8930 16,-8: 0: 60395 - 5: 4 + 6: 4 17,-8: 0: 65535 18,-8: 0: 12914 - 5: 137 + 6: 137 18,-7: 0: 47858 18,-6: @@ -7107,19 +7109,19 @@ entities: 0: 3983 16,-9: 0: 59951 - 5: 1216 + 6: 1216 17,-9: 0: 65375 - 5: 160 + 6: 160 17,-10: 0: 40960 - 5: 24560 + 6: 24560 18,-10: 0: 4096 - 5: 8976 + 6: 8976 18,-9: 0: 12896 - 5: 35227 + 6: 35227 10,-10: 0: 63249 10,-9: @@ -7588,7 +7590,7 @@ entities: 0: 65535 3,-14: 0: 61713 - 5: 3822 + 6: 3822 3,-13: 0: 65535 -2,-16: @@ -8098,11 +8100,11 @@ entities: 20,7: 0: 4369 19,-8: - 5: 51 + 6: 51 16,-10: - 5: 60608 + 6: 60608 19,-9: - 5: 13107 + 6: 13107 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -8134,6 +8136,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -10278,11 +10295,23 @@ entities: - type: Transform pos: 68.5,8.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12540: + - DoorStatus: DoorBolt - uid: 12560 components: - type: Transform pos: 65.5,8.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12540: + - DoorStatus: DoorBolt - proto: AirlockEngineeringLocked entities: - uid: 1109 @@ -10446,6 +10475,14 @@ entities: - type: Transform pos: 66.5,6.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 12560: + - DoorStatus: DoorBolt + 12559: + - DoorStatus: DoorBolt - uid: 23561 components: - type: Transform @@ -10558,21 +10595,58 @@ entities: - type: Transform pos: -44.5,33.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 3 + - type: DeviceLinkSource + linkedPorts: + 3442: + - DoorStatus: DoorBolt + 3582: + - DoorStatus: DoorBolt - uid: 3442 components: - type: Transform pos: -43.5,29.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 3445: + - DoorStatus: DoorBolt + 3441: + - DoorStatus: DoorBolt - uid: 3445 components: - type: Transform pos: -44.5,32.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 3 + - type: DeviceLinkSource + linkedPorts: + 3442: + - DoorStatus: DoorBolt + 3582: + - DoorStatus: DoorBolt - uid: 3582 components: - type: Transform pos: -42.5,29.5 parent: 5350 + - type: Door + secondsUntilStateChange: -99.68158 + state: Opening + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 3445: + - DoorStatus: DoorBolt + 3441: + - DoorStatus: DoorBolt + lastSignals: + DoorStatus: True - uid: 3884 components: - type: Transform @@ -10590,11 +10664,23 @@ entities: - type: Transform pos: 63.5,38.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 13927: + - DoorStatus: DoorBolt - uid: 13927 components: - type: Transform pos: 63.5,40.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 13926: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassLocked entities: - uid: 5442 @@ -10602,21 +10688,49 @@ entities: - type: Transform pos: -76.5,8.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 5443: + - DoorStatus: Close - uid: 5712 components: - type: Transform pos: -74.5,-17.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 5711: + - DoorStatus: Close - uid: 5713 components: - type: Transform pos: -72.5,-19.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 5716: + - DoorStatus: Close + 5715: + - DoorStatus: Close - uid: 5714 components: - type: Transform pos: -73.5,-19.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 5715: + - DoorStatus: Close + 5716: + - DoorStatus: Close - uid: 5742 components: - type: Transform @@ -10627,21 +10741,45 @@ entities: - type: Transform pos: -41.5,35.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 9492: + - DoorStatus: DoorBolt - uid: 9494 components: - type: Transform pos: -32.5,45.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 9495: + - DoorStatus: DoorBolt - uid: 9495 components: - type: Transform pos: -32.5,47.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 9494: + - DoorStatus: DoorBolt - uid: 13922 components: - type: Transform pos: 48.5,38.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 13921: + - DoorStatus: DoorBolt - uid: 14536 components: - type: Transform @@ -10658,36 +10796,78 @@ entities: - type: Transform pos: -50.5,-40.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 16715: + - DoorStatus: DoorBolt - uid: 17204 components: - type: Transform pos: -42.5,-63.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 17205: + - DoorStatus: DoorBolt - uid: 17205 components: - type: Transform pos: -39.5,-63.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 17204: + - DoorStatus: DoorBolt - uid: 20027 components: - type: Transform pos: 5.5,-65.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 20026: + - DoorStatus: DoorBolt - uid: 20029 components: - type: Transform pos: 38.5,-64.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 20030: + - DoorStatus: DoorBolt - uid: 20030 components: - type: Transform pos: 38.5,-61.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 20029: + - DoorStatus: DoorBolt - uid: 20038 components: - type: Transform pos: 39.5,-54.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 20037: + - DoorStatus: DoorBolt - uid: 25050 components: - type: Transform @@ -10794,22 +10974,50 @@ entities: rot: -1.5707963267948966 rad pos: -78.5,8.5 parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 5442: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 5711 components: - type: Transform rot: -1.5707963267948966 rad pos: -76.5,-17.5 parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 5712: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 5715 components: - type: Transform pos: -73.5,-22.5 parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 5713: + - DoorStatus: Close + 5714: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 2 - uid: 5716 components: - type: Transform pos: -72.5,-22.5 parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 5713: + - DoorStatus: Close + 5714: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 2 - proto: AirlockExternalLocked entities: - uid: 9492 @@ -10817,11 +11025,23 @@ entities: - type: Transform pos: -44.5,35.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 9493: + - DoorStatus: DoorBolt - uid: 13921 components: - type: Transform pos: 49.5,39.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 13922: + - DoorStatus: DoorBolt - uid: 13923 components: - type: Transform @@ -10831,8 +11051,6 @@ entities: linkedPorts: 14536: - DoorStatus: DoorBolt - 13924: - - DoorStatus: DoorBolt - uid: 13924 components: - type: Transform @@ -10842,23 +11060,39 @@ entities: linkedPorts: 14536: - DoorStatus: DoorBolt - 13923: - - DoorStatus: DoorBolt - uid: 16715 components: - type: Transform pos: -52.5,-40.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 16716: + - DoorStatus: DoorBolt - uid: 20026 components: - type: Transform pos: 5.5,-67.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 20027: + - DoorStatus: DoorBolt - uid: 20037 components: - type: Transform pos: 41.5,-54.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 20038: + - DoorStatus: DoorBolt - proto: AirlockFreezerKitchenHydroLocked entities: - uid: 2433 @@ -13597,12 +13831,12 @@ entities: - type: Transform pos: -1.8845375,-5.58767 parent: 5350 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 491 components: - type: Transform - pos: 34.5,-12.5 + pos: 34.5,-17.5 parent: 5350 - uid: 5086 components: @@ -13612,32 +13846,38 @@ entities: - uid: 5326 components: - type: Transform + rot: 1.5707963267948966 rad pos: 41.5,47.5 parent: 5350 - uid: 5330 components: - type: Transform - pos: -63.5,-13.5 + rot: -1.5707963267948966 rad + pos: -64.5,-13.5 parent: 5350 - uid: 6473 components: - type: Transform + rot: -1.5707963267948966 rad pos: -45.5,16.5 parent: 5350 - uid: 6502 components: - type: Transform + rot: -1.5707963267948966 rad pos: -45.5,18.5 parent: 5350 - uid: 8480 components: - type: Transform - pos: -70.5,-5.5 + rot: 3.141592653589793 rad + pos: -63.5,-5.5 parent: 5350 - uid: 8604 components: - type: Transform - pos: -63.5,-5.5 + rot: 3.141592653589793 rad + pos: -70.5,-5.5 parent: 5350 - uid: 9158 components: @@ -13647,12 +13887,14 @@ entities: - uid: 10294 components: - type: Transform - pos: 39.5,-15.5 + rot: 3.141592653589793 rad + pos: 34.5,-12.5 parent: 5350 - uid: 11035 components: - type: Transform - pos: 34.5,-17.5 + rot: 1.5707963267948966 rad + pos: 39.5,-15.5 parent: 5350 - uid: 11212 components: @@ -13662,59 +13904,33 @@ entities: - uid: 14164 components: - type: Transform - pos: -63.5,-7.5 + pos: -11.5,-74.5 parent: 5350 - uid: 14682 components: - type: Transform - pos: -70.5,-7.5 + pos: -9.5,-74.5 parent: 5350 - uid: 14683 components: - type: Transform - pos: -63.5,6.5 + pos: -3.5,-74.5 parent: 5350 - uid: 14684 components: - type: Transform - pos: -70.5,6.5 + pos: -1.5,-74.5 parent: 5350 - uid: 14913 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,32.5 - parent: 5350 - - uid: 20063 - components: - - type: Transform - pos: -11.5,-74.5 - parent: 5350 - - uid: 20064 - components: - - type: Transform - pos: -9.5,-74.5 - parent: 5350 - - uid: 20065 - components: - - type: Transform - pos: -3.5,-74.5 - parent: 5350 - - uid: 20066 - components: - - type: Transform - pos: -1.5,-74.5 - parent: 5350 - - uid: 20167 components: - type: Transform pos: -70.5,4.5 parent: 5350 - - uid: 24782 + - uid: 24792 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,33.5 + rot: 1.5707963267948966 rad + pos: 59.5,4.5 parent: 5350 - proto: AtmosFixBlockerMarker entities: @@ -60950,6 +61166,22 @@ entities: - type: Transform pos: -16.428204,45.62322 parent: 5350 +- proto: ClothingOuterHardsuitSecurity + entities: + - uid: 20063 + components: + - type: Transform + parent: 9140 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 20064 + components: + - type: Transform + parent: 10335 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: ClothingOuterHoodieBlack entities: - uid: 22120 @@ -112764,6 +112996,16 @@ entities: - type: Transform pos: 9.5,-62.5 parent: 5350 + - uid: 20065 + components: + - type: Transform + pos: -34.5,-75.5 + parent: 5350 + - uid: 20066 + components: + - type: Transform + pos: -34.5,-74.5 + parent: 5350 - uid: 20067 components: - type: Transform @@ -112949,6 +113191,11 @@ entities: - type: Transform pos: -0.5,-68.5 parent: 5350 + - uid: 20167 + components: + - type: Transform + pos: -34.5,-77.5 + parent: 5350 - uid: 21454 components: - type: Transform @@ -113209,6 +113456,56 @@ entities: rot: 1.5707963267948966 rad pos: 94.5,19.5 parent: 5350 + - uid: 24782 + components: + - type: Transform + pos: -33.5,-77.5 + parent: 5350 + - uid: 24783 + components: + - type: Transform + pos: -32.5,-77.5 + parent: 5350 + - uid: 24784 + components: + - type: Transform + pos: -31.5,-77.5 + parent: 5350 + - uid: 24785 + components: + - type: Transform + pos: -30.5,-77.5 + parent: 5350 + - uid: 24786 + components: + - type: Transform + pos: -28.5,-77.5 + parent: 5350 + - uid: 24787 + components: + - type: Transform + pos: -27.5,-77.5 + parent: 5350 + - uid: 24788 + components: + - type: Transform + pos: -26.5,-77.5 + parent: 5350 + - uid: 24789 + components: + - type: Transform + pos: -25.5,-77.5 + parent: 5350 + - uid: 24790 + components: + - type: Transform + pos: -36.5,-74.5 + parent: 5350 + - uid: 24791 + components: + - type: Transform + pos: -37.5,-74.5 + parent: 5350 - uid: 24922 components: - type: Transform @@ -137969,11 +138266,61 @@ entities: - type: Transform pos: -7.5,37.5 parent: 5350 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 20063 - uid: 10335 components: - type: Transform pos: -7.5,38.5 parent: 5350 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 20064 - proto: SuitStorageWarden entities: - uid: 10358 From 0a0720312121769a8174f0c1b6fc070fcd644933 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:26:06 -0700 Subject: [PATCH 20/23] Lets atmos build gas pipes in walls (#28707) Co-authored-by: plykiya --- .../Prototypes/Recipes/Construction/utilities.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml index 930768b3ea..d07201bf7b 100644 --- a/Resources/Prototypes/Recipes/Construction/utilities.yml +++ b/Resources/Prototypes/Recipes/Construction/utilities.yml @@ -394,7 +394,7 @@ targetNode: half category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeHalf @@ -408,7 +408,7 @@ targetNode: straight category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeStraight @@ -422,7 +422,7 @@ targetNode: bend category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeBend @@ -436,7 +436,7 @@ targetNode: tjunction category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeTJunction @@ -450,7 +450,7 @@ targetNode: fourway category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeFourway From ff581d4275e9642b7edc0db3450bc7e8768e2329 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 25 Jul 2024 23:27:14 +0000 Subject: [PATCH 21/23] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e49f71b9f0..ccb0287f5b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: osjarw - changes: - - message: Fixed some anomaly behaviours pulsing at wrong rates. - type: Fix - id: 6481 - time: '2024-04-28T09:28:16.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27435 - author: Ubaser changes: - message: Pyrotton can now be mutated from cotton. @@ -3780,3 +3773,10 @@ id: 6980 time: '2024-07-25T10:52:18.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29629 +- author: Plykiya + changes: + - message: You can now build atmos gas pipes through things like walls. + type: Tweak + id: 6981 + time: '2024-07-25T23:26:06.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28707 From d5236d8236d3638a4dcd54a4a219c4b9a44d34c4 Mon Sep 17 00:00:00 2001 From: Ilya246 <57039557+Ilya246@users.noreply.github.com> Date: Fri, 26 Jul 2024 03:37:54 +0400 Subject: [PATCH 22/23] give nukie reinforcements full operative gear (#30173) * rebase master * free fish * introduce recommended changes * fix prototypes * fix protos yet again * fkhsdjbhehbo;ehb * rafle --- .../en-US/ghost/roles/ghost-role-component.ftl | 3 +++ Resources/Locale/en-US/store/uplink-catalog.ftl | 5 +++-- Resources/Prototypes/Catalog/uplink_catalog.yml | 10 +++++----- .../Prototypes/Entities/Mobs/Player/human.yml | 8 ++++++-- .../reinforcement_teleporter.yml | 10 +++++++--- Resources/Prototypes/Roles/Antags/nukeops.yml | 12 +++++++++--- Resources/Prototypes/Roles/Antags/traitor.yml | 8 -------- .../Objects/Devices/communication.rsi/meta.json | 3 +++ .../communication.rsi/old-radio-nukeop.png | Bin 0 -> 1578 bytes 9 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index b2082f7728..6dc214fc10 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -206,6 +206,9 @@ ghost-role-information-syndicate-reinforcement-spy-description = Someone needs r ghost-role-information-syndicate-reinforcement-thief-name = Syndicate Thief ghost-role-information-syndicate-reinforcement-thief-description = Someone needs reinforcements. Your job is to break in and retrieve something valuable for your agent. +ghost-role-information-nukeop-reinforcement-name = Nuclear Operative +ghost-role-information-nukeop-reinforcement-description = The nuclear operatives need reinforcements. You, a reserve agent, will help them. +ghost-role-information-nukeop-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the nuclear operatives who summoned you. ghost-role-information-syndicate-monkey-reinforcement-name = Syndicate Monkey Agent ghost-role-information-syndicate-monkey-reinforcement-description = Someone needs reinforcements. You, a trained monkey, will help them. diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 85a64c71ae..07edd8f007 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -124,10 +124,11 @@ uplink-black-jetpack-desc = A black jetpack. It allows you to fly around in spac uplink-reinforcement-radio-ancestor-name = Genetic Ancestor Reinforcement Teleporter uplink-reinforcement-radio-ancestor-desc = Call in a trained ancestor of your choosing to assist you. Comes with a single syndicate cigarette. - uplink-reinforcement-radio-name = Reinforcement Teleporter uplink-reinforcement-radio-traitor-desc = Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. Call in a medic or spy or thief to help you out. Good luck. -uplink-reinforcement-radio-nukeops-desc = Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. They have a pistol with no reserve ammo, and a knife. That's it. + +uplink-reinforcement-radio-nukeops-name = Nuclear Operative Teleporter +uplink-reinforcement-radio-nukeops-desc = Radio in a nuclear operative of extremely questionable quality. No off button, buy this if you're ready to party. They have basic nuclear operative gear. uplink-reinforcement-radio-cyborg-assault-name = Syndicate Assault Cyborg Teleporter uplink-reinforcement-radio-cyborg-assault-desc = A lean, mean killing machine with access to an Energy Sword, LMG, Cryptographic Sequencer, and a Pinpointer. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index fe8b038dd9..5a92bc77f8 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -122,7 +122,7 @@ name: uplink-sniper-bundle-name description: uplink-sniper-bundle-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } - productEntity: BriefcaseSyndieSniperBundleFilled + productEntity: BriefcaseSyndieSniperBundleFilled cost: Telecrystal: 12 categories: @@ -916,11 +916,11 @@ - NukeOpsUplink - type: listing - id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns an agent with the NukeOperative component. - name: uplink-reinforcement-radio-name + id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns another nuclear operative without the uplink. + name: uplink-reinforcement-radio-nukeops-name description: uplink-reinforcement-radio-nukeops-desc productEntity: ReinforcementRadioSyndicateNukeops - icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-nukeop } cost: Telecrystal: 35 categories: @@ -1004,7 +1004,7 @@ Telecrystal: 6 categories: - UplinkAllies - + - type: listing id: UplinkSyndicatePersonalAI name: uplink-syndicate-pai-name diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index ad72f2e065..e07ce9c5b4 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -62,9 +62,13 @@ id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink suffix: Human, NukeOps components: - - type: Loadout - prototypes: [SyndicateOperativeGearReinforcementNukeOps] - type: NukeOperative + - type: RandomMetadata + nameSegments: + - nukeops-role-operator + - SyndicateNamesNormal + - type: Loadout + prototypes: [SyndicateOperativeGearFullNoUplink] # Nuclear Operative - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index 6aa2686fa6..e4bca77069 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -35,12 +35,16 @@ - type: entity parent: ReinforcementRadio id: ReinforcementRadioSyndicateNukeops # Reinforcement radio exclusive to nukeops uplink + name: nuclear operative radio + description: Call in a nuclear operative of questionable quality, instantly! Basic nukeop equipment provided. suffix: NukeOps components: - type: GhostRole - name: ghost-role-information-syndicate-reinforcement-name - description: ghost-role-information-syndicate-reinforcement-description - rules: ghost-role-information-syndicate-reinforcement-rules + name: ghost-role-information-nukeop-reinforcement-name + description: ghost-role-information-nukeop-reinforcement-description + rules: ghost-role-information-nukeop-reinforcement-rules + raffle: + settings: default - type: GhostRoleMobSpawner prototype: MobHumanSyndicateAgentNukeops diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 7cfed348f1..8dec692ee5 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -38,9 +38,8 @@ # should be changed to nukie playtime when thats tracked (wyci) guides: [ NuclearOperatives ] -#Nuclear Operative Gear - type: startingGear - id: SyndicateOperativeGearFull + id: SyndicateOperativeGearFullNoUplink equipment: jumpsuit: ClothingUniformJumpsuitOperative back: ClothingBackpackDuffelSyndicate @@ -52,7 +51,7 @@ shoes: ClothingShoesBootsCombatFilled id: SyndiPDA pocket1: DoubleEmergencyOxygenTankFilled - pocket2: BaseUplinkRadio40TC + pocket2: PlushieCarp belt: ClothingBeltMilitaryWebbing storage: back: @@ -61,6 +60,13 @@ - PinpointerSyndicateNuclear - DeathAcidifierImplanter +#Nuclear Operative Gear +- type: startingGear + id: SyndicateOperativeGearFull + parent: SyndicateOperativeGearFullNoUplink + equipment: + pocket2: BaseUplinkRadio40TC + #Nuclear Operative Commander Gear - type: startingGear id: SyndicateCommanderGearFull diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index feb8109739..e40466d57f 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -78,14 +78,6 @@ - BoxSurvivalSyndicate - SyndicateJawsOfLife -# Syndicate Reinforcement NukeOps -- type: startingGear - id: SyndicateOperativeGearReinforcementNukeOps - parent: SyndicateOperativeGearExtremelyBasic - equipment: - id: SyndiPDA #Do not give a PDA to the normal Reinforcement - it will spawn with a 20TC uplink - - #Syndicate Operative Outfit - Basic - type: startingGear id: SyndicateOperativeGearBasic diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json index 328747df09..784e509c1d 100644 --- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json @@ -86,6 +86,9 @@ { "name": "old-radio-urist" }, + { + "name": "old-radio-nukeop" + }, { "name": "old-radio-ancestor" }, diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png new file mode 100644 index 0000000000000000000000000000000000000000..b5befcf26db4cfb01b6dec2fc540e0b9e8cf1465 GIT binary patch literal 1578 zcmV+_2G#kAP)c9Ugyg9KZ_#zL?V zZG08}18oIc1wl{*5ld@djfC}%8;FRRW%hoYnRA&r1EIL7TW;MTSUJy0OvR!Li%Ze) z3t`%5WsD|GckPLpnK)I)=N&bw-VUf<)%X27no@?VLrsJ5h;BQc@VIb%&9fD63AgK6 zEhT&?-0#Q%g|C#J4ER}bCg69)&Rk*=LaJvp^NW+eSkF3^aG!9uWft`EdDKmsjokdK z)J~aQxFnb&MwBE4Rx$AykeZXs{`U?3_@>E=N0+}%5l0*uvf}L*wIE#$scF#-`Amu` z_rH0%>EWTEdvgrxpM3wV2f{m0+V=ggBi}C_L+vA6IZ%!|N%uEJE82G%g2OmDf4Bhq-lmqHEaOhhEtqS@{MA!DtN) zJD?H(000SaNLh0L01FZT01FZU(%pXi000DGNkl&3-mnJYWG9o*jPSxk$(P-p*X7djF8-W0R*xHf` z7J+;uIy*aMy^+#SwyB+)$ zqY39OyuB-dIf@TS2=sjgT)6_H zp#;Ti>j+VbPu8TKo%iKFhy*xkA(OxT!W;K|BdOR+t1YOlDC594ZB3~yb=pf{!~DBJqg#>5-^%l zCmU%Rlg$3^N$r4B?U{aEhTQw(1Nd;G1PiPtbS&H?l!{N~AZ{!zU`z!|mB7Y&Qq|k) z`etQb>8JBg)s0p=K8VcmG;A6e39SK_=DffObIu5Ax1aA!$rSdNl}T1u^N&+sL`Pls zd4xX3t`XSn4#*{zTD$y>(S{n+F(fQ&!0-?fXWH;nSt%BRt9-ZM-=<(M zLSUgZ7!_V(y*%&wf)WU+cp1v!c|kr%gq&vKzpF{&>!wq_U?3>+2B=X74JG$8&K1 ci~oE12cs__^f>bMRR91007*qoM6N<$g1>w5zyJUM literal 0 HcmV?d00001 From af47cbd7b0389098d263248ca380b1940e400821 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 25 Jul 2024 23:39:00 +0000 Subject: [PATCH 23/23] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ccb0287f5b..4246977411 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Ubaser - changes: - - message: Pyrotton can now be mutated from cotton. - type: Add - id: 6482 - time: '2024-04-28T11:07:37.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27200 - author: Plykiya changes: - message: You can now pick up Smile and put them in your bag. @@ -3780,3 +3773,13 @@ id: 6981 time: '2024-07-25T23:26:06.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28707 +- author: Ilya246 + changes: + - message: Nuclear operative reinforcements now come with full nuclear operative + gear (and a toy carp) at no additional cost. + type: Tweak + - message: Nuclear operative reinforcements now get nuclear operative names. + type: Tweak + id: 6982 + time: '2024-07-25T23:37:54.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30173