diff --git a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs index 0c38696f628..422938bb4c4 100644 --- a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs +++ b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs @@ -26,7 +26,7 @@ public sealed class GuidebookUIController : UIController, IOnStateEntered UIManager.GetActiveUIWidgetOrNull()?.GuidebookButton; diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index 9ea9fa40f59..7ae906583b4 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -1,5 +1,6 @@ using Content.Server.Administration.Logs; using Content.Server.Administration.Managers; // Frontier +using Content.Server.Cargo.Systems; // Frontier using Content.Server.Chat.Managers; using Content.Server.GameTicking; using Content.Server.Ghost.Components; @@ -93,6 +94,7 @@ public override void Initialize() SubscribeLocalEvent(OnActionPerform); SubscribeLocalEvent(OnGhostHearingAction); SubscribeLocalEvent(OnEntityStorageInsertAttempt); + SubscribeLocalEvent(OnPriceCalculation); // Frontier SubscribeLocalEvent(_ => MakeVisible(true)); SubscribeLocalEvent(OnToggleGhostVisibilityToAll); @@ -592,6 +594,14 @@ public bool OnGhostAttempt(EntityUid mindId, bool canReturnGlobal, bool viaComma return true; } + + // Frontier: worthless ghosts + private void OnPriceCalculation(Entity ent, ref PriceCalculationEvent args) + { + args.Price = 0; + args.Handled = true; + } + // End Frontier } public sealed class GhostAttemptHandleEvent(MindComponent mind, bool canReturnGlobal) : HandledEntityEventArgs diff --git a/Content.Shared/_NF/Clothing/Components/NFMoonBootsComponent.cs b/Content.Shared/_NF/Clothing/Components/NFMoonBootsComponent.cs new file mode 100644 index 00000000000..fe284b696d5 --- /dev/null +++ b/Content.Shared/_NF/Clothing/Components/NFMoonBootsComponent.cs @@ -0,0 +1,23 @@ +using Content.Shared.Alert; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Content.Shared._NF.Clothing.EntitySystems; + +namespace Content.Shared._NF.Clothing.Components; + +/// +/// This is used for clothing that makes an entity weightless when worn. +/// +[RegisterComponent, NetworkedComponent] +[Access(typeof(SharedNFMoonBootsSystem))] +public sealed partial class NFMoonBootsComponent : Component +{ + [DataField] + public ProtoId MoonBootsAlert = "MoonBoots"; + + /// + /// Slot the clothing has to be worn in to work. + /// + [DataField] + public string Slot = "shoes"; +} diff --git a/Content.Shared/_NF/Clothing/Systems/EmitsSoundOnMoveSystem.cs b/Content.Shared/_NF/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs similarity index 98% rename from Content.Shared/_NF/Clothing/Systems/EmitsSoundOnMoveSystem.cs rename to Content.Shared/_NF/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs index 555805c83d2..49935370565 100644 --- a/Content.Shared/_NF/Clothing/Systems/EmitsSoundOnMoveSystem.cs +++ b/Content.Shared/_NF/Clothing/EntitySystems/EmitsSoundOnMoveSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.Physics.Components; using Robust.Shared.Timing; -namespace Content.Shared._NF.Clothing.Systems; +namespace Content.Shared._NF.Clothing.EntitySystems; public sealed class EmitsSoundOnMoveSystem : EntitySystem { diff --git a/Content.Shared/_NF/Clothing/EntitySystems/NFMoonBootsSystem.cs b/Content.Shared/_NF/Clothing/EntitySystems/NFMoonBootsSystem.cs new file mode 100644 index 00000000000..06a89cb77f4 --- /dev/null +++ b/Content.Shared/_NF/Clothing/EntitySystems/NFMoonBootsSystem.cs @@ -0,0 +1,81 @@ +using Content.Shared.Gravity; +using Content.Shared.Inventory; +using Content.Shared.Item.ItemToggle.Components; +using Content.Shared.Alert; +using Content.Shared.Item; +using Content.Shared.Item.ItemToggle; +using Robust.Shared.Containers; +using Content.Shared.Clothing.EntitySystems; +using Content.Shared._NF.Clothing.Components; +using Content.Shared.Clothing; + +namespace Content.Shared._NF.Clothing.EntitySystems; + +public sealed class SharedNFMoonBootsSystem : EntitySystem +{ + [Dependency] private readonly AlertsSystem _alerts = default!; + [Dependency] private readonly ClothingSystem _clothing = default!; + [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private readonly SharedItemSystem _item = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnToggled); + SubscribeLocalEvent(OnGotEquipped); + SubscribeLocalEvent(OnGotUnequipped); + SubscribeLocalEvent(OnIsWeightless); + SubscribeLocalEvent>(OnIsWeightless); + } + + private void OnToggled(Entity ent, ref ItemToggledEvent args) + { + var (uid, comp) = ent; + // only works if being worn in the correct slot + if (_container.TryGetContainingContainer((uid, null, null), out var container) && + _inventory.TryGetSlotEntity(container.Owner, comp.Slot, out var worn) + && uid == worn) + { + UpdateMoonbootEffects(container.Owner, ent, args.Activated); + } + + var prefix = args.Activated ? "on" : null; + _item.SetHeldPrefix(ent, prefix); + _clothing.SetEquippedPrefix(ent, prefix); + } + + private void OnGotUnequipped(Entity ent, ref ClothingGotUnequippedEvent args) + { + UpdateMoonbootEffects(args.Wearer, ent, false); + } + + private void OnGotEquipped(Entity ent, ref ClothingGotEquippedEvent args) + { + UpdateMoonbootEffects(args.Wearer, ent, _toggle.IsActivated(ent.Owner)); + } + + public void UpdateMoonbootEffects(EntityUid user, Entity ent, bool state) + { + if (state) + _alerts.ShowAlert(user, ent.Comp.MoonBootsAlert); + else + _alerts.ClearAlert(user, ent.Comp.MoonBootsAlert); + } + + private void OnIsWeightless(Entity ent, ref IsWeightlessEvent args) + { + if (args.Handled || !_toggle.IsActivated(ent.Owner)) + return; + + args.Handled = true; + args.IsWeightless = true; + } + + private void OnIsWeightless(Entity ent, ref InventoryRelayedEvent args) + { + OnIsWeightless(ent, ref args.Args); + } +} diff --git a/Content.Shared/_NF/Containers/CondimentCupComponent.cs b/Content.Shared/_NF/Containers/CondimentCupComponent.cs new file mode 100644 index 00000000000..01ef61f9ed0 --- /dev/null +++ b/Content.Shared/_NF/Containers/CondimentCupComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Containers.Components; +/// +/// CondimentCup empty component +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CondimentCupComponent : Component +{ + +} diff --git a/Content.Shared/_NF/Containers/CondimentKetchupComponent.cs b/Content.Shared/_NF/Containers/CondimentKetchupComponent.cs new file mode 100644 index 00000000000..27571ed0c65 --- /dev/null +++ b/Content.Shared/_NF/Containers/CondimentKetchupComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Containers.Components; +/// +/// CondimentKetchup empty component +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CondimentKetchupComponent : Component +{ + +} diff --git a/Content.Shared/_NF/Containers/CondimentMustardComponent.cs b/Content.Shared/_NF/Containers/CondimentMustardComponent.cs new file mode 100644 index 00000000000..8d242809760 --- /dev/null +++ b/Content.Shared/_NF/Containers/CondimentMustardComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Containers.Components; +/// +/// CondimentMustard empty component +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CondimentMustardComponent : Component +{ + +} diff --git a/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs b/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs new file mode 100644 index 00000000000..7d7711f1a3b --- /dev/null +++ b/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Containers.Components; +/// +/// CondimentSqueezeBottle empty component +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CondimentSqueezeBottleComponent : Component +{ + +} diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 89664e6d8d6..3f2423429e8 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6194,3 +6194,51 @@ Entries: unable to fit inside a donut box. id: 5624 time: '2025-01-03T01:21:06.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: ATM flatpack to flatpack vend. + id: 5625 + time: '2025-01-03T12:49:10.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Add toggle feature to moon boots. + id: 5626 + time: '2025-01-03T13:22:59.0000000+00:00' +- author: PeccNeck + changes: + - type: Tweak + message: Bocakillo now uses directional fans + - type: Tweak + message: Moved Bocakillo plasma into wall locker + - type: Fix + message: Fixed loose piping on Bocakillo + id: 5627 + time: '2025-01-03T16:44:50.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Add + message: Charon gets shutters and some cameras. + - type: Tweak + message: Charon had a bunch of small fixes and additions made. + id: 5628 + time: '2025-01-03T17:32:24.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Adds clear condiment bottle and lathe recipe. + id: 5629 + time: '2025-01-04T16:53:52.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Condiment dispenser. + id: 5630 + time: '2025-01-04T20:32:57.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Colored craftable lightbulbs and prefilled light strobes.! + id: 5631 + time: '2025-01-04T23:23:37.0000000+00:00' diff --git a/Resources/Locale/en-US/_NF/alerts/alerts.ftl b/Resources/Locale/en-US/_NF/alerts/alerts.ftl index 61fa886596b..cfda909a7d0 100644 --- a/Resources/Locale/en-US/_NF/alerts/alerts.ftl +++ b/Resources/Locale/en-US/_NF/alerts/alerts.ftl @@ -1,2 +1,5 @@ alerts-pacified-zone-name = [color=royalblue]Pacified Zone[/color] alerts-pacified-zone-desc = You're in a pacified zone, you need to leave before harming living things. + +alerts-moon-boots-name = Moon Boots +alerts-moon-boots-desc = Gravity? What's that? \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/clothing/components/moonboots-component.ftl b/Resources/Locale/en-US/_NF/clothing/components/moonboots-component.ftl new file mode 100644 index 00000000000..51fd3327f2a --- /dev/null +++ b/Resources/Locale/en-US/_NF/clothing/components/moonboots-component.ftl @@ -0,0 +1,2 @@ +# Toggle Moon Boots Verb +toggle-moon-boots-verb-get-data-text = Toggle Moon Boots diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index 5a008481981..4bb723f2702 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -2,6 +2,7 @@ guide-entry-nf14 = Frontier Guide guide-entry-bank = NT Galactic Bank guide-entry-piloting = Piloting +guide-entry-startinggear = Starting Equipment guide-entry-hiring = Hiring Crew guide-entry-expeditions = Expeditions guide-entry-shipyard = Shipyard @@ -72,6 +73,7 @@ guide-entry-shipyard-sparrow = Sparrow guide-entry-shipyard-skipper = Skipper guide-entry-shipyard-spirit = Spirit guide-entry-shipyard-stasis = Stasis +guide-entry-shipyard-tide = Tide guide-entry-shipyard-vagabond = Vagabond # Rules entries diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl new file mode 100644 index 00000000000..f89397fcb53 --- /dev/null +++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl @@ -0,0 +1,2 @@ +reagent-name-coldsauce = coldsauce +reagent-desc-coldsauce = Coldsauce. Leaves the tongue numb in its passage. diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml index fd01f53615d..f92644803d4 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml @@ -19,11 +19,11 @@ entities: components: - type: MetaData name: Bocakillo - - type: BecomesStation - id: Bocakillo - type: Transform pos: -0.4375,-1.703125 parent: invalid + - type: BecomesStation + id: Bocakillo - type: MapGrid chunks: 0,0: @@ -231,11 +231,11 @@ entities: - type: RadiationGridResistance - proto: AirCanister entities: - - uid: 126 + - uid: 24 components: - type: Transform anchored: True - pos: -0.5,0.5 + pos: 0.5,0.5 parent: 2 - type: Physics bodyType: Static @@ -251,12 +251,6 @@ entities: - type: Transform pos: 1.5,-0.5 parent: 2 - - type: Door - secondsUntilStateChange: -239.95091 - state: Opening - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - uid: 59 components: - type: Transform @@ -299,30 +293,27 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,9.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 162 components: - type: Transform - rot: -1.5707963267948966 rad pos: 0.5,-3.5 parent: 2 - - uid: 218 + - uid: 164 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-3.5 + pos: 1.5,-3.5 parent: 2 - - uid: 247 + - uid: 197 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-3.5 + pos: -0.5,-3.5 parent: 2 - - uid: 248 + - uid: 198 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 3.141592653589793 rad pos: 2.5,4.5 parent: 2 - proto: AtmosFixBlockerMarker @@ -434,58 +425,31 @@ entities: - type: Transform pos: -0.5,12.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 171 components: - type: Transform pos: 1.5,6.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 184 components: - type: Transform pos: 1.5,12.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 212 components: - type: Transform pos: -0.5,8.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 219 components: - type: Transform pos: 0.5,12.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 - uid: 220 components: - type: Transform pos: -2.5,0.5 parent: 2 - - type: DeviceLinkSink - links: - - 186 -- proto: BoxBodyBag - entities: - - uid: 192 - components: - - type: Transform - parent: 191 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ButtonFrameCaution entities: - uid: 213 @@ -837,39 +801,6 @@ entities: - type: Transform pos: -0.5,12.5 parent: 2 -- proto: ClosetWall - entities: - - uid: 191 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,1.5 - parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - 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: - - 192 - proto: ComputerIFF entities: - uid: 195 @@ -993,7 +924,7 @@ entities: pos: -0.5,10.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 111 components: - type: Transform @@ -1019,14 +950,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1111FF' - - uid: 26 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,0.5 - parent: 2 - - type: AtmosPipeColor - color: '#0088FFFF' - uid: 28 components: - type: Transform @@ -1034,7 +957,7 @@ entities: pos: -0.5,8.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 36 components: - type: Transform @@ -1072,7 +995,7 @@ entities: pos: -0.5,3.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 91 components: - type: Transform @@ -1088,7 +1011,7 @@ entities: pos: -0.5,9.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 108 components: - type: Transform @@ -1104,7 +1027,7 @@ entities: pos: -0.5,4.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 113 components: - type: Transform @@ -1112,7 +1035,7 @@ entities: pos: -0.5,5.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 114 components: - type: Transform @@ -1120,7 +1043,7 @@ entities: pos: -0.5,7.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 117 components: - type: Transform @@ -1144,7 +1067,7 @@ entities: pos: -0.5,1.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 130 components: - type: Transform @@ -1152,9 +1075,17 @@ entities: pos: -0.5,-0.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - proto: GasPipeTJunction entities: + - uid: 26 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 34 components: - type: Transform @@ -1162,7 +1093,7 @@ entities: pos: -0.5,6.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 41 components: - type: Transform @@ -1178,7 +1109,7 @@ entities: pos: -0.5,2.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 49 components: - type: Transform @@ -1197,14 +1128,14 @@ entities: color: '#FF1111FF' - proto: GasPort entities: - - uid: 131 + - uid: 126 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,0.5 + rot: -1.5707963267948966 rad + pos: 0.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - proto: GasVentPump entities: - uid: 23 @@ -1214,7 +1145,7 @@ entities: pos: -0.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 132 components: - type: Transform @@ -1222,7 +1153,7 @@ entities: pos: 0.5,10.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 141 components: - type: Transform @@ -1230,7 +1161,7 @@ entities: pos: 0.5,2.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - uid: 142 components: - type: Transform @@ -1238,7 +1169,7 @@ entities: pos: 0.5,6.5 parent: 2 - type: AtmosPipeColor - color: '#0088FFFF' + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 33 @@ -1286,34 +1217,22 @@ entities: - type: Transform pos: -0.5,5.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 -- proto: LockerWallMedicalFilled +- proto: LockerWallMaterialsFuelPlasmaFilled entities: - - uid: 216 + - uid: 191 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,5.5 parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 +- proto: LockerWallMedicalFilled + entities: + - uid: 188 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,1.5 + parent: 2 - proto: PirateFlag entities: - uid: 79 @@ -1383,15 +1302,11 @@ entities: parent: 2 - proto: PortableGeneratorPacmanShuttle entities: - - uid: 24 + - uid: 131 components: - type: Transform pos: -0.5,6.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 157 @@ -1470,13 +1385,6 @@ entities: - type: Transform pos: 3.5,-2.5 parent: 2 -- proto: SheetPlasma - entities: - - uid: 188 - components: - - type: Transform - pos: -0.5,6.5 - parent: 2 - proto: ShuttleGunPirateCannon entities: - uid: 75 @@ -1485,18 +1393,12 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,5.5 parent: 2 - - type: DeviceLinkSink - links: - - 226 - uid: 86 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,7.5 parent: 2 - - type: DeviceLinkSink - links: - - 226 - proto: SignalButtonDirectional entities: - uid: 186 @@ -1594,54 +1496,40 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-0.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 13 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-1.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 15 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-0.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 182 components: - type: Transform pos: -2.5,4.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 187 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-0.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 225 components: - type: Transform pos: -3.5,4.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 236 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,3.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - proto: WallPlastitanium entities: - uid: 18 @@ -1888,7 +1776,7 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,7.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 93 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/charon.yml b/Resources/Maps/_NF/Shuttles/Expedition/charon.yml index 10dd44ef769..a99fbffc6dc 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/charon.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/charon.yml @@ -27,19 +27,19 @@ entities: chunks: 0,0: ind: 0,0 - tiles: gwAAAAAAIQAAAAADcQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAACIQAAAAADgwAAAAAAIQAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAABIQAAAAACgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAACgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAACIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAACcQAAAAAAgwAAAAAAcQAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: gwAAAAAAgwAAAAAAcQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAACIQAAAAADgwAAAAAAIQAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAABIQAAAAACgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAACgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAACIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAACcQAAAAAAgwAAAAAAcQAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 - tiles: BAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAIQAAAAACIQAAAAABgwAAAAAAIQAAAAACIQAAAAABIQAAAAAAIQAAAAABIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAABgwAAAAAAIQAAAAACIQAAAAACIQAAAAAAIQAAAAACgwAAAAAAIQAAAAACIQAAAAACIQAAAAABIQAAAAACIQAAAAADcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAACAgAAAAABAgAAAAACIQAAAAACAgAAAAADIQAAAAACAgAAAAADIQAAAAABAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAAgAAAAABAgAAAAABIQAAAAABAgAAAAAAIQAAAAADAgAAAAADIQAAAAACAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAABIQAAAAAAcQAAAAAAIQAAAAABIQAAAAADcQAAAAAAIQAAAAADcQAAAAAAIQAAAAADAQAAAAAAAQAAAAAAAAAAAAAABAAAAAABgwAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAABIQAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACAAAAAAAAgwAAAAAAIQAAAAADIQAAAAAAIQAAAAABIQAAAAABIQAAAAABIQAAAAAAIQAAAAACIQAAAAACcQAAAAAAIQAAAAADAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAADAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADIQAAAAACIQAAAAABIQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAIQAAAAAAAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAABAAAAAAAAgwAAAAAAIQAAAAACIQAAAAABIQAAAAACIQAAAAACIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAAwAAAAAAIQAAAAACAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAABIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: BAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAIQAAAAACIQAAAAABgwAAAAAAIQAAAAACIQAAAAABgwAAAAAAIQAAAAABIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAABgwAAAAAAIQAAAAACIQAAAAACIQAAAAAAIQAAAAACgwAAAAAAIQAAAAACIQAAAAACIQAAAAABIQAAAAACIQAAAAADcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABIQAAAAADgwAAAAAAAgAAAAABAgAAAAACgwAAAAAAAgAAAAADgwAAAAAAAgAAAAADgwAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAgwAAAAAAAgAAAAABAgAAAAABgwAAAAAAAgAAAAAAgwAAAAAAAgAAAAADgwAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAABgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAAAAAAAAABAAAAAABgwAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAABIQAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACAAAAAAAAgwAAAAAAIQAAAAADIQAAAAAAIQAAAAABIQAAAAABIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAADAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADIQAAAAACIQAAAAABgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAABAAAAAAAAgwAAAAAAIQAAAAACIQAAAAABIQAAAAACIQAAAAACIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAAwAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAABIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIQAAAAACgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIQAAAAABIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABIQAAAAAAIQAAAAABgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAADIQAAAAADIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAADIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAIQAAAAADIQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAADIQAAAAABIQAAAAACIQAAAAACIQAAAAAAIQAAAAABIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADIQAAAAACIQAAAAABIQAAAAACIQAAAAABIQAAAAAAIQAAAAABIQAAAAACIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAACIQAAAAACIQAAAAACIQAAAAABIQAAAAACIQAAAAACAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAADIQAAAAABIQAAAAADIQAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAggAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAIQAAAAABgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAADIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABgwAAAAAAIQAAAAADIQAAAAABIQAAAAACIQAAAAACIQAAAAAAgwAAAAAAIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADgwAAAAAAIQAAAAABIQAAAAACIQAAAAABIQAAAAAAIQAAAAABgwAAAAAAIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAACIQAAAAACIQAAAAACgwAAAAAAIQAAAAACIQAAAAACAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAADgwAAAAAAIQAAAAADIQAAAAAC version: 6 0,-1: ind: 0,-1 - tiles: cQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAACIQAAAAADIQAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAgwAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAADIQAAAAABgwAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAABIQAAAAAAgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: cQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADgwAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAgwAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAADIQAAAAABgwAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-2: ind: 0,-2 @@ -548,40 +548,41 @@ entities: 0,1: 0: 60894 -1,1: - 0: 56784 + 0: 56528 + 1: 256 0,2: 0: 44798 -1,2: 0: 16383 0,3: 0: 2798 - 1: 256 + 2: 256 0,-1: 0: 61166 1,0: 0: 65376 - 1: 8 + 2: 8 1,3: - 1: 256 + 2: 256 1,1: - 2: 544 - 1: 8 + 3: 544 + 2: 8 1,-1: - 2: 8192 + 3: 8192 -4,0: - 1: 1 + 2: 1 0: 65376 -4,1: - 1: 1 - 2: 1088 + 2: 1 + 3: 1088 -4,2: - 1: 2 + 2: 2 0: 52424 -4,3: - 1: 32 + 2: 32 0: 12 -4,-1: - 2: 16384 + 3: 16384 -3,0: 0: 65522 -3,1: @@ -590,7 +591,7 @@ entities: 0: 30591 -3,3: 0: 3 - 1: 64 + 2: 64 -3,-1: 0: 30583 -2,0: @@ -602,30 +603,30 @@ entities: -2,-1: 0: 65535 -2,3: - 1: 2 - 2: 192 + 2: 2 + 3: 192 -1,3: - 2: 48 - 1: 4 + 3: 48 + 2: 4 -1,-1: 0: 56797 -4,-3: - 2: 2 + 3: 2 0: 19520 -4,-2: 0: 2 - 2: 1088 + 3: 1088 -4,-4: - 2: 18432 + 3: 18432 -3,-4: 0: 65228 - 2: 16 + 3: 16 -3,-3: 0: 65535 -3,-2: 0: 65535 -3,-5: - 1: 11264 + 2: 11264 -2,-4: 0: 65535 -2,-3: @@ -640,25 +641,25 @@ entities: 0: 4095 0,-4: 0: 63283 - 2: 128 + 3: 128 0,-3: 0: 65535 0,-2: 0: 65535 0,-5: - 1: 17152 + 2: 17152 1,-4: - 2: 8448 + 3: 8448 1,-3: 0: 8992 - 2: 4 + 3: 4 1,-2: - 2: 544 + 3: 544 0: 4 -1,-5: - 1: 3840 + 2: 3840 -2,-5: - 1: 3840 + 2: 3840 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -675,6 +676,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14996 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -1508,6 +1524,51 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-3.5 parent: 1 +- proto: ButtonFrameCautionSecurity + entities: + - uid: 1145 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,4.5 + parent: 1 + - uid: 1152 + components: + - type: Transform + pos: -11.5,4.5 + parent: 1 + - uid: 1153 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,10.5 + parent: 1 +- proto: ButtonFrameGrey + entities: + - uid: 1131 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-1.5 + parent: 1 + - uid: 1132 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,7.5 + parent: 1 + - uid: 1133 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + - uid: 1151 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,7.5 + parent: 1 - proto: CableApcExtension entities: - uid: 327 @@ -3550,13 +3611,6 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,5.5 parent: 1 -- proto: ClosetWallMaintenanceFilledRandom - entities: - - uid: 497 - components: - - type: Transform - pos: -6.5,11.5 - parent: 1 - proto: ClosetWallO2N2FilledRandom entities: - uid: 135 @@ -3565,12 +3619,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,10.5 parent: 1 - - uid: 136 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-7.5 - parent: 1 - uid: 140 components: - type: Transform @@ -3582,6 +3630,12 @@ entities: - type: Transform pos: -7.5,4.5 parent: 1 + - uid: 1134 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-8.5 + parent: 1 - proto: ComputerPowerMonitoring entities: - uid: 470 @@ -3600,11 +3654,11 @@ entities: parent: 1 - proto: ComputerTabletopRadar entities: - - uid: 679 + - uid: 945 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,9.5 + rot: -1.5707963267948966 rad + pos: -9.5,-2.5 parent: 1 - proto: ComputerTabletopSalvageExpedition entities: @@ -3622,14 +3676,36 @@ entities: parent: 1 - proto: ComputerTabletopStationRecords entities: - - uid: 418 + - uid: 981 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,9.5 + parent: 1 +- proto: ComputerTabletopSurveillanceCameraMonitor + entities: + - uid: 263 components: - type: Transform rot: 1.5707963267948966 rad pos: -13.5,10.5 parent: 1 +- proto: ComputerTelevision + entities: + - uid: 691 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,10.5 + parent: 1 - proto: ComputerWallmountWithdrawBankATM entities: + - uid: 876 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-14.5 + parent: 1 - uid: 1023 components: - type: Transform @@ -3784,9 +3860,9 @@ entities: - type: Transform pos: 3.5,-6.5 parent: 1 -- proto: CrateMaterials +- proto: CrateEmptySpawner entities: - - uid: 816 + - uid: 497 components: - type: Transform pos: 3.5,-2.5 @@ -3843,11 +3919,22 @@ entities: parent: 1 - proto: DefibrillatorCabinetFilled entities: - - uid: 142 + - uid: 894 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,7.5 + pos: -6.5,4.5 + parent: 1 +- proto: DrinkMugMetal + entities: + - uid: 968 + components: + - type: Transform + pos: 0.514734,5.5936146 + parent: 1 + - uid: 989 + components: + - type: Transform + pos: -13.586125,12.227859 parent: 1 - proto: EmergencyLight entities: @@ -3900,10 +3987,11 @@ entities: - type: Transform pos: -12.5,-8.5 parent: 1 - - uid: 452 + - uid: 458 components: - type: Transform - pos: 4.5,-8.5 + rot: -1.5707963267948966 rad + pos: 4.5,-7.5 parent: 1 - proto: FaxMachineShip entities: @@ -3966,10 +4054,10 @@ entities: - 1002 - proto: FlashlightLantern entities: - - uid: 1035 + - uid: 979 components: - type: Transform - pos: -9.327917,-2.2779932 + pos: 1.620919,-2.118234 parent: 1 - proto: FloorDrain entities: @@ -3981,19 +4069,26 @@ entities: parent: 1 - type: Fixtures fixtures: {} +- proto: FoodPlateSmall + entities: + - uid: 816 + components: + - type: Transform + pos: -0.48450565,5.718701 + parent: 1 - proto: FoodShakerPepper entities: - uid: 793 components: - type: Transform - pos: 0.031318903,5.7154756 + pos: 0.11334777,5.708277 parent: 1 - proto: FoodShakerSalt entities: - uid: 792 components: - type: Transform - pos: -0.1718061,5.5434813 + pos: -0.0012357235,5.520647 parent: 1 - proto: GasFilterOxygenOnFlipped entities: @@ -5718,14 +5813,21 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,6.5 parent: 1 -- proto: LockerWallEVAColorSalvageFilled +- proto: LockerWallColorGenericBlack entities: - - uid: 263 + - uid: 452 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-14.5 parent: 1 +- proto: LockerWallColorGenericBlue + entities: + - uid: 136 + components: + - type: Transform + pos: -6.5,11.5 + parent: 1 - proto: LockerWallMaterialsFuelAmeJarFilled entities: - uid: 1019 @@ -5736,10 +5838,10 @@ entities: parent: 1 - proto: MicroManipulatorStockPart entities: - - uid: 945 + - uid: 988 components: - type: Transform - pos: 1.5528102,-2.126207 + pos: 1.662586,-1.492799 parent: 1 - proto: MopItem entities: @@ -5816,11 +5918,11 @@ entities: rot: -1.5707963267948966 rad pos: -11.5,5.5 parent: 1 - - uid: 1036 + - uid: 1179 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-2.5 + rot: 3.141592653589793 rad + pos: 1.5,-2.5 parent: 1 - proto: PoweredLEDLightPostSmall entities: @@ -6134,13 +6236,6 @@ entities: - type: Transform pos: 1.5,-17.5 parent: 1 -- proto: RandomArcade - entities: - - uid: 894 - components: - - type: Transform - pos: -1.5,10.5 - parent: 1 - proto: RandomBook entities: - uid: 101 @@ -6169,10 +6264,11 @@ entities: - type: Transform pos: -7.5,9.5 parent: 1 - - uid: 876 + - uid: 985 components: - type: Transform - pos: 2.5,-14.5 + rot: 3.141592653589793 rad + pos: 4.5,-11.5 parent: 1 - uid: 1007 components: @@ -6356,20 +6452,160 @@ entities: parent: 1 - proto: Screwdriver entities: - - uid: 979 + - uid: 1035 components: - type: Transform - pos: 1.4590602,-2.470196 + pos: 1.527169,-1.8055165 parent: 1 - proto: ShipyardCharonInfo entities: - - uid: 1133 + - uid: 1074 + components: + - type: Transform + pos: -13.304875,12.49888 + parent: 1 +- proto: ShuttersNormalOpen + entities: + - uid: 986 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,12.5 + parent: 1 + - uid: 987 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,13.5 + parent: 1 + - uid: 994 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,13.5 + parent: 1 + - uid: 998 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,13.5 + parent: 1 + - uid: 999 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,13.5 + parent: 1 + - uid: 1022 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,12.5 + parent: 1 + - uid: 1026 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,11.5 + parent: 1 + - uid: 1027 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,10.5 + parent: 1 + - uid: 1030 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,9.5 + parent: 1 + - uid: 1031 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 1 + - uid: 1040 components: - type: Transform - pos: -13.227627,12.695766 + rot: -1.5707963267948966 rad + pos: -12.5,-3.5 + parent: 1 + - uid: 1041 + components: + - type: Transform + pos: -13.5,8.5 + parent: 1 + - uid: 1042 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-2.5 + parent: 1 + - uid: 1122 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-3.5 + parent: 1 + - uid: 1123 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,9.5 + parent: 1 + - uid: 1130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,8.5 parent: 1 - proto: SignalButton entities: + - uid: 418 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,7.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 1041: + - Pressed: Toggle + 1030: + - Pressed: Toggle + 1027: + - Pressed: Toggle + 1026: + - Pressed: Toggle + 1022: + - Pressed: Toggle + 999: + - Pressed: Toggle + 998: + - Pressed: Toggle + 994: + - Pressed: Toggle + 987: + - Pressed: Toggle + 986: + - Pressed: Toggle + - uid: 962 + components: + - type: Transform + pos: -11.5,4.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 44: + - Pressed: DoorBolt + 35: + - Pressed: DoorBolt + 487: + - Pressed: DoorBolt + 41: + - Pressed: DoorBolt - uid: 996 components: - type: Transform @@ -6434,6 +6670,76 @@ entities: - Pressed: Toggle 276: - Pressed: Toggle + - uid: 1075 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-1.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 1031: + - Pressed: Toggle + 1122: + - Pressed: Toggle + - uid: 1076 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,4.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 731: + - Pressed: DoorBolt + 486: + - Pressed: DoorBolt + 38: + - Pressed: DoorBolt + 489: + - Pressed: DoorBolt + - uid: 1077 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-1.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 1042: + - Pressed: Toggle + 1040: + - Pressed: Toggle + - uid: 1078 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,7.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 1123: + - Pressed: Toggle + 1130: + - Pressed: Toggle + - uid: 1090 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,10.5 + parent: 1 + - type: SignalSwitch + state: True + - type: DeviceLinkSource + linkedPorts: + 42: + - Pressed: DoorBolt + 40: + - Pressed: DoorBolt + 73: + - Pressed: DoorBolt + 46: + - Pressed: DoorBolt - uid: 1118 components: - type: Transform @@ -6471,11 +6777,11 @@ entities: parent: 1 - proto: SignDirectionalBridge entities: - - uid: 962 + - uid: 1079 components: - type: Transform rot: 3.141592653589793 rad - pos: -11.5,4.5 + pos: -9.5,4.5 parent: 1 - proto: SignDirectionalCB1 entities: @@ -6552,42 +6858,6 @@ entities: - type: Transform pos: -3.5,-1.5 parent: 1 -- proto: SpawnDungeonLootCutlery - entities: - - uid: 989 - components: - - type: Transform - pos: -3.456415,11.434776 - parent: 1 - - uid: 1014 - components: - - type: Transform - pos: -0.5656798,5.6530457 - parent: 1 - - uid: 1135 - components: - - type: Transform - pos: -3.456415,11.163755 - parent: 1 -- proto: SpawnDungeonLootMugs - entities: - - uid: 968 - components: - - type: Transform - pos: 0.52348495,5.589697 - parent: 1 - - uid: 1134 - components: - - type: Transform - pos: -13.602627,12.195419 - parent: 1 -- proto: SpawnDungeonVendomatsClothes - entities: - - uid: 458 - components: - - type: Transform - pos: 1.5,8.5 - parent: 1 - proto: SpawnerHoloGraffitiRandom entities: - uid: 165 @@ -6644,6 +6914,53 @@ entities: - type: Transform pos: -9.5,-0.5 parent: 1 +- proto: SurveillanceCameraAssembly + entities: + - uid: 1173 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-0.5 + parent: 1 + - uid: 1175 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-0.5 + parent: 1 +- proto: SurveillanceCameraGeneral + entities: + - uid: 1036 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,3.5 + parent: 1 + - uid: 1176 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-17.5 + parent: 1 + - uid: 1181 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,3.5 + parent: 1 + - uid: 1182 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,12.5 + parent: 1 +- proto: SurveillanceCameraRouterGeneral + entities: + - uid: 983 + components: + - type: Transform + pos: -4.5,-3.5 + parent: 1 - proto: Table entities: - uid: 258 @@ -6662,18 +6979,20 @@ entities: - type: Transform pos: 1.5,-1.5 parent: 1 - - uid: 988 + - uid: 1178 components: - type: Transform - pos: -9.5,-2.5 + rot: 3.141592653589793 rad + pos: -5.5,-0.5 parent: 1 - - uid: 1130 +- proto: TableCounterMetal + entities: + - uid: 142 components: - type: Transform - pos: -4.5,-3.5 + rot: 1.5707963267948966 rad + pos: -13.5,9.5 parent: 1 -- proto: TableCounterMetal - entities: - uid: 631 components: - type: Transform @@ -6692,11 +7011,11 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,11.5 parent: 1 - - uid: 691 + - uid: 679 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,9.5 + rot: -1.5707963267948966 rad + pos: -9.5,-2.5 parent: 1 - uid: 693 components: @@ -6746,9 +7065,9 @@ entities: - type: Transform pos: -7.5,5.5 parent: 1 -- proto: TelecomServerFilledCommon +- proto: TelecomServerFilledShuttle entities: - - uid: 1030 + - uid: 982 components: - type: Transform pos: -3.5,-3.5 @@ -6893,10 +7212,10 @@ entities: parent: 1 - proto: ToolboxElectricalFilled entities: - - uid: 1027 + - uid: 980 components: - type: Transform - pos: -4.56157,-3.2981017 + pos: -5.4728174,-0.3558907 parent: 1 - proto: TrashBag entities: @@ -7025,6 +7344,13 @@ entities: - Left: Reverse - Right: Forward - Middle: Off +- proto: VendingMachineCargoDrobe + entities: + - uid: 1014 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 - proto: VendingMachineEngiDrobe entities: - uid: 993 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml index 08262021883..9f46292a949 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml @@ -13,17 +13,18 @@ tilemap: entities: - proto: "" entities: - - uid: 1 + - uid: 2 components: - type: MetaData name: Tide - - pos: -2.3024244,-6.0853996 + - type: Transform + pos: -2.3024244,-6.0853996 parent: invalid - type: Transform - - chunks: + - type: MapGrid + chunks: 0,0: ind: 0,0 - tiles: cAAAAAAASwAAAAAASwAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAASwAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAGAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: cAAAAAAASwAAAAAASwAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAGAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 @@ -37,524 +38,199 @@ entities: ind: 0,-1 tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAbwAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: MapGrid - type: Broadphase - - bodyStatus: InAir + - type: Physics + bodyStatus: InAir angularDamping: 0.05 linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Physics - - fixtures: {} - type: Fixtures + - type: Fixtures + fixtures: {} - type: OccluderTree - type: SpreaderGrid - type: Shuttle - type: GridPathfinding - - gravityShakeSound: !type:SoundPathSpecifier + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg - type: Gravity - - chunkCollection: + - type: DecalGrid + chunkCollection: version: 2 nodes: - - node: - color: '#334E6DFF' - id: BrickTileWhiteCornerNe - decals: - 329: 1,10 - - node: - color: '#334E6DFF' - id: BrickTileWhiteCornerNw - decals: - 328: -1,10 - - node: - color: '#334E6DFF' - id: BrickTileWhiteCornerSw - decals: - 327: -1,9 - - node: - color: '#334E6DFF' - id: BrickTileWhiteLineN - decals: - 330: 0,10 - - node: - color: '#334E6DFF' - id: BrickTileWhiteLineS - decals: - 331: 0,9 - - node: - color: '#FFFFFFAB' - id: Damaged - decals: - 203: -3,1 - 204: 4,4 - 205: -2,6 - - node: - color: '#FFFFFFFF' - id: Damaged - decals: - 332: -1,9 - 333: -1,10 - 334: 0,10 - 364: -1,9 - 365: 1,8 - node: color: '#FFFFFF46' id: Dirt decals: 78: 0,4 79: 0,4 - 80: -1,4 - 81: -2,6 - 82: -3,6 - 83: -3,6 - 84: -2,7 - 85: 0,7 - 86: 0,6 - 87: 0,6 - 88: 1,7 - - node: - color: '#FFFFFFAB' - id: Dirt - decals: - 213: -2,6 - 214: -2,6 - node: color: '#FFFFFFB7' id: Dirt decals: 289: 0,4 - 290: -1,4 291: 0,4 292: 0,4 - node: color: '#FFFFFFFF' id: Dirt decals: - 14: -3,1 - 15: -2,1 16: 3,4 - 17: 0,6 18: 0,8 - 19: -1,7 - 20: -2,7 - 21: -3,6 22: 0,5 - 23: -1,4 24: 4,3 - 25: 5,4 - 26: 5,5 - 27: 5,4 28: 4,3 - 29: 6,2 30: 5,7 - 31: 4,5 32: 4,3 - 33: 3,2 - 34: 5,4 - 35: 4,5 - 36: 5,5 - 37: 4,6 - 38: 4,4 39: 4,3 40: 3,5 - 41: 3,9 - 42: 3,9 - 43: 3,9 - 96: 6,7 - 144: -2,1 - 145: -3,1 - 146: 0,1 147: 1,1 - 148: 3,1 - 149: 2,0 150: 1,0 - 201: -3,7 - 202: -3,7 - 227: 2,2 - 250: 1,6 - 251: 2,6 - 252: 2,7 - 253: 2,5 - 254: 2,5 - 255: 2,4 - 256: 1,8 - 257: 1,8 - 277: -1,3 - 278: -1,3 - 279: -1,3 - 280: -2,4 - 281: -2,3 - 282: 0,3 283: 0,4 - 316: -4,4 - 317: -4,4 - 323: -4,10 - 324: 7,7 - 325: 4,8 - 326: 6,-1 - 335: -1,9 - 336: -1,10 - 337: 0,10 - 338: 1,10 - 339: 0,9 - 340: 1,9 - 375: -1,7 - - node: - color: '#FFFFFFAB' - id: DirtHeavy - decals: - 206: -3,6 - 207: -2,6 - 208: -2,6 - 209: -2,6 - 210: -2,6 - 211: -2,6 - 212: -2,6 + 376: -3,1 + 377: -1,1 + 379: 2,6 + 380: 1,8 + 381: 1,9 + 382: -1,9 + 383: -2,7 + 385: -2,3 + 386: -1,3 + 387: 0,3 + 388: -4,4 + 398: -3,7 + 399: 4,8 + 400: 7,7 + 401: -4,10 + 402: -4,8 + 403: 6,-1 - node: color: '#FFFFFFFF' id: DirtHeavy decals: 44: -2,2 - 45: -2,1 - 46: -2,1 - 47: -1,1 - 48: 1,2 - 49: 1,2 - 50: 1,4 - 51: -1,4 - 52: 1,4 53: 4,3 - 54: 4,4 55: 3,5 56: 1,5 - 57: -1,7 - 58: 0,6 - 59: 0,7 - 60: -1,7 - 61: -3,6 - 62: -2,6 - 63: -2,7 - 64: -1,8 - 65: 2,8 - 66: 1,7 - 67: 0,7 - 68: 1,7 - 69: 3,2 - 70: 5,3 - 71: 5,5 - 72: 5,5 - 73: 4,4 - 74: 4,2 - 75: -1,1 - 89: 0,6 - 90: 0,6 - 91: 0,7 - 92: 0,6 - 93: 0,7 - 97: 2,3 - 98: 2,3 - 99: 2,1 - 100: 2,0 - 101: 2,0 - 102: 2,0 - 103: 2,1 104: 1,0 105: 1,1 - 106: 2,1 - 107: 0,1 - 108: 0,1 109: 1,1 - 110: 2,3 - 237: 1,6 - 238: 2,6 - 239: 2,7 - 240: 2,5 - 241: 2,4 - 242: 2,4 - 243: 2,6 - 244: 2,6 - 245: 1,6 - 246: 2,7 - 247: 2,6 - 248: 2,5 - 249: 2,4 - 258: 1,8 - 259: 1,8 - 260: 1,6 - 261: 1,6 262: 0,4 263: 0,4 - 264: -2,3 - 265: -1,3 - 266: 0,3 267: 0,4 - 268: -1,4 - 269: -2,3 - 270: -1,3 271: 0,4 - 272: -1,4 - 273: -1,4 - 274: 0,3 275: 0,4 - 276: -2,4 293: 0,4 - 294: -4,10 - 295: -4,10 - 296: -4,10 - 297: -3,9 - 298: -3,9 - 299: 4,8 - 300: 4,8 - 301: 4,8 - 302: 4,8 - 303: 4,8 - 304: 6,-1 - 305: 6,-1 - 306: 6,-1 - 307: 6,-1 - 308: 6,-1 - 309: 6,-1 - 310: 7,7 - 311: 7,7 - 312: 7,7 - 313: 7,7 - 314: 7,7 - 315: 7,7 - 318: -4,4 - 319: -4,4 - 320: -4,4 - 321: -4,4 - 322: -4,10 - 341: 1,9 - 342: 1,9 - 343: 1,9 - 344: 0,9 - 345: 0,9 - 346: -1,9 - 347: -1,10 - 348: 0,10 - 349: 1,10 - 350: 1,10 - 351: 1,9 - 352: -1,9 - 353: -1,9 - 354: 0,10 - 355: 1,10 - 356: 1,9 - 357: 0,9 - 358: 0,9 - 359: 1,10 - 366: -1,7 - 367: -1,7 - 368: -1,7 - 369: -1,7 - 370: -1,7 - 371: -1,7 - - node: - color: '#FFFFFFAB' - id: DirtHeavyMonotile - decals: - 215: -2,6 - 216: -2,6 - 217: -2,6 - 218: -2,6 + 412: 2,3 + 413: 2,2 + 414: 4,4 + 415: 5,4 + 416: 5,5 + 417: 1,7 + 418: 0,7 + 419: 2,0 + 420: 2,1 + 422: -3,6 - node: color: '#FFFFFFFF' id: DirtHeavyMonotile decals: 76: -1,5 - 77: -1,7 - 111: 0,1 112: 1,1 113: 1,1 114: 1,0 115: 1,0 116: 1,1 - 117: 0,1 - 118: -1,1 - 119: -2,1 - 120: -2,1 - 121: -2,1 - 122: -1,1 123: 1,1 - 124: 2,1 - 125: 2,0 - 126: 2,0 127: 1,0 128: 1,0 - 129: 2,3 - 130: 2,3 - 131: -1,4 132: 0,4 + 389: 2,3 + 390: 2,2 + 391: 1,7 + 392: 0,7 + 393: -1,9 + 423: -2,6 - node: color: '#FFFFFFFF' id: DirtLight decals: - 133: 2,3 - 134: 2,3 - 135: 2,1 - 136: 2,1 - 137: 2,0 138: 1,0 139: 1,1 - 140: 0,1 - 141: 0,1 - 142: -3,1 - 143: -3,1 - 360: -1,9 - 361: 0,9 - 362: -1,10 - 363: -1,10 - 372: -1,7 - 373: -1,7 - 374: -1,7 - - node: - color: '#FFFFFFAB' - id: Rust - decals: - 219: -2,6 - 220: -2,6 - 221: -2,6 - 222: -2,6 - 223: -2,6 + 394: 0,9 + 395: 0,10 + 396: -1,10 + 397: 1,10 + 404: 2,0 + 405: 2,1 + 406: 4,4 + 407: 5,4 + 408: 5,5 + 409: 4,5 + 410: 4,3 + 411: 4,2 - node: color: '#FFFFFFFF' id: Rust decals: 0: 4,3 - 1: 4,2 - 2: 4,4 - 3: 6,4 - 4: 1,7 - 5: 1,7 - 6: -1,6 - 7: -2,7 - 8: -2,7 - 9: -3,6 - 10: 1,4 - 11: -1,4 - 12: -2,1 - 13: -3,1 - 151: -3,1 - 152: -2,1 - 153: 0,1 154: 1,1 155: 1,0 - 156: 2,0 - 157: 2,1 - 158: 2,3 - 159: 0,6 - 160: 0,7 - 161: 6,0 - 162: 5,0 - 163: 4,0 - 164: 3,-1 - 165: 3,-1 - 166: 3,0 - 167: 2,-1 - 168: 1,-1 - 169: 1,-1 170: 0,0 - 171: -1,0 - 172: -1,0 173: -3,0 - 174: -4,0 175: -4,2 176: -3,2 177: -2,2 - 178: -1,2 - 179: 1,2 - 180: 3,2 - 181: 3,2 - 182: 5,2 - 183: 5,3 184: 4,3 185: 3,3 186: 3,4 - 187: 3,6 - 188: 3,6 189: 1,5 190: 0,5 191: -1,5 192: -2,5 193: -3,5 194: -3,5 - 195: -4,6 - 196: -4,7 - 197: -3,6 - 198: -2,7 - 199: -2,7 - 200: -3,7 - 225: 2,2 - 226: 2,2 - 228: 0,-1 - 229: 1,-1 - 230: 6,7 - 231: 6,7 - 232: -4,7 - 233: -4,7 - 234: -4,8 - 235: 2,3 - 236: 2,2 - 284: 0,3 - - node: - color: '#FFFFFFFF' - id: StairsRS - decals: - 224: 2,2 - node: color: '#FFFFFFB7' id: WarnFull decals: 288: 0,4 - - node: - color: '#FFFFFF8E' - id: WarnLineE - decals: - 285: 5,3 - 286: 5,4 - 287: 5,5 - - node: - color: '#FFFFFFFF' - id: body - decals: - 95: -2,7 - - node: - color: '#760000FF' - id: splatter - decals: - 94: -2,7 - type: DecalGrid - - version: 2 + - type: GridAtmosphere + version: 2 data: tiles: 0,0: - 0: 65535 - 1,0: - 0: 65399 + 0: 29942 + 0,-1: + 0: 36864 + 1: 3072 + -1,0: + 0: 49328 0,1: - 0: 65535 + 0: 30541 + -1,1: + 0: 58893 0,2: - 0: 14335 + 0: 947 + -1,2: + 0: 2464 + 1: 528 0,3: - 0: 2 + 1: 2 + 1,0: + 0: 29447 + 1: 34816 1,1: - 0: 65535 + 0: 33587 + 1: 2184 1,2: - 0: 21 - -1,0: - 0: 61439 - -1,1: - 0: 65535 - -1,2: - 0: 36863 - -1,-1: - 0: 16384 - 0,-1: - 0: 64512 + 0: 1 + 1: 20 1,-1: - 0: 24576 + 1: 8192 + 0: 16384 + -1,-1: + 1: 16384 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -571,1410 +247,1371 @@ entities: - 0 - 0 - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GridAtmosphere - type: GasTileOverlay - type: RadiationGridResistance - type: BecomesStation id: Tide -- proto: Airlock +- proto: AirlockAssemblyMaintenance entities: - - uid: 2 + - uid: 84 components: - - pos: -0.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,8.5 + parent: 2 - proto: AirlockGlassShuttle entities: - - uid: 3 + - uid: 4 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -3.5,1.5 - parent: 1 - type: Transform + parent: 2 - proto: AirlockMaint entities: - - uid: 4 + - uid: 3 + components: + - type: Transform + pos: -0.5,7.5 + parent: 2 + - uid: 5 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,3.5 - parent: 1 - type: Transform + parent: 2 + - uid: 126 + components: + - type: Transform + pos: 3.5,4.5 + parent: 2 + - uid: 135 + components: + - type: Transform + pos: 2.5,2.5 + parent: 2 - proto: APCBasic entities: - - uid: 5 + - uid: 6 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 2.5,-0.5 - parent: 1 - type: Transform -- proto: Barricade + parent: 2 +- proto: CableApcExtension entities: - - uid: 6 - components: - - pos: -3.5,7.5 - parent: 1 - type: Transform - - uid: 7 - components: - - pos: 0.5,11.5 - parent: 1 - type: Transform - uid: 8 components: - - pos: 1.5,11.5 - parent: 1 - type: Transform + - type: Transform + pos: -3.5,1.5 + parent: 2 - uid: 9 components: - - pos: 6.5,3.5 - parent: 1 - type: Transform -- proto: CableApcExtension - entities: + - type: Transform + pos: -2.5,1.5 + parent: 2 - uid: 10 components: - - pos: -3.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: -1.5,1.5 + parent: 2 - uid: 11 components: - - pos: -2.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: -0.5,1.5 + parent: 2 - uid: 12 components: - - pos: -1.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: 0.5,1.5 + parent: 2 - uid: 13 components: - - pos: -0.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: 1.5,1.5 + parent: 2 - uid: 14 components: - - pos: 0.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,1.5 + parent: 2 - uid: 15 components: - - pos: 1.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,0.5 + parent: 2 - uid: 16 components: - - pos: 2.5,1.5 - parent: 1 - type: Transform + - type: Transform + pos: 2.5,-0.5 + parent: 2 - uid: 17 components: - - pos: 2.5,0.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,-0.5 + parent: 2 - uid: 18 components: - - pos: 2.5,-0.5 - parent: 1 - type: Transform - + - type: Transform + pos: 0.5,-0.5 + parent: 2 - uid: 19 components: - - pos: 1.5,-0.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,2.5 + parent: 2 - uid: 20 components: - - pos: 0.5,-0.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,3.5 + parent: 2 - uid: 21 components: - - pos: 2.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,3.5 + parent: 2 - uid: 22 components: - - pos: 2.5,3.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,3.5 + parent: 2 - uid: 23 components: - - pos: 1.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: -0.5,3.5 + parent: 2 - uid: 24 components: - - pos: 0.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: -1.5,3.5 + parent: 2 - uid: 25 components: - - pos: -0.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: 1.5,6.5 + parent: 2 - uid: 26 components: - - pos: -1.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: 0.5,7.5 + parent: 2 - uid: 27 components: - - pos: 1.5,6.5 - parent: 1 - type: Transform - + - type: Transform + pos: -1.5,6.5 + parent: 2 - uid: 28 components: - - pos: 0.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,6.5 + parent: 2 - uid: 29 components: - - pos: -1.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,7.5 + parent: 2 - uid: 30 components: - - pos: -2.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,7.5 + parent: 2 - uid: 31 components: - - pos: -0.5,7.5 - parent: 1 - type: Transform - + - type: Transform + pos: 1.5,7.5 + parent: 2 - uid: 32 components: - - pos: -1.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,8.5 + parent: 2 - uid: 33 components: - - pos: 1.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,9.5 + parent: 2 - uid: 34 components: - - pos: 1.5,8.5 - parent: 1 - type: Transform - + - type: Transform + pos: 1.5,10.5 + parent: 2 - uid: 35 components: - - pos: 1.5,9.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,4.5 + parent: 2 - uid: 36 components: - - pos: 1.5,10.5 - parent: 1 - type: Transform + - type: Transform + pos: 6.5,4.5 + parent: 2 - uid: 37 components: - - pos: 5.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 7.5,4.5 + parent: 2 - uid: 38 components: - - pos: 6.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,5.5 + parent: 2 - uid: 39 components: - - pos: 7.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,6.5 + parent: 2 - uid: 40 components: - - pos: 5.5,5.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,7.5 + parent: 2 - uid: 41 components: - - pos: 5.5,6.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,3.5 + parent: 2 - uid: 42 components: - - pos: 5.5,7.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,2.5 + parent: 2 - uid: 43 components: - - pos: 5.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,1.5 + parent: 2 - uid: 44 components: - - pos: 5.5,2.5 - parent: 1 - type: Transform - + - type: Transform + pos: 5.5,0.5 + parent: 2 - uid: 45 components: - - pos: 5.5,1.5 - parent: 1 - type: Transform - + - type: Transform + pos: 4.5,6.5 + parent: 2 - uid: 46 components: - - pos: 5.5,0.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,4.5 + parent: 2 - uid: 47 components: - - pos: 4.5,6.5 - parent: 1 - type: Transform - + - type: Transform + pos: 3.5,4.5 + parent: 2 - uid: 48 components: - - pos: 2.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 4.5,4.5 + parent: 2 - uid: 49 components: - - pos: 3.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,6.5 + parent: 2 +- proto: CableApcStack1 + entities: - uid: 50 components: - - pos: 4.5,4.5 - parent: 1 - type: Transform - + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.2841935,4.753075 + parent: 2 - uid: 51 components: - - pos: 2.5,6.5 - parent: 1 - type: Transform - -- proto: CableApcStack1 - entities: + - type: Transform + pos: 1.2873576,9.791525 + parent: 2 - uid: 52 components: - - rot: 1.5707963267948966 rad - pos: 2.2841935,4.753075 - parent: 1 - type: Transform + - type: Transform + pos: 1.5862179,1.5903597 + parent: 2 - uid: 53 components: - - pos: 1.2873576,9.791525 - parent: 1 - type: Transform + - type: Transform + pos: 2.7530308,6.615054 + parent: 2 +- proto: CableHV + entities: - uid: 54 components: - - pos: 1.5862179,1.5903597 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,4.5 + parent: 2 - uid: 55 components: - - pos: 2.7530308,6.615054 - parent: 1 - type: Transform -- proto: CableHV + - type: Transform + pos: -0.5,4.5 + parent: 2 +- proto: CableMV entities: - uid: 56 components: - - pos: 0.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,3.5 + parent: 2 - uid: 57 components: - - pos: -0.5,4.5 - parent: 1 - type: Transform - -- proto: CableMV - entities: + - type: Transform + pos: -0.5,4.5 + parent: 2 - uid: 58 components: - - pos: 2.5,3.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,3.5 + parent: 2 - uid: 59 components: - - pos: -0.5,4.5 - parent: 1 - type: Transform - + - type: Transform + pos: 0.5,3.5 + parent: 2 - uid: 60 components: - - pos: -0.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,1.5 + parent: 2 - uid: 61 components: - - pos: 0.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,2.5 + parent: 2 - uid: 62 components: - - pos: 2.5,1.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,3.5 + parent: 2 - uid: 63 components: - - pos: 2.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: 2.5,0.5 + parent: 2 - uid: 64 components: - - pos: 1.5,3.5 - parent: 1 - type: Transform - + - type: Transform + pos: 2.5,-0.5 + parent: 2 +- proto: Catwalk + entities: - uid: 65 components: - - pos: 2.5,0.5 - parent: 1 - type: Transform + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,2.5 + parent: 2 - uid: 66 components: - - pos: 2.5,-0.5 - parent: 1 - type: Transform - -- proto: Catwalk - entities: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,3.5 + parent: 2 - uid: 67 components: - - rot: -1.5707963267948966 rad - pos: 4.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: 7.5,3.5 + parent: 2 - uid: 68 components: - - rot: -1.5707963267948966 rad - pos: 4.5,3.5 - parent: 1 - type: Transform + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,5.5 + parent: 2 - uid: 69 components: - - pos: 7.5,3.5 - parent: 1 - type: Transform + - type: Transform + pos: 7.5,4.5 + parent: 2 - uid: 70 components: - - rot: -1.5707963267948966 rad - pos: 4.5,5.5 - parent: 1 - type: Transform + - type: Transform + pos: 7.5,5.5 + parent: 2 - uid: 71 components: - - pos: 7.5,4.5 - parent: 1 - type: Transform - - uid: 72 - components: - - pos: 7.5,5.5 - parent: 1 - type: Transform - - uid: 73 - components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 5.5,6.5 - parent: 1 - type: Transform - - uid: 74 + parent: 2 + - uid: 72 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 4.5,6.5 - parent: 1 - type: Transform + parent: 2 + - uid: 103 + components: + - type: Transform + pos: 5.5,2.5 + parent: 2 - proto: Chair entities: - - uid: 75 + - uid: 73 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 0.5,9.5 - parent: 1 - type: Transform + parent: 2 - proto: ChairFolding entities: - - uid: 76 + - uid: 74 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 1.2483454,6.5219746 - parent: 1 - type: Transform + parent: 2 - proto: ChairPilotSeat entities: - - uid: 77 + - uid: 75 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 1.5,0.5 - parent: 1 - type: Transform - - uid: 78 + parent: 2 + - uid: 76 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 2.5,0.5 - parent: 1 - type: Transform + parent: 2 - proto: ComputerBroken entities: - - uid: 79 + - uid: 77 components: - - pos: -0.5,10.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,10.5 + parent: 2 - proto: ComputerShuttle entities: - - uid: 80 + - uid: 78 components: - - pos: 0.5,10.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,10.5 + parent: 2 - proto: ComputerStationRecords entities: - - uid: 81 + - uid: 79 components: - - pos: 1.5,10.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,10.5 + parent: 2 - proto: CrateEmptySpawner entities: - - uid: 82 + - uid: 80 components: - - pos: 4.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: 4.5,2.5 + parent: 2 - proto: Crowbar entities: - - uid: 83 + - uid: 81 components: - - pos: -0.5,1.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,1.5 + parent: 2 - proto: Firelock entities: - - uid: 84 - components: - - pos: 3.5,4.5 - parent: 1 - type: Transform - - uid: 85 + - uid: 82 components: - - pos: 2.5,2.5 - parent: 1 - type: Transform -- proto: FirelockFrame + - type: Transform + pos: 3.5,4.5 + parent: 2 +- proto: FuelPlasma entities: - - uid: 86 + - uid: 83 components: - - pos: 0.5,8.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.4788256,4.4430637 + parent: 2 - proto: GasPassiveVent entities: - - uid: 87 + - uid: 85 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 5.5,4.5 - parent: 1 - type: Transform + parent: 2 + - uid: 193 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,1.5 + parent: 2 - proto: GasPipeBend entities: - - uid: 88 + - uid: 86 components: - - anchored: False + - type: Transform + anchored: False rot: -0.12514226137072493 rad pos: 2.5779724,6.4750323 - parent: 1 - type: Transform - - canCollide: True + parent: 2 + - type: Physics + canCollide: True bodyType: Dynamic - type: Physics - - - uid: 89 + - uid: 87 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 0.5,6.5 - parent: 1 - type: Transform + parent: 2 - proto: GasPipeStraight entities: - - uid: 90 + - uid: 88 components: - - anchored: False - rot: -2.0017326374881614 rad - pos: 2.4778514,5.5419455 - parent: 1 - type: Transform - - canCollide: True - bodyType: Dynamic - type: Physics - - - uid: 91 + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,5.5 + parent: 2 + - uid: 89 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -0.5,3.5 - parent: 1 - type: Transform - - - uid: 92 + parent: 2 + - uid: 90 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 0.5,3.5 - parent: 1 - type: Transform - - - uid: 93 + parent: 2 + - uid: 91 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,3.5 - parent: 1 - type: Transform - - - uid: 94 + parent: 2 + - uid: 92 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 3.5,4.5 - parent: 1 - type: Transform - - - uid: 95 + parent: 2 + - uid: 94 components: - - rot: -1.5707963267948966 rad - pos: 4.5,4.5 - parent: 1 - type: Transform - - - uid: 96 + - type: Transform + pos: 2.5,2.5 + parent: 2 + - uid: 95 components: - - pos: 2.5,2.5 - parent: 1 - type: Transform + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,6.5 + parent: 2 - uid: 97 components: - - rot: -1.5707963267948966 rad - pos: 1.5,6.5 - parent: 1 - type: Transform - - - uid: 98 + - type: Transform + pos: 0.5,8.5 + parent: 2 + - uid: 225 components: - - pos: 0.5,7.5 - parent: 1 - type: Transform - - uid: 99 + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,1.5 + parent: 2 + - uid: 226 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,1.5 + parent: 2 + - uid: 227 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,1.5 + parent: 2 + - uid: 228 components: - - pos: 0.5,8.5 - parent: 1 - type: Transform + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,7.5 + parent: 2 - proto: GasPipeTJunction entities: - - uid: 100 + - uid: 96 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,7.5 + parent: 2 + - uid: 98 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 2.5,3.5 - parent: 1 - type: Transform - - uid: 101 + parent: 2 + - uid: 99 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: 2.5,4.5 - parent: 1 - type: Transform - + parent: 2 + - uid: 101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,1.5 + parent: 2 - proto: GasPort entities: - - uid: 102 + - uid: 100 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -1.5,3.5 - parent: 1 - type: Transform -- proto: GasVentPump + parent: 2 +- proto: GasPressurePump entities: - - uid: 103 + - uid: 93 components: - - rot: 3.141592653589793 rad - pos: 2.5,1.5 - parent: 1 - type: Transform - - enabled: False - type: AmbientSound - - uid: 104 + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,4.5 + parent: 2 + - uid: 125 components: - - pos: 0.5,9.5 - parent: 1 - type: Transform - - enabled: False - type: AmbientSound -- proto: Girder + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,1.5 + parent: 2 +- proto: GasVentPump entities: - - uid: 105 - components: - - pos: 4.5,1.5 - parent: 1 - type: Transform - - uid: 106 - components: - - pos: -3.5,0.5 - parent: 1 - type: Transform - - uid: 107 - components: - - pos: 3.5,3.5 - parent: 1 - type: Transform - - uid: 108 + - uid: 102 components: - - pos: -0.5,5.5 - parent: 1 - type: Transform - - uid: 109 + - type: Transform + pos: 0.5,9.5 + parent: 2 + - uid: 105 components: - - pos: 3.5,8.5 - parent: 1 - type: Transform - - uid: 110 + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,0.5 + parent: 2 + - uid: 229 components: - - pos: -3.5,2.5 - parent: 1 - type: Transform + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,7.5 + parent: 2 - proto: Grille entities: - - uid: 111 + - uid: 121 components: - - pos: 6.5,7.5 - parent: 1 - type: Transform - - uid: 112 + - type: Transform + pos: -3.5,7.5 + parent: 2 + - uid: 123 components: - - pos: -1.5,5.5 - parent: 1 - type: Transform - - uid: 113 + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,5.5 + parent: 2 + - uid: 222 components: - - pos: -1.5,8.5 - parent: 1 - type: Transform - - uid: 114 + - type: Transform + pos: 0.5,11.5 + parent: 2 + - uid: 223 + components: + - type: Transform + pos: 1.5,11.5 + parent: 2 + - uid: 224 components: - - pos: -3.5,5.5 - parent: 1 - type: Transform + - type: Transform + pos: 3.5,0.5 + parent: 2 - proto: GrilleBroken entities: + - uid: 114 + components: + - type: Transform + pos: 1.5,8.5 + parent: 2 - uid: 115 components: - - pos: 1.5,8.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,0.5 + parent: 2 - uid: 116 components: - - rot: 3.141592653589793 rad - pos: 1.5,8.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,1.5 + parent: 2 - uid: 117 components: - - pos: 1.5,0.5 - parent: 1 - type: Transform + - type: Transform + pos: 5.5,4.5 + parent: 2 - uid: 118 components: - - pos: 1.5,1.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,4.5 + parent: 2 - uid: 119 components: - - pos: 5.5,4.5 - parent: 1 - type: Transform - - uid: 120 - components: - - pos: 0.5,4.5 - parent: 1 - type: Transform - - uid: 121 - components: - - pos: -2.5,7.5 - parent: 1 - type: Transform -- proto: GrilleSpawner - entities: - - uid: 122 - components: - - pos: 3.5,6.5 - parent: 1 - type: Transform - - uid: 123 - components: - - pos: 0.5,11.5 - parent: 1 - type: Transform - - uid: 124 - components: - - pos: 1.5,11.5 - parent: 1 - type: Transform - - uid: 125 - components: - - pos: 2.5,5.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,7.5 + parent: 2 - proto: Gyroscope entities: - - uid: 126 + - uid: 124 components: - - pos: -2.5,9.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,9.5 + parent: 2 - proto: InflatableDoor entities: - uid: 127 components: - - pos: 0.5,1.5 - parent: 1 - type: Transform - - uid: 128 - components: - - pos: 3.5,4.5 - parent: 1 - type: Transform - - uid: 129 - components: - - pos: -1.5,1.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,1.5 + parent: 2 - proto: InflatableDoorStack1 entities: - - uid: 130 + - uid: 128 components: - - pos: -1.5,4.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,4.5 + parent: 2 - proto: InflatableWall entities: - - uid: 131 + - uid: 7 components: - - pos: -0.5,11.5 - parent: 1 - type: Transform - - uid: 132 + - type: Transform + pos: 7.5,5.5 + parent: 2 + - uid: 122 components: - - pos: 5.5,2.5 - parent: 1 - type: Transform - - uid: 133 + - type: Transform + pos: -0.5,11.5 + parent: 2 + - uid: 129 components: - - pos: 5.5,3.5 - parent: 1 - type: Transform -- proto: InflatableWallStack5 - entities: - - uid: 134 + - type: Transform + pos: 7.5,3.5 + parent: 2 + - uid: 156 components: - - pos: -1.5,4.5 - parent: 1 - type: Transform -- proto: MaintenanceWeaponSpawner + - type: Transform + pos: 7.5,4.5 + parent: 2 +- proto: InflatableWallStack5 entities: - - uid: 135 + - uid: 131 components: - - pos: 0.5,4.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,4.5 + parent: 2 - proto: Mattress entities: - - uid: 136 + - uid: 133 components: - - pos: -2.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,7.5 + parent: 2 - proto: OreBag entities: - - uid: 137 + - uid: 134 components: - - pos: 5.5351467,6.5488915 - parent: 1 - type: Transform + - type: Transform + pos: 5.5351467,6.5488915 + parent: 2 - proto: PartRodMetal1 entities: - - uid: 138 - components: - - rot: 3.141592653589793 rad - pos: -2.3108153,7.444821 - parent: 1 - type: Transform - - uid: 139 + - uid: 136 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -1.9982572,1.738504 - parent: 1 - type: Transform - - uid: 140 + parent: 2 + - uid: 142 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,7.5 + parent: 2 + - uid: 143 components: - - pos: 2.540806,4.403475 - parent: 1 - type: Transform + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,3.5 + parent: 2 - proto: Pickaxe entities: - - uid: 141 + - uid: 138 components: - - pos: 4.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: 4.5,6.5 + parent: 2 - proto: PortableGeneratorPacman entities: - - uid: 142 + - uid: 1 components: - - pos: -0.5,3.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,4.5 + parent: 2 - proto: PosterContrabandGreyTide entities: - - uid: 143 + - uid: 140 components: - - pos: 3.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: 3.5,2.5 + parent: 2 - proto: PoweredSmallLight entities: - - uid: 144 + - uid: 130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,6.5 + parent: 2 + - uid: 141 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -2.5,6.5 - parent: 1 - type: Transform + parent: 2 + - uid: 144 + components: + - type: Transform + pos: 5.5,6.5 + parent: 2 - uid: 145 components: - - rot: -1.5707963267948966 rad - pos: 1.5,10.5 - parent: 1 - type: Transform + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,0.5 + parent: 2 +- proto: Rack + entities: - uid: 146 components: - - rot: 3.141592653589793 rad - pos: 6.5,8.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,4.5 + parent: 2 - uid: 147 components: - - pos: -1.5,-0.5 - parent: 1 - type: Transform + - type: Transform + pos: 4.5,6.5 + parent: 2 - uid: 148 components: - - pos: 5.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: 5.5,6.5 + parent: 2 +- proto: Railing + entities: - uid: 149 components: - - rot: 3.141592653589793 rad - pos: 2.5,0.5 - parent: 1 - type: Transform + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,2.5 + parent: 2 - uid: 150 components: - - rot: -1.5707963267948966 rad - pos: -3.5,4.5 - parent: 1 - type: Transform -- proto: Rack + - type: Transform + pos: 7.5,6.5 + parent: 2 +- proto: ShardGlass entities: - uid: 151 components: - - pos: -1.5,4.5 - parent: 1 - type: Transform + - type: Transform + pos: 2.5409737,3.4604747 + parent: 2 - uid: 152 components: - - pos: 4.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5126061,7.633571 + parent: 2 - uid: 153 components: - - pos: 5.5,6.5 - parent: 1 - type: Transform -- proto: Railing - entities: + - type: Transform + pos: -1.7702793,6.5593524 + parent: 2 - uid: 154 components: - - rot: 3.141592653589793 rad - pos: 7.5,2.5 - parent: 1 - type: Transform + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,8.5 + parent: 2 - uid: 155 components: - - pos: 7.5,6.5 - parent: 1 - type: Transform -- proto: ShardGlass - entities: - - uid: 162 - components: - - pos: 2.5409737,3.4604747 - parent: 1 - type: Transform - - uid: 163 - components: - - pos: -2.5126061,7.633571 - parent: 1 - type: Transform - - uid: 164 - components: - - pos: -1.7702793,6.5593524 - parent: 1 - type: Transform - - uid: 165 - components: - - pos: 1.4725108,9.157009 - parent: 1 - type: Transform - - uid: 166 - components: - - pos: -0.4028381,10.563259 - parent: 1 - type: Transform - - uid: 167 - components: - - pos: 7.5285015,3.3042417 - parent: 1 - type: Transform -- proto: SheetPlasma1 - entities: - - uid: 168 - components: - - pos: -1.472928,4.493269 - parent: 1 - type: Transform - - count: 6 - type: Stack - - size: 6 - type: Item + - type: Transform + pos: -0.4028381,10.563259 + parent: 2 - proto: SheetSteel1 entities: - - uid: 169 + - uid: 158 components: - - pos: 4.4873247,3.5939727 - parent: 1 - type: Transform + - type: Transform + pos: 4.5407724,3.3561268 + parent: 2 - proto: ShuttersFrame entities: - - uid: 170 + - uid: 159 components: - - anchored: True + - type: Transform + anchored: True pos: 6.5,3.5 - parent: 1 - type: Transform - - bodyType: Static - type: Physics + parent: 2 + - type: Physics + bodyType: Static - proto: ShuttersWindow entities: - - uid: 171 + - uid: 160 components: - - pos: 6.5,4.5 - parent: 1 - type: Transform - - links: - - 174 - type: DeviceLinkSink - - uid: 172 + - type: Transform + pos: 6.5,4.5 + parent: 2 + - uid: 161 components: - - pos: 6.5,5.5 - parent: 1 - type: Transform - - links: - - 174 - type: DeviceLinkSink + - type: Transform + pos: 6.5,5.5 + parent: 2 - proto: ShuttleWindow entities: - - uid: 173 + - uid: 162 components: - - pos: 3.5,0.5 - parent: 1 - type: Transform + - type: Transform + pos: 3.5,0.5 + parent: 2 - proto: SignalButton entities: - - uid: 174 + - uid: 163 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 6.5,2.5 - parent: 1 - type: Transform - - linkedPorts: - 171: + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 160: - Pressed: Toggle - 172: + 161: - Pressed: Toggle - type: DeviceLinkSource - proto: SignDirectionalEvac entities: - - uid: 175 + - uid: 164 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,2.5 - parent: 1 - type: Transform + parent: 2 - proto: SignEVA entities: - - uid: 176 + - uid: 165 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -0.5,2.5 - parent: 1 - type: Transform - - uid: 177 + parent: 2 + - uid: 166 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 6.5,6.5 - parent: 1 - type: Transform + parent: 2 - proto: SignToolStorage entities: - - uid: 178 + - uid: 167 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,4.5 - parent: 1 - type: Transform + parent: 2 - proto: Spaceshroom entities: - - uid: 179 + - uid: 168 components: - - pos: 1.5,1.5 - parent: 1 - type: Transform - - uid: 180 + - type: Transform + pos: 1.5,1.5 + parent: 2 + - uid: 169 components: - - pos: 0.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,7.5 + parent: 2 - proto: Stool entities: - - uid: 181 + - uid: 170 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: -1.3014435,6.6570086 - parent: 1 - type: Transform + parent: 2 - proto: SubstationBasic entities: - - uid: 182 + - uid: 171 components: - - pos: -0.5,4.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,4.5 + parent: 2 - proto: Table entities: - - uid: 183 + - uid: 172 components: - - pos: 0.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,6.5 + parent: 2 - proto: Thruster entities: - - uid: 184 - components: - - rot: 1.5707963267948966 rad - pos: 0.5,-0.5 - parent: 1 - type: Transform - - uid: 185 + - uid: 132 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 5.5,0.5 - parent: 1 - type: Transform - - uid: 186 + parent: 2 + - uid: 173 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 2 + - uid: 175 + components: + - type: Transform + rot: -1.5707963267948966 rad pos: 6.5,0.5 - parent: 1 - type: Transform - - uid: 187 + parent: 2 + - uid: 176 components: - - pos: 3.5,9.5 - parent: 1 - type: Transform + - type: Transform + pos: 3.5,9.5 + parent: 2 - proto: ToolboxMechanical entities: - - uid: 188 + - uid: 177 components: - - pos: -2.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,6.5 + parent: 2 - proto: ToyFigurineGreytider entities: - - uid: 189 + - uid: 178 components: - - pos: 0.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,6.5 + parent: 2 - proto: WallShuttle entities: + - uid: 179 + components: + - type: Transform + pos: 2.5,9.5 + parent: 2 + - uid: 182 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 2 + - uid: 183 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 2 + - uid: 184 + components: + - type: Transform + pos: -1.5,10.5 + parent: 2 +- proto: WallShuttleDiagonal + entities: + - uid: 189 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-0.5 + parent: 2 - uid: 190 components: - - pos: 2.5,9.5 - parent: 1 - type: Transform + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,1.5 + parent: 2 +- proto: WallSolid + entities: + - uid: 104 + components: + - type: Transform + pos: -3.5,2.5 + parent: 2 + - uid: 106 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,5.5 + parent: 2 + - uid: 107 + components: + - type: Transform + pos: 3.5,8.5 + parent: 2 + - uid: 108 + components: + - type: Transform + pos: -3.5,0.5 + parent: 2 + - uid: 109 + components: + - type: Transform + pos: 6.5,7.5 + parent: 2 + - uid: 111 + components: + - type: Transform + pos: -1.5,8.5 + parent: 2 + - uid: 112 + components: + - type: Transform + pos: -3.5,5.5 + parent: 2 + - uid: 113 + components: + - type: Transform + pos: -2.5,0.5 + parent: 2 + - uid: 120 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,3.5 + parent: 2 + - uid: 180 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,8.5 + parent: 2 + - uid: 181 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,7.5 + parent: 2 + - uid: 185 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,2.5 + parent: 2 + - uid: 186 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,1.5 + parent: 2 + - uid: 187 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,5.5 + parent: 2 + - uid: 188 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,2.5 + parent: 2 - uid: 191 components: - - pos: 5.5,7.5 - parent: 1 - type: Transform + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,1.5 + parent: 2 - uid: 192 components: - - pos: 6.5,1.5 - parent: 1 - type: Transform - - uid: 193 - components: - - pos: 2.5,-0.5 - parent: 1 - type: Transform + - type: Transform + pos: 6.5,6.5 + parent: 2 - uid: 194 components: - - pos: 1.5,-0.5 - parent: 1 - type: Transform - - uid: 195 - components: - - pos: -1.5,10.5 - parent: 1 - type: Transform + - type: Transform + pos: -3.5,6.5 + parent: 2 - uid: 196 components: - - pos: -2.5,0.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,4.5 + parent: 2 - uid: 197 components: - - pos: 1.5,5.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,3.5 + parent: 2 - uid: 198 components: - - rot: 1.5707963267948966 rad - pos: 0.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,6.5 + parent: 2 - uid: 199 components: - - rot: 1.5707963267948966 rad - pos: 3.5,5.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,2.5 + parent: 2 - uid: 200 components: - - rot: -1.5707963267948966 rad - pos: 6.5,2.5 - parent: 1 - type: Transform -- proto: WallShuttleDiagonal - entities: + - type: Transform + pos: 1.5,2.5 + parent: 2 - uid: 201 components: - - rot: 3.141592653589793 rad - pos: 3.5,-0.5 - parent: 1 - type: Transform - - uid: 202 + - type: Transform + pos: 3.5,2.5 + parent: 2 + - uid: 230 components: - - rot: -1.5707963267948966 rad - pos: 3.5,1.5 - parent: 1 - type: Transform -- proto: WallSolid + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,6.5 + parent: 2 + - uid: 231 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,5.5 + parent: 2 +- proto: WallSolidRust entities: + - uid: 110 + components: + - type: Transform + pos: -1.5,5.5 + parent: 2 + - uid: 195 + components: + - type: Transform + pos: -2.5,5.5 + parent: 2 + - uid: 202 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,10.5 + parent: 2 - uid: 203 components: - - rot: 1.5707963267948966 rad - pos: 5.5,1.5 - parent: 1 - type: Transform + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,7.5 + parent: 2 - uid: 204 components: - - pos: 6.5,6.5 - parent: 1 - type: Transform + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,0.5 + parent: 2 - uid: 205 components: - - pos: 4.5,0.5 - parent: 1 - type: Transform + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,2.5 + parent: 2 - uid: 206 components: - - pos: -3.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: 0.5,5.5 + parent: 2 - uid: 207 components: - - pos: -2.5,5.5 - parent: 1 - type: Transform + - type: Transform + pos: 3.5,7.5 + parent: 2 - uid: 208 components: - - pos: -2.5,4.5 - parent: 1 - type: Transform + - type: Transform + pos: 2.5,8.5 + parent: 2 - uid: 209 components: - - pos: -2.5,3.5 - parent: 1 - type: Transform + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 2 - uid: 210 components: - - pos: -0.5,6.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,0.5 + parent: 2 - uid: 211 components: - - pos: -0.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,9.5 + parent: 2 - uid: 212 components: - - pos: 1.5,2.5 - parent: 1 - type: Transform + - type: Transform + pos: -0.5,8.5 + parent: 2 - uid: 213 components: - - pos: 3.5,2.5 - parent: 1 - type: Transform -- proto: WallSolidRust - entities: + - type: Transform + pos: -2.5,8.5 + parent: 2 - uid: 214 components: - - rot: 1.5707963267948966 rad - pos: 2.5,10.5 - parent: 1 - type: Transform + - type: Transform + pos: -2.5,2.5 + parent: 2 - uid: 215 components: - - rot: 1.5707963267948966 rad - pos: 4.5,7.5 - parent: 1 - type: Transform - - uid: 216 - components: - - rot: 1.5707963267948966 rad - pos: 0.5,0.5 - parent: 1 - type: Transform - - uid: 217 - components: - - rot: 1.5707963267948966 rad - pos: -1.5,2.5 - parent: 1 - type: Transform - - uid: 218 - components: - - pos: 0.5,5.5 - parent: 1 - type: Transform - - uid: 219 - components: - - pos: 3.5,7.5 - parent: 1 - type: Transform - - uid: 220 - components: - - pos: 2.5,8.5 - parent: 1 - type: Transform + - type: Transform + pos: 1.5,4.5 + parent: 2 - uid: 221 components: - - rot: 1.5707963267948966 rad - pos: -0.5,0.5 - parent: 1 - type: Transform - - uid: 222 - components: - - pos: -1.5,0.5 - parent: 1 - type: Transform - - uid: 223 - components: - - pos: -1.5,9.5 - parent: 1 - type: Transform - - uid: 224 - components: - - pos: -0.5,8.5 - parent: 1 - type: Transform - - uid: 225 - components: - - pos: -2.5,8.5 - parent: 1 - type: Transform - - uid: 226 - components: - - pos: -2.5,2.5 - parent: 1 - type: Transform - - uid: 227 - components: - - pos: 1.5,4.5 - parent: 1 - type: Transform -- proto: WarpPointShip + - type: Transform + pos: 4.5,1.5 + parent: 2 +- proto: WarpPoint entities: - - uid: 228 + - uid: 216 components: - - pos: 2.5,4.5 - parent: 1 - type: Transform - - location: Sv-Tide - type: WarpPoint + - type: Transform + pos: 2.5,4.5 + parent: 2 + - type: WarpPoint + location: Sv-Tide - proto: Window entities: - - uid: 229 + - uid: 217 components: - - pos: 1.5,11.5 - parent: 1 - type: Transform - - uid: 230 + - type: Transform + pos: 1.5,11.5 + parent: 2 + - uid: 218 components: - - pos: 0.5,11.5 - parent: 1 - type: Transform - - uid: 231 + - type: Transform + pos: 0.5,11.5 + parent: 2 + - uid: 219 components: - - pos: -3.5,7.5 - parent: 1 - type: Transform + - type: Transform + pos: -3.5,7.5 + parent: 2 - proto: Wrench entities: - - uid: 232 + - uid: 220 components: - - pos: -1.5,4.5 - parent: 1 - type: Transform + - type: Transform + pos: -1.5,4.5 + parent: 2 ... diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml index a4dddd0e5d8..f3dd5b58959 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml @@ -15,12 +15,13 @@ FoodCondimentPacketSoy: 5 FoodCondimentPacketSugar: 5 FoodCondimentPacketCornoil: 5 - FoodCondimentBottleBBQ: 2 # Frontier - FoodCondimentBottleColdsauce: 2 # Frontier - FoodCondimentBottleHotsauce: 2 # Frontier - FoodCondimentBottleKetchup: 2 # Frontier - FoodCondimentSqueezeBottleKetchup: 4 # Frontier - FoodCondimentSqueezeBottleMustard: 4 # Frontier + FoodCondimentBottleBBQ: 1 # Frontier + FoodCondimentBottleColdsauce: 1 # Frontier + FoodCondimentBottleHotsauce: 1 # Frontier + FoodCondimentBottleKetchup: 1 # Frontier + FoodCondimentSqueezeBottleClear: 2 # Frontier + FoodCondimentSqueezeBottleKetchup: 1 # Frontier + FoodCondimentSqueezeBottleMustard: 1 # Frontier ForkPlastic: 10 SpoonPlastic: 10 KnifePlastic: 10 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml index 300f9c6916f..5f039d309ee 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml @@ -136,6 +136,7 @@ id: ClothingShoesBootsMoon name: moon boots description: Special anti-gravity boots developed with a speciality blend of lunar rock gel. Shipped from the Netherlands. + categories: [ HideSpawnMenu ] # Frontier components: - type: Sprite sprite: Clothing/Shoes/Boots/moonboots.rsi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml index 71eda92b8e4..89376c39294 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml @@ -196,6 +196,8 @@ - id: BoxInflatable # Frontier - id: BoxLighttube # Frontier - id: BoxLightbulb # Frontier + - id: BoxColoredLighttube # Frontier + - id: BoxColoredLightbulb # Frontier - type: entityTable id: SalvageEquipmentUncommon diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 07a8fe14503..4d2afe193da 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -157,6 +157,8 @@ - ExteriorLightTube - LightBulb - LedLightBulb + - SodiumLightBulb # Frontier + - ExteriorLightBulb #Frontier - Bucket - DrinkMug - DrinkMugMetal @@ -211,6 +213,7 @@ - FreezerElectronics - BoxDispenserFlare # Frontier - Durathread # Frontier + - FoodCondimentSqueezeBottleClear # Frontier - type: EmagLatheRecipes emagStaticRecipes: - BoxLethalshot @@ -354,7 +357,7 @@ - SynthesizerInstrument - RPED - ClothingShoesBootsMagSci - - ClothingShoesBootsMoon + - NFClothingShoesBootsMoon # Frontier ClothingShoesBootsMoon + # TIDE-CLASS GENERAL SHUTTLE + + + + + + + + [color=#a4885c]Ship Size:[/color] Small + + [color=#a4885c]Recommended Crew:[/color] 1-3 + + [color=#a4885c]Power Gen Type:[/color] Plasma + + [color=#a4885c]Expeditions:[/color] None + + [color=#a4885c]IFF Console:[/color] None + + "A flying pile of scrap for the seasoned assistant." + + # PREFLIGHT CHECKLIST + + ## 1. Power supply + + ## 1.1. Battery units + + + + + + - Check to see if the substation is working. + - Check that the APC unit's Main Breaker is toggled on. + - Check the APC unit's current Load* (W). + + ## 1.2. P.A.C.M.A.N. generator unit + + + + + + - Check that the P.A.C.M.A.N. generator unit is anchored, fueled, and on top of Heavy Voltage cable. + + ## 2. Atmospherics + + ## 2.1. Distribution Loop + + + + + + + - Acquire an air canister if wanted. + - After acquiring an air canister, attach it to the connector. + - Check that the pipeline is intact. + + ## 3. Other checks + + + + + + - Check that the gyroscope is anchored, powered, and enabled. + - Ensure the wiring is in order. + + ## Sidenotes + + * - The Tide requires around 8 kilowatts of power to be in working order. + + ** - The Tide has no tiny fans, in return, there are pumps in the airlocks so you may vent the gases into the air pipes. + + *** - There is no gravity generator, and there is minor damage to the interior and exterior. + diff --git a/Resources/ServerInfo/_NF/Guidebook/StartingGear.xml b/Resources/ServerInfo/_NF/Guidebook/StartingGear.xml new file mode 100644 index 00000000000..be6e1dc8f56 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/StartingGear.xml @@ -0,0 +1,36 @@ + + # Starting Equipment + + + + In the bag on your person you will find the following equipment: + + -A [color=#028ed9]survival box[/color], containing equipment to help you survive emergency scenarios + -A [color=#CC6633]traffic control key[/color], which can be slotted into your radio headset to utilize the traffic control radio channel + -A [color=#33bbff]medical implant[/color]. If you inject it, when you get incapacitated, it'll tell your location to medics. Click the implanter to equip it in your hand, and click it again to inject it into your body. + + Find your headset by opening your inventory (backpack icon, bottom left corner). + +# Suit Sensors + + + + Suit sensors give your vital status and position to anyone with a [color=#55bbff]crew monitoring console[/color], typically used by medical personnel. + + The sensor options are the following: + + -Off: Disables tracking - you will not be listed + -Binary: Shows you as Alive or Dead with no position + -Vitals: Shows your vital status (Good, Okay, Poor, Bad, Critical) with no position + -Coordinates: Shows your vital status and current position on a crew monitor + + To change your suit sensors: + + -Right-click your jumpsuit + -Hover over "Sensor >" + -Left-click your new setting + + In general, set your sensors to Coordinates if you'd like medics to come get you in a crisis. + + + diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..c2b156524af Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png new file mode 100644 index 00000000000..0d9a9acb692 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json new file mode 100644 index 00000000000..e53406df8f1 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "equipped-HELMET, icon by wallflowerghost(discord), edited by dvir001 (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png new file mode 100644 index 00000000000..99f15a33e6e Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png new file mode 100644 index 00000000000..e0d3cabc8a8 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/icon-on.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/icon-on.png new file mode 100644 index 00000000000..c3f56ddd4dd Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/icon-on.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/icon.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/icon.png new file mode 100644 index 00000000000..177c3a546ef Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/inhand-left.png new file mode 100644 index 00000000000..03bdacf9fb5 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/inhand-right.png new file mode 100644 index 00000000000..f00d861ca54 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/meta.json new file mode 100644 index 00000000000..6fe97d10536 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/meta.json @@ -0,0 +1,50 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Tau Ceti Station at commit https://github.com/TauCetiStation/TauCetiClassic/blob/HEAD/icons/obj/clothing/shoes.dmi", + "copyright": "Added on/off version edited by dvir001", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "on-equipped-FEET", + "directions": 4 + }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "on-equipped-FEET-vox", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-on" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-equipped-FEET-vox.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-equipped-FEET-vox.png new file mode 100644 index 00000000000..73febb15c0d Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-equipped-FEET-vox.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-equipped-FEET.png new file mode 100644 index 00000000000..7455ba73b37 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-inhand-left.png new file mode 100644 index 00000000000..03bdacf9fb5 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-inhand-right.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-inhand-right.png new file mode 100644 index 00000000000..f00d861ca54 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Shoes/Boots/moonboots.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json index 14145fba669..3a1728a35fe 100644 --- a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json +++ b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json @@ -115,6 +115,9 @@ { "name": "stasis" }, + { + "name": "tide" + }, { "name": "vagabond" } diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/tide.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/tide.png new file mode 100644 index 00000000000..e9a7d279ec2 Binary files /dev/null and b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/tide.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png new file mode 100644 index 00000000000..e570dc439c8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png new file mode 100644 index 00000000000..589dcf55b36 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json new file mode 100644 index 00000000000..90542ff7b90 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "icon-0/1 by wallflowerghost(discord)", + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json index 0ff13deaa74..cd6fb5554dc 100644 --- a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "bingus", + "copyright": "gentlebutter, clear edited by dustylens(github)", "size": { "x": 32, "y": 32 @@ -12,6 +12,27 @@ }, { "name": "squeeze-bottle-mustard" + }, + { + "name": "squeeze-bottle-clear" + }, + { + "name": "squeeze-bottle-clear1" + }, + { + "name": "squeeze-bottle-clear2" + }, + { + "name": "squeeze-bottle-clear3" + }, + { + "name": "squeeze-bottle-clear4" + }, + { + "name": "squeeze-bottle-clear5" + }, + { + "name": "squeeze-bottle-clear6" } ] } diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear.png new file mode 100644 index 00000000000..12a9b1945ba Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear1.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear1.png new file mode 100644 index 00000000000..7e77c9045d2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear1.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear2.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear2.png new file mode 100644 index 00000000000..6d934936d01 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear2.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear3.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear3.png new file mode 100644 index 00000000000..6aee0346489 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear3.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear4.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear4.png new file mode 100644 index 00000000000..1e2605cedf0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear4.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear5.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear5.png new file mode 100644 index 00000000000..3048b72afb9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear5.png differ diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear6.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear6.png new file mode 100644 index 00000000000..b8f4b7296a5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear6.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png new file mode 100644 index 00000000000..c6d594488b7 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser1.png b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser1.png new file mode 100644 index 00000000000..85e367189d3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json new file mode 100644 index 00000000000..6c27c69df8f --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by dustylens", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dispenser0" + }, + { + "name": "dispenser1" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png b/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png new file mode 100644 index 00000000000..de1dfe52b9c Binary files /dev/null and b/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Structures/smalldispensers.rsi/meta.json b/Resources/Textures/_NF/Structures/smalldispensers.rsi/meta.json new file mode 100644 index 00000000000..7f3397b2939 --- /dev/null +++ b/Resources/Textures/_NF/Structures/smalldispensers.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "wallflowerghost(discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml index b64ad3579c4..f17c5ceb6af 100644 --- a/Resources/_NF/migration.yml +++ b/Resources/_NF/migration.yml @@ -181,3 +181,13 @@ CrateSpaceCleaner: ChemicalBarrelSpaceCleaner ScienceTechFab: UnfinishedMachineFrame ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard ScienceTechFabFlatpack: ProtolatheFlatpack + +# 2025-01-05 Lights +ColoredLightTubeRed: LightTubeCrystalRed +ColoredBlueLightTube: LightTubeCrystalBlue +ColoredLightTubeCyan: LightTubeCrystalCyan +ColoredLightTubeBlackLight: PoweredlightBlack +PoweredlightColoredRed: PoweredlightRed +PoweredlightBlueInterior: PoweredlightBlue +PoweredlightColoredFrostyBlue: PoweredlightCyan +PoweredlightColoredBlack: LightTubeCrystalBlack