diff --git a/Content.Client/Commands/ActionsCommands.cs b/Content.Client/Commands/ActionsCommands.cs index c155c7a9dea..738a6544763 100644 --- a/Content.Client/Commands/ActionsCommands.cs +++ b/Content.Client/Commands/ActionsCommands.cs @@ -1,5 +1,8 @@ -using Content.Client.Actions; +using Content.Client.Actions; +using System.IO; using Content.Shared.Administration; +using Robust.Client.UserInterface; +using YamlDotNet.RepresentationModel; using Robust.Shared.Console; namespace Content.Client.Commands; @@ -46,7 +49,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 1) { - shell.WriteLine(Help); + LoadActs(); // DeltaV - Load from a file dialogue instead return; } @@ -59,4 +62,24 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) shell.WriteError(LocalizationManager.GetString($"cmd-{Command}-error")); } } + + /// + /// DeltaV - Load actions from a file stream instead + /// + private static async void LoadActs() + { + var fileMan = IoCManager.Resolve(); + var actMan = IoCManager.Resolve().GetEntitySystem(); + + var stream = await fileMan.OpenFile(new FileDialogFilters(new FileDialogFilters.Group("yml"))); + if (stream is null) + return; + + var reader = new StreamReader(stream); + var yamlStream = new YamlStream(); + yamlStream.Load(reader); + + actMan.LoadActionAssignments(yamlStream); + reader.Close(); + } } diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index 7c69ec8ea54..6e277dd29fb 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -74,14 +74,12 @@ private void OnStoreRelay(EntityUid uid, StoreComponent store, ImplantRelayEvent return; // same as store code, but message is only shown to yourself - args.Handled = _store.TryAddCurrency(_store.GetCurrencyValue(args.Used, currency), uid, store); - - if (!args.Handled) + if (!_store.TryAddCurrency((args.Used, currency), (uid, store))) return; + args.Handled = true; var msg = Loc.GetString("store-currency-inserted-implant", ("used", args.Used)); _popup.PopupEntity(msg, args.User, args.User); - QueueDel(args.Used); } private void OnFreedomImplant(EntityUid uid, SubdermalImplantComponent component, UseFreedomImplantEvent args) diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs index b9553a6b849..bc1800ffd1e 100644 --- a/Content.Server/Stack/StackSystem.cs +++ b/Content.Server/Stack/StackSystem.cs @@ -100,6 +100,13 @@ public EntityUid Spawn(int amount, StackPrototype prototype, EntityCoordinates s /// public List SpawnMultiple(string entityPrototype, int amount, EntityCoordinates spawnPosition) { + if (amount <= 0) + { + Log.Error( + $"Attempted to spawn an invalid stack: {entityPrototype}, {amount}. Trace: {Environment.StackTrace}"); + return new(); + } + var spawns = CalculateSpawns(entityPrototype, amount); var spawnedEnts = new List(); @@ -116,6 +123,13 @@ public List SpawnMultiple(string entityPrototype, int amount, EntityC /// public List SpawnMultiple(string entityPrototype, int amount, EntityUid target) { + if (amount <= 0) + { + Log.Error( + $"Attempted to spawn an invalid stack: {entityPrototype}, {amount}. Trace: {Environment.StackTrace}"); + return new(); + } + var spawns = CalculateSpawns(entityPrototype, amount); var spawnedEnts = new List(); diff --git a/Content.Server/Store/Components/CurrencyComponent.cs b/Content.Server/Store/Components/CurrencyComponent.cs index cfe9b76c8bf..eb4ca1c0e36 100644 --- a/Content.Server/Store/Components/CurrencyComponent.cs +++ b/Content.Server/Store/Components/CurrencyComponent.cs @@ -8,6 +8,11 @@ namespace Content.Server.Store.Components; /// Identifies a component that can be inserted into a store /// to increase its balance. /// +/// +/// Note that if this entity is a stack of items, then this is meant to represent the value per stack item, not +/// the whole stack. This also means that in general, the actual value should not be modified from the initial +/// prototype value because otherwise stack merging/splitting may modify the total value. +/// [RegisterComponent] public sealed partial class CurrencyComponent : Component { @@ -16,6 +21,12 @@ public sealed partial class CurrencyComponent : Component /// The string is the currency type that will be added. /// The FixedPoint2 is the value of each individual currency entity. /// + /// + /// Note that if this entity is a stack of items, then this is meant to represent the value per stack item, not + /// the whole stack. This also means that in general, the actual value should not be modified from the initial + /// prototype value + /// because otherwise stack merging/splitting may modify the total value. + /// [ViewVariables(VVAccess.ReadWrite)] [DataField("price", customTypeSerializer: typeof(PrototypeIdDictionarySerializer))] public Dictionary Price = new(); diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs index 247055c2a7f..51afa4ea56e 100644 --- a/Content.Server/Store/Systems/StoreSystem.Ui.cs +++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs @@ -284,6 +284,9 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi /// private void OnRequestWithdraw(EntityUid uid, StoreComponent component, StoreRequestWithdrawMessage msg) { + if (msg.Amount <= 0) + return; + //make sure we have enough cash in the bank and we actually support this currency if (!component.Balance.TryGetValue(msg.Currency, out var currentAmount) || currentAmount < msg.Amount) return; @@ -307,7 +310,8 @@ private void OnRequestWithdraw(EntityUid uid, StoreComponent component, StoreReq var cashId = proto.Cash[value]; var amountToSpawn = (int) MathF.Floor((float) (amountRemaining / value)); var ents = _stack.SpawnMultiple(cashId, amountToSpawn, coordinates); - _hands.PickupOrDrop(buyer, ents.First()); + if (ents.FirstOrDefault() is {} ent) + _hands.PickupOrDrop(buyer, ent); amountRemaining -= value * amountToSpawn; } diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs index bf9e8a10ec9..33727fe37d1 100644 --- a/Content.Server/Store/Systems/StoreSystem.cs +++ b/Content.Server/Store/Systems/StoreSystem.cs @@ -92,14 +92,12 @@ private void OnAfterInteract(EntityUid uid, CurrencyComponent component, AfterIn if (ev.Cancelled) return; - args.Handled = TryAddCurrency(GetCurrencyValue(uid, component), args.Target.Value, store); + if (!TryAddCurrency((uid, component), (args.Target.Value, store))) + return; - if (args.Handled) - { - var msg = Loc.GetString("store-currency-inserted", ("used", args.Used), ("target", args.Target)); - _popup.PopupEntity(msg, args.Target.Value, args.User); - QueueDel(args.Used); - } + args.Handled = true; + var msg = Loc.GetString("store-currency-inserted", ("used", args.Used), ("target", args.Target)); + _popup.PopupEntity(msg, args.Target.Value, args.User); } private void OnImplantActivate(EntityUid uid, StoreComponent component, OpenUplinkImplantEvent args) @@ -111,6 +109,10 @@ private void OnImplantActivate(EntityUid uid, StoreComponent component, OpenUpli /// Gets the value from an entity's currency component. /// Scales with stacks. /// + /// + /// If this result is intended to be used with , + /// consider using instead to ensure that the currency is consumed in the process. + /// /// /// /// The value of the currency @@ -121,19 +123,34 @@ public Dictionary GetCurrencyValue(EntityUid uid, CurrencyC } /// - /// Tries to add a currency to a store's balance. + /// Tries to add a currency to a store's balance. Note that if successful, this will consume the currency in the process. /// - /// - /// - /// The currency to add - /// The store to add it to - /// Whether or not the currency was succesfully added - [PublicAPI] - public bool TryAddCurrency(EntityUid currencyEnt, EntityUid storeEnt, StoreComponent? store = null, CurrencyComponent? currency = null) + public bool TryAddCurrency(Entity currency, Entity store) { - if (!Resolve(currencyEnt, ref currency) || !Resolve(storeEnt, ref store)) + if (!Resolve(currency.Owner, ref currency.Comp)) + return false; + + if (!Resolve(store.Owner, ref store.Comp)) return false; - return TryAddCurrency(GetCurrencyValue(currencyEnt, currency), storeEnt, store); + + var value = currency.Comp.Price; + if (TryComp(currency.Owner, out StackComponent? stack) && stack.Count != 1) + { + value = currency.Comp.Price + .ToDictionary(v => v.Key, p => p.Value * stack.Count); + } + + if (!TryAddCurrency(value, store, store.Comp)) + return false; + + // Avoid having the currency accidentally be re-used. E.g., if multiple clients try to use the currency in the + // same tick + currency.Comp.Price.Clear(); + if (stack != null) + _stack.SetCount(currency.Owner, 0, stack); + + QueueDel(currency); + return true; } /// diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 53086154e67..4e7aa173a53 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,22 +1,4 @@ Entries: -- author: VMSolidus - changes: - - message: Harpies can now be stripped, and can randomly be psychic - type: Fix - id: 83 - time: '2023-10-23T23:32:00.0000000+00:00' -- author: FluffiestFloof - changes: - - message: Fixed Mantis not having their Metapsionic Pulse. - type: Fix - id: 84 - time: '2023-10-23T23:40:59.0000000+00:00' -- author: JJ - changes: - - message: Tweaked round weighting and lowered instances of Revs - type: Tweak - id: 85 - time: '2023-10-24T00:05:22.0000000+00:00' - author: FluffiestFloof changes: - message: Fixed Felinids not being able to eat certain food. @@ -3631,3 +3613,27 @@ id: 582 time: '2024-09-24T19:48:45.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1908 +- author: TadJohnson00 + changes: + - message: Added turtlenecks to most security roles. Helps to keep the chill out + on cool nights. + type: Add + - message: Removed security greatcoats from loadouts and the vendor. + type: Remove + id: 583 + time: '2024-09-26T20:35:41.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1901 +- author: MilonPL + changes: + - message: Fixed the description of large mail packages. + type: Fix + id: 584 + time: '2024-09-27T23:42:30.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1925 +- author: Radezolid + changes: + - message: Fixed deep fryer not being repairable after being broken. + type: Fix + id: 585 + time: '2024-09-30T14:41:21.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1940 diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index fb84cba4086..5b29400825b 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, asperger-sind, aspiringLich, astriloqua, AutoOtter, avalon, avghdev, Awlod, azzy, AzzyIsNotHere, backetako, BananaFlambe, Baptr0b0t, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, benev0, benjamin-burges, BGare, bhespiritu, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, Charlese2, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DakotaGay, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, Goldminermac, Golinth, GoodWheatley, Gorox221, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, justart1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, koteq, KrasnoshchekovPavel, Krunklehorn, Kukutis96513, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, MilonPL, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, Phill101, phunnyguy, pigeonpeas, PilgrimViis, Pill-U, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samsterious, SaphireLattice, SapphicOverload, sarahon, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, SpaceManiac, SpaceyLady, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, Theomund, TheOneWhoIsManyFrame, theOperand, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vitalvitriol, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, Zumorica, ZweiHawke, Zymem, zzylex +0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, avalon, avghdev, Awlod, azzy, AzzyIsNotHere, backetako, BananaFlambe, Baptr0b0t, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, Charlese2, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DakotaGay, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, koteq, KrasnoshchekovPavel, Krunklehorn, Kukutis96513, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, milon, MilonPL, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, Phill101, phunnyguy, pigeonpeas, PilgrimViis, Pill-U, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samsterious, SaphireLattice, SapphicOverload, sarahon, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, SpaceManiac, SpaceyLady, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, Theomund, TheOneWhoIsManyFrame, theOperand, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vitalvitriol, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, Zumorica, ZweiHawke, Zymem, zzylex diff --git a/Resources/Locale/en-US/_NF/mail/mail.ftl b/Resources/Locale/en-US/_NF/mail/mail.ftl index 394c551fad5..7ab4f6b6f55 100644 --- a/Resources/Locale/en-US/_NF/mail/mail.ftl +++ b/Resources/Locale/en-US/_NF/mail/mail.ftl @@ -1,7 +1,8 @@ mail-large-item-name-unaddressed = package mail-large-item-name-addressed = package ({$recipient}) mail-large-desc-far = A large package. -mail-large-desc-close = A large package addressed to {CAPITALIZE($name)}, {$job}. Last known location: {$station}. +# DelaV - Removed "Last known location" +mail-large-desc-close = A large package addressed to {CAPITALIZE($name)}, {$job}. ### Frontier: mailtestbulk command-mailtestbulk = Sends one of each type of parcel to a given mail teleporter. Implicitly calls mailnow. diff --git a/Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl index 9ee840f9987..6715433353c 100644 --- a/Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/deltav/ghost/roles/ghost-role-component.ftl @@ -2,7 +2,7 @@ ghost-role-information-nukie-mouse-name = Nuclear Operative Mouse ghost-role-information-nukie-mouse-description = A Nuclear Operative reinforcement for the Syndicate. ghost-role-information-nukie-mouse-rules = Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them. The crew is allowed to kill you without warning. - You are allowed to attack the crew and destroy the station without provocation. + You are allowed to attack the crew and destroy the station without provocation. ghost-role-information-listeningop-name = Listening Post Operative ghost-role-information-listeningop-description = You are a Listening Post operative. Get into range, observe the station, intercept communications and assist any operatives in the area! ghost-role-information-listeningop-rules = You are a Syndicate Operative tasked with the continuous reporting and monitoring of the station and its activities, as well as assisting any fellow operatives who may be aboard the station. As an antagonist, do whatever is required for you to complete this task. Make sure your station doesn't fall into enemy hands and DO NOT abandon your station! Hide your existence at any cost! @@ -24,7 +24,7 @@ ghost-role-information-recruiter-rules = You are just a recruiter so do not act like a full-on antagonist, i.e. no killing people. ghost-role-information-silvia-name = Silvia -ghost-role-information-silvia-description = You are Silvia the space snake and the CMO's charming companion. +ghost-role-information-silvia-description = You are Silvia the space snake and the CMO's charming companion. ghost-role-information-silvia-rules = Keep the medical team company and help out in emergencies with your omnizine venom. Stick close to the CMO in case they need emergency healing. ghost-role-information-synthesis-name = Synthesis Specialist diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index ec18b4f7a17..a81350ed0f0 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -85,10 +85,11 @@ loadout-group-head-of-security-shoes = Head of Security shoes loadout-group-security-cadet-head = Security Cadet head loadout-group-security-neck = Security neck -loadout-group-brig-medic-head = Brigmedic head -loadout-group-brig-medic-jumpsuit = Brigmedic jumpsuit -loadout-group-brig-medic-back = Brigmedic backpack +loadout-group-brig-medic-head = Corpsman head +loadout-group-brig-medic-jumpsuit = Corpsman jumpsuit +loadout-group-brig-medic-back = Corpsman backpack loadout-group-brig-medic-neck = Corpsman neck +loadout-group-brig-medic-outerclothing = Corpsman outer clothing loadout-group-prison-guard-head = Prison Guard head loadout-group-prison-guard-jumpsuit = Prison Guard jumpsuit diff --git a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl index 12c562422d9..ba0545fb59e 100644 --- a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl +++ b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl @@ -52,7 +52,7 @@ steal-target-groups-chem-dispenser = chemical dispenser steal-target-groups-xeno-artifact = alien artifact steal-target-groups-booze-dispenser = booze dispenser # DeltaV - Epistemics Department - Replace RD with Mystagogue -steal-target-groups-plant-rd = "Mytagogue's potted plant" +steal-target-groups-plant-rd = "Mystagogue's potted plant" steal-target-groups-toilet-golden-dirty-water = golden toilet # Thief Animal diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_Titan.yml b/Resources/Maps/Shuttles/DeltaV/NTES_Titan.yml index 902aff3b8e4..f63608502df 100644 --- a/Resources/Maps/Shuttles/DeltaV/NTES_Titan.yml +++ b/Resources/Maps/Shuttles/DeltaV/NTES_Titan.yml @@ -72,6 +72,11 @@ entities: - type: Gravity gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg + - type: DeviceNetwork + configurators: [ ] + deviceLists: [ ] + transmitFrequencyId: ShuttleTimer + deviceNetId: Wireless - type: GridPathfinding - type: DecalGrid chunkCollection: diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml index 426a614bb1c..49b7daf6b60 100644 --- a/Resources/Maps/arena.yml +++ b/Resources/Maps/arena.yml @@ -530,8 +530,8 @@ entities: - type: Broadphase - type: Physics bodyStatus: InAir - angularDamping: 10000 - linearDamping: 10000 + angularDamping: 0.05 + linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Fixtures @@ -11356,9 +11356,6 @@ entities: - 0 chunkSize: 4 - type: OccluderTree - - type: Shuttle - angularDamping: 10000 - linearDamping: 10000 - type: GridPathfinding - type: RadiationGridResistance - type: BecomesStation diff --git a/Resources/Maps/chibi.yml b/Resources/Maps/chibi.yml index af9f8850244..14209b5445a 100644 --- a/Resources/Maps/chibi.yml +++ b/Resources/Maps/chibi.yml @@ -24843,6 +24843,13 @@ entities: - type: Transform pos: -5.5,7.5 parent: 2 +- proto: SpawnPointLatejoin + entities: + - uid: 4312 + components: + - type: Transform + pos: 10.5,9.5 + parent: 2 - proto: SpawnPointLocationMidRoundAntag entities: - uid: 4217 diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml index b1b06eeed7f..8ab44a7cc2a 100644 --- a/Resources/Maps/glacier.yml +++ b/Resources/Maps/glacier.yml @@ -9694,9 +9694,9 @@ entities: 0: 111 -4,12: 0: 30583 - 3: 34952 + 2: 34952 -4,10: - 2: 12 + 3: 12 0: 52224 -4,11: 0: 3276 @@ -9704,12 +9704,12 @@ entities: 0: 118 -3,10: 0: 4352 - 3: 26214 + 2: 26214 -3,11: 0: 281 - 3: 26214 + 2: 26214 -3,12: - 3: 63351 + 2: 63351 -2,9: 0: 2039 -2,10: @@ -9718,7 +9718,7 @@ entities: 0: 30591 -2,12: 0: 119 - 3: 61440 + 2: 61440 -1,9: 0: 30711 -1,10: @@ -9727,16 +9727,16 @@ entities: 0: 30503 -1,12: 0: 119 - 3: 61440 + 2: 61440 0,8: 0: 63351 0,9: 0: 63736 0,10: - 3: 61712 + 2: 61712 0: 232 0,11: - 3: 16255 + 2: 16255 0,-4: 0: 60428 0,-3: @@ -9852,17 +9852,17 @@ entities: 4,7: 0: 61663 0,12: - 3: 64443 + 2: 64443 1,9: 0: 32767 1,10: 0: 35507 - 3: 12288 + 2: 12288 1,11: - 3: 8994 + 2: 8994 0: 34944 1,12: - 3: 291 + 2: 291 2,9: 0: 4095 2,10: @@ -9879,7 +9879,7 @@ entities: 0: 65534 3,12: 0: 28927 - 3: 32768 + 2: 32768 4,8: 0: 65294 4,9: @@ -9994,7 +9994,7 @@ entities: 0: 56831 4,12: 0: 255 - 3: 61440 + 2: 61440 5,9: 0: 3838 5,10: @@ -10003,7 +10003,7 @@ entities: 0: 65528 5,12: 0: 33535 - 3: 28672 + 2: 28672 6,9: 0: 61439 6,10: @@ -10160,16 +10160,16 @@ entities: 0: 43008 10,12: 0: 19 - 3: 27784 + 2: 27784 11,9: 0: 65534 11,10: 0: 56559 11,11: 0: 477 - 3: 17408 + 2: 17408 11,12: - 3: 4407 + 2: 4407 12,8: 0: 30583 12,9: @@ -10179,76 +10179,76 @@ entities: 12,11: 0: 3327 0,13: - 3: 43929 + 2: 43929 -1,13: - 3: 2039 + 2: 2039 0,14: - 3: 61038 + 2: 61038 0: 128 -1,14: 0: 65535 0,15: - 3: 61166 + 2: 61166 -1,15: 0: 15 4: 65280 0,16: - 3: 43942 + 2: 43942 0: 8 1,13: - 3: 273 + 2: 273 0: 8 1,14: - 3: 51711 + 2: 51711 1,15: - 3: 39127 + 2: 39127 0: 8 1,16: - 3: 25823 + 2: 25823 2,13: 0: 3067 2,14: - 3: 60303 + 2: 60303 3,13: 0: 2867 - 3: 136 + 2: 136 3,14: 0: 65535 4,13: - 3: 255 + 2: 255 0: 36608 4,14: 0: 65535 5,13: - 3: 30583 + 2: 30583 0: 34952 5,14: - 3: 1911 + 2: 1911 0: 63624 6,13: 0: 61167 6,14: - 3: 45552 + 2: 45552 5,15: 0: 8 6,15: 0: 34959 7,13: 0: 13107 - 3: 34952 + 2: 34952 7,14: - 3: 62200 + 2: 62200 6,16: 0: 136 - 3: 34816 + 2: 34816 7,15: 0: 27718 7,16: 0: 53106 8,13: - 3: 17615 + 2: 17615 8,14: - 3: 5828 + 2: 5828 0: 8192 12,4: 0: 6 @@ -10266,25 +10266,25 @@ entities: 0: 61439 15,6: 0: 20480 - 3: 35840 + 2: 35840 15,7: 0: 61661 16,6: - 3: 12288 + 2: 12288 16,7: 0: 61489 - 3: 70 + 2: 70 6,17: - 3: 2184 + 2: 2184 7,17: - 3: 25138 + 2: 25138 0: 34956 7,18: - 3: 36386 + 2: 36386 0: 8 8,18: 0: 241 - 3: 61952 + 2: 61952 13,9: 0: 28671 13,10: @@ -10309,10 +10309,10 @@ entities: 0: 28912 16,9: 0: 61489 - 3: 70 + 2: 70 16,10: 0: 12528 - 3: 16384 + 2: 16384 16,11: 0: 1 13,0: @@ -10323,7 +10323,7 @@ entities: 0: 12407 13,3: 0: 51 - 3: 1024 + 2: 1024 13,-1: 0: 34963 -8,4: @@ -10428,20 +10428,20 @@ entities: 4,-6: 0: 33075 -8,-3: - 3: 12544 + 2: 12544 -9,-3: 0: 64250 - 3: 1285 + 2: 1285 -8,-1: 0: 61731 -9,-2: 0: 64170 - 3: 1365 + 2: 1365 -9,-1: 0: 64174 - 3: 1361 + 2: 1361 -8,-2: - 3: 512 + 2: 512 -8,0: 0: 65526 -7,-3: @@ -10450,7 +10450,7 @@ entities: 0: 62321 -7,-5: 0: 24576 - 3: 119 + 2: 119 -7,-4: 0: 49152 -7,-2: @@ -10471,27 +10471,27 @@ entities: 0: 30513 -9,0: 0: 64170 - 3: 1365 + 2: 1365 -8,1: - 3: 1799 + 2: 1799 0: 2296 -9,1: 0: 64250 - 3: 1285 + 2: 1285 -8,2: 0: 64384 -9,2: 0: 51200 - 3: 1 + 2: 1 -9,3: 0: 47308 -7,1: - 3: 1799 + 2: 1799 0: 2296 -7,2: 0: 65392 -6,1: - 3: 263 + 2: 263 0: 248 -6,2: 0: 52424 @@ -10502,32 +10502,32 @@ entities: 8,16: 0: 204 9,13: - 3: 34959 + 2: 34959 9,14: - 3: 248 + 2: 248 0: 62464 9,15: 0: 4351 9,16: 0: 65535 10,13: - 3: 3 + 2: 3 10,14: 0: 36864 - 3: 32 + 2: 32 10,15: 0: 61499 10,16: 0: 4539 11,14: - 3: 8177 + 2: 8177 0: 57344 11,15: 0: 207 11,13: - 3: 4401 + 2: 4401 12,14: - 3: 12561 + 2: 12561 12,15: 0: 8209 11,16: @@ -10548,10 +10548,10 @@ entities: 0: 65535 -12,3: 0: 49151 - 3: 16384 + 2: 16384 -13,3: 0: 9215 - 3: 56320 + 2: 56320 -11,0: 0: 65535 -11,1: @@ -10559,7 +10559,7 @@ entities: -11,2: 0: 65535 -11,3: - 3: 1799 + 2: 1799 0: 63736 -11,-1: 0: 65535 @@ -10569,12 +10569,12 @@ entities: 0: 65535 -10,1: 0: 63999 - 3: 1536 + 2: 1536 -10,2: - 3: 1285 + 2: 1285 0: 31482 -10,3: - 3: 773 + 2: 773 0: 12338 -10,-1: 0: 65535 @@ -10588,19 +10588,19 @@ entities: 0: 61183 -13,5: 0: 58468 - 3: 2 + 2: 2 -13,6: 0: 26188 - 3: 48 + 2: 48 -12,7: 0: 45056 - 3: 16384 + 2: 16384 -12,8: - 3: 1799 + 2: 1799 0: 12536 -13,7: 0: 57344 - 3: 4914 + 2: 4914 -11,5: 0: 30583 -11,6: @@ -10608,7 +10608,7 @@ entities: -11,7: 0: 61986 -11,8: - 3: 1797 + 2: 1797 0: 59642 -10,6: 0: 52479 @@ -10617,7 +10617,7 @@ entities: -10,5: 0: 52430 -10,8: - 3: 771 + 2: 771 0: 29812 -9,6: 0: 12545 @@ -10626,7 +10626,7 @@ entities: -12,-4: 0: 61440 -12,-3: - 3: 1799 + 2: 1799 0: 63736 -13,-3: 0: 3935 @@ -10638,28 +10638,28 @@ entities: 0: 65535 -11,-4: 0: 12288 - 3: 16384 + 2: 16384 -11,-3: - 3: 1807 + 2: 1807 0: 63728 -11,-2: 0: 65535 -10,-3: - 3: 1797 + 2: 1797 0: 63736 -10,-2: 0: 65535 -10,-4: - 3: 6152 + 2: 6152 0: 49152 -10,-5: 0: 34952 -9,-4: - 3: 1365 + 2: 1365 0: 64170 -9,-5: 0: 64175 - 3: 1360 + 2: 1360 -16,-4: 0: 28671 -16,-5: @@ -10676,19 +10676,19 @@ entities: 0: 28398 -16,-1: 0: 49138 - 3: 16384 + 2: 16384 -17,-1: 0: 2240 - 3: 32768 + 2: 32768 -16,0: - 3: 1 + 2: 1 0: 1150 -15,-4: 0: 819 - 3: 32768 + 2: 32768 -15,-3: 0: 819 - 3: 34952 + 2: 34952 -15,-2: 0: 13107 -15,-1: @@ -10703,41 +10703,41 @@ entities: 0: 65534 -14,-4: 0: 57344 - 3: 64 + 2: 64 -14,-2: - 3: 15 + 2: 15 0: 51328 -14,0: 0: 65535 -13,-4: 0: 28672 - 3: 144 + 2: 144 -10,-6: 0: 32768 -9,-6: 0: 61440 -8,-5: - 3: 255 + 2: 255 -16,-6: - 3: 15 + 2: 15 0: 63232 -17,-6: - 3: 74 + 2: 74 0: 61696 -17,-5: 0: 57561 -16,-7: - 3: 8192 + 2: 8192 -15,-6: - 3: 16400 + 2: 16400 0: 45056 -14,-6: 0: 4096 - 3: 8192 + 2: 8192 -14,-5: - 3: 4352 + 2: 4352 -17,0: - 3: 8 + 2: 8 0: 2240 -16,1: 0: 3824 @@ -10754,7 +10754,7 @@ entities: -16,4: 0: 65535 -15,1: - 3: 752 + 2: 752 0: 8456 -15,3: 0: 20447 @@ -10762,29 +10762,29 @@ entities: 0: 50786 -15,4: 0: 9830 - 3: 2048 + 2: 2048 -14,1: 0: 61439 -14,2: 0: 62606 - 3: 320 + 2: 320 -14,3: 0: 8191 - 3: 57344 + 2: 57344 -14,4: - 3: 1834 + 2: 1834 0: 34944 -13,4: 0: 24578 - 3: 544 + 2: 544 -18,-7: - 3: 2112 + 2: 2112 -18,-6: 0: 51396 -18,-5: 0: 12 -17,-7: - 3: 40064 + 2: 40064 -19,2: 0: 9319 -19,3: @@ -10852,7 +10852,7 @@ entities: 0: 7103 8,-9: 0: 57344 - 3: 224 + 2: 224 9,-8: 0: 53755 9,-7: @@ -10861,7 +10861,7 @@ entities: 0: 4081 9,-9: 0: 47296 - 3: 16 + 2: 16 10,-8: 0: 56343 10,-7: @@ -10991,22 +10991,22 @@ entities: 17,-2: 0: 34955 17,-1: - 3: 22016 + 2: 22016 0: 43208 17,0: 0: 30475 - 3: 4 + 2: 4 18,-3: 0: 30591 18,-2: 0: 25207 - 3: 5376 + 2: 5376 18,-1: 0: 61203 - 3: 4196 + 2: 4196 18,0: 0: 49117 - 3: 16418 + 2: 16418 19,-3: 0: 49087 19,-1: @@ -11041,7 +11041,7 @@ entities: 0: 65532 -13,8: 0: 43257 - 3: 1798 + 2: 1798 -11,9: 0: 3104 -10,9: @@ -11064,40 +11064,40 @@ entities: 0: 65394 -14,7: 0: 45736 - 3: 19522 + 2: 19522 -14,8: 0: 9386 - 3: 51780 + 2: 51780 -4,13: 0: 119 - 3: 62600 + 2: 62600 -5,13: 0: 30632 -4,14: - 3: 65023 + 2: 65023 -5,14: - 3: 21882 + 2: 21882 0: 5 -4,15: - 3: 4383 + 2: 4383 -5,15: - 3: 29772 + 2: 29772 -4,16: - 3: 18255 + 2: 18255 -3,13: - 3: 14071 + 2: 14071 -3,14: - 3: 13107 + 2: 13107 0: 34952 -3,15: - 3: 8739 + 2: 8739 0: 8 4: 34816 -3,16: - 3: 60963 + 2: 60963 4: 8 -2,13: - 3: 3324 + 2: 3324 0: 49152 -2,14: 0: 65535 @@ -11106,64 +11106,64 @@ entities: 4: 65280 -2,16: 4: 15 - 3: 65280 + 2: 65280 -1,16: 4: 15 - 3: 7936 + 2: 7936 -5,16: - 3: 7962 + 2: 7962 0: 16452 -4,17: - 3: 47332 + 2: 47332 0: 16384 -5,17: - 3: 42567 + 2: 42567 0: 16384 -4,18: - 3: 35820 + 2: 35820 0: 1024 -5,18: - 3: 4030 + 2: 4030 -4,19: - 3: 51400 + 2: 51400 -3,17: - 3: 49722 + 2: 49722 0: 12288 -3,18: - 3: 3631 + 2: 3631 0: 256 -3,19: - 3: 4112 + 2: 4112 -4,20: - 3: 51400 + 2: 51400 -2,17: - 3: 61453 + 2: 61453 -2,18: - 3: 3455 + 2: 3455 0: 512 -1,17: - 3: 57617 + 2: 57617 0: 4096 -1,18: - 3: 36767 + 2: 36767 -1,19: - 3: 51400 + 2: 51400 0,17: - 3: 30891 + 2: 30891 0: 32768 0,18: - 3: 185 + 2: 185 0: 256 0,19: - 3: 4112 + 2: 4112 -1,20: - 3: 51400 + 2: 51400 1,17: - 3: 4372 + 2: 4372 1,18: - 3: 99 + 2: 99 2,16: - 3: 1 + 2: 1 -8,12: 0: 65328 -9,12: @@ -11179,9 +11179,9 @@ entities: -6,14: 0: 35055 -6,15: - 3: 34952 + 2: 34952 -6,16: - 3: 7960 + 2: 7960 0: 32896 21,-4: 0: 4096 @@ -11228,14 +11228,14 @@ entities: 15,-13: 0: 65409 21,-8: - 3: 32903 + 2: 32903 0: 32624 21,-7: - 3: 7 + 2: 7 22,-8: - 3: 18241 + 2: 18241 22,-7: - 3: 1 + 2: 1 -16,5: 0: 14199 -17,5: @@ -11246,23 +11246,23 @@ entities: 0: 61198 -15,5: 0: 4402 - 3: 17984 + 2: 17984 -15,6: - 3: 16 + 2: 16 0: 236 -14,6: 0: 8208 - 3: 224 + 2: 224 -14,5: - 3: 8 + 2: 8 -8,16: - 3: 20288 + 2: 20288 -7,16: - 3: 24400 + 2: 24400 -6,17: - 3: 34952 + 2: 34952 -6,18: - 3: 136 + 2: 136 0: 2048 12,16: 0: 23955 @@ -11270,39 +11270,39 @@ entities: 0: 1535 9,18: 0: 48 - 3: 62528 + 2: 62528 10,17: 0: 273 10,18: - 3: 63616 + 2: 63616 11,18: - 3: 15904 + 2: 15904 0: 4 11,17: 0: 2048 12,17: 0: 48 12,18: - 3: 1809 + 2: 1809 -7,-6: 0: 36864 - 3: 26222 + 2: 26222 -7,-8: - 3: 26342 + 2: 26342 -7,-9: - 3: 28262 + 2: 28262 -7,-7: - 3: 26222 + 2: 26222 -6,-8: - 3: 8244 + 2: 8244 0: 52424 -6,-7: - 3: 17 + 2: 17 0: 63342 -6,-6: 0: 179 -6,-9: - 3: 20300 + 2: 20300 0: 32768 -5,-8: 0: 63863 @@ -11310,7 +11310,7 @@ entities: 0: 34968 -5,-9: 0: 16382 - 3: 1 + 2: 1 -4,-8: 0: 17417 -4,-6: @@ -11384,20 +11384,20 @@ entities: 17,-14: 0: 4096 -3,20: - 3: 4112 + 2: 4112 -4,21: - 3: 136 + 2: 136 0,20: - 3: 4112 + 2: 4112 -1,21: - 3: 136 + 2: 136 -7,-10: 0: 2050 - 3: 26348 + 2: 26348 -6,-10: - 3: 17663 + 2: 17663 -5,-10: - 3: 17 + 2: 17 0: 51456 -5,-11: 0: 4096 @@ -11423,7 +11423,7 @@ entities: 1: 3 0: 3712 16,0: - 3: 4 + 2: 4 0: 51208 16,1: 0: 2248 @@ -11431,31 +11431,31 @@ entities: 0: 1911 18,1: 0: 4081 - 3: 14 + 2: 14 19,1: - 3: 13 + 2: 13 0: 3826 20,0: 0: 62208 - 3: 3072 + 2: 3072 20,1: 0: 1023 - 3: 3072 + 2: 3072 21,0: - 3: 9472 + 2: 9472 0: 4096 21,1: 0: 31 - 3: 3360 + 2: 3360 22,1: 0: 1367 - 3: 520 + 2: 520 22,0: - 3: 4096 + 2: 4096 23,1: - 3: 17 + 2: 17 23,0: - 3: 4096 + 2: 4096 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -11488,10 +11488,11 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True + temperature: 213.15 moles: - - 0 - - 6666.982 + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -11503,11 +11504,10 @@ entities: - 0 - 0 - volume: 2500 - immutable: True - temperature: 213.15 + temperature: 293.15 moles: - - 21.824879 - - 82.10312 + - 0 + - 6666.982 - 0 - 0 - 0 @@ -11773,8 +11773,22 @@ entities: - 4145 - 4146 - 4147 + - uid: 6307 + components: + - type: MetaData + name: service room air alarm + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,0.5 + parent: 2 + - type: DeviceList + devices: + - 9373 + - 9448 - uid: 8610 components: + - type: MetaData + name: teg air alarm - type: Transform pos: -3.5,61.5 parent: 2 @@ -11783,6 +11797,8 @@ entities: - 4760 - uid: 17596 components: + - type: MetaData + name: tool room air alarm - type: Transform rot: -1.5707963267948966 rad pos: 33.5,36.5 @@ -11797,12 +11813,16 @@ entities: - 17600 - uid: 17597 components: + - type: MetaData + name: central hall air alarm - type: Transform rot: 1.5707963267948966 rad pos: 20.5,22.5 parent: 2 - uid: 17598 components: + - type: MetaData + name: east hall air alarm - type: Transform rot: -1.5707963267948966 rad pos: 36.5,21.5 @@ -11827,6 +11847,8 @@ entities: - 17550 - uid: 17604 components: + - type: MetaData + name: chapel air alarm - type: Transform pos: 32.5,-14.5 parent: 2 @@ -11837,6 +11859,8 @@ entities: - 8249 - uid: 17605 components: + - type: MetaData + name: medical air alarm - type: Transform pos: 9.5,-0.5 parent: 2 @@ -11855,6 +11879,8 @@ entities: - 9435 - uid: 17606 components: + - type: MetaData + name: cryogenics air alarm - type: Transform pos: -2.5,-5.5 parent: 2 @@ -11864,6 +11890,143 @@ entities: - 9375 - 9296 - 9453 + - uid: 17929 + components: + - type: MetaData + name: mime air alarm + - type: Transform + rot: 3.141592653589793 rad + pos: -22.5,-4.5 + parent: 2 + - type: DeviceList + devices: + - 9372 + - 9449 + - uid: 17930 + components: + - type: MetaData + name: clown air alarm + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-12.5 + parent: 2 + - type: DeviceList + devices: + - 9450 + - 9371 + - uid: 17931 + components: + - type: MetaData + name: public garden air alarm + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-16.5 + parent: 2 + - type: DeviceList + devices: + - 9452 + - 9370 + - uid: 17932 + components: + - type: MetaData + name: boxing ring air alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,-14.5 + parent: 2 + - type: DeviceList + devices: + - 9369 + - 9451 + - uid: 17933 + components: + - type: MetaData + name: perma air alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -33.5,17.5 + parent: 2 + - type: DeviceList + devices: + - 17936 + - 17935 + - 9293 + - 9437 + - 17937 + - 17934 + - uid: 17938 + components: + - type: MetaData + name: security air alarm + - type: Transform + pos: -17.5,20.5 + parent: 2 + - type: DeviceList + devices: + - 17939 + - 17940 + - 17942 + - 17943 + - 9368 + - 17944 + - uid: 17945 + components: + - type: MetaData + name: warden air alarm + - type: Transform + pos: -13.5,23.5 + parent: 2 + - type: DeviceList + devices: + - 9445 + - 9361 + - uid: 17946 + components: + - type: MetaData + name: brig air alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,21.5 + parent: 2 + - type: DeviceList + devices: + - 17947 + - 9443 + - 17939 + - 17940 + - 6196 + - 14340 + - 17614 + - 14342 + - uid: 17948 + components: + - type: MetaData + name: security lobby air alarm + - type: Transform + pos: -3.5,31.5 + parent: 2 + - type: DeviceList + devices: + - 9330 + - 9409 + - 9438 + - 9362 + - uid: 17949 + components: + - type: MetaData + name: security dorms air alarm + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,35.5 + parent: 2 + - type: DeviceList + devices: + - 9440 + - 9366 + - 9364 + - 9441 + - 9365 + - 9442 - proto: AirAlarmAssembly entities: - uid: 12 @@ -13809,6 +13972,42 @@ entities: - type: DeviceNetwork deviceLists: - 8610 + - uid: 17934 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -28.5,12.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17933 + - uid: 17935 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -29.5,26.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17933 + - uid: 17936 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,26.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17933 + - uid: 17937 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,16.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17933 - proto: AltarSpawner entities: - uid: 241 @@ -15875,8 +16074,7 @@ entities: desc: Used for administering ten CCs of PAIN! name: The Doctor's Orders - type: Transform - rot: 3.141592653589793 rad - pos: 13.689892,-7.3280826 + pos: 13.626989,-7.2987084 parent: 2 - uid: 624 components: @@ -16364,6 +16562,13 @@ entities: - type: Transform pos: -1.5,49.5 parent: 2 +- proto: Biogenerator + entities: + - uid: 6400 + components: + - type: Transform + pos: 27.5,2.5 + parent: 2 - proto: BiomassReclaimer entities: - uid: 709 @@ -47504,6 +47709,12 @@ entities: parent: 2 - proto: ComputerAlert entities: + - uid: 14097 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,57.5 + parent: 2 - uid: 17148 components: - type: Transform @@ -48437,11 +48648,6 @@ entities: - type: Transform pos: 26.5,6.5 parent: 2 - - uid: 6400 - components: - - type: Transform - pos: 27.5,2.5 - parent: 2 - proto: CrateHydroSecure entities: - uid: 6401 @@ -49360,11 +49566,6 @@ entities: parent: 2 - proto: DefaultStationBeaconSalvage entities: - - uid: 6307 - components: - - type: Transform - pos: 80.5,4.5 - parent: 2 - uid: 9958 components: - type: Transform @@ -49376,7 +49577,7 @@ entities: pos: 89.5,4.5 parent: 2 - type: NavMapBeacon - text: Salvage Arm + text: Salvage Magnet - proto: DefaultStationBeaconScience entities: - uid: 10226 @@ -54771,6 +54972,12 @@ entities: rot: -1.5707963267948966 rad pos: -23.5,43.5 parent: 2 + - uid: 17951 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-7.5 + parent: 2 - proto: EmergencyRollerBedSpawnFolded entities: - uid: 7221 @@ -54879,7 +55086,7 @@ entities: pos: 69.5,-7.5 parent: 2 - type: FaxMachine - name: Service, Reporter + name: Reporter's Office - uid: 7239 components: - type: Transform @@ -54921,21 +55128,21 @@ entities: pos: 20.5,-12.5 parent: 2 - type: FaxMachine - name: CMO's Room + name: Chief Medical Officer - uid: 7245 components: - type: Transform pos: 26.5,22.5 parent: 2 - type: FaxMachine - name: Service, HoP + name: Head of Personnel - uid: 7246 components: - type: Transform pos: 7.5,-13.5 parent: 2 - type: FaxMachine - name: Medical, Virology + name: Virology - uid: 7247 components: - type: Transform @@ -55135,6 +55342,18 @@ entities: - 17538 - 17537 - 17536 + - uid: 17941 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,17.5 + parent: 2 + - type: DeviceList + devices: + - 17939 + - 17940 + - 17942 + - 17943 - proto: FireAxeCabinetFilled entities: - uid: 7267 @@ -55168,6 +55387,27 @@ entities: deviceLists: - 10 - 9 +- proto: FirelockEdge + entities: + - uid: 17942 + components: + - type: Transform + pos: -22.5,18.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17941 + - 17938 + - uid: 17943 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,22.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17941 + - 17938 - proto: FirelockFrame entities: - uid: 7268 @@ -55439,6 +55679,26 @@ entities: deviceLists: - 11 - 17604 + - uid: 17939 + components: + - type: Transform + pos: -14.5,18.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17941 + - 17938 + - 17946 + - uid: 17940 + components: + - type: Transform + pos: -14.5,17.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17941 + - 17938 + - 17946 - proto: Fireplace entities: - uid: 7270 @@ -58633,13 +58893,6 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,49.5 parent: 2 - - uid: 12260 - components: - - type: Transform - pos: -7.5,18.5 - parent: 2 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 12345 components: - type: Transform @@ -67489,14 +67742,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 8937 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,20.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 8938 components: - type: Transform @@ -69393,6 +69638,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 8937 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,18.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 9089 components: - type: Transform @@ -70486,6 +70739,14 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 12260 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,20.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 12670 components: - type: Transform @@ -70998,6 +71259,9 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,16.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17946 - type: AtmosPipeColor color: '#0055CCFF' - uid: 6332 @@ -71092,6 +71356,9 @@ entities: rot: 1.5707963267948966 rad pos: -26.5,19.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17933 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9294 @@ -71388,6 +71655,9 @@ entities: rot: 3.141592653589793 rad pos: -1.5,26.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17948 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9332 @@ -71614,6 +71884,9 @@ entities: rot: 1.5707963267948966 rad pos: -14.5,22.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17945 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9362 @@ -71622,6 +71895,9 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,34.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17948 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9363 @@ -71637,6 +71913,9 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,37.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17949 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9365 @@ -71644,6 +71923,9 @@ entities: - type: Transform pos: -18.5,42.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17949 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9366 @@ -71652,6 +71934,9 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,31.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17949 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9368 @@ -71659,6 +71944,9 @@ entities: - type: Transform pos: -19.5,21.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17938 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9369 @@ -71667,6 +71955,9 @@ entities: rot: 3.141592653589793 rad pos: -13.5,-16.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17932 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9370 @@ -71675,6 +71966,9 @@ entities: rot: 3.141592653589793 rad pos: -19.5,-16.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17931 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9371 @@ -71683,6 +71977,9 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,-9.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17930 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9372 @@ -71691,6 +71988,9 @@ entities: rot: 1.5707963267948966 rad pos: -23.5,-2.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17929 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9373 @@ -71699,6 +71999,9 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,1.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 6307 - type: AtmosPipeColor color: '#0055CCFF' - uid: 9374 @@ -71766,6 +72069,9 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,16.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17946 - type: AtmosPipeColor color: '#0055CCFF' - uid: 17864 @@ -71805,6 +72111,16 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 17947 + components: + - type: Transform + pos: -7.5,19.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17946 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 5443 @@ -72124,6 +72440,9 @@ entities: rot: 3.141592653589793 rad pos: -3.5,25.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17948 - type: AtmosPipeColor color: '#990000FF' - uid: 9410 @@ -72369,6 +72688,9 @@ entities: rot: 1.5707963267948966 rad pos: -29.5,20.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17933 - type: AtmosPipeColor color: '#990000FF' - uid: 9438 @@ -72377,6 +72699,9 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,32.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17948 - type: AtmosPipeColor color: '#990000FF' - uid: 9439 @@ -72392,6 +72717,9 @@ entities: rot: 1.5707963267948966 rad pos: -18.5,30.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17949 - type: AtmosPipeColor color: '#990000FF' - uid: 9441 @@ -72400,6 +72728,9 @@ entities: rot: 1.5707963267948966 rad pos: -18.5,36.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17949 - type: AtmosPipeColor color: '#990000FF' - uid: 9442 @@ -72407,6 +72738,9 @@ entities: - type: Transform pos: -17.5,41.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17949 - type: AtmosPipeColor color: '#990000FF' - uid: 9443 @@ -72415,6 +72749,9 @@ entities: rot: 3.141592653589793 rad pos: -6.5,19.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17946 - type: AtmosPipeColor color: '#990000FF' - uid: 9445 @@ -72423,6 +72760,9 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,20.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17945 - type: AtmosPipeColor color: '#990000FF' - uid: 9447 @@ -72439,6 +72779,9 @@ entities: rot: 1.5707963267948966 rad pos: -18.5,-0.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 6307 - type: AtmosPipeColor color: '#990000FF' - uid: 9449 @@ -72447,6 +72790,9 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,-3.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17929 - type: AtmosPipeColor color: '#990000FF' - uid: 9450 @@ -72455,6 +72801,9 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,-10.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17930 - type: AtmosPipeColor color: '#990000FF' - uid: 9451 @@ -72463,6 +72812,9 @@ entities: rot: 3.141592653589793 rad pos: -12.5,-17.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17932 - type: AtmosPipeColor color: '#990000FF' - uid: 9452 @@ -72471,6 +72823,9 @@ entities: rot: 3.141592653589793 rad pos: -17.5,-17.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17931 - type: AtmosPipeColor color: '#990000FF' - uid: 9453 @@ -72500,6 +72855,9 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,15.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17946 - type: AtmosPipeColor color: '#990000FF' - uid: 14342 @@ -72508,6 +72866,9 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,15.5 parent: 2 + - type: DeviceNetwork + deviceLists: + - 17946 - type: AtmosPipeColor color: '#990000FF' - uid: 16450 @@ -72585,6 +72946,16 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 17944 + components: + - type: Transform + pos: -21.5,21.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 17938 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasVolumePump entities: - uid: 4223 @@ -72814,11 +73185,6 @@ entities: - type: Transform pos: -13.734782,10.56881 parent: 2 - - uid: 9485 - components: - - type: Transform - pos: 42.850143,-31.586727 - parent: 2 - proto: Grille entities: - uid: 462 @@ -95269,21 +95635,6 @@ entities: - type: Transform pos: 26.5,25.5 parent: 2 - - uid: 13238 - components: - - type: Transform - pos: 37.5,10.5 - parent: 2 - - uid: 13239 - components: - - type: Transform - pos: 38.5,10.5 - parent: 2 - - uid: 13240 - components: - - type: Transform - pos: 42.5,9.5 - parent: 2 - uid: 13241 components: - type: Transform @@ -100751,7 +101102,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: ai satellite 2 + id: AI Satellite 2 - uid: 10831 components: - type: Transform @@ -100762,7 +101113,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: ai satellite 1 + id: AI Satellite 1 - uid: 10833 components: - type: Transform @@ -100773,7 +101124,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: ai core + id: AI Core - uid: 11036 components: - type: Transform @@ -100784,7 +101135,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: ai satellite 3 + id: AI Satellite 3 - uid: 14090 components: - type: Transform @@ -100827,7 +101178,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: Control Room + id: Bridge - uid: 14094 components: - type: Transform @@ -100849,6 +101200,28 @@ entities: - SurveillanceCameraCommand nameSet: True id: Vault + - uid: 14101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,40.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Chief Engineer's Office + - uid: 14109 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,-32.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Mysta's Room - uid: 16356 components: - type: Transform @@ -100858,7 +101231,40 @@ entities: setupAvailableNetworks: - SurveillanceCameraCommand nameSet: True - id: bridge exterior + id: Bridge Exterior + - uid: 17962 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 45.5,41.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Bridge Courtyard + - uid: 17963 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,65.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: AI Upload + - uid: 17969 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 52.5,13.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraCommand + nameSet: True + id: Logistics Officer's Office - proto: SurveillanceCameraEngineering entities: - uid: 5352 @@ -100894,16 +101300,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmospherics Lobby - - uid: 14097 - components: - - type: Transform - pos: -2.5,56.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Atmospherics Experiment Chambers - uid: 14100 components: - type: Transform @@ -100915,17 +101311,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: AME Room - - uid: 14101 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,40.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Chief Engineer's Office - uid: 14102 components: - type: Transform @@ -100946,7 +101331,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: Robotics + id: Backup Power - uid: 14104 components: - type: Transform @@ -100969,8 +101354,71 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmospheric Upper Courtyard + - uid: 14156 + components: + - type: Transform + pos: 10.5,56.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos Walkway + - uid: 17964 + components: + - type: Transform + pos: 9.5,51.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Telecomms + - uid: 17965 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 25.5,55.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Gravity + - uid: 17966 + components: + - type: Transform + pos: -4.5,66.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Solar Control + - uid: 17967 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,56.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: TEG Exterior - proto: SurveillanceCameraGeneral entities: + - uid: 13240 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 35.5,10.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Logistics Front - uid: 14106 components: - type: Transform @@ -100988,7 +101436,7 @@ entities: parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - - SurveillanceCameraGeneral + - SurveillanceCameraMedical nameSet: True id: Medical Front - uid: 14108 @@ -101000,17 +101448,6 @@ entities: - type: SurveillanceCamera nameSet: True id: Clothing Kiosk - - uid: 14109 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 35.5,10.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: Cargo Front - uid: 14110 components: - type: Transform @@ -101064,6 +101501,60 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Evacuation + - uid: 17953 + components: + - type: Transform + pos: 49.5,-12.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Cryosleep + - uid: 17955 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 37.5,-0.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Disposals + - uid: 17959 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,21.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Central Hall + - uid: 17960 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,10.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Botany Hall + - uid: 17961 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,35.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Tool Room - proto: SurveillanceCameraMedical entities: - uid: 13913 @@ -101164,6 +101655,17 @@ entities: - SurveillanceCameraMedical nameSet: True id: Chemistry Lab + - uid: 17950 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-7.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraMedical + nameSet: True + id: Morgue - proto: SurveillanceCameraRouterCommand entities: - uid: 17901 @@ -101273,17 +101775,6 @@ entities: - SurveillanceCameraScience nameSet: True id: Lockers - - uid: 14135 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 30.5,-27.5 - parent: 2 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraScience - nameSet: True - id: Artifact Chamber - uid: 14136 components: - type: Transform @@ -101305,6 +101796,16 @@ entities: - SurveillanceCameraScience nameSet: True id: Forensic Mantis' Office + - uid: 17971 + components: + - type: Transform + pos: 34.5,-32.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraScience + nameSet: True + id: Artifact Lab - proto: SurveillanceCameraSecurity entities: - uid: 14139 @@ -101447,6 +101948,38 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Courtroom + - uid: 17956 + components: + - type: Transform + pos: -21.5,18.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Perma Visitation + - uid: 17957 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,22.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Warden's Room + - uid: 17958 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,15.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Brig Cells - proto: SurveillanceCameraService entities: - uid: 14153 @@ -101481,41 +102014,63 @@ entities: - SurveillanceCameraService nameSet: True id: Hydroponics - - uid: 14156 + - uid: 14157 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 55.5,41.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Musician's Room + - uid: 14158 components: - type: Transform rot: -1.5707963267948966 rad - pos: 43.5,10.5 + pos: 7.5,15.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraService nameSet: True - id: Cargo - - uid: 14157 + id: Kitchen + - uid: 17952 components: - type: Transform rot: 1.5707963267948966 rad - pos: 55.5,41.5 + pos: 39.5,3.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraService nameSet: True - id: Musician's Room - - uid: 14158 + id: Janitor's Closet + - uid: 17954 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,15.5 + rot: 1.5707963267948966 rad + pos: 69.5,-9.5 parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraService nameSet: True - id: Kitchen + id: Reporter's Office - proto: SurveillanceCameraSupply entities: + - uid: 14135 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,10.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Logistics - uid: 17375 components: - type: Transform @@ -101524,6 +102079,26 @@ entities: parent: 2 - type: SurveillanceCamera id: Salvage Dock + - uid: 17968 + components: + - type: Transform + pos: 48.5,14.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Salvage Equipment + - uid: 17970 + components: + - type: Transform + pos: 52.5,2.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSupply + nameSet: True + id: Cargo Shuttle Dock - proto: SurveillanceCameraWirelessRouterEntertainment entities: - uid: 8556 @@ -113855,7 +114430,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -1095.1196 + secondsUntilStateChange: -3483.2776 state: Opening - type: Airlock autoClose: False @@ -113871,7 +114446,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -1094.553 + secondsUntilStateChange: -3482.711 state: Opening - type: Airlock autoClose: False @@ -113893,7 +114468,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -1094.0863 + secondsUntilStateChange: -3482.2444 state: Opening - type: Airlock autoClose: False @@ -113909,7 +114484,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -1095.6196 + secondsUntilStateChange: -3483.7776 state: Opening - type: Airlock autoClose: False @@ -113955,11 +114530,26 @@ entities: - type: Transform pos: 2.5,-6.5 parent: 2 + - uid: 9485 + components: + - type: Transform + pos: 37.5,10.5 + parent: 2 - uid: 12145 components: - type: Transform pos: 42.5,-19.5 parent: 2 + - uid: 13238 + components: + - type: Transform + pos: 38.5,10.5 + parent: 2 + - uid: 13239 + components: + - type: Transform + pos: 42.5,9.5 + parent: 2 - uid: 16358 components: - type: Transform diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml index 0d4c80a132a..8918fe2f0d0 100644 --- a/Resources/Maps/hammurabi.yml +++ b/Resources/Maps/hammurabi.yml @@ -123,7 +123,7 @@ entities: version: 6 1,-1: ind: 1,-1 - tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAXgAAAAAAXgAAAAACfwAAAAAAZQAAAAAAXgAAAAACXgAAAAACXgAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAXgAAAAABXgAAAAABXgAAAAACXgAAAAACZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAXgAAAAACXgAAAAACUgAAAAAAUgAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAXgAAAAADZQAAAAAAZQAAAAAAZQAAAAAAXgAAAAADXgAAAAACfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbwAAAAACQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAABXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAABXgAAAAADXgAAAAACXgAAAAABXgAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACXgAAAAADXgAAAAADfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAADXgAAAAABXgAAAAADQwAAAAAAQwAAAAAAXgAAAAABfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAABXgAAAAACXgAAAAADQwAAAAAAQwAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAAAXgAAAAABQwAAAAAAQwAAAAAAXgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAABXgAAAAADXgAAAAADUAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAABUAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAXgAAAAAAXgAAAAACfwAAAAAAZQAAAAAAXgAAAAACXgAAAAACXgAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAXgAAAAABXgAAAAABXgAAAAACXgAAAAACZQAAAAAAZQAAAAAAZQAAAAAAZQAAAAAAXgAAAAACXgAAAAACUgAAAAAAUgAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAXgAAAAADZQAAAAAAZQAAAAAAZQAAAAAAXgAAAAADXgAAAAACfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZQAAAAAAZQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUgAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbwAAAAACQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAABXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAABXgAAAAADXgAAAAACXgAAAAABXgAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACXgAAAAADXgAAAAADfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAADXgAAAAABXgAAAAADQwAAAAAAQwAAAAAAXgAAAAABfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAABXgAAAAACXgAAAAADQwAAAAAAQwAAAAAAXgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAADXgAAAAAAXgAAAAABQwAAAAAAQwAAAAAAXgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAABXgAAAAADXgAAAAADUAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACXgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAABUAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,1: ind: -1,1 @@ -391,7 +391,7 @@ entities: version: 6 -1,2: ind: -1,2 - tiles: fQAAAAABfQAAAAAAfQAAAAACfQAAAAADfQAAAAAAfwAAAAAAUwAAAAAAUwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfQAAAAACfQAAAAACfQAAAAABfQAAAAACfQAAAAABfwAAAAAAUwAAAAAAUwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfQAAAAABUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACXgAAAAABUAAAAAAAaQAAAAABaQAAAAACaQAAAAABaQAAAAABaQAAAAADaQAAAAABaQAAAAADaQAAAAAAaQAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAaQAAAAADaQAAAAADaQAAAAACaQAAAAAAaQAAAAACaQAAAAACaQAAAAAAaQAAAAACaQAAAAABaQAAAAACUAAAAAAAXgAAAAACXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAUAAAAAAAaQAAAAAAaQAAAAAAaQAAAAACaQAAAAABaQAAAAAAaQAAAAACaQAAAAACaQAAAAACaQAAAAAAfwAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAAAXgAAAAADfwAAAAAAaQAAAAACaQAAAAABaQAAAAABaQAAAAACaQAAAAAAaQAAAAACaQAAAAABaQAAAAAAaQAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAIAAAAAABIAAAAAADIAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAACIAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fQAAAAABfQAAAAAAfQAAAAACfQAAAAADfQAAAAAAfwAAAAAAUwAAAAAAUwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfQAAAAACfQAAAAACfQAAAAABfQAAAAACfQAAAAABfwAAAAAAUwAAAAAAUwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfQAAAAABUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACXgAAAAABUAAAAAAAaQAAAAABaQAAAAACaQAAAAABaQAAAAABaQAAAAADaQAAAAABaQAAAAADaQAAAAAAaQAAAAACXgAAAAACXgAAAAADXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAaQAAAAADaQAAAAADaQAAAAACaQAAAAAAaQAAAAACaQAAAAACaQAAAAAAaQAAAAACaQAAAAABaQAAAAACUAAAAAAAXgAAAAACXgAAAAAAXgAAAAADXgAAAAADXgAAAAAAUAAAAAAAaQAAAAAAaQAAAAAAaQAAAAACaQAAAAABaQAAAAAAaQAAAAACaQAAAAACaQAAAAACaQAAAAAAfwAAAAAAXgAAAAABXgAAAAABXgAAAAADXgAAAAAAXgAAAAADfwAAAAAAaQAAAAACaQAAAAABaQAAAAABaQAAAAACaQAAAAAAaQAAAAACaQAAAAABaQAAAAAAaQAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAIAAAAAABIAAAAAADIAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAACIAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 -5,2: ind: -5,2 @@ -439,7 +439,7 @@ entities: version: 6 3,-4: ind: 3,-4 - tiles: bQAAAAAAUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAACUAAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAADXgAAAAACUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAADXgAAAAABXgAAAAADXgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAXgAAAAAAXgAAAAABXgAAAAADXgAAAAACXgAAAAACXgAAAAABXgAAAAACUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAXgAAAAADUAAAAAAAXgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAABUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAABQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbwAAAAADbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbwAAAAACbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbwAAAAACbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAA + tiles: bQAAAAAAUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAACUAAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAADXgAAAAACUAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXgAAAAAAXgAAAAAAXgAAAAABXgAAAAADXgAAAAABXgAAAAADXgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAXgAAAAAAXgAAAAABXgAAAAADXgAAAAACXgAAAAACXgAAAAABXgAAAAACUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAXgAAAAADUAAAAAAAXgAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAABUAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAABQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbwAAAAADbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbwAAAAACbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbwAAAAACbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAA version: 6 -3,-6: ind: -3,-6 @@ -451,7 +451,7 @@ entities: version: 6 3,-3: ind: 3,-3 - tiles: fwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbwAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbwAAAAABbQAAAAAAbQAAAAAAbwAAAAACbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbwAAAAABbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbwAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbwAAAAABbQAAAAAAbQAAAAAAbwAAAAACbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAbwAAAAABbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,-2: ind: 3,-2 @@ -475,7 +475,7 @@ entities: version: 6 -8,-2: ind: -8,-2 - tiles: QwAAAAAABQAAAAAJQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAABQAAAAAIQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAZwAAAAAAZwAAAAAAZwAAAAABZwAAAAACZwAAAAAAZwAAAAAAZwAAAAADZwAAAAABZwAAAAADZwAAAAABBQAAAAAFBQAAAAABBQAAAAAOBQAAAAACBQAAAAANfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAABQAAAAAGQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAQwAAAAAABQAAAAAMQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAbQAAAAAAbQAAAAAAZwAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAZwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAJQAAAAACfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAJQAAAAACJQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAA + tiles: QwAAAAAABQAAAAAJQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAABQAAAAAIQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAZwAAAAAAZwAAAAAAZwAAAAABZwAAAAACZwAAAAAAZwAAAAAAZwAAAAADZwAAAAABZwAAAAADZwAAAAABBQAAAAAFBQAAAAABBQAAAAAOBQAAAAACBQAAAAANfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAABQAAAAAGQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAQwAAAAAABQAAAAAMQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAbQAAAAAAbQAAAAAAZwAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAZwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAJQAAAAACfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAJQAAAAACJQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAUwAAAAAAUwAAAAAAUwAAAAAA version: 6 -5,-6: ind: -5,-6 @@ -535,7 +535,7 @@ entities: version: 6 -9,-3: ind: -9,-3 - tiles: fgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAOQAAAAAAUAAAAAAAXgAAAAADfwAAAAAAXgAAAAACfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAUAAAAAAAOQAAAAAAUAAAAAAAXgAAAAAAfwAAAAAAXgAAAAABfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAUAAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAOQAAAAAAUAAAAAAAXgAAAAABXgAAAAAAXgAAAAACXgAAAAABUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA + tiles: fgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAOQAAAAAAUAAAAAAAXgAAAAADfwAAAAAAXgAAAAACfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAUAAAAAAAOQAAAAAAUAAAAAAAXgAAAAAAfwAAAAAAXgAAAAABfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAPAAAAAAAUAAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAOQAAAAAAUAAAAAAAXgAAAAABXgAAAAAAXgAAAAACXgAAAAABUAAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA version: 6 -8,-4: ind: -8,-4 @@ -712,16 +712,13 @@ entities: - type: Broadphase - type: Physics bodyStatus: InAir - angularDamping: 10000 - linearDamping: 10000 + angularDamping: 0.05 + linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Fixtures fixtures: {} - type: OccluderTree - - type: Shuttle - angularDamping: 10000 - linearDamping: 10000 - type: GridPathfinding - type: Gravity gravityShakeSound: !type:SoundPathSpecifier @@ -1054,6 +1051,8 @@ entities: 6995: 19,-3 6996: 19,0 6997: 19,2 + 9471: -6,50 + 9472: -2,48 - node: angle: 1.5707963267948966 rad color: '#52B4E9FF' @@ -3933,6 +3932,12 @@ entities: id: Clandestine decals: 5978: -49.234955,-76.92839 + - node: + color: '#A4610696' + id: Delivery + decals: + 9463: -7,47 + 9464: -7,47 - node: color: '#FFFFFFFF' id: Delivery @@ -3961,6 +3966,7 @@ entities: 6349: 81,-52 6350: 81,-44 6351: 73,-44 + 9462: -10,23 - node: cleanable: True color: '#D5188DFF' @@ -12273,6 +12279,9 @@ entities: 7070: 36,1 7071: 36,2 7084: -8,43 + 9468: -7,50 + 9469: -7,49 + 9470: -7,48 - node: color: '#1D1D21FF' id: WarnLineGreyscaleE @@ -12469,6 +12478,9 @@ entities: 7057: 37,27 7059: 42,-3 7073: 36,2 + 9465: -7,50 + 9466: -7,49 + 9467: -7,48 - node: color: '#A46106DD' id: WarnLineW @@ -13724,7 +13736,7 @@ entities: -9,-12: 0: 53503 -8,-11: - 0: 64733 + 0: 64735 -9,-11: 0: 55773 -8,-10: @@ -14334,8 +14346,7 @@ entities: -14,-12: 0: 61412 -14,-11: - 0: 53212 - 4: 4096 + 0: 57308 -14,-10: 0: 57308 -14,-13: @@ -15528,7 +15539,8 @@ entities: -2,10: 0: 65535 -2,11: - 2: 63200 + 2: 55008 + 0: 8192 -2,12: 0: 36863 2: 12288 @@ -15916,7 +15928,7 @@ entities: 2: 3824 14,-15: 2: 13056 - 0: 32768 + 0: 34816 14,-14: 0: 16379 14,-13: @@ -15926,7 +15938,7 @@ entities: 15,-16: 2: 20208 15,-15: - 0: 47104 + 0: 47872 2: 12 15,-14: 0: 35839 @@ -16110,7 +16122,7 @@ entities: -32,-6: 0: 2184 -31,-8: - 0: 56785 + 0: 57297 -31,-7: 0: 64973 -31,-6: @@ -16153,7 +16165,7 @@ entities: -28,-17: 0: 65391 -28,-15: - 7: 7 + 4: 7 3: 1792 -28,-14: 3: 7 @@ -17067,28 +17079,13 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.14975 - moles: - - 20.078888 - - 75.53487 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 temperature: 293.15 moles: - 0 - - 6666.982 - 0 - 0 + - 6666.982 - 0 - 0 - 0 @@ -17100,8 +17097,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 - 0 + - 6666.982 - 0 - 0 - 0 @@ -17115,10 +17112,10 @@ entities: - volume: 2500 temperature: 293.15 moles: + - 6666.982 - 0 - 0 - 0 - - 6666.982 - 0 - 0 - 0 @@ -19506,9 +19503,7 @@ entities: - 41608 - 41607 - 41600 - - 41603 - 41604 - - 41605 - 41506 - 41606 - 24748 @@ -19534,9 +19529,7 @@ entities: - type: DeviceList devices: - 41503 - - 41605 - 41604 - - 41603 - 16849 - 23025 - uid: 41619 @@ -20194,6 +20187,11 @@ entities: - type: Transform pos: 12.5,-19.5 parent: 1 + - uid: 32683 + components: + - type: Transform + pos: 8.5,-24.5 + parent: 1 - proto: AirlockAssembly entities: - uid: 4369 @@ -20461,6 +20459,11 @@ entities: - DoorStatus: DoorBolt 17976: - DoorStatus: DoorBolt + - uid: 32684 + components: + - type: Transform + pos: -122.5,-29.5 + parent: 1 - proto: AirlockChiefEngineerLocked entities: - uid: 9755 @@ -20802,6 +20805,10 @@ entities: - DoorStatus: DoorBolt 10673: - DoorStatus: DoorBolt + 10675: + - DoorStatus: DoorBolt + 10674: + - DoorStatus: DoorBolt - uid: 10671 components: - type: Transform @@ -20813,6 +20820,10 @@ entities: - DoorStatus: DoorBolt 10672: - DoorStatus: DoorBolt + 10675: + - DoorStatus: DoorBolt + 10674: + - DoorStatus: DoorBolt - proto: AirlockExternalGlass entities: - uid: 539 @@ -21087,6 +21098,8 @@ entities: - type: Transform pos: 62.5,-55.5 parent: 1 + - type: DeviceLinkSink + invokeCounter: 2 - type: DeviceLinkSource linkedPorts: 10673: @@ -21098,6 +21111,8 @@ entities: - type: Transform pos: 62.5,-54.5 parent: 1 + - type: DeviceLinkSink + invokeCounter: 2 - type: DeviceLinkSource linkedPorts: 10673: @@ -23398,13 +23413,6 @@ entities: - type: Transform pos: 14.5,-7.5 parent: 1 - - uid: 1576 - components: - - type: MetaData - name: glass airlock to The Hole - - type: Transform - pos: 8.5,-24.5 - parent: 1 - uid: 1577 components: - type: Transform @@ -26495,8 +26503,10 @@ entities: parent: 1 - proto: APCConstructed entities: - - uid: 18602 + - uid: 31263 components: + - type: MetaData + name: particle accelerator APC - type: Transform pos: 58.5,-52.5 parent: 1 @@ -27372,212 +27382,257 @@ entities: - type: Transform pos: 44.5,-6.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 541 components: - type: Transform - pos: -72.5,45.5 + pos: -25.5,-24.5 parent: 1 - uid: 548 components: - type: Transform - pos: -64.5,45.5 + pos: -5.5,-65.5 parent: 1 - uid: 550 components: - type: Transform - pos: -46.5,45.5 + pos: 2.5,-65.5 parent: 1 - - uid: 2036 + - uid: 907 components: - type: Transform - pos: -30.5,42.5 + pos: 16.5,-65.5 parent: 1 - - uid: 2179 + - uid: 908 components: - type: Transform - pos: -74.5,45.5 + pos: 38.5,-65.5 parent: 1 - - uid: 2214 + - uid: 929 components: - type: Transform - pos: -66.5,45.5 + pos: -45.5,-78.5 parent: 1 - - uid: 2464 + - uid: 930 components: - type: Transform - pos: -48.5,45.5 + pos: -3.5,-65.5 parent: 1 - - uid: 5442 + - uid: 1576 components: - type: Transform - pos: -31.5,42.5 + pos: 4.5,-65.5 parent: 1 - - uid: 5579 + - uid: 2036 components: - type: Transform - pos: 3.5,51.5 + pos: 26.5,-65.5 parent: 1 - - uid: 5587 + - uid: 2179 components: - type: Transform - pos: -34.5,42.5 + pos: -41.5,-78.5 parent: 1 - - uid: 5661 + - uid: 2214 components: - type: Transform - pos: -33.5,42.5 + pos: 40.5,-65.5 parent: 1 - - uid: 5991 + - uid: 2464 components: - type: Transform - pos: 28.5,5.5 + pos: 24.5,-65.5 parent: 1 - - uid: 5992 + - uid: 3061 components: - type: Transform - pos: 28.5,9.5 + pos: 48.5,-65.5 parent: 1 - - uid: 9647 + - uid: 3082 + components: + - type: Transform + pos: 46.5,-65.5 + parent: 1 + - uid: 3117 components: - type: Transform + rot: -1.5707963267948966 rad pos: -25.5,10.5 parent: 1 - - uid: 10515 + - uid: 3281 components: - type: Transform + rot: -1.5707963267948966 rad pos: 22.5,-41.5 parent: 1 - - uid: 11108 + - uid: 3410 components: - type: Transform + rot: -1.5707963267948966 rad pos: -26.5,-23.5 parent: 1 - - uid: 12719 + - uid: 4394 components: - type: Transform - pos: -97.5,38.5 + rot: -1.5707963267948966 rad + pos: -137.5,-24.5 parent: 1 - - uid: 12720 + - uid: 5442 components: - type: Transform - pos: -87.5,45.5 + pos: 18.5,-65.5 parent: 1 - - uid: 12721 + - uid: 5579 components: - type: Transform - pos: -87.5,38.5 + pos: -49.5,-78.5 parent: 1 - - uid: 12788 + - uid: 5587 components: - type: Transform - pos: -97.5,45.5 + pos: -93.5,-89.5 parent: 1 - - uid: 16635 + - uid: 5661 components: - type: Transform - pos: -137.5,-24.5 + rot: -1.5707963267948966 rad + pos: -153.5,-33.5 parent: 1 - - uid: 19249 + - uid: 5991 components: - type: Transform - pos: -45.5,-78.5 + rot: 1.5707963267948966 rad + pos: -90.5,-86.5 parent: 1 - - uid: 24591 + - uid: 5992 components: - type: Transform - pos: -5.5,-65.5 + rot: 3.141592653589793 rad + pos: -72.5,45.5 parent: 1 - - uid: 24592 + - uid: 6150 components: - type: Transform - pos: -3.5,-65.5 + rot: 3.141592653589793 rad + pos: -34.5,42.5 parent: 1 - - uid: 24593 + - uid: 6151 components: - type: Transform - pos: 2.5,-65.5 + rot: 3.141592653589793 rad + pos: -64.5,45.5 parent: 1 - - uid: 24594 + - uid: 6152 components: - type: Transform - pos: 4.5,-65.5 + rot: 3.141592653589793 rad + pos: -48.5,45.5 parent: 1 - - uid: 24595 + - uid: 6153 components: - type: Transform - pos: 16.5,-65.5 + rot: 3.141592653589793 rad + pos: -46.5,45.5 parent: 1 - - uid: 24596 + - uid: 6611 components: - type: Transform - pos: 18.5,-65.5 + rot: 3.141592653589793 rad + pos: -33.5,42.5 parent: 1 - - uid: 24597 + - uid: 6615 components: - type: Transform - pos: 24.5,-65.5 + rot: 3.141592653589793 rad + pos: -66.5,45.5 parent: 1 - - uid: 24598 + - uid: 6617 components: - type: Transform - pos: 26.5,-65.5 + rot: 3.141592653589793 rad + pos: -30.5,42.5 parent: 1 - - uid: 24599 + - uid: 6618 components: - type: Transform - pos: 38.5,-65.5 + rot: 3.141592653589793 rad + pos: 3.5,51.5 parent: 1 - - uid: 24600 + - uid: 6619 components: - type: Transform - pos: 40.5,-65.5 + rot: 1.5707963267948966 rad + pos: 28.5,9.5 parent: 1 - - uid: 24601 + - uid: 6620 components: - type: Transform - pos: 46.5,-65.5 + rot: 1.5707963267948966 rad + pos: 28.5,5.5 parent: 1 - - uid: 24602 + - uid: 6629 components: - type: Transform - pos: 48.5,-65.5 + rot: 3.141592653589793 rad + pos: -74.5,45.5 parent: 1 - - uid: 24931 + - uid: 6632 components: - type: Transform - pos: -41.5,-78.5 + rot: -1.5707963267948966 rad + pos: -87.5,45.5 parent: 1 - - uid: 24947 + - uid: 6633 components: - type: Transform - pos: -49.5,-78.5 + rot: -1.5707963267948966 rad + pos: -153.5,-32.5 parent: 1 - - uid: 36459 + - uid: 6635 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -87.5,38.5 + parent: 1 + - uid: 6636 components: - type: Transform + rot: 3.141592653589793 rad pos: -124.5,27.5 parent: 1 - - uid: 36464 + - uid: 6639 components: - type: Transform - pos: -153.5,-32.5 + rot: 1.5707963267948966 rad + pos: -97.5,45.5 parent: 1 - - uid: 36465 + - uid: 6643 components: - type: Transform - pos: -153.5,-33.5 + rot: 1.5707963267948966 rad + pos: -97.5,38.5 parent: 1 - - uid: 41739 + - uid: 32687 components: - type: Transform - pos: -93.5,-89.5 + rot: 3.141592653589793 rad + pos: -31.5,42.5 parent: 1 - - uid: 41810 + - uid: 43123 components: - type: Transform - pos: -90.5,-86.5 + pos: -24.5,-24.5 + parent: 1 + - uid: 43124 + components: + - type: Transform + pos: -23.5,-24.5 + parent: 1 + - uid: 43125 + components: + - type: Transform + pos: -22.5,-24.5 parent: 1 - proto: AtmosFixBlockerMarker entities: @@ -29648,6 +29703,13 @@ entities: rot: 3.141592653589793 rad pos: -65.50091,6.665364 parent: 1 +- proto: Biofabricator + entities: + - uid: 4780 + components: + - type: Transform + pos: -34.5,-11.5 + parent: 1 - proto: BiomassReclaimer entities: - uid: 1731 @@ -29951,10 +30013,11 @@ entities: parent: 1 - proto: BookAtmosAirAlarms entities: - - uid: 15400 + - uid: 2090 components: - type: Transform - pos: -94.90623,-39.386993 + rot: -1.5707963267948966 rad + pos: -94.47202,-41.99912 parent: 1 - proto: BookBartendersManual entities: @@ -30016,11 +30079,11 @@ entities: parent: 1 - proto: BookLeafLoversSecret entities: - - uid: 904 + - uid: 639 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -34.50293,-11.364823 + rot: -1.5707963267948966 rad + pos: -28.470697,-17.970749 parent: 1 - uid: 11025 components: @@ -30517,6 +30580,18 @@ entities: - type: Transform pos: -7.970074,38.58155 parent: 1 +- proto: BoxEnvelope + entities: + - uid: 32620 + components: + - type: Transform + pos: -49.340946,33.642918 + parent: 1 + - uid: 32622 + components: + - type: Transform + pos: -49.653446,33.663765 + parent: 1 - proto: BoxFlashbang entities: - uid: 12144 @@ -30844,11 +30919,6 @@ entities: - type: Transform pos: -46.74948,-33.33157 parent: 1 - - uid: 28648 - components: - - type: Transform - pos: -1.480845,-20.389856 - parent: 1 - uid: 29448 components: - type: Transform @@ -31135,6 +31205,20 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,-36.5 parent: 1 +- proto: ButtonFrameGrey + entities: + - uid: 2300 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -65.5,22.5 + parent: 1 + - uid: 2301 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,22.5 + parent: 1 - proto: ButtonFrameJanitor entities: - uid: 42175 @@ -45509,6 +45593,11 @@ entities: - type: Transform pos: -6.5,17.5 parent: 1 + - uid: 28648 + components: + - type: Transform + pos: 60.5,-55.5 + parent: 1 - uid: 28649 components: - type: Transform @@ -54895,6 +54984,31 @@ entities: - type: Transform pos: -62.5,-40.5 parent: 1 + - uid: 10648 + components: + - type: Transform + pos: 61.5,-56.5 + parent: 1 + - uid: 10657 + components: + - type: Transform + pos: 59.5,-50.5 + parent: 1 + - uid: 10662 + components: + - type: Transform + pos: 58.5,-50.5 + parent: 1 + - uid: 10877 + components: + - type: Transform + pos: 59.5,-47.5 + parent: 1 + - uid: 10887 + components: + - type: Transform + pos: 60.5,-48.5 + parent: 1 - uid: 10921 components: - type: Transform @@ -55390,16 +55504,6 @@ entities: - type: Transform pos: 61.5,-55.5 parent: 1 - - uid: 14247 - components: - - type: Transform - pos: 61.5,-56.5 - parent: 1 - - uid: 14248 - components: - - type: Transform - pos: 60.5,-56.5 - parent: 1 - uid: 14249 components: - type: Transform @@ -55470,16 +55574,6 @@ entities: - type: Transform pos: 57.5,-49.5 parent: 1 - - uid: 14966 - components: - - type: Transform - pos: 58.5,-49.5 - parent: 1 - - uid: 14971 - components: - - type: Transform - pos: 59.5,-49.5 - parent: 1 - uid: 14973 components: - type: Transform @@ -55565,6 +55659,11 @@ entities: - type: Transform pos: 56.5,-42.5 parent: 1 + - uid: 15203 + components: + - type: Transform + pos: 57.5,-47.5 + parent: 1 - uid: 15206 components: - type: Transform @@ -55578,28 +55677,13 @@ entities: - uid: 15225 components: - type: Transform - pos: 57.5,-46.5 - parent: 1 - - uid: 15247 - components: - - type: Transform - pos: 58.5,-46.5 - parent: 1 - - uid: 15249 - components: - - type: Transform - pos: 59.5,-46.5 + pos: 58.5,-47.5 parent: 1 - uid: 15256 components: - type: Transform pos: 60.5,-46.5 parent: 1 - - uid: 15259 - components: - - type: Transform - pos: 60.5,-45.5 - parent: 1 - uid: 15265 components: - type: Transform @@ -58579,6 +58663,11 @@ entities: - type: Transform pos: 23.5,5.5 parent: 1 + - uid: 29517 + components: + - type: Transform + pos: 59.5,-57.5 + parent: 1 - uid: 29544 components: - type: Transform @@ -58589,11 +58678,21 @@ entities: - type: Transform pos: -79.5,-39.5 parent: 1 + - uid: 30380 + components: + - type: Transform + pos: 60.5,-57.5 + parent: 1 - uid: 30387 components: - type: Transform pos: 9.5,-38.5 parent: 1 + - uid: 30774 + components: + - type: Transform + pos: 61.5,-57.5 + parent: 1 - uid: 32309 components: - type: Transform @@ -63542,6 +63641,11 @@ entities: - type: Transform pos: -70.5,-7.5 parent: 1 + - uid: 10649 + components: + - type: Transform + pos: 59.5,-57.5 + parent: 1 - uid: 10957 components: - type: Transform @@ -71992,11 +72096,6 @@ entities: - type: Transform pos: -40.5,-75.5 parent: 1 - - uid: 39650 - components: - - type: Transform - pos: 58.5,-52.5 - parent: 1 - uid: 39651 components: - type: Transform @@ -73202,6 +73301,11 @@ entities: - type: Transform pos: -27.5,5.5 parent: 1 + - uid: 43155 + components: + - type: Transform + pos: 58.5,-52.5 + parent: 1 - proto: CableMVStack entities: - uid: 3219 @@ -73255,10 +73359,10 @@ entities: rot: 3.141592653589793 rad pos: -112.5,-22.5 parent: 1 - - uid: 10919 + - uid: 10890 components: - type: Transform - pos: 61.5,-55.5 + pos: 61.5,-56.5 parent: 1 - uid: 13298 components: @@ -76273,6 +76377,11 @@ entities: - type: Transform pos: -96.5,-28.5 parent: 1 + - uid: 19293 + components: + - type: Transform + pos: 59.5,-56.5 + parent: 1 - uid: 19927 components: - type: Transform @@ -83535,12 +83644,6 @@ entities: rot: 1.5707963267948966 rad pos: 60.690517,-43.173733 parent: 1 - - uid: 10896 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 60.45093,-49.412567 - parent: 1 - uid: 11034 components: - type: Transform @@ -83581,6 +83684,12 @@ entities: rot: 1.5707963267948966 rad pos: -95.2549,-40.368137 parent: 1 + - uid: 28739 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 60.387344,-50.33426 + parent: 1 - uid: 28742 components: - type: Transform @@ -84517,17 +84626,6 @@ entities: parent: 1 - proto: Cigarette entities: - - uid: 17689 - components: - - type: Transform - pos: -87.698425,-17.302172 - parent: 1 - - uid: 19293 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -88.51011,-46.27136 - parent: 1 - uid: 28706 components: - type: Transform @@ -84560,17 +84658,6 @@ entities: - type: Transform pos: -6.248913,11.525083 parent: 1 - - uid: 28739 - components: - - type: Transform - pos: 6.7320995,-15.165098 - parent: 1 - - uid: 29442 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.212751,-49.56133 - parent: 1 - proto: CigaretteBanana entities: - uid: 36443 @@ -84797,26 +84884,6 @@ entities: rot: 3.141592653589793 rad pos: -35.667667,-67.367386 parent: 1 - - uid: 31263 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -31.385698,17.652447 - parent: 1 -- proto: CigPackBlue - entities: - - uid: 15092 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -92.257256,25.130632 - parent: 1 - - uid: 30380 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.647594,-73.685814 - parent: 1 - proto: CigPackGreen entities: - uid: 14743 @@ -84832,12 +84899,6 @@ entities: rot: -1.5707963267948966 rad pos: 70.85632,1.4241102 parent: 1 - - uid: 30774 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -75.63711,-38.75398 - parent: 1 - proto: CigPackMixed entities: - uid: 2056 @@ -85997,6 +86058,26 @@ entities: - type: Transform pos: -0.54146147,-37.24413 parent: 1 +- proto: ClothingBackpackElectropack + entities: + - uid: 2695 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.3645833,-23.317299 + parent: 1 + - uid: 2698 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.646861,-21.428116 + parent: 1 + - uid: 2701 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -47.292618,-33.169548 + parent: 1 - proto: ClothingBeltSecurityFilled entities: - uid: 9509 @@ -86053,6 +86134,11 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage + - uid: 41603 + components: + - type: Transform + pos: 61.52096,-53.54917 + parent: 1 - proto: ClothingEyesHudSecurity entities: - uid: 9511 @@ -87307,6 +87393,11 @@ entities: - type: Transform pos: -103.5,11.5 parent: 1 + - uid: 7584 + components: + - type: Transform + pos: -95.5,-39.5 + parent: 1 - uid: 8223 components: - type: Transform @@ -87625,12 +87716,6 @@ entities: rot: -1.5707963267948966 rad pos: -104.5,-33.5 parent: 1 - - uid: 10890 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 59.5,-49.5 - parent: 1 - uid: 16180 components: - type: Transform @@ -87641,6 +87726,12 @@ entities: - type: Transform pos: -106.5,12.5 parent: 1 + - uid: 29442 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 59.5,-50.5 + parent: 1 - uid: 34245 components: - type: Transform @@ -87693,13 +87784,6 @@ entities: - type: Transform pos: -28.5,41.5 parent: 1 -- proto: ComputerShuttleSalvage - entities: - - uid: 13170 - components: - - type: Transform - pos: -3.5,51.5 - parent: 1 - proto: ComputerSolarControl entities: - uid: 16186 @@ -88854,58 +88938,65 @@ entities: rot: 3.141592653589793 rad pos: 3.5,31.5 parent: 1 - - uid: 6611 + - uid: 7123 components: - type: Transform - rot: 1.5707963267948966 rad + rot: -1.5707963267948966 rad pos: -5.5,23.5 parent: 1 - - uid: 6617 + - uid: 7157 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,23.5 + pos: -4.5,26.5 parent: 1 - - uid: 6618 + - uid: 7158 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,23.5 + pos: -4.5,25.5 parent: 1 - - uid: 6619 + - uid: 8505 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,23.5 + pos: 42.5,11.5 parent: 1 - - uid: 6620 + - uid: 8781 components: - type: Transform - rot: 1.5707963267948966 rad + pos: -4.5,24.5 + parent: 1 + - uid: 8967 + components: + - type: Transform + pos: -4.5,28.5 + parent: 1 + - uid: 9639 + components: + - type: Transform + rot: -1.5707963267948966 rad pos: -6.5,23.5 parent: 1 - - uid: 6633 + - uid: 9640 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,23.5 + pos: -4.5,27.5 parent: 1 - - uid: 6635 + - uid: 9642 components: - type: Transform rot: 3.141592653589793 rad - pos: -4.5,23.5 + pos: -6.5,48.5 parent: 1 - - uid: 6639 + - uid: 9647 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,23.5 + rot: 3.141592653589793 rad + pos: -6.5,49.5 parent: 1 - - uid: 8505 + - uid: 9848 components: - type: Transform - pos: 42.5,11.5 + rot: 3.141592653589793 rad + pos: -6.5,50.5 parent: 1 - uid: 10042 components: @@ -89034,19 +89125,35 @@ entities: rot: -1.5707963267948966 rad pos: 23.5,-3.5 parent: 1 + - uid: 10515 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,23.5 + parent: 1 - uid: 10656 components: - type: Transform pos: 42.5,7.5 parent: 1 + - uid: 11108 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,23.5 + parent: 1 + - uid: 11289 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,23.5 + parent: 1 - uid: 11292 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,23.5 + rot: -1.5707963267948966 rad + pos: -11.5,23.5 parent: 1 - - type: DeviceLinkSink - invokeCounter: 1 - uid: 11313 components: - type: Transform @@ -89198,20 +89305,8 @@ entities: - uid: 12021 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-16.5 - parent: 1 - - uid: 12022 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,-16.5 - parent: 1 - - uid: 12023 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-16.5 + rot: -1.5707963267948966 rad + pos: -12.5,23.5 parent: 1 - uid: 13108 components: @@ -89237,41 +89332,10 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,27.5 parent: 1 - - uid: 15165 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,24.5 - parent: 1 - - uid: 15166 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,25.5 - parent: 1 - - uid: 15167 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,26.5 - parent: 1 - - uid: 15168 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,27.5 - parent: 1 - - uid: 15169 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,28.5 - parent: 1 - uid: 15170 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,29.5 + pos: -4.5,23.5 parent: 1 - uid: 17138 components: @@ -89328,6 +89392,29 @@ entities: - type: Transform pos: 42.5,1.5 parent: 1 + - uid: 32629 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-16.5 + parent: 1 + - uid: 36830 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-16.5 + parent: 1 + - uid: 41217 + components: + - type: Transform + pos: -4.5,29.5 + parent: 1 + - uid: 42850 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-16.5 + parent: 1 - proto: CrateArtifactContainer entities: - uid: 6801 @@ -89521,6 +89608,24 @@ entities: - type: Transform pos: 59.5,-45.5 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: CrateEngineeringSingularityCollector entities: - uid: 15890 @@ -90052,6 +90157,13 @@ entities: - 0 - 0 - 0 +- proto: CrateMaterialGlass + entities: + - uid: 43129 + components: + - type: Transform + pos: 52.5,-49.5 + parent: 1 - proto: CrateMedical entities: - uid: 9063 @@ -91789,24 +91901,6 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,-30.5 parent: 1 - - uid: 6150 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -25.5,-14.5 - parent: 1 - - uid: 6151 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,-11.5 - parent: 1 - - uid: 6153 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,-11.5 - parent: 1 - uid: 8312 components: - type: Transform @@ -91847,6 +91941,24 @@ entities: rot: 1.5707963267948966 rad pos: -82.5,-35.5 parent: 1 + - uid: 12563 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -46.5,-57.5 + parent: 1 + - uid: 12720 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -28.5,-19.5 + parent: 1 + - uid: 12721 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-16.5 + parent: 1 - uid: 13927 components: - type: Transform @@ -92307,6 +92419,12 @@ entities: rot: -1.5707963267948966 rad pos: -43.5,-25.5 parent: 1 + - uid: 16635 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,-13.5 + parent: 1 - uid: 16647 components: - type: Transform @@ -92342,6 +92460,35 @@ entities: - type: Transform pos: -42.5,42.5 parent: 1 + - uid: 19249 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-12.5 + parent: 1 + - uid: 24591 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -58.5,-68.5 + parent: 1 + - uid: 24592 + components: + - type: Transform + pos: -13.5,-9.5 + parent: 1 + - uid: 24597 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -52.5,-68.5 + parent: 1 + - uid: 24598 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -52.5,-66.5 + parent: 1 - uid: 28671 components: - type: Transform @@ -92618,6 +92765,12 @@ entities: rot: 1.5707963267948966 rad pos: -40.5,21.5 parent: 1 + - uid: 30185 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -46.5,-49.5 + parent: 1 - uid: 32468 components: - type: Transform @@ -92660,35 +92813,41 @@ entities: rot: -1.5707963267948966 rad pos: -58.5,-71.5 parent: 1 - - uid: 32544 + - uid: 32542 components: - type: Transform rot: 1.5707963267948966 rad - pos: -58.5,-66.5 + pos: -48.5,-57.5 parent: 1 - - uid: 32545 + - uid: 32543 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-16.5 + parent: 1 + - uid: 32544 components: - type: Transform rot: -1.5707963267948966 rad - pos: -48.5,-66.5 + pos: -22.5,-19.5 parent: 1 - - uid: 32562 + - uid: 32545 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -48.5,-58.5 + rot: -1.5707963267948966 rad + pos: -48.5,-66.5 parent: 1 - - uid: 32563 + - uid: 32546 components: - type: Transform rot: -1.5707963267948966 rad - pos: -44.5,-58.5 + pos: -28.5,-21.5 parent: 1 - - uid: 32575 + - uid: 32547 components: - type: Transform rot: 1.5707963267948966 rad - pos: -44.5,-49.5 + pos: -38.5,-21.5 parent: 1 - uid: 32576 components: @@ -92735,88 +92894,61 @@ entities: - uid: 32607 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -38.5,-22.5 - parent: 1 - - uid: 32608 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -27.5,-22.5 + rot: 3.141592653589793 rad + pos: -23.5,-9.5 parent: 1 - - uid: 32609 + - uid: 32615 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -27.5,-20.5 + pos: -21.5,8.5 parent: 1 - - uid: 32610 + - uid: 32618 components: - type: Transform rot: -1.5707963267948966 rad - pos: -22.5,-20.5 - parent: 1 - - uid: 32611 - components: - - type: Transform - pos: -22.5,-15.5 - parent: 1 - - uid: 32612 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,-15.5 + pos: -21.5,0.5 parent: 1 - - uid: 32613 + - uid: 32619 components: - type: Transform - pos: -23.5,-14.5 + rot: 1.5707963267948966 rad + pos: -23.5,0.5 parent: 1 - - uid: 32645 + - uid: 32640 components: - type: Transform rot: 1.5707963267948966 rad - pos: -24.5,-3.5 + pos: -25.5,18.5 parent: 1 - - uid: 32646 + - uid: 32641 components: - type: Transform rot: -1.5707963267948966 rad - pos: -23.5,-3.5 - parent: 1 - - uid: 32658 - components: - - type: Transform - pos: -23.5,8.5 + pos: -19.5,18.5 parent: 1 - - uid: 32659 + - uid: 32644 components: - type: Transform - rot: 3.141592653589793 rad - pos: -25.5,8.5 + rot: -1.5707963267948966 rad + pos: -29.5,5.5 parent: 1 - - uid: 32660 + - uid: 32646 components: - type: Transform rot: 1.5707963267948966 rad - pos: -25.5,17.5 + pos: -29.5,7.5 parent: 1 - - uid: 32678 + - uid: 32650 components: - type: Transform rot: -1.5707963267948966 rad - pos: -14.5,17.5 - parent: 1 - - uid: 32679 - components: - - type: Transform - pos: -14.5,22.5 + pos: -27.5,7.5 parent: 1 - - uid: 32690 + - uid: 32659 components: - type: Transform rot: 3.141592653589793 rad - pos: -19.5,22.5 + pos: -25.5,8.5 parent: 1 - uid: 32691 components: @@ -93416,11 +93548,23 @@ entities: - type: Transform pos: -27.5,10.5 parent: 1 - - uid: 42849 + - uid: 42852 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -26.5,-10.5 + parent: 1 + - uid: 42853 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-11.5 + parent: 1 + - uid: 42861 components: - type: Transform rot: -1.5707963267948966 rad - pos: -27.5,5.5 + pos: -25.5,-10.5 parent: 1 - uid: 42862 components: @@ -93480,6 +93624,56 @@ entities: - type: Transform pos: 13.5,-12.5 parent: 1 + - uid: 43068 + components: + - type: Transform + pos: -25.5,-0.5 + parent: 1 + - uid: 43069 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-0.5 + parent: 1 + - uid: 43070 + components: + - type: Transform + pos: -26.5,3.5 + parent: 1 + - uid: 43071 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -27.5,3.5 + parent: 1 + - uid: 43072 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -27.5,5.5 + parent: 1 + - uid: 43077 + components: + - type: Transform + pos: -24.5,5.5 + parent: 1 + - uid: 43078 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,1.5 + parent: 1 + - uid: 43079 + components: + - type: Transform + pos: -20.5,1.5 + parent: 1 + - uid: 43080 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-11.5 + parent: 1 - proto: DisposalJunction entities: - uid: 2416 @@ -94128,12 +94322,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-34.5 parent: 1 - - uid: 6152 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -25.5,-12.5 - parent: 1 - uid: 8309 components: - type: Transform @@ -94168,11 +94356,65 @@ entities: rot: 1.5707963267948966 rad pos: -81.5,-35.5 parent: 1 + - uid: 12025 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-12.5 + parent: 1 + - uid: 12027 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -53.5,-68.5 + parent: 1 - uid: 12152 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -44.5,-49.5 + parent: 1 + - uid: 12562 components: - type: Transform rot: 3.141592653589793 rad - pos: -25.5,-13.5 + pos: -46.5,-52.5 + parent: 1 + - uid: 12564 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-19.5 + parent: 1 + - uid: 12565 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -34.5,-21.5 + parent: 1 + - uid: 12719 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -36.5,-21.5 + parent: 1 + - uid: 12788 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-16.5 + parent: 1 + - uid: 13170 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-16.5 + parent: 1 + - uid: 13222 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-5.5 parent: 1 - uid: 13564 components: @@ -97541,12 +97783,35 @@ entities: rot: 3.141592653589793 rad pos: -33.5,-13.5 parent: 1 + - uid: 15165 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-3.5 + parent: 1 + - uid: 15166 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,4.5 + parent: 1 + - uid: 15169 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,18.5 + parent: 1 - uid: 16110 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,36.5 parent: 1 + - uid: 16196 + components: + - type: Transform + pos: -29.5,6.5 + parent: 1 - uid: 16305 components: - type: Transform @@ -97689,6 +97954,54 @@ entities: rot: -1.5707963267948966 rad pos: -70.5,-24.5 parent: 1 + - uid: 24593 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -54.5,-68.5 + parent: 1 + - uid: 24594 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -55.5,-68.5 + parent: 1 + - uid: 24595 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -56.5,-68.5 + parent: 1 + - uid: 24596 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -57.5,-68.5 + parent: 1 + - uid: 24599 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -45.5,-49.5 + parent: 1 + - uid: 24600 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-50.5 + parent: 1 + - uid: 24601 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-51.5 + parent: 1 + - uid: 24602 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-53.5 + parent: 1 - uid: 24740 components: - type: Transform @@ -97700,6 +98013,18 @@ entities: - type: Transform pos: -74.5,-28.5 parent: 1 + - uid: 24931 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-54.5 + parent: 1 + - uid: 24947 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-55.5 + parent: 1 - uid: 25027 components: - type: Transform @@ -97715,6 +98040,12 @@ entities: - type: Transform pos: -56.5,31.5 parent: 1 + - uid: 28279 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-56.5 + parent: 1 - uid: 28655 components: - type: Transform @@ -97751,6 +98082,12 @@ entities: - type: Transform pos: -42.5,33.5 parent: 1 + - uid: 28841 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -47.5,-57.5 + parent: 1 - uid: 28844 components: - type: Transform @@ -99597,6 +99934,11 @@ entities: rot: 3.141592653589793 rad pos: -39.5,36.5 parent: 1 + - uid: 29514 + components: + - type: Transform + pos: -48.5,-58.5 + parent: 1 - uid: 29647 components: - type: Transform @@ -99773,53 +100115,28 @@ entities: rot: 3.141592653589793 rad pos: -58.5,-69.5 parent: 1 - - uid: 32542 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -58.5,-68.5 - parent: 1 - - uid: 32543 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -58.5,-67.5 - parent: 1 - - uid: 32546 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -57.5,-66.5 - parent: 1 - - uid: 32547 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -56.5,-66.5 - parent: 1 - uid: 32548 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -55.5,-66.5 + pos: -38.5,-22.5 parent: 1 - uid: 32549 components: - type: Transform rot: -1.5707963267948966 rad - pos: -54.5,-66.5 + pos: -37.5,-21.5 parent: 1 - uid: 32550 components: - type: Transform rot: -1.5707963267948966 rad - pos: -53.5,-66.5 + pos: -35.5,-21.5 parent: 1 - uid: 32551 components: - type: Transform rot: -1.5707963267948966 rad - pos: -52.5,-66.5 + pos: -33.5,-21.5 parent: 1 - uid: 32552 components: @@ -99881,63 +100198,89 @@ entities: rot: 3.141592653589793 rad pos: -48.5,-59.5 parent: 1 + - uid: 32562 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,-21.5 + parent: 1 + - uid: 32563 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.5,-21.5 + parent: 1 - uid: 32564 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -47.5,-58.5 + rot: -1.5707963267948966 rad + pos: -30.5,-21.5 parent: 1 - uid: 32565 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -46.5,-58.5 + rot: -1.5707963267948966 rad + pos: -29.5,-21.5 parent: 1 - uid: 32566 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -45.5,-58.5 + rot: 3.141592653589793 rad + pos: -28.5,-20.5 parent: 1 - uid: 32567 components: - type: Transform - pos: -44.5,-57.5 + rot: 1.5707963267948966 rad + pos: -27.5,-19.5 parent: 1 - uid: 32568 components: - type: Transform - pos: -44.5,-56.5 + rot: 1.5707963267948966 rad + pos: -26.5,-19.5 parent: 1 - uid: 32569 components: - type: Transform - pos: -44.5,-55.5 + rot: 1.5707963267948966 rad + pos: -25.5,-19.5 parent: 1 - uid: 32570 components: - type: Transform - pos: -44.5,-54.5 + rot: 1.5707963267948966 rad + pos: -24.5,-19.5 parent: 1 - uid: 32571 components: - type: Transform - pos: -44.5,-53.5 + rot: -1.5707963267948966 rad + pos: -17.5,-16.5 parent: 1 - uid: 32572 components: - type: Transform - pos: -44.5,-52.5 + rot: -1.5707963267948966 rad + pos: -18.5,-16.5 parent: 1 - uid: 32573 components: - type: Transform - pos: -44.5,-51.5 + rot: -1.5707963267948966 rad + pos: -19.5,-16.5 parent: 1 - uid: 32574 components: - type: Transform - pos: -44.5,-50.5 + rot: -1.5707963267948966 rad + pos: -20.5,-16.5 + parent: 1 + - uid: 32575 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-16.5 parent: 1 - uid: 32579 components: @@ -100074,118 +100417,101 @@ entities: - type: Transform pos: -38.5,-24.5 parent: 1 - - uid: 32615 + - uid: 32608 components: - type: Transform rot: 3.141592653589793 rad - pos: -22.5,-16.5 + pos: -23.5,-4.5 parent: 1 - - uid: 32616 + - uid: 32609 components: - type: Transform rot: 3.141592653589793 rad - pos: -22.5,-17.5 + pos: -21.5,5.5 parent: 1 - - uid: 32617 + - uid: 32610 components: - type: Transform rot: 3.141592653589793 rad - pos: -22.5,-18.5 + pos: -21.5,6.5 parent: 1 - - uid: 32618 + - uid: 32611 components: - type: Transform rot: 3.141592653589793 rad - pos: -22.5,-19.5 + pos: -21.5,7.5 parent: 1 - - uid: 32619 + - uid: 32612 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,-20.5 + rot: -1.5707963267948966 rad + pos: -22.5,8.5 parent: 1 - - uid: 32620 + - uid: 32613 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -24.5,-20.5 + rot: -1.5707963267948966 rad + pos: -23.5,8.5 parent: 1 - - uid: 32621 + - uid: 32616 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,-20.5 + rot: 3.141592653589793 rad + pos: -22.5,-17.5 parent: 1 - - uid: 32622 + - uid: 32617 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -26.5,-20.5 + rot: 3.141592653589793 rad + pos: -22.5,-18.5 parent: 1 - uid: 32623 components: - type: Transform - pos: -27.5,-21.5 + rot: 3.141592653589793 rad + pos: -19.5,22.5 parent: 1 - uid: 32624 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -28.5,-22.5 + rot: 3.141592653589793 rad + pos: -19.5,21.5 parent: 1 - uid: 32625 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -29.5,-22.5 + rot: 3.141592653589793 rad + pos: -19.5,20.5 parent: 1 - uid: 32626 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -30.5,-22.5 + rot: 3.141592653589793 rad + pos: -19.5,19.5 parent: 1 - uid: 32627 components: - type: Transform rot: -1.5707963267948966 rad - pos: -31.5,-22.5 - parent: 1 - - uid: 32628 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -32.5,-22.5 - parent: 1 - - uid: 32629 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -33.5,-22.5 + pos: -20.5,18.5 parent: 1 - uid: 32630 components: - type: Transform rot: -1.5707963267948966 rad - pos: -34.5,-22.5 + pos: -21.5,18.5 parent: 1 - uid: 32631 components: - type: Transform rot: -1.5707963267948966 rad - pos: -35.5,-22.5 + pos: -22.5,18.5 parent: 1 - uid: 32632 components: - type: Transform rot: -1.5707963267948966 rad - pos: -36.5,-22.5 - parent: 1 - - uid: 32633 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -37.5,-22.5 + pos: -23.5,18.5 parent: 1 - uid: 32634 components: @@ -100193,47 +100519,28 @@ entities: rot: 3.141592653589793 rad pos: -38.5,-23.5 parent: 1 - - uid: 32638 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-10.5 - parent: 1 - uid: 32639 components: - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-9.5 - parent: 1 - - uid: 32640 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-8.5 - parent: 1 - - uid: 32641 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-7.5 + pos: -25.5,17.5 parent: 1 - uid: 32642 components: - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-6.5 + rot: 1.5707963267948966 rad + pos: -25.5,-2.5 parent: 1 - uid: 32643 components: - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-5.5 + rot: -1.5707963267948966 rad + pos: -16.5,-16.5 parent: 1 - - uid: 32644 + - uid: 32645 components: - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-4.5 + rot: -1.5707963267948966 rad + pos: -28.5,7.5 parent: 1 - uid: 32647 components: @@ -100253,53 +100560,17 @@ entities: rot: 3.141592653589793 rad pos: -23.5,-0.5 parent: 1 - - uid: 32650 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,0.5 - parent: 1 - uid: 32651 components: - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,1.5 - parent: 1 - - uid: 32652 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,2.5 - parent: 1 - - uid: 32653 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,3.5 - parent: 1 - - uid: 32654 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,4.5 - parent: 1 - - uid: 32655 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,5.5 - parent: 1 - - uid: 32656 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,6.5 + rot: 1.5707963267948966 rad + pos: -26.5,-2.5 parent: 1 - - uid: 32657 + - uid: 32660 components: - type: Transform rot: 3.141592653589793 rad - pos: -23.5,7.5 + pos: -25.5,-8.5 parent: 1 - uid: 32661 components: @@ -100347,113 +100618,65 @@ entities: - type: Transform pos: -25.5,16.5 parent: 1 - - uid: 32670 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,17.5 - parent: 1 - - uid: 32671 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -23.5,17.5 - parent: 1 - uid: 32672 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,17.5 - parent: 1 - - uid: 32673 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,17.5 - parent: 1 - - uid: 32674 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,17.5 + rot: 3.141592653589793 rad + pos: -23.5,-8.5 parent: 1 - uid: 32675 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,17.5 + rot: 1.5707963267948966 rad + pos: -24.5,-11.5 parent: 1 - uid: 32676 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,17.5 - parent: 1 - - uid: 32677 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,17.5 - parent: 1 - - uid: 32680 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,17.5 - parent: 1 - - uid: 32681 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,17.5 - parent: 1 - - uid: 32682 components: - type: Transform rot: 3.141592653589793 rad - pos: -14.5,18.5 + pos: -23.5,-6.5 parent: 1 - - uid: 32683 + - uid: 32677 components: - type: Transform rot: 3.141592653589793 rad - pos: -14.5,19.5 + pos: -23.5,-7.5 parent: 1 - - uid: 32684 + - uid: 32678 components: - type: Transform - rot: 3.141592653589793 rad - pos: -14.5,20.5 + rot: 1.5707963267948966 rad + pos: -21.5,-9.5 parent: 1 - - uid: 32685 + - uid: 32679 components: - type: Transform - rot: 3.141592653589793 rad - pos: -14.5,21.5 + rot: 1.5707963267948966 rad + pos: -19.5,-9.5 parent: 1 - - uid: 32686 + - uid: 32680 components: - type: Transform rot: 1.5707963267948966 rad - pos: -15.5,22.5 + pos: -22.5,-9.5 parent: 1 - - uid: 32687 + - uid: 32681 components: - type: Transform rot: 1.5707963267948966 rad - pos: -16.5,22.5 + pos: -18.5,-9.5 parent: 1 - - uid: 32688 + - uid: 32682 components: - type: Transform rot: 1.5707963267948966 rad - pos: -17.5,22.5 + pos: -20.5,-9.5 parent: 1 - uid: 32689 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,22.5 + rot: 3.141592653589793 rad + pos: -25.5,-9.5 parent: 1 - uid: 32694 components: @@ -102477,12 +102700,6 @@ entities: rot: 3.141592653589793 rad pos: -39.5,21.5 parent: 1 - - uid: 38461 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -26.5,-2.5 - parent: 1 - uid: 38462 components: - type: Transform @@ -102911,12 +103128,6 @@ entities: rot: 1.5707963267948966 rad pos: -39.5,21.5 parent: 1 - - uid: 41407 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,-14.5 - parent: 1 - uid: 41408 components: - type: Transform @@ -104970,30 +105181,6 @@ entities: - type: Transform pos: -32.5,4.5 parent: 1 - - uid: 42850 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -29.5,5.5 - parent: 1 - - uid: 42851 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -28.5,5.5 - parent: 1 - - uid: 42852 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -27.5,6.5 - parent: 1 - - uid: 42853 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -27.5,7.5 - parent: 1 - uid: 42854 components: - type: Transform @@ -105022,11 +105209,29 @@ entities: - type: Transform pos: -29.5,12.5 parent: 1 + - uid: 42864 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-7.5 + parent: 1 + - uid: 42865 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-6.5 + parent: 1 - uid: 42866 components: - type: Transform pos: 10.5,-24.5 parent: 1 + - uid: 42867 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-5.5 + parent: 1 - uid: 42868 components: - type: Transform @@ -105333,6 +105538,283 @@ entities: rot: 3.141592653589793 rad pos: 9.5,7.5 parent: 1 + - uid: 43064 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-4.5 + parent: 1 + - uid: 43065 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-2.5 + parent: 1 + - uid: 43066 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-1.5 + parent: 1 + - uid: 43067 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-3.5 + parent: 1 + - uid: 43073 + components: + - type: Transform + pos: -27.5,4.5 + parent: 1 + - uid: 43074 + components: + - type: Transform + pos: -26.5,2.5 + parent: 1 + - uid: 43075 + components: + - type: Transform + pos: -26.5,1.5 + parent: 1 + - uid: 43076 + components: + - type: Transform + pos: -26.5,0.5 + parent: 1 + - uid: 43081 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-11.5 + parent: 1 + - uid: 43082 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-11.5 + parent: 1 + - uid: 43083 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-10.5 + parent: 1 + - uid: 43084 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-9.5 + parent: 1 + - uid: 43085 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-8.5 + parent: 1 + - uid: 43086 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-7.5 + parent: 1 + - uid: 43087 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-6.5 + parent: 1 + - uid: 43088 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-5.5 + parent: 1 + - uid: 43089 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-4.5 + parent: 1 + - uid: 43090 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-3.5 + parent: 1 + - uid: 43091 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-2.5 + parent: 1 + - uid: 43092 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-1.5 + parent: 1 + - uid: 43093 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-0.5 + parent: 1 + - uid: 43094 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,0.5 + parent: 1 + - uid: 43095 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,1.5 + parent: 1 + - uid: 43096 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,1.5 + parent: 1 + - uid: 43097 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,1.5 + parent: 1 + - uid: 43098 + components: + - type: Transform + pos: -24.5,2.5 + parent: 1 + - uid: 43099 + components: + - type: Transform + pos: -24.5,3.5 + parent: 1 + - uid: 43100 + components: + - type: Transform + pos: -24.5,4.5 + parent: 1 + - uid: 43101 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-9.5 + parent: 1 + - uid: 43102 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,-9.5 + parent: 1 + - uid: 43103 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-9.5 + parent: 1 + - uid: 43104 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-9.5 + parent: 1 + - uid: 43105 + components: + - type: Transform + pos: -13.5,-10.5 + parent: 1 + - uid: 43106 + components: + - type: Transform + pos: -13.5,-11.5 + parent: 1 + - uid: 43107 + components: + - type: Transform + pos: -13.5,-12.5 + parent: 1 + - uid: 43108 + components: + - type: Transform + pos: -13.5,-13.5 + parent: 1 + - uid: 43109 + components: + - type: Transform + pos: -13.5,-14.5 + parent: 1 + - uid: 43110 + components: + - type: Transform + pos: -13.5,-15.5 + parent: 1 + - uid: 43111 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,3.5 + parent: 1 + - uid: 43112 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,2.5 + parent: 1 + - uid: 43113 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,1.5 + parent: 1 + - uid: 43114 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,0.5 + parent: 1 +- proto: DisposalRouterFlipped + entities: + - uid: 12023 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,-11.5 + parent: 1 + - type: DisposalRouter + tags: + - Common Hydroponics + - uid: 12024 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,-11.5 + parent: 1 + - type: DisposalRouter + tags: + - Prison Hydroponics + - uid: 40966 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -26.5,5.5 + parent: 1 + - type: DisposalRouter + tags: + - Common Kitchen + - uid: 42859 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,5.5 + parent: 1 + - type: DisposalRouter + tags: + - Prison Kitchen - proto: DisposalTagger entities: - uid: 4552 @@ -105604,12 +106086,6 @@ entities: - type: Transform pos: -28.5,-11.5 parent: 1 - - uid: 28841 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,-2.5 - parent: 1 - uid: 28856 components: - type: Transform @@ -105729,29 +106205,6 @@ entities: parent: 1 - proto: DisposalTrunk entities: - - uid: 3061 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,6.5 - parent: 1 - - uid: 3082 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -26.5,6.5 - parent: 1 - - uid: 3117 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,-13.5 - parent: 1 - - uid: 3281 - components: - - type: Transform - pos: -24.5,-12.5 - parent: 1 - uid: 6621 components: - type: Transform @@ -106169,6 +106622,28 @@ entities: rot: 3.141592653589793 rad pos: 22.5,-61.5 parent: 1 + - uid: 32652 + components: + - type: Transform + pos: -26.5,6.5 + parent: 1 + - uid: 32653 + components: + - type: Transform + pos: -25.5,6.5 + parent: 1 + - uid: 32654 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-13.5 + parent: 1 + - uid: 32655 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,-12.5 + parent: 1 - uid: 32981 components: - type: Transform @@ -107179,6 +107654,18 @@ entities: - type: Transform pos: -87.573425,-17.312595 parent: 1 +- proto: DrinkCreamCartonXL + entities: + - uid: 43126 + components: + - type: Transform + pos: -22.355007,-23.196678 + parent: 1 + - uid: 43127 + components: + - type: Transform + pos: -22.636257,-23.207102 + parent: 1 - proto: DrinkDoctorsDelightGlass entities: - uid: 9692 @@ -107363,13 +107850,6 @@ entities: - type: Transform pos: -101.65036,-1.0470593 parent: 1 -- proto: DrinkMilkCarton - entities: - - uid: 41989 - components: - - type: Transform - pos: -24.361698,9.772873 - parent: 1 - proto: DrinkMugBlack entities: - uid: 30366 @@ -107550,13 +108030,6 @@ entities: - type: Transform pos: -58.353912,-80.77482 parent: 1 -- proto: DrinkOatMilkCarton - entities: - - uid: 9639 - components: - - type: Transform - pos: -24.46927,9.605224 - parent: 1 - proto: DrinkPatronBottleFull entities: - uid: 21261 @@ -107637,6 +108110,11 @@ entities: - type: Transform pos: -6.8075304,-57.165375 parent: 1 + - uid: 43128 + components: + - type: Transform + pos: -22.782091,-23.363462 + parent: 1 - proto: DrinkShinyFlask entities: - uid: 17539 @@ -108994,6 +109472,11 @@ entities: - type: PointLight enabled: True - type: ActiveEmergencyLight + - uid: 32658 + components: + - type: Transform + pos: -127.5,-33.5 + parent: 1 - uid: 33772 components: - type: Transform @@ -109206,11 +109689,6 @@ entities: rot: 3.141592653589793 rad pos: -14.5,-56.5 parent: 1 - - uid: 41196 - components: - - type: Transform - pos: -120.5,-32.5 - parent: 1 - uid: 41197 components: - type: Transform @@ -109328,11 +109806,6 @@ entities: rot: -1.5707963267948966 rad pos: -109.5,-38.5 parent: 1 - - uid: 41217 - components: - - type: Transform - pos: -127.5,-33.5 - parent: 1 - uid: 41218 components: - type: Transform @@ -109395,6 +109868,11 @@ entities: rot: 3.141592653589793 rad pos: -54.5,35.5 parent: 1 + - uid: 41605 + components: + - type: Transform + pos: -120.5,-32.5 + parent: 1 - uid: 42997 components: - type: Transform @@ -112176,9 +112654,7 @@ entities: devices: - 41606 - 41506 - - 41605 - 41604 - - 41603 - 41600 - 41607 - 41608 @@ -112208,9 +112684,7 @@ entities: - type: DeviceList devices: - 41503 - - 41605 - 41604 - - 41603 - uid: 41620 components: - type: Transform @@ -115955,17 +116429,6 @@ entities: - 7586 - 6689 - 29917 - - uid: 41603 - components: - - type: Transform - pos: -122.5,-30.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 41597 - - 41596 - - 41602 - - 41601 - uid: 41604 components: - type: Transform @@ -115977,17 +116440,6 @@ entities: - 41596 - 41602 - 41601 - - uid: 41605 - components: - - type: Transform - pos: -122.5,-28.5 - parent: 1 - - type: DeviceNetwork - deviceLists: - - 41597 - - 41596 - - 41602 - - 41601 - uid: 41611 components: - type: Transform @@ -118765,23 +119217,6 @@ entities: - type: Transform pos: -24.36231,11.578384 parent: 1 -- proto: FoodCarrot - entities: - - uid: 12563 - components: - - type: Transform - pos: -26.355158,-6.3291545 - parent: 1 - - uid: 12564 - components: - - type: Transform - pos: -26.511408,-6.2978826 - parent: 1 - - uid: 12565 - components: - - type: Transform - pos: -26.563492,-6.2353396 - parent: 1 - proto: FoodCheese entities: - uid: 12453 @@ -118813,6 +119248,12 @@ entities: - type: Transform pos: 19.331057,-35.095882 parent: 1 + - uid: 43135 + components: + - type: Transform + parent: 43134 + - type: Physics + canCollide: False - proto: FoodCondimentBottleKetchup entities: - uid: 16231 @@ -118827,6 +119268,20 @@ entities: - type: Transform pos: -36.542675,-7.269909 parent: 1 +- proto: FoodCondimentPacketFrostoil + entities: + - uid: 43145 + components: + - type: Transform + parent: 43144 + - type: Physics + canCollide: False + - uid: 43146 + components: + - type: Transform + parent: 43144 + - type: Physics + canCollide: False - proto: FoodCondimentPacketHorseradish entities: - uid: 12437 @@ -118852,6 +119307,14 @@ entities: rot: 3.141592653589793 rad pos: 19.826754,-12.501836 parent: 1 +- proto: FoodCondimentPacketPepper + entities: + - uid: 43147 + components: + - type: Transform + parent: 43144 + - type: Physics + canCollide: False - proto: FoodContainerEgg entities: - uid: 1853 @@ -118899,6 +119362,22 @@ entities: rot: 3.141592653589793 rad pos: -69.73008,2.5374973 parent: 1 +- proto: FoodDonkpocketPizza + entities: + - uid: 43137 + components: + - type: Transform + parent: 43134 + - type: Physics + canCollide: False +- proto: FoodDonkpocketTeriyaki + entities: + - uid: 43136 + components: + - type: Transform + parent: 43134 + - type: Physics + canCollide: False - proto: FoodDonutJelly entities: - uid: 2912 @@ -119019,6 +119498,19 @@ entities: - type: Transform pos: -22.999104,-24.087002 parent: 1 +- proto: FoodKebabSkewer + entities: + - uid: 23691 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 68.86674,0.631893 + parent: 1 + - uid: 34157 + components: + - type: Transform + pos: -92.34517,-42.339275 + parent: 1 - proto: FoodLollipop entities: - uid: 4599 @@ -119167,38 +119659,6 @@ entities: - type: Transform pos: -39.45363,-67.880325 parent: 1 -- proto: FoodMeat - entities: - - uid: 9640 - components: - - type: Transform - pos: -23.522871,9.588505 - parent: 1 - - uid: 9641 - components: - - type: Transform - pos: -23.522871,9.588505 - parent: 1 - - uid: 9642 - components: - - type: Transform - pos: -23.522871,9.588505 - parent: 1 -- proto: FoodMeatLizardtailKebab - entities: - - uid: 23691 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 68.86674,0.631893 - parent: 1 -- proto: FoodMeatRatdoubleKebab - entities: - - uid: 34157 - components: - - type: Transform - pos: -92.34517,-42.339275 - parent: 1 - proto: FoodMeatSalami entities: - uid: 29515 @@ -119468,31 +119928,6 @@ entities: parent: 1 - proto: FoodPotato entities: - - uid: 907 - components: - - type: Transform - pos: -27.375992,-8.299273 - parent: 1 - - uid: 908 - components: - - type: Transform - pos: -27.365574,-8.45563 - parent: 1 - - uid: 929 - components: - - type: Transform - pos: -27.521824,-8.278425 - parent: 1 - - uid: 930 - components: - - type: Transform - pos: -27.490574,-8.486902 - parent: 1 - - uid: 12562 - components: - - type: Transform - pos: -27.594742,-8.445207 - parent: 1 - uid: 41390 components: - type: Transform @@ -119586,14 +120021,7 @@ entities: - type: Transform pos: -7.4966226,26.602148 parent: 1 -- proto: FoodTacoBeef - entities: - - uid: 36858 - components: - - type: Transform - pos: -108.51099,-15.411085 - parent: 1 -- proto: FoodTacoChickenSupreme +- proto: FoodTacoShell entities: - uid: 3327 components: @@ -119605,6 +120033,11 @@ entities: - type: Transform pos: -113.362076,-54.217827 parent: 1 + - uid: 36858 + components: + - type: Transform + pos: -108.51099,-15.411085 + parent: 1 - proto: FoodTinBeans entities: - uid: 31244 @@ -151449,14 +151882,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#3399FFFF' - - uid: 28279 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 8.5,-24.5 - parent: 1 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 28281 components: - type: Transform @@ -182081,11 +182506,6 @@ entities: - type: Transform pos: 31.5,-43.5 parent: 1 - - uid: 10657 - components: - - type: Transform - pos: 59.5,-52.5 - parent: 1 - uid: 10658 components: - type: Transform @@ -183546,6 +183966,11 @@ entities: - type: Transform pos: -73.5,-16.5 parent: 1 + - uid: 15092 + components: + - type: Transform + pos: 59.5,-52.5 + parent: 1 - uid: 15100 components: - type: Transform @@ -186396,6 +186821,16 @@ entities: - type: Transform pos: -121.5,-50.5 parent: 1 + - uid: 32670 + components: + - type: Transform + pos: -122.5,-28.5 + parent: 1 + - uid: 32671 + components: + - type: Transform + pos: -122.5,-30.5 + parent: 1 - uid: 32918 components: - type: Transform @@ -189246,6 +189681,11 @@ entities: - type: Transform pos: 43.5,-0.5 parent: 1 + - uid: 41739 + components: + - type: Transform + pos: -122.5,-27.5 + parent: 1 - uid: 41869 components: - type: Transform @@ -190387,11 +190827,6 @@ entities: - type: Transform pos: -49.1553,32.613728 parent: 1 - - uid: 7584 - components: - - type: Transform - pos: -65.61705,23.486242 - parent: 1 - uid: 9044 components: - type: Transform @@ -190407,6 +190842,11 @@ entities: - type: Transform pos: -62.701748,-31.470161 parent: 1 + - uid: 43167 + components: + - type: Transform + pos: -65.534615,23.29667 + parent: 1 - proto: HappyHonk entities: - uid: 28661 @@ -190539,18 +190979,17 @@ entities: rot: 3.141592653589793 rad pos: 7.5583315,-10.995381 parent: 1 - - uid: 34876 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.45170987,-20.482744 - parent: 1 - uid: 34880 components: - type: Transform rot: 1.5707963267948966 rad pos: -49.58078,-41.406494 parent: 1 + - uid: 39650 + components: + - type: Transform + pos: -0.44299912,-20.356264 + parent: 1 - proto: HospitalCurtains entities: - uid: 4885 @@ -190903,11 +191342,6 @@ entities: parent: 1 - proto: InflatableDoor entities: - - uid: 13222 - components: - - type: Transform - pos: -122.5,-29.5 - parent: 1 - uid: 15724 components: - type: Transform @@ -190947,11 +191381,6 @@ entities: parent: 1 - proto: InflatableWall entities: - - uid: 8967 - components: - - type: Transform - pos: -122.5,-30.5 - parent: 1 - uid: 15705 components: - type: Transform @@ -190968,11 +191397,6 @@ entities: - type: Transform pos: -81.5,-70.5 parent: 1 - - uid: 16196 - components: - - type: Transform - pos: -122.5,-28.5 - parent: 1 - uid: 33893 components: - type: Transform @@ -192154,6 +192578,20 @@ entities: - type: Transform pos: -9.708311,-58.46945 parent: 1 +- proto: LockableButtonSecurity + entities: + - uid: 43133 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-11.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 43132: + - Pressed: Toggle + 43131: + - Pressed: Toggle - proto: LockerAtmosphericsFilledHardsuit entities: - uid: 6008 @@ -192201,6 +192639,18 @@ entities: - type: Transform pos: -55.5,-1.5 parent: 1 +- proto: LockerBotanistFilled + entities: + - uid: 38461 + components: + - type: Transform + pos: -27.5,-15.5 + parent: 1 + - uid: 43130 + components: + - type: Transform + pos: -27.5,-14.5 + parent: 1 - proto: LockerBrigmedicFilledHardsuit entities: - uid: 15212 @@ -193203,6 +193653,14 @@ entities: - type: Transform pos: -53.5,-75.5 parent: 1 +- proto: LootSpawnerMaterialsSurplus + entities: + - uid: 43148 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 51.5,-50.5 + parent: 1 - proto: Machete entities: - uid: 3223 @@ -193314,10 +193772,15 @@ entities: - type: Transform pos: -62.5,-34.5 parent: 1 - - uid: 10898 + - uid: 10876 components: - type: Transform - pos: 60.5,-45.5 + pos: 58.5,-46.5 + parent: 1 + - uid: 10896 + components: + - type: Transform + pos: 60.5,-48.5 parent: 1 - uid: 10899 components: @@ -193329,11 +193792,6 @@ entities: - type: Transform pos: 60.5,-47.5 parent: 1 - - uid: 10901 - components: - - type: Transform - pos: 58.5,-45.5 - parent: 1 - uid: 10903 components: - type: Transform @@ -194155,13 +194613,6 @@ entities: - type: Transform pos: -68.354355,23.527685 parent: 1 -- proto: MaterialReclaimer - entities: - - uid: 6629 - components: - - type: Transform - pos: -11.5,23.5 - parent: 1 - proto: MaterialWoodPlank entities: - uid: 4234 @@ -194353,11 +194804,6 @@ entities: - type: Transform pos: -69.49619,-22.27755 parent: 1 - - uid: 13955 - components: - - type: Transform - pos: -65.6483,23.840654 - parent: 1 - uid: 28517 components: - type: Transform @@ -194368,6 +194814,11 @@ entities: - type: Transform pos: -108.11858,2.6922636 parent: 1 + - uid: 43166 + components: + - type: Transform + pos: -68.58669,23.724052 + parent: 1 - proto: MedkitBruteFilled entities: - uid: 29219 @@ -194674,6 +195125,11 @@ entities: - type: Transform pos: -81.5,-4.5 parent: 1 + - uid: 14971 + components: + - type: Transform + pos: -20.5,34.5 + parent: 1 - uid: 30717 components: - type: Transform @@ -197610,6 +198066,12 @@ entities: - type: Transform pos: -14.826958,23.972439 parent: 1 + - uid: 43139 + components: + - type: Transform + parent: 43138 + - type: Physics + canCollide: False - proto: Multitool entities: - uid: 2894 @@ -203978,18 +204440,19 @@ entities: parent: 1 - proto: ParticleAcceleratorControlBox entities: - - uid: 10876 + - uid: 10663 components: - type: Transform - pos: 58.5,-47.5 + rot: 3.141592653589793 rad + pos: 58.5,-48.5 parent: 1 - proto: ParticleAcceleratorFuelChamberUnfinished entities: - - uid: 10877 + - uid: 15204 components: - type: Transform rot: 1.5707963267948966 rad - pos: 58.5,-46.5 + pos: 58.5,-47.5 parent: 1 - proto: PartRodMetal entities: @@ -204347,6 +204810,12 @@ entities: - type: Transform pos: -17.577652,-17.448551 parent: 1 + - uid: 43140 + components: + - type: Transform + parent: 43138 + - type: Physics + canCollide: False - proto: PhoneInstrument entities: - uid: 31064 @@ -204875,11 +205344,6 @@ entities: - type: Transform pos: 22.5,-3.5 parent: 1 - - uid: 6636 - components: - - type: Transform - pos: -5.5,23.5 - parent: 1 - uid: 9982 components: - type: Transform @@ -204972,6 +205436,12 @@ entities: - type: Transform pos: 3.5,34.5 parent: 1 + - uid: 32621 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,23.5 + parent: 1 - proto: PlasticFlapsOpaque entities: - uid: 15284 @@ -205942,11 +206412,6 @@ entities: - type: Transform pos: -108.5,-35.5 parent: 1 - - uid: 15267 - components: - - type: Transform - pos: 60.5,-56.5 - parent: 1 - uid: 15855 components: - type: Transform @@ -205962,6 +206427,11 @@ entities: - type: Transform pos: -110.5,-19.5 parent: 1 + - uid: 43154 + components: + - type: Transform + pos: 60.5,-57.5 + parent: 1 - proto: PortableGeneratorSuperPacman entities: - uid: 8277 @@ -207191,10 +207661,10 @@ entities: parent: 1 - proto: PowerCellRecharger entities: - - uid: 4780 + - uid: 641 components: - type: Transform - pos: -65.5,22.5 + pos: -65.5,23.5 parent: 1 - uid: 5832 components: @@ -207229,12 +207699,6 @@ entities: rot: 1.5707963267948966 rad pos: 61.5,-43.5 parent: 1 - - uid: 10916 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 61.5,-49.5 - parent: 1 - uid: 11298 components: - type: Transform @@ -207325,17 +207789,16 @@ entities: - type: Transform pos: 7.5,-11.5 parent: 1 - - uid: 18852 + - uid: 17689 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -112.5,-40.5 + pos: 61.5,-50.5 parent: 1 - - uid: 20327 + - uid: 18852 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -95.5,-39.5 + rot: -1.5707963267948966 rad + pos: -112.5,-40.5 parent: 1 - uid: 20366 components: @@ -210080,6 +210543,11 @@ entities: rot: 1.5707963267948966 rad pos: 41.5,-2.5 parent: 1 + - uid: 15167 + components: + - type: Transform + pos: -128.5,-33.5 + parent: 1 - uid: 15279 components: - type: Transform @@ -210112,6 +210580,11 @@ entities: parent: 1 - type: ApcPowerReceiver powerLoad: 0 + - uid: 32690 + components: + - type: Transform + pos: -119.5,-32.5 + parent: 1 - uid: 39809 components: - type: Transform @@ -210148,11 +210621,6 @@ entities: rot: -1.5707963267948966 rad pos: 43.5,35.5 parent: 1 - - uid: 40966 - components: - - type: Transform - pos: -128.5,-33.5 - parent: 1 - uid: 40970 components: - type: Transform @@ -210177,11 +210645,6 @@ entities: rot: 3.141592653589793 rad pos: -119.5,-43.5 parent: 1 - - uid: 41073 - components: - - type: Transform - pos: -119.5,-32.5 - parent: 1 - proto: PoweredLightColoredBlack entities: - uid: 16388 @@ -210596,15 +211059,15 @@ entities: - type: Transform pos: -111.5,6.5 parent: 1 - - uid: 15203 + - uid: 15259 components: - type: Transform - pos: 1.5,21.5 + pos: -2.5,20.5 parent: 1 - - uid: 15204 + - uid: 15267 components: - type: Transform - pos: -2.5,21.5 + pos: 1.5,20.5 parent: 1 - uid: 15900 components: @@ -211224,12 +211687,6 @@ entities: rot: 3.141592653589793 rad pos: 58.5,-40.5 parent: 1 - - uid: 41017 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 58.5,-54.5 - parent: 1 - uid: 41033 components: - type: Transform @@ -212746,6 +213203,11 @@ entities: - type: Transform pos: -110.5,-28.5 parent: 1 + - uid: 9036 + components: + - type: Transform + pos: 61.5,-53.5 + parent: 1 - uid: 9049 components: - type: Transform @@ -213682,65 +214144,17 @@ entities: - type: Transform pos: -44.5,-3.5 parent: 1 - - uid: 2090 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 48.5,-38.5 - parent: 1 - uid: 2101 components: - type: Transform rot: 3.141592653589793 rad pos: -32.5,21.5 parent: 1 - - uid: 2253 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 51.5,-38.5 - parent: 1 - - uid: 2289 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 45.5,-38.5 - parent: 1 - uid: 2290 components: - type: Transform rot: 3.141592653589793 rad - pos: 46.5,-38.5 - parent: 1 - - uid: 2300 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 47.5,-38.5 - parent: 1 - - uid: 2301 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 50.5,-38.5 - parent: 1 - - uid: 2304 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 49.5,-38.5 - parent: 1 - - uid: 2321 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 53.5,-38.5 - parent: 1 - - uid: 2325 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 52.5,-38.5 + pos: 45.5,-38.5 parent: 1 - uid: 5384 components: @@ -214015,16 +214429,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,21.5 parent: 1 - - uid: 12024 - components: - - type: Transform - pos: 15.5,-15.5 - parent: 1 - - uid: 12025 - components: - - type: Transform - pos: 14.5,-15.5 - parent: 1 - uid: 12330 components: - type: Transform @@ -214444,104 +214848,104 @@ entities: pos: 22.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42326 components: - type: Transform pos: 23.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42327 components: - type: Transform pos: 24.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42328 components: - type: Transform pos: 25.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42329 components: - type: Transform pos: 26.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42330 components: - type: Transform pos: 27.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42331 components: - type: Transform pos: 28.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42332 components: - type: Transform pos: 29.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42333 components: - type: Transform pos: 30.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42334 components: - type: Transform pos: 31.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42335 components: - type: Transform pos: 32.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42336 components: - type: Transform pos: 33.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42337 components: - type: Transform pos: 34.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42338 components: - type: Transform @@ -214549,8 +214953,8 @@ entities: pos: 22.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42339 components: - type: Transform @@ -214558,8 +214962,8 @@ entities: pos: 23.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42340 components: - type: Transform @@ -214567,8 +214971,8 @@ entities: pos: 24.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42341 components: - type: Transform @@ -214576,8 +214980,8 @@ entities: pos: 25.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42342 components: - type: Transform @@ -214585,8 +214989,8 @@ entities: pos: 26.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42343 components: - type: Transform @@ -214594,8 +214998,8 @@ entities: pos: 27.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42344 components: - type: Transform @@ -214603,8 +215007,8 @@ entities: pos: 28.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42345 components: - type: Transform @@ -214612,8 +215016,8 @@ entities: pos: 29.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42346 components: - type: Transform @@ -214621,8 +215025,8 @@ entities: pos: 30.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42347 components: - type: Transform @@ -214630,8 +215034,8 @@ entities: pos: 31.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42348 components: - type: Transform @@ -214639,8 +215043,8 @@ entities: pos: 32.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42349 components: - type: Transform @@ -214648,8 +215052,8 @@ entities: pos: 33.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable - uid: 42350 components: - type: Transform @@ -214657,8 +215061,56 @@ entities: pos: 34.5,1.5 parent: 1 missingComponents: - - Climbable - Construction + - Climbable + - uid: 43157 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 47.5,-38.5 + parent: 1 + - uid: 43159 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,-38.5 + parent: 1 + - uid: 43160 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 52.5,-38.5 + parent: 1 + - uid: 43161 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 50.5,-38.5 + parent: 1 + - uid: 43162 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 49.5,-38.5 + parent: 1 + - uid: 43163 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 48.5,-38.5 + parent: 1 + - uid: 43164 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 51.5,-38.5 + parent: 1 + - uid: 43165 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 46.5,-38.5 + parent: 1 - proto: RailingCorner entities: - uid: 1477 @@ -215548,6 +216000,13 @@ entities: - type: Transform pos: -120.5,-48.5 parent: 1 +- proto: RandomIngredient + entities: + - uid: 32656 + components: + - type: Transform + pos: -24.490547,9.58144 + parent: 1 - proto: RandomInstruments entities: - uid: 8574 @@ -215749,6 +216208,14 @@ entities: - type: Transform pos: 42.5,34.5 parent: 1 +- proto: RandomMeat + entities: + - uid: 32657 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.480131,9.52932 + parent: 1 - proto: RandomPainting entities: - uid: 11681 @@ -216273,6 +216740,16 @@ entities: - type: Transform pos: -26.5,-8.5 parent: 1 + - uid: 32673 + components: + - type: Transform + pos: -27.5,-8.5 + parent: 1 + - uid: 32674 + components: + - type: Transform + pos: -26.5,-6.5 + parent: 1 - uid: 37380 components: - type: Transform @@ -221683,6 +222160,55 @@ entities: - type: Transform pos: 63.5,33.5 parent: 1 +- proto: RandomSmokables + entities: + - uid: 10898 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -87.71364,-17.604465 + parent: 1 + - uid: 10901 + components: + - type: Transform + pos: -88.303764,-46.31555 + parent: 1 + - uid: 10916 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.687157,-15.542501 + parent: 1 + - uid: 10918 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.2677426,-49.5005 + parent: 1 + - uid: 10919 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -31.336027,17.71119 + parent: 1 + - uid: 10920 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -92.30878,25.097778 + parent: 1 + - uid: 14247 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.660622,-73.661354 + parent: 1 + - uid: 14248 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -75.732475,-38.726807 + parent: 1 - proto: RandomSnacks entities: - uid: 3683 @@ -222238,17 +222764,23 @@ entities: parent: 1 - proto: Recycler entities: - - uid: 4394 + - uid: 12022 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-16.5 + rot: 3.141592653589793 rad + pos: -6.5,49.5 parent: 1 - - uid: 6643 + - uid: 15168 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,23.5 + rot: -1.5707963267948966 rad + pos: -11.5,23.5 + parent: 1 + - uid: 41407 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-16.5 parent: 1 - proto: ReinforcedGirder entities: @@ -226791,16 +227323,6 @@ entities: - type: Transform pos: 31.5,-43.5 parent: 1 - - uid: 10662 - components: - - type: Transform - pos: 59.5,-52.5 - parent: 1 - - uid: 10663 - components: - - type: Transform - pos: 60.5,-52.5 - parent: 1 - uid: 10664 components: - type: Transform @@ -227786,6 +228308,11 @@ entities: - type: Transform pos: 30.5,-24.5 parent: 1 + - uid: 14966 + components: + - type: Transform + pos: 59.5,-52.5 + parent: 1 - uid: 15074 components: - type: Transform @@ -227806,6 +228333,11 @@ entities: - type: Transform pos: -95.5,26.5 parent: 1 + - uid: 15249 + components: + - type: Transform + pos: 60.5,-52.5 + parent: 1 - uid: 15516 components: - type: Transform @@ -228926,6 +229458,16 @@ entities: - type: Transform pos: -134.5,-4.5 parent: 1 + - uid: 32685 + components: + - type: Transform + pos: -122.5,-27.5 + parent: 1 + - uid: 32686 + components: + - type: Transform + pos: -122.5,-30.5 + parent: 1 - uid: 32886 components: - type: Transform @@ -229971,6 +230513,11 @@ entities: - type: Transform pos: 47.5,-41.5 parent: 1 + - uid: 41073 + components: + - type: Transform + pos: -122.5,-28.5 + parent: 1 - uid: 41558 components: - type: Transform @@ -230455,6 +231002,54 @@ entities: - type: Transform pos: 23.5,-42.5 parent: 1 +- proto: SalvageSpawnerScrapCommon + entities: + - uid: 32628 + components: + - type: Transform + pos: 21.5,-13.5 + parent: 1 + - uid: 43116 + components: + - type: Transform + pos: 19.5,-12.5 + parent: 1 + - uid: 43121 + components: + - type: Transform + pos: 77.5,41.5 + parent: 1 +- proto: SalvageSpawnerScrapCommon75 + entities: + - uid: 43119 + components: + - type: Transform + pos: 77.5,37.5 + parent: 1 +- proto: SalvageSpawnerScrapValuable + entities: + - uid: 43117 + components: + - type: Transform + pos: 74.5,-0.5 + parent: 1 + - uid: 43118 + components: + - type: Transform + pos: 78.5,-11.5 + parent: 1 + - uid: 43122 + components: + - type: Transform + pos: 78.5,40.5 + parent: 1 +- proto: SalvageSpawnerScrapValuable75 + entities: + - uid: 43120 + components: + - type: Transform + pos: 90.5,30.5 + parent: 1 - proto: Saw entities: - uid: 9056 @@ -230873,12 +231468,6 @@ entities: - type: Transform pos: -75.37833,-33.457405 parent: 1 - - uid: 29514 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 51.5903,-50.36724 - parent: 1 - uid: 34554 components: - type: Transform @@ -231267,25 +231856,125 @@ entities: - type: Transform pos: -111.40744,-3.3558848 parent: 1 -- proto: ShockCollar +- proto: ShelfKitchen entities: - - uid: 2695 + - uid: 43144 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.3645833,-23.317299 + rot: -1.5707963267948966 rad + pos: -66.5,16.5 parent: 1 - - uid: 2698 + - type: Storage + storedItems: + 43145: + position: 0,0 + _rotation: South + 43146: + position: 1,0 + _rotation: South + 43147: + position: 2,0 + _rotation: South + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 43145 + - 43146 + - 43147 +- proto: ShelfMetal + entities: + - uid: 10647 components: - type: Transform - rot: 3.141592653589793 rad - pos: 13.646861,-21.428116 + pos: -41.5,32.5 parent: 1 - - uid: 2701 + - uid: 39881 components: - type: Transform - rot: 3.141592653589793 rad - pos: -47.292618,-33.169548 + pos: -21.5,34.5 + parent: 1 + - type: Storage + storedItems: + 41017: + position: 0,0 + _rotation: East + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 41017 + - uid: 43138 + components: + - type: Transform + pos: -7.5,27.5 + parent: 1 + - type: Storage + storedItems: + 43139: + position: 0,0 + _rotation: South + 43140: + position: 1,0 + _rotation: South + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 43139 + - 43140 +- proto: ShelfRWood + entities: + - uid: 43134 + components: + - type: Transform + pos: -24.5,34.5 + parent: 1 + - type: Storage + storedItems: + 43135: + position: 0,0 + _rotation: South + 43136: + position: 1,0 + _rotation: South + 43137: + position: 2,0 + _rotation: South + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 43135 + - 43136 + - 43137 +- proto: ShelfWood + entities: + - uid: 43141 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -50.5,27.5 + parent: 1 + - uid: 43142 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -46.5,27.5 + parent: 1 + - uid: 43143 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,27.5 parent: 1 - proto: Shovel entities: @@ -231342,6 +232031,16 @@ entities: - type: Transform pos: -61.5,-69.5 parent: 1 + - uid: 43131 + components: + - type: Transform + pos: 21.5,-11.5 + parent: 1 + - uid: 43132 + components: + - type: Transform + pos: 22.5,-11.5 + parent: 1 - proto: ShuttersNormalOpen entities: - uid: 1051 @@ -231349,6 +232048,31 @@ entities: - type: Transform pos: -12.5,-28.5 parent: 1 + - uid: 2289 + components: + - type: Transform + pos: -63.5,22.5 + parent: 1 + - uid: 2304 + components: + - type: Transform + pos: -63.5,19.5 + parent: 1 + - uid: 2321 + components: + - type: Transform + pos: -63.5,21.5 + parent: 1 + - uid: 2325 + components: + - type: Transform + pos: -63.5,23.5 + parent: 1 + - uid: 3595 + components: + - type: Transform + pos: -63.5,20.5 + parent: 1 - uid: 3604 components: - type: Transform @@ -231564,6 +232288,16 @@ entities: - type: Transform pos: -51.5,-22.5 parent: 1 + - uid: 43156 + components: + - type: Transform + pos: -70.5,21.5 + parent: 1 + - uid: 43158 + components: + - type: Transform + pos: -70.5,22.5 + parent: 1 - proto: ShuttersRadiationOpen entities: - uid: 10902 @@ -231724,6 +232458,36 @@ entities: - Pressed: DoorBolt - proto: SignalButtonDirectional entities: + - uid: 904 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -65.5,22.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 43158: + - Pressed: Toggle + 43156: + - Pressed: Toggle + - uid: 2253 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,22.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 2325: + - Pressed: Toggle + 2289: + - Pressed: Toggle + 2321: + - Pressed: Toggle + 3595: + - Pressed: Toggle + 2304: + - Pressed: Toggle - uid: 5773 components: - type: MetaData @@ -234409,8 +235173,6 @@ entities: - type: Transform pos: -98.5,-31.5 parent: 1 -- proto: SignAtmosMinsky - entities: - uid: 36728 components: - type: Transform @@ -234492,15 +235254,11 @@ entities: - type: Transform pos: 5.5,-36.5 parent: 1 -- proto: SignChemistry1 - entities: - uid: 23321 components: - type: Transform pos: -67.5,-32.5 parent: 1 -- proto: SignChemistry2 - entities: - uid: 28641 components: - type: Transform @@ -234520,20 +235278,6 @@ entities: - type: Transform pos: -68.5,-61.5 parent: 1 -- proto: SignCourt - entities: - - uid: 11796 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -88.5,10.5 - parent: 1 - - uid: 28169 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -82.5,10.5 - parent: 1 - proto: SignCryogenicsMed entities: - uid: 1130 @@ -234562,6 +235306,19 @@ entities: rot: 1.5707963267948966 rad pos: -14.5,7.5 parent: 1 +- proto: SignDirectionalAtmos + entities: + - uid: 32638 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -103.5,-24.5 + parent: 1 + - uid: 43115 + components: + - type: Transform + pos: -98.5,-25.5 + parent: 1 - proto: SignDirectionalBar entities: - uid: 6704 @@ -235292,13 +236049,6 @@ entities: - type: Transform pos: -5.5,24.5 parent: 1 -- proto: SignDrones - entities: - - uid: 9812 - components: - - type: Transform - pos: -112.5,-34.5 - parent: 1 - proto: SignElectrical entities: - uid: 15801 @@ -235591,11 +236341,6 @@ entities: - type: Transform pos: -12.5,16.5 parent: 1 - - uid: 9848 - components: - - type: Transform - pos: -122.5,-27.5 - parent: 1 - uid: 15807 components: - type: Transform @@ -235755,11 +236500,23 @@ entities: parent: 1 - proto: SignLawyer entities: + - uid: 11796 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -88.5,10.5 + parent: 1 - uid: 11949 components: - type: Transform pos: -86.5,-4.5 parent: 1 + - uid: 28169 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -82.5,10.5 + parent: 1 - proto: SignLibrary entities: - uid: 2624 @@ -235786,6 +236543,13 @@ entities: rot: 1.5707963267948966 rad pos: -50.5,35.5 parent: 1 +- proto: SignMaterials + entities: + - uid: 9812 + components: + - type: Transform + pos: -112.5,-34.5 + parent: 1 - proto: SignMedical entities: - uid: 16354 @@ -235866,11 +236630,6 @@ entities: parent: 1 - proto: SignRadiation entities: - - uid: 15795 - components: - - type: Transform - pos: 58.5,-57.5 - parent: 1 - uid: 15796 components: - type: Transform @@ -235891,6 +236650,11 @@ entities: - type: Transform pos: 54.5,-38.5 parent: 1 + - uid: 43153 + components: + - type: Transform + pos: 58.5,-58.5 + parent: 1 - proto: SignRedFive entities: - uid: 41237 @@ -236465,6 +237229,14 @@ entities: rot: 3.141592653589793 rad pos: -21.5,-73.5 parent: 1 +- proto: SmallLight + entities: + - uid: 15795 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 58.5,-54.5 + parent: 1 - proto: SmartFridge entities: - uid: 4707 @@ -236539,12 +237311,12 @@ entities: - type: Transform pos: -64.5,-42.5 parent: 1 - - uid: 10918 + - uid: 15247 components: - type: MetaData name: Particle Accelerator SMES - type: Transform - pos: 61.5,-56.5 + pos: 61.5,-57.5 parent: 1 - uid: 28642 components: @@ -236574,6 +237346,11 @@ entities: rot: 3.141592653589793 rad pos: -109.58488,-31.092873 parent: 1 + - uid: 20327 + components: + - type: Transform + pos: 61.46888,-53.30942 + parent: 1 - proto: SmokingPipeFilledCannabis entities: - uid: 11953 @@ -236593,6 +237370,14 @@ entities: - type: Transform pos: -58.56885,-41.41053 parent: 1 +- proto: SoapNT + entities: + - uid: 41017 + components: + - type: Transform + parent: 39881 + - type: Physics + canCollide: False - proto: SodaDispenser entities: - uid: 1531 @@ -238129,11 +238914,6 @@ entities: - type: Transform pos: -56.5,-27.5 parent: 1 - - uid: 36830 - components: - - type: Transform - pos: -126.5,-29.5 - parent: 1 - uid: 36831 components: - type: Transform @@ -239060,6 +239840,13 @@ entities: - type: Transform pos: -70.5,-27.5 parent: 1 +- proto: StationAnchor + entities: + - uid: 6644 + components: + - type: Transform + pos: -126.5,-29.5 + parent: 1 - proto: StationMap entities: - uid: 1827 @@ -239831,12 +240618,12 @@ entities: parent: 1 - proto: SubstationBasicEmpty entities: - - uid: 10920 + - uid: 18602 components: - type: MetaData name: particle accelerator substation - type: Transform - pos: 59.5,-56.5 + pos: 59.5,-57.5 parent: 1 - uid: 33510 components: @@ -242237,11 +243024,6 @@ entities: - type: Transform pos: -24.5,3.5 parent: 1 - - uid: 639 - components: - - type: Transform - pos: -34.5,-11.5 - parent: 1 - uid: 914 components: - type: Transform @@ -244199,12 +244981,6 @@ entities: - type: Transform pos: -104.5,4.5 parent: 1 - - uid: 9036 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -95.5,-39.5 - parent: 1 - uid: 9037 components: - type: Transform @@ -244360,24 +245136,12 @@ entities: rot: 1.5707963267948966 rad pos: 61.5,-50.5 parent: 1 - - uid: 10887 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 61.5,-49.5 - parent: 1 - uid: 10888 components: - type: Transform rot: 1.5707963267948966 rad pos: 59.5,-51.5 parent: 1 - - uid: 10889 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 59.5,-50.5 - parent: 1 - uid: 11081 components: - type: Transform @@ -246406,11 +247170,6 @@ entities: rot: 3.141592653589793 rad pos: -81.5,24.5 parent: 1 - - uid: 8781 - components: - - type: Transform - pos: -118.5,1.5 - parent: 1 - uid: 8949 components: - type: Transform @@ -246479,6 +247238,15 @@ entities: rot: -1.5707963267948966 rad pos: -20.5,-72.5 parent: 1 +- proto: ToiletGoldenEmpty + entities: + - uid: 41196 + components: + - type: Transform + pos: -118.5,1.5 + parent: 1 + - type: StealTarget + stealGroup: ToiletGoldenDirtyWater - proto: ToolboxElectricalFilled entities: - uid: 9862 @@ -246825,96 +247593,29 @@ entities: parent: 1 - proto: TwoWayLever entities: - - uid: 11289 + - uid: 9641 components: - type: Transform pos: -11.5,24.5 parent: 1 - type: DeviceLinkSource linkedPorts: - 11292: - - Left: Reverse - - Right: Forward - - Middle: Off - 6633: - - Left: Reverse - - Right: Forward - - Middle: Off - 6639: - - Left: Reverse - - Right: Forward - - Middle: Off - 6617: - - Left: Reverse - - Right: Forward - - Middle: Off - 6618: - - Left: Reverse - - Right: Forward - - Middle: Off - 6619: - - Left: Reverse - - Right: Forward - - Middle: Off - 6620: - - Left: Reverse - - Right: Forward - - Middle: Off - 6611: - - Left: Reverse - - Right: Forward - - Middle: Off - 6635: - - Left: Reverse - - Right: Forward - - Middle: Off - 15165: - - Left: Reverse - - Right: Forward + 12021: + - Left: Forward + - Right: Reverse - Middle: Off - 15166: - - Left: Reverse - - Right: Forward + 11292: + - Left: Forward + - Right: Reverse - Middle: Off - 15167: - - Left: Reverse - - Right: Forward + 11289: + - Left: Forward + - Right: Reverse - Middle: Off 15168: - - Left: Reverse - - Right: Forward - - Middle: Off - 15169: - - Left: Reverse - - Right: Forward - - Middle: Off - 15170: - - Left: Reverse - - Right: Forward - - Middle: Off - - uid: 12027 - components: - - type: Transform - pos: 15.5,-15.5 - parent: 1 - - type: DeviceLinkSource - linkedPorts: - 4394: - Left: Forward - Right: Reverse - Middle: Off - 12021: - - Left: Reverse - - Right: Forward - - Middle: Off - 12022: - - Left: Reverse - - Right: Forward - - Middle: Off - 12023: - - Left: Reverse - - Right: Forward - - Middle: Off - uid: 18589 components: - type: Transform @@ -246985,6 +247686,103 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + - uid: 32633 + components: + - type: Transform + pos: -8.5,24.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 11108: + - Left: Forward + - Right: Reverse + - Middle: Off + 10515: + - Left: Forward + - Right: Reverse + - Middle: Off + 9639: + - Left: Forward + - Right: Reverse + - Middle: Off + 7123: + - Left: Forward + - Right: Reverse + - Middle: Off + 15170: + - Left: Forward + - Right: Reverse + - Middle: Off + 8781: + - Left: Forward + - Right: Reverse + - Middle: Off + 7158: + - Left: Forward + - Right: Reverse + - Middle: Off + 7157: + - Left: Forward + - Right: Reverse + - Middle: Off + 9640: + - Left: Forward + - Right: Reverse + - Middle: Off + 8967: + - Left: Forward + - Right: Reverse + - Middle: Off + 41217: + - Left: Forward + - Right: Reverse + - Middle: Off + - uid: 32688 + components: + - type: Transform + pos: 14.5,-15.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 36830: + - Left: Forward + - Right: Reverse + - Middle: Off + 32629: + - Left: Forward + - Right: Reverse + - Middle: Off + 42850: + - Left: Forward + - Right: Reverse + - Middle: Off + 41407: + - Left: Forward + - Right: Reverse + - Middle: Off + - uid: 36465 + components: + - type: Transform + pos: -5.5,50.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 9848: + - Left: Forward + - Right: Reverse + - Middle: Off + 9647: + - Left: Forward + - Right: Reverse + - Middle: Off + 9642: + - Left: Forward + - Right: Reverse + - Middle: Off + 12022: + - Left: Forward + - Right: Reverse + - Middle: Off - proto: UnfinishedMachineFrame entities: - uid: 9849 @@ -256485,16 +257283,6 @@ entities: - type: Transform pos: 20.5,-11.5 parent: 1 - - uid: 7123 - components: - - type: Transform - pos: 21.5,-11.5 - parent: 1 - - uid: 7124 - components: - - type: Transform - pos: 22.5,-11.5 - parent: 1 - uid: 7125 components: - type: Transform @@ -259245,21 +260033,6 @@ entities: - type: Transform pos: 58.5,-57.5 parent: 1 - - uid: 10647 - components: - - type: Transform - pos: 59.5,-57.5 - parent: 1 - - uid: 10648 - components: - - type: Transform - pos: 60.5,-57.5 - parent: 1 - - uid: 10649 - components: - - type: Transform - pos: 61.5,-57.5 - parent: 1 - uid: 10650 components: - type: Transform @@ -259435,6 +260208,11 @@ entities: - type: Transform pos: 23.5,-52.5 parent: 1 + - uid: 10889 + components: + - type: Transform + pos: 58.5,-52.5 + parent: 1 - uid: 11022 components: - type: Transform @@ -264390,11 +265168,6 @@ entities: - type: Transform pos: 22.5,-2.5 parent: 1 - - uid: 39881 - components: - - type: Transform - pos: 58.5,-52.5 - parent: 1 - uid: 40049 components: - type: Transform @@ -264470,6 +265243,11 @@ entities: - type: Transform pos: -0.5,29.5 parent: 1 + - uid: 42863 + components: + - type: Transform + pos: -129.5,-33.5 + parent: 1 - uid: 43003 components: - type: Transform @@ -264480,6 +265258,26 @@ entities: - type: Transform pos: -97.5,-3.5 parent: 1 + - uid: 43149 + components: + - type: Transform + pos: 58.5,-58.5 + parent: 1 + - uid: 43150 + components: + - type: Transform + pos: 59.5,-58.5 + parent: 1 + - uid: 43151 + components: + - type: Transform + pos: 60.5,-58.5 + parent: 1 + - uid: 43152 + components: + - type: Transform + pos: 61.5,-58.5 + parent: 1 - proto: WallSolid entities: - uid: 301 @@ -266197,11 +266995,6 @@ entities: - type: Transform pos: -118.5,-8.5 parent: 1 - - uid: 3410 - components: - - type: Transform - pos: -122.5,-27.5 - parent: 1 - uid: 3415 components: - type: Transform @@ -271619,11 +272412,11 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 29517 + - uid: 34876 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 59.523373,-50.694332 + rot: 3.141592653589793 rad + pos: 61.595676,-50.803333 parent: 1 - proto: WeaponLauncherRocket entities: @@ -271758,7 +272551,7 @@ entities: - uid: 640 components: - type: Transform - pos: -34.71126,-10.728965 + pos: -34.640953,-10.110379 parent: 1 - uid: 947 components: @@ -272239,6 +273032,11 @@ entities: rot: 1.5707963267948966 rad pos: -136.5,-46.5 parent: 1 + - uid: 36459 + components: + - type: Transform + pos: 15.5,-15.5 + parent: 1 - uid: 36761 components: - type: Transform @@ -272422,23 +273220,11 @@ entities: parent: 1 - proto: WindoorSecureJanitorLocked entities: - - uid: 6615 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,23.5 - parent: 1 - - uid: 6644 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,23.5 - parent: 1 - - uid: 7158 + - uid: 7124 components: - type: Transform rot: 3.141592653589793 rad - pos: -6.5,23.5 + pos: -9.5,23.5 parent: 1 - uid: 29934 components: @@ -272582,6 +273368,22 @@ entities: parent: 1 - proto: WindoorSecureSecurityLawyerLocked entities: + - uid: 4241 + components: + - type: MetaData + name: secure windoor (with justice access) + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,-35.5 + parent: 1 + - uid: 4242 + components: + - type: MetaData + name: secure windoor (with justice access) + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,-36.5 + parent: 1 - uid: 7912 components: - type: Transform @@ -272600,6 +273402,12 @@ entities: rot: -1.5707963267948966 rad pos: -81.5,16.5 parent: 1 + - uid: 15400 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,-28.5 + parent: 1 - uid: 29570 components: - type: Transform @@ -272663,12 +273471,6 @@ entities: rot: 3.141592653589793 rad pos: -6.5,-53.5 parent: 1 - - uid: 3595 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -42.5,-28.5 - parent: 1 - uid: 3939 components: - type: MetaData @@ -272685,22 +273487,20 @@ entities: parent: 1 - uid: 4240 components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -42.5,-36.5 - parent: 1 - - uid: 4241 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -42.5,-35.5 - parent: 1 - - uid: 4242 - components: + - type: MetaData + name: secure windoor (security access only) - type: Transform rot: -1.5707963267948966 rad pos: -42.5,-34.5 parent: 1 + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - type: Door + secondsUntilStateChange: -325.88925 + state: Opening + - type: Airlock + autoClose: False - uid: 5792 components: - type: Transform @@ -275572,24 +276372,12 @@ entities: - type: Transform pos: -72.5,25.5 parent: 1 - - uid: 6632 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,23.5 - parent: 1 - uid: 6750 components: - type: Transform rot: 1.5707963267948966 rad pos: -114.5,-38.5 parent: 1 - - uid: 7157 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,23.5 - parent: 1 - uid: 7304 components: - type: Transform @@ -276154,6 +276942,11 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,23.5 parent: 1 + - uid: 36464 + components: + - type: Transform + pos: 14.5,-15.5 + parent: 1 - uid: 36471 components: - type: Transform @@ -276190,6 +276983,30 @@ entities: rot: 1.5707963267948966 rad pos: -122.5,-60.5 parent: 1 + - uid: 41810 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,23.5 + parent: 1 + - uid: 41989 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,23.5 + parent: 1 + - uid: 42849 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,23.5 + parent: 1 + - uid: 42851 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,23.5 + parent: 1 - uid: 42972 components: - type: Transform @@ -276201,6 +277018,11 @@ entities: - type: Transform pos: -89.5,19.5 parent: 1 + - uid: 43168 + components: + - type: Transform + pos: -42.5,-34.5 + parent: 1 - proto: WindowTintedDirectional entities: - uid: 4126 @@ -276377,11 +277199,6 @@ entities: parent: 1 - proto: Wrench entities: - - uid: 641 - components: - - type: Transform - pos: -34.50293,-10.572606 - parent: 1 - uid: 1226 components: - type: Transform @@ -276416,6 +277233,11 @@ entities: - type: Transform pos: -37.47136,-41.748615 parent: 1 + - uid: 13955 + components: + - type: Transform + pos: -34.58887,-10.464792 + parent: 1 - uid: 30614 components: - type: Transform diff --git a/Resources/Maps/hive.yml b/Resources/Maps/hive.yml index 910be260221..58d5eb71518 100644 --- a/Resources/Maps/hive.yml +++ b/Resources/Maps/hive.yml @@ -223,11 +223,11 @@ entities: version: 6 0,-4: ind: 0,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAQQAAAAAATgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAAQQAAAAAATgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAQQAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAQQAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAZQAAAAADQQAAAAAAZQAAAAADZQAAAAAAZQAAAAABZQAAAAADZQAAAAADZQAAAAABQQAAAAAAZQAAAAACZQAAAAACZQAAAAACZQAAAAACZQAAAAABZQAAAAACZQAAAAAAZQAAAAABZQAAAAABZQAAAAADZQAAAAAAZQAAAAABZQAAAAABZQAAAAACZQAAAAABZQAAAAACZQAAAAADZQAAAAAAZQAAAAACZQAAAAACZQAAAAAAZQAAAAAAZQAAAAAD + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAAQQAAAAAATgAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAQQAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAZQAAAAADZQAAAAAAZQAAAAADZQAAAAAAQQAAAAAAZQAAAAADZQAAAAADZQAAAAABZQAAAAAAZQAAAAACZQAAAAACZQAAAAACZQAAAAACZQAAAAABZQAAAAACZQAAAAAAZQAAAAABZQAAAAABZQAAAAADZQAAAAAAZQAAAAABZQAAAAABZQAAAAACZQAAAAABZQAAAAACZQAAAAADZQAAAAAAZQAAAAACZQAAAAACZQAAAAAAZQAAAAAAZQAAAAAD version: 6 -1,-4: ind: -1,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZQAAAAABZQAAAAABZQAAAAAAZQAAAAADZQAAAAABZQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAZQAAAAABZQAAAAAAZQAAAAADZQAAAAAAZQAAAAACZQAAAAAB + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAATgAAAAAAQQAAAAAATgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAATgAAAAAATgAAAAAAfAAAAAAAQQAAAAAAfAAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZQAAAAABZQAAAAABZQAAAAAAQQAAAAAAZQAAAAABZQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAZQAAAAABZQAAAAAAZQAAAAADZQAAAAAAZQAAAAACZQAAAAAB version: 6 -1,-3: ind: -1,-3 @@ -307,7 +307,7 @@ entities: version: 6 -4,0: ind: -4,0 - tiles: fAAAAAAAfAAAAAAAeQAAAAABeQAAAAAAeQAAAAACeQAAAAACfAAAAAAAHgAAAAACHgAAAAADHgAAAAADHgAAAAACTgAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABfAAAAAAAfAAAAAAATgAAAAAAKwAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAACTgAAAAAAXAAAAAAAfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAABZQAAAAABZQAAAAADZQAAAAABZQAAAAAATgAAAAAAXAAAAAADXAAAAAACTgAAAAAAXAAAAAABfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAADZQAAAAADZQAAAAAAZQAAAAACZQAAAAAAZQAAAAACXAAAAAABXAAAAAADfAAAAAAAXAAAAAABfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAABZQAAAAAAZQAAAAAAZQAAAAADZQAAAAABTgAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAXAAAAAACawAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAABZQAAAAADZQAAAAADZQAAAAABZQAAAAABTgAAAAAAXAAAAAACXAAAAAABfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAACXAAAAAADfAAAAAAAZQAAAAAAawAAAAAAfAAAAAAAYwAAAAAAXAAAAAABXAAAAAACXAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAXAAAAAADXAAAAAADfAAAAAAAZQAAAAACawAAAAAAfAAAAAAAXAAAAAAAXAAAAAABbQAAAAACXAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAATgAAAAAATgAAAAAAXAAAAAADXAAAAAADTgAAAAAAZQAAAAABawAAAAAAfAAAAAAAYwAAAAAAXAAAAAABXAAAAAABXAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAATgAAAAAATgAAAAAAXAAAAAADXAAAAAADZQAAAAADZQAAAAADQQAAAAAAfAAAAAAAYwAAAAAAXAAAAAAAXAAAAAACYwAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAADXAAAAAACTgAAAAAAZQAAAAABawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAYwAAAAAAYwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAXAAAAAADXAAAAAAAfAAAAAAAZQAAAAABawAAAAAAawAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAADXAAAAAACfAAAAAAAfAAAAAAAQQAAAAAAawAAAAAAawAAAAAAQQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAUQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAXAAAAAABXAAAAAACfAAAAAAAUQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAfAAAAAAA + tiles: fAAAAAAAfAAAAAAAeQAAAAABeQAAAAAAeQAAAAACeQAAAAACfAAAAAAAHgAAAAACHgAAAAADHgAAAAADHgAAAAACTgAAAAAAXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABfAAAAAAAfAAAAAAATgAAAAAAKwAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABXAAAAAACTgAAAAAAXAAAAAAAfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAABZQAAAAABZQAAAAADZQAAAAABZQAAAAAATgAAAAAAXAAAAAADXAAAAAACTgAAAAAAXAAAAAABfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAADZQAAAAADZQAAAAAAZQAAAAACZQAAAAAAZQAAAAACXAAAAAABXAAAAAADfAAAAAAAXAAAAAABfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAABZQAAAAAAZQAAAAAAZQAAAAADZQAAAAABTgAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAXAAAAAACawAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAZQAAAAABZQAAAAADZQAAAAADZQAAAAABZQAAAAABTgAAAAAAXAAAAAACXAAAAAABfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAACXAAAAAADfAAAAAAAZQAAAAAAawAAAAAAfAAAAAAAYwAAAAAAXAAAAAABXAAAAAACXAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAXAAAAAADXAAAAAADfAAAAAAAZQAAAAACawAAAAAAfAAAAAAAXAAAAAAAXAAAAAABbQAAAAACXAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAATgAAAAAATgAAAAAAXAAAAAADXAAAAAADTgAAAAAAZQAAAAABawAAAAAAfAAAAAAAYwAAAAAAXAAAAAABXAAAAAABXAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAATgAAAAAATgAAAAAAXAAAAAADXAAAAAADZQAAAAADZQAAAAADQQAAAAAAfAAAAAAAYwAAAAAAXAAAAAAAXAAAAAACYwAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAADXAAAAAACTgAAAAAAZQAAAAABawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAYwAAAAAAYwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAXAAAAAADXAAAAAAAfAAAAAAAZQAAAAABawAAAAAAawAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAXAAAAAADXAAAAAACfAAAAAAAfAAAAAAAQQAAAAAAawAAAAAAawAAAAAAQQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAUQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAXAAAAAABXAAAAAACfAAAAAAAUQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAXAAAAAAAfAAAAAAAfAAAAAAA version: 6 -4,-2: ind: -4,-2 @@ -319,7 +319,7 @@ entities: version: 6 -4,1: ind: -4,1 - tiles: fAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAAAXAAAAAABXAAAAAACXAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAADXAAAAAABXAAAAAAAXAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAABXAAAAAADXAAAAAACXAAAAAABMwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAACXAAAAAADXAAAAAACXAAAAAADMwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAAAXAAAAAADXAAAAAADXAAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAATgAAAAAAfAAAAAAATgAAAAAAfAAAAAAATgAAAAAAfAAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAA + tiles: fAAAAAAAfAAAAAAAQQAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAAAXAAAAAABXAAAAAACXAAAAAABfAAAAAAAewAAAAAAfAAAAAAAQQAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAADXAAAAAABXAAAAAAAXAAAAAAAfAAAAAAAewAAAAAAfAAAAAAAQQAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAABXAAAAAADXAAAAAACXAAAAAABMwAAAAABewAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAACXAAAAAADXAAAAAACXAAAAAADMwAAAAADewAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAMwAAAAAAXAAAAAADXAAAAAADXAAAAAAAMwAAAAAAewAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAAfAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAawAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAATgAAAAAAfAAAAAAATgAAAAAAfAAAAAAATgAAAAAAfAAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAewAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAA version: 6 -3,1: ind: -3,1 @@ -395,7 +395,7 @@ entities: version: 6 -5,1: ind: -5,1 - tiles: AAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAA + tiles: AAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAA version: 6 -5,2: ind: -5,2 @@ -516,16 +516,13 @@ entities: - type: Broadphase - type: Physics bodyStatus: InAir - angularDamping: 10000 - linearDamping: 10000 + angularDamping: 0.05 + linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Fixtures fixtures: {} - type: OccluderTree - - type: Shuttle - angularDamping: 10000 - linearDamping: 10000 - type: GridPathfinding - type: Gravity gravityShakeSound: !type:SoundPathSpecifier @@ -762,12 +759,6 @@ entities: decals: 88: -10,45 89: -8,45 - - node: - color: '#FFFFFFFF' - id: BrickLineOverlayS - decals: - 5488: 87,-9 - 5489: 88,-9 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNe @@ -863,10 +854,10 @@ entities: color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 450: 8,-26 478: 7,-27 479: 7,-26 480: 7,-25 + 6232: 8,-26 - node: color: '#52B4E996' id: BrickTileWhiteBox @@ -2601,8 +2592,8 @@ entities: 5486: 86,-10 5487: 89,-10 5494: 87,-8 - 5495: 88,-8 5502: 87,-7 + 6244: 88,-8 - node: color: '#6B2833DD' id: BrickTileWhiteLineN @@ -2943,7 +2934,7 @@ entities: id: BrickTileWhiteLineN decals: 5490: 87,-8 - 5491: 88,-8 + 6239: 88,-8 - node: color: '#334E6DC8' id: BrickTileWhiteLineS @@ -3004,11 +2995,11 @@ entities: 736: 0,-50 737: 2,-50 738: 3,-50 - 739: 4,-50 740: 5,-50 - 741: 6,-50 - 742: 7,-50 - 743: 9,-50 + 6254: 1,-50 + 6255: -1,-50 + 6256: -2,-50 + 6257: -4,-50 - node: color: '#52B4E996' id: BrickTileWhiteLineS @@ -3062,10 +3053,10 @@ entities: 5475: 66,-5 5484: 86,-7 5485: 89,-7 - 5498: 87,-9 - 5499: 88,-9 5500: 87,-10 5501: 88,-10 + 6242: 87,-9 + 6243: 88,-9 - node: color: '#6B2833DD' id: BrickTileWhiteLineS @@ -3346,6 +3337,12 @@ entities: 5441: 72,-16 5442: 71,-16 5443: 70,-16 + - node: + color: '#FFFFFFFF' + id: BrickTileWhiteLineS + decals: + 6240: 87,-9 + 6241: 88,-9 - node: color: '#334E6DC8' id: BrickTileWhiteLineW @@ -4167,6 +4164,12 @@ entities: 4902: -88,4 5230: -46,-41 5233: -47,-43 + - node: + color: '#A4610696' + id: DeliveryGreyscale + decals: + 6247: -37,-39 + 6248: -35,-43 - node: color: '#DE3A3A96' id: DeliveryGreyscale @@ -4210,6 +4213,8 @@ entities: 5237: 63,-21 5238: 63,-22 5239: 63,-23 + 6245: -37,-39 + 6246: -35,-43 - node: color: '#169C9CFF' id: DiagonalCheckerAOverlay @@ -5454,8 +5459,6 @@ entities: color: '#FFFFFFFF' id: DirtHeavy decals: - 1849: 8.025802,-52.01098 - 1850: 8.025802,-52.01098 1873: 1.9995551,-37.991898 1874: 3.9683056,-38.0336 1875: 3.9683056,-38.0336 @@ -5601,12 +5604,6 @@ entities: 1795: 1.5304413,-50.037285 1796: 1.4625741,-49.516083 1797: 1.4625741,-49.516083 - 1798: 7.519104,-50.600174 - 1799: 7.56077,-50.495934 - 1800: 7.56077,-50.339577 - 1801: 8.477437,-50.391693 - 1802: 8.456603,-50.235336 - 1803: 8.43577,-50.07898 1804: 8.050354,-49.57863 1805: 7.99827,-49.47439 1806: 7.894104,-49.49524 @@ -5652,11 +5649,6 @@ entities: 1846: 25.367579,-53.330887 1847: 25.346746,-53.16411 1848: 26.782354,-51.990128 - 1851: 0.56068707,-51.619858 - 1852: 1.435687,-51.60943 - 1853: 1.498187,-52.047234 - 1854: 1.3627704,-52.40165 - 1855: 0.8523537,-52.370377 1856: 4.981906,-45.67549 1857: 4.9923224,-45.477432 1858: 10.532811,-46.511147 @@ -8210,11 +8202,6 @@ entities: 5666: 41,15 5667: 42,15 5668: 43,15 - - node: - color: '#FFFFFFFF' - id: MiniTileSteelLineE - decals: - 637: 8,-26 - node: color: '#9FED5896' id: Omni @@ -8463,6 +8450,7 @@ entities: decals: 149: 0,43 5157: -8,-6 + 6253: -35,-39 - node: color: '#FFFFFFFF' id: WarnEndE @@ -8602,6 +8590,7 @@ entities: 6190: 136,2 6191: 137,2 6192: 138,2 + 6252: -36,-39 - node: color: '#FFFFFFFF' id: WarnLineS @@ -8639,6 +8628,9 @@ entities: 5224: -46,-46 5231: -46,-42 5232: -46,-43 + 6249: -35,-42 + 6250: -35,-41 + 6251: -35,-40 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -9018,7 +9010,7 @@ entities: 0: 65039 0,4: 0: 33279 - 1: 12288 + 2: 12288 0,-1: 0: 61166 1,0: @@ -9066,13 +9058,15 @@ entities: 4,3: 0: 52639 0,-4: - 0: 64764 + 0: 60668 0,-5: 0: 65359 + -1,-4: + 0: 54597 0,-3: - 0: 65167 + 0: 65166 -1,-3: - 0: 56645 + 0: 56653 0,-2: 0: 61006 -1,-2: @@ -9115,17 +9109,17 @@ entities: 0: 39743 -8,-9: 0: 65280 - 2: 4 + 1: 4 -9,-8: 0: 65416 -8,-7: 0: 4369 - 2: 52428 + 1: 52428 -9,-7: 0: 48056 -8,-6: 0: 4593 - 2: 49152 + 1: 49152 -9,-6: 0: 63931 -8,-5: @@ -9137,13 +9131,13 @@ entities: -7,-8: 0: 21839 -7,-7: - 2: 65521 + 1: 65521 0: 4 -7,-6: - 2: 65535 + 1: 65535 -7,-5: 0: 61681 - 2: 14 + 1: 14 -7,-9: 0: 65535 -7,-4: @@ -9151,49 +9145,49 @@ entities: -6,-8: 0: 65535 -6,-7: - 2: 65520 + 1: 65520 -6,-6: - 2: 16383 + 1: 16383 -6,-5: - 2: 1 + 1: 1 0: 47290 -6,-9: 0: 65297 - 2: 4 + 1: 4 -6,-4: 0: 65225 -5,-8: 0: 13119 - 2: 34816 + 1: 34816 -5,-7: - 2: 30712 + 1: 30712 -5,-6: - 2: 7 + 1: 7 0: 60928 -5,-5: 0: 4479 - 1: 49152 + 2: 49152 -5,-9: 0: 65416 -5,-4: 0: 4881 - 1: 52428 + 2: 52428 -4,-8: 0: 15 - 2: 65280 + 1: 65280 -4,-6: 0: 65294 -4,-5: 0: 34947 - 1: 13056 + 2: 13056 -4,-4: - 1: 4403 + 2: 4403 0: 49288 -4,-3: - 1: 1 + 2: 1 0: 32524 -5,-3: - 1: 12 + 2: 12 0: 64272 -4,-2: 0: 63255 @@ -9206,9 +9200,9 @@ entities: -4,0: 0: 65287 -3,-4: - 0: 63709 + 0: 55517 -3,-3: - 0: 65485 + 0: 65487 -3,-2: 0: 65535 -3,-1: @@ -9229,10 +9223,8 @@ entities: 0: 65407 -2,-5: 0: 49660 - -1,-4: - 0: 21830 -1,-5: - 0: 25719 + 0: 21623 4,4: 0: 47357 5,0: @@ -9317,7 +9309,7 @@ entities: 0: 63351 -8,-1: 0: 21572 - 2: 17 + 1: 17 -9,0: 0: 65501 -8,1: @@ -9326,15 +9318,15 @@ entities: 0: 56831 -8,2: 0: 17477 - 2: 4352 + 1: 4352 -9,2: 0: 284 - 2: 52224 + 1: 52224 -8,3: - 2: 23 + 1: 23 0: 31744 -9,3: - 2: 255 + 1: 255 0: 53504 -8,4: 0: 57460 @@ -9379,19 +9371,19 @@ entities: -4,3: 0: 65287 -9,-4: - 2: 65248 + 1: 65248 -8,-3: 0: 17873 - 2: 4096 + 1: 4096 -9,-3: - 2: 65535 + 1: 65535 -8,-2: - 2: 30583 + 1: 30583 -9,-2: - 2: 52462 + 1: 52462 0: 785 -9,-1: - 2: 204 + 1: 204 0: 49425 -7,-3: 0: 30591 @@ -9421,10 +9413,10 @@ entities: 0: 61160 -1,4: 0: 4607 - 1: 49152 + 2: 49152 -9,4: 0: 196 - 2: 61713 + 1: 61713 -8,5: 0: 65534 -8,6: @@ -9437,62 +9429,61 @@ entities: 0: 56558 -8,8: 0: 141 - 2: 57856 + 1: 57856 -7,5: 0: 511 - 2: 49152 + 1: 49152 -7,7: 0: 12289 - 2: 35054 + 1: 35054 -7,6: - 2: 61166 + 1: 61166 -7,8: 0: 55 - 2: 63624 + 1: 63624 -6,5: 0: 3827 -6,6: - 2: 30481 + 1: 30481 0: 102 -6,7: - 2: 65527 + 1: 65527 -6,8: - 2: 65535 + 1: 65535 -5,5: 0: 15344 -5,6: 0: 49151 -5,7: - 2: 65328 + 1: 65328 0: 8 -5,8: - 2: 8191 + 1: 8191 -4,5: 0: 52700 -4,6: 0: 65311 -4,7: 0: 79 - 2: 28928 + 1: 28928 0,5: - 1: 51 + 2: 51 0: 63628 -1,5: - 1: 204 + 2: 204 0: 61457 0,6: 0: 62702 -1,6: - 0: 62345 - 3: 2 + 0: 62347 0,7: 0: 3087 - 2: 13056 + 1: 13056 -1,7: 0: 13103 - 2: 34816 + 1: 34816 0,8: - 2: 4095 + 1: 4095 1,5: 0: 61183 1,6: @@ -9500,7 +9491,7 @@ entities: 1,7: 0: 53007 1,8: - 2: 273 + 1: 273 0: 3276 2,5: 0: 56575 @@ -9530,21 +9521,21 @@ entities: 0: 58976 -3,-8: 0: 3299 - 2: 4096 + 1: 4096 -3,-7: - 2: 52479 + 1: 52479 0: 4096 -3,-6: 0: 65281 - 2: 12 + 1: 12 -3,-9: 0: 40160 -2,-8: 0: 20465 -2,-7: - 2: 65393 + 1: 65393 -2,-6: - 2: 15 + 1: 15 0: 65280 -2,-9: 0: 56784 @@ -9552,18 +9543,18 @@ entities: 0: 49136 -1,-7: 0: 3 - 2: 65408 + 1: 65408 -1,-6: - 2: 15 + 1: 15 0: 65280 -1,-9: 0: 48058 0,-8: 0: 4080 0,-7: - 2: 16382 + 1: 16382 0,-6: - 2: 3 + 1: 3 0: 65292 0,-9: 0: 61199 @@ -9598,7 +9589,7 @@ entities: 4,-6: 0: 65295 -4,8: - 2: 4095 + 1: 4095 -3,5: 0: 54551 -3,6: @@ -9606,7 +9597,7 @@ entities: -3,7: 0: 33727 -3,8: - 2: 4095 + 1: 4095 -2,5: 0: 55807 -2,6: @@ -9614,10 +9605,10 @@ entities: -2,7: 0: 28783 -2,8: - 2: 247 + 1: 247 0: 10240 -1,8: - 2: 248 + 1: 248 0: 16640 -12,0: 0: 32767 @@ -9639,7 +9630,7 @@ entities: 0: 15291 -12,4: 0: 7 - 2: 61064 + 1: 61064 -11,0: 0: 65535 -11,1: @@ -9651,7 +9642,7 @@ entities: -11,-1: 0: 64796 -11,4: - 2: 65535 + 1: 65535 -10,0: 0: 61438 -10,1: @@ -9661,30 +9652,30 @@ entities: -10,3: 0: 35591 -10,4: - 2: 65535 + 1: 65535 -10,-1: 0: 36591 4,8: 0: 819 - 2: 2184 + 1: 2184 5,5: 0: 49617 5,6: 0: 64433 5,7: 0: 783 - 2: 52224 + 1: 52224 5,8: - 2: 4095 + 1: 4095 6,5: 0: 48120 6,6: 0: 16305 6,7: 0: 79 - 2: 28928 + 1: 28928 6,8: - 2: 255 + 1: 255 0: 10240 7,5: 0: 47931 @@ -9692,9 +9683,9 @@ entities: 0: 33720 7,7: 0: 959 - 2: 32768 + 1: 32768 7,8: - 2: 255 + 1: 255 0: 16640 8,4: 0: 65485 @@ -9704,9 +9695,9 @@ entities: 0: 63803 8,7: 0: 15 - 2: 65024 + 1: 65024 8,8: - 2: 255 + 1: 255 0: 3840 9,4: 0: 65535 @@ -9719,7 +9710,7 @@ entities: 9,3: 0: 65359 9,8: - 2: 30719 + 1: 30719 10,4: 0: 65535 10,5: @@ -9728,20 +9719,20 @@ entities: 0: 65520 10,7: 0: 271 - 2: 60928 + 1: 60928 10,3: 0: 65294 10,8: - 2: 51 + 1: 51 0: 63616 11,4: 0: 53213 11,6: 0: 4371 - 2: 52360 + 1: 52360 11,7: 0: 1 - 2: 4044 + 1: 4044 11,3: 0: 53709 11,5: @@ -9752,9 +9743,9 @@ entities: 0: 30583 12,5: 0: 7 - 2: 15872 + 1: 15872 12,6: - 2: 3 + 1: 3 0: 61320 12,7: 0: 18190 @@ -9763,20 +9754,20 @@ entities: 12,8: 0: 65535 13,4: - 2: 29491 + 1: 29491 0: 136 13,5: - 2: 1911 + 1: 1911 13,6: 0: 48059 13,7: 0: 65419 13,3: - 2: 13107 + 1: 13107 0: 32844 13,8: 0: 13107 - 2: 34944 + 1: 34944 14,4: 0: 48059 14,5: @@ -9785,7 +9776,7 @@ entities: 0: 65535 14,7: 0: 287 - 2: 1024 + 1: 1024 14,3: 0: 16360 15,4: @@ -9796,7 +9787,7 @@ entities: 0: 48059 15,7: 0: 139 - 2: 512 + 1: 512 15,3: 0: 7163 16,4: @@ -9845,20 +9836,20 @@ entities: 0: 55807 13,2: 0: 49629 - 2: 12288 + 1: 12288 13,-1: 0: 56592 - 2: 15 + 1: 15 14,0: 0: 65435 14,1: 0: 47359 14,2: 0: 35003 - 2: 12288 + 1: 12288 14,-1: 0: 48012 - 2: 1 + 1: 1 15,0: 0: 65485 15,1: @@ -9901,24 +9892,24 @@ entities: 0: 65535 11,-5: 0: 61440 - 2: 238 + 1: 238 12,-4: 0: 4096 - 2: 35942 + 1: 35942 12,-3: 0: 28531 12,-2: 0: 26215 12,-5: - 2: 26227 + 1: 26227 0: 12 13,-4: 0: 15 - 2: 30464 + 1: 30464 13,-3: - 2: 26215 + 1: 26215 13,-2: - 2: 65399 + 1: 65399 13,-5: 0: 15245 14,-4: @@ -9952,33 +9943,33 @@ entities: 7,-8: 0: 49136 8,-7: - 2: 65534 + 1: 65534 7,-7: - 2: 65408 + 1: 65408 0: 3 8,-6: - 2: 15 + 1: 15 0: 65280 7,-6: - 2: 15 + 1: 15 0: 65280 9,-8: 0: 1775 9,-7: - 2: 8191 + 1: 8191 9,-6: - 2: 1 + 1: 1 0: 65422 9,-9: 0: 64733 10,-8: 0: 61439 10,-7: - 2: 18224 + 1: 18224 0: 8 10,-6: 0: 61699 - 2: 204 + 1: 204 10,-9: 0: 4369 11,-8: @@ -9986,7 +9977,7 @@ entities: 11,-7: 0: 61247 11,-6: - 2: 58992 + 1: 58992 0: 128 12,-8: 0: 65535 @@ -9994,25 +9985,24 @@ entities: 0: 65295 12,-6: 0: 51258 - 2: 12288 + 1: 12288 4,-9: 0: 48027 5,-8: 0: 4080 5,-7: - 2: 53247 + 1: 53247 5,-6: 0: 65283 - 2: 12 + 1: 12 5,-9: - 0: 47929 - 3: 2 + 0: 47931 6,-8: 0: 20466 6,-7: - 2: 65393 + 1: 65393 6,-6: - 2: 15 + 1: 15 0: 65280 6,-9: 0: 30471 @@ -10043,64 +10033,64 @@ entities: 18,4: 0: 14327 19,0: - 2: 15 + 1: 15 0: 65280 19,1: 0: 12543 - 2: 32768 + 1: 32768 19,2: 0: 65283 - 2: 8 + 1: 8 19,3: 0: 30479 19,-1: - 2: 61440 + 1: 61440 0: 191 19,4: 0: 1919 20,0: - 2: 15 + 1: 15 0: 65280 20,1: 0: 255 - 2: 61440 + 1: 61440 20,2: - 2: 1 + 1: 1 0: 56576 20,3: 0: 65309 20,-1: - 2: 61440 + 1: 61440 0: 187 20,4: 0: 64511 21,0: - 2: 15 + 1: 15 0: 65280 21,1: 0: 255 - 2: 61440 + 1: 61440 21,2: 0: 4352 - 2: 34952 + 1: 34952 21,3: 0: 54721 21,-1: - 2: 63488 + 1: 63488 0: 55 21,4: 0: 56541 22,0: - 2: 3 + 1: 3 0: 65416 22,1: 0: 51455 - 2: 4096 + 1: 4096 22,2: - 2: 12561 + 1: 12561 0: 32972 22,-1: - 2: 13107 + 1: 13107 0: 34952 22,3: 0: 43688 @@ -10171,8 +10161,8 @@ entities: 0,-12: 0: 45311 0,-13: - 0: 65282 - 2: 8 + 0: 65280 + 1: 7 -1,-12: 0: 57583 0,-11: @@ -10190,8 +10180,8 @@ entities: 1,-10: 0: 56575 1,-13: - 0: 65280 - 2: 7 + 0: 65281 + 1: 12 2,-12: 0: 55551 2,-11: @@ -10199,8 +10189,8 @@ entities: 2,-10: 0: 8191 2,-13: - 0: 65281 - 2: 12 + 0: 65280 + 1: 15 3,-12: 0: 45567 3,-11: @@ -10209,7 +10199,7 @@ entities: 0: 36863 3,-13: 0: 65280 - 2: 15 + 1: 15 4,-12: 0: 63743 4,-11: @@ -10220,7 +10210,7 @@ entities: 0: 47359 8,-13: 0: 28672 - 2: 200 + 1: 200 7,-12: 0: 53631 8,-11: @@ -10239,15 +10229,15 @@ entities: 0: 56829 10,-12: 0: 4352 - 2: 35023 + 1: 35023 10,-11: 0: 12561 - 2: 35016 + 1: 35016 10,-10: 0: 13107 - 2: 34952 + 1: 34952 10,-13: - 2: 43694 + 1: 43694 4,12: 0: 3838 5,9: @@ -10346,7 +10336,7 @@ entities: 0: 61951 13,-7: 0: 13070 - 2: 2048 + 1: 2048 13,-6: 0: 56559 13,-8: @@ -10355,7 +10345,7 @@ entities: 0: 65523 14,-7: 0: 34831 - 2: 768 + 1: 768 14,-6: 0: 47935 14,-9: @@ -10376,7 +10366,7 @@ entities: 0: 4380 16,-9: 0: 4352 - 2: 19456 + 1: 19456 17,-8: 0: 4401 17,-7: @@ -10398,26 +10388,26 @@ entities: 20,-5: 0: 4092 8,-14: - 2: 36608 + 1: 36608 7,-14: - 2: 3584 + 1: 3584 9,-14: - 2: 3840 + 1: 3840 9,-13: - 2: 272 + 1: 272 10,-14: - 2: 28416 + 1: 28416 11,-14: - 2: 4352 + 1: 4352 11,-13: - 2: 17 + 1: 17 4,-14: 0: 43520 4,-13: 0: 65450 5,-13: 0: 65280 - 2: 14 + 1: 14 5,-12: 0: 64767 6,-13: @@ -10428,29 +10418,30 @@ entities: 0: 65535 7,-13: 0: 30464 - 2: 8 - 0,-14: - 0: 8192 + 1: 8 -1,-13: - 0: 65280 - 2,-14: + 1: 8 + 0: 65282 + 1,-14: 0: 4096 -4,-14: - 2: 61440 + 1: 61440 -5,-14: - 2: 61440 + 1: 61440 -3,-14: - 2: 28672 + 1: 28672 -3,-13: - 2: 498 + 1: 498 0: 49152 -3,-12: 0: 14206 -2,-13: - 2: 18 + 1: 18 0: 56320 -2,-12: 0: 65295 + -1,-14: + 0: 8192 -4,-12: 0: 48112 -4,-11: @@ -10471,26 +10462,26 @@ entities: 0: 63351 -9,-9: 0: 32768 - 2: 17 + 1: 17 -8,-10: - 2: 17484 + 1: 17484 -8,-12: - 2: 34952 + 1: 34952 -8,-13: - 2: 34956 + 1: 34956 -8,-11: - 2: 34952 + 1: 34952 -7,-10: 0: 65280 -6,-10: 0: 4352 - 2: 17478 + 1: 17478 -6,-12: - 2: 8738 + 1: 8738 -6,-13: - 2: 8743 + 1: 8743 -6,-11: - 2: 8738 + 1: 8738 5,-11: 0: 52511 5,-10: @@ -10521,7 +10512,7 @@ entities: 0: 7631 23,-2: 0: 49425 - 2: 68 + 1: 68 24,-4: 0: 61438 24,-3: @@ -10575,37 +10566,37 @@ entities: 21,-6: 0: 47359 21,-8: - 2: 3822 + 1: 3822 0: 24576 21,-7: 0: 36590 22,-8: - 2: 49971 + 1: 49971 22,-7: 0: 273 - 2: 49152 + 1: 49152 22,-6: - 2: 3720 + 1: 3720 22,-9: - 2: 8738 + 1: 8738 23,-8: - 2: 61440 + 1: 61440 23,-7: - 2: 29218 + 1: 29218 23,-6: - 2: 256 + 1: 256 0: 3264 23,-5: 0: 3822 24,-8: - 2: 61440 + 1: 61440 24,-5: 0: 33655 8,12: 0: 6015 9,9: 0: 65280 - 2: 6 + 1: 6 9,10: 0: 48015 9,11: @@ -10616,12 +10607,12 @@ entities: 0: 4095 10,10: 0: 12288 - 2: 34 + 1: 34 10,11: 0: 13107 10,12: 0: 273 - 2: 16384 + 1: 16384 11,9: 0: 34944 11,10: @@ -10640,15 +10631,15 @@ entities: 0: 8 9,13: 0: 819 - 2: 32768 + 1: 32768 9,14: - 2: 12 + 1: 12 10,13: - 2: 61998 + 1: 61998 11,13: - 2: 64719 + 1: 64719 12,13: - 2: 61455 + 1: 61455 -4,9: 0: 52701 -5,9: @@ -10685,27 +10676,27 @@ entities: 0: 30576 -9,9: 0: 35071 - 2: 12288 + 1: 12288 -8,10: 0: 207 -9,10: 0: 8 - 2: 48 + 1: 48 -8,11: - 2: 28672 + 1: 28672 -9,11: - 2: 61696 + 1: 61696 -8,12: - 2: 35946 + 1: 35946 -7,9: - 2: 255 + 1: 255 0: 33536 -7,10: 0: 14591 -7,11: 0: 61439 -6,9: - 2: 119 + 1: 119 0: 28672 -6,10: 0: 14335 @@ -10716,13 +10707,13 @@ entities: -5,12: 0: 52364 -7,12: - 2: 12560 + 1: 12560 -7,13: - 2: 2246 + 1: 2246 -6,13: - 2: 3840 + 1: 3840 -5,13: - 2: 25360 + 1: 25360 0: 140 -4,13: 0: 4095 @@ -10771,33 +10762,33 @@ entities: 13,10: 0: 119 14,8: - 2: 16 + 1: 16 0: 57344 14,9: 0: 65534 14,10: 0: 61183 14,11: - 2: 32768 + 1: 32768 14,12: - 2: 4972 + 1: 4972 15,11: - 2: 8030 + 1: 8030 15,10: - 2: 32768 + 1: 32768 16,10: - 2: 5100 + 1: 5100 16,11: - 2: 3968 + 1: 3968 -12,-4: 0: 255 - 2: 57344 + 1: 57344 -12,-5: 0: 65520 -13,-4: 0: 62327 -12,-3: - 2: 35054 + 1: 35054 0: 28672 -13,-3: 0: 63487 @@ -10809,18 +10800,18 @@ entities: 0: 48051 -11,-4: 0: 255 - 2: 61440 + 1: 61440 -11,-3: - 2: 65535 + 1: 65535 -11,-2: 0: 65520 -11,-5: 0: 65520 -10,-4: - 2: 61440 + 1: 61440 0: 238 -10,-3: - 2: 65535 + 1: 65535 -10,-2: 0: 30576 -10,-5: @@ -10828,7 +10819,7 @@ entities: -16,-4: 0: 61030 -17,-4: - 2: 2296 + 1: 2296 -16,-3: 0: 61166 -16,-2: @@ -10868,30 +10859,30 @@ entities: -13,-5: 0: 63346 -20,-4: - 2: 4096 + 1: 4096 -20,-3: - 2: 61299 + 1: 61299 -21,-4: - 2: 61440 + 1: 61440 -21,-3: - 2: 4528 + 1: 4528 -20,-1: 0: 65329 - 2: 8 + 1: 8 -21,-1: 0: 31 - 2: 4576 + 1: 4576 -20,0: 0: 43955 - 2: 4096 + 1: 4096 -20,-2: - 2: 34956 + 1: 34956 -19,-3: - 2: 4096 + 1: 4096 -19,-2: - 2: 4369 + 1: 4369 -19,-1: - 2: 1 + 1: 1 0: 48896 -19,0: 0: 65522 @@ -10900,45 +10891,45 @@ entities: -18,0: 0: 64434 -18,-4: - 2: 17604 + 1: 17604 -18,-5: - 2: 17476 + 1: 17476 -18,-3: - 2: 12 + 1: 12 -17,-3: - 2: 1 + 1: 1 -17,0: 0: 64441 -21,0: 0: 9 - 2: 37142 + 1: 37142 -20,1: - 2: 16 + 1: 16 0: 15274 -21,1: - 2: 4496 + 1: 4496 0: 9 -20,2: 0: 15291 -21,2: 0: 4105 - 2: 57622 + 1: 57622 -20,3: 0: 1 - 2: 34952 + 1: 34952 -21,3: 0: 255 - 2: 4864 + 1: 4864 -19,1: 0: 4095 -19,2: 0: 187 -19,3: - 2: 4369 + 1: 4369 -20,4: - 2: 32748 + 1: 32748 -19,4: - 2: 17 + 1: 17 -18,1: 0: 3007 -18,2: @@ -10954,13 +10945,18 @@ entities: -16,2: 0: 7647 -16,3: - 0: 8183 + 0: 40951 + -16,4: + 0: 36044 + 1: 4368 -15,1: 0: 45277 -15,2: 0: 13243 -15,3: 0: 4080 + -15,4: + 0: 4369 -14,1: 0: 61559 -14,2: @@ -10972,15 +10968,15 @@ entities: -13,4: 0: 65407 -16,-8: - 2: 39 + 1: 39 0: 34816 -17,-8: - 2: 15 + 1: 15 -16,-7: - 2: 4384 + 1: 4384 0: 51336 -16,-6: - 2: 4369 + 1: 4369 0: 52236 -15,-8: 0: 65520 @@ -11001,7 +10997,7 @@ entities: -13,-6: 0: 32631 -13,-9: - 2: 51200 + 1: 51200 0: 8 -12,-8: 0: 64988 @@ -11010,7 +11006,7 @@ entities: -12,-6: 0: 65295 -12,-9: - 2: 4352 + 1: 4352 0: 52431 -11,-8: 0: 65523 @@ -11028,80 +11024,86 @@ entities: 0: 62379 -10,-9: 0: 30579 + -17,4: + 1: 128 + -16,5: + 1: 4369 + 0: 34952 -16,6: - 2: 15 - 0: 32768 + 1: 817 + 0: 32904 + -17,5: + 1: 32768 -17,6: - 2: 15 + 1: 2063 -16,7: 0: 52367 - 2: 4352 + 1: 4352 -17,7: 0: 26120 - 2: 7 + 1: 7 -16,8: - 2: 17153 + 1: 17153 0: 140 + -15,5: + 0: 4369 + 3: 2048 -15,6: - 2: 17 - 0: 64716 + 0: 64735 -15,7: 0: 65535 - -15,5: - 2: 4096 - 4: 2048 -15,8: 0: 65535 -14,5: - 4: 1792 + 3: 1792 0: 8 -14,6: 0: 65535 -14,7: 0: 4383 - 5: 17408 + 4: 17408 -14,8: 0: 65297 - 5: 4 + 4: 4 -13,5: 0: 65311 -13,6: 0: 65535 -13,7: 0: 15 - 6: 4352 - 4: 17408 + 5: 4352 + 3: 17408 -13,8: - 6: 1 - 4: 4 + 5: 1 + 3: 4 0: 65280 -12,5: 0: 65280 - 2: 14 + 1: 14 -12,6: 0: 65535 -12,7: 0: 15 - 7: 4352 - 4: 17408 + 6: 4352 + 3: 17408 -12,8: - 7: 1 - 4: 4 + 6: 1 + 3: 4 0: 65280 -11,5: - 2: 3 + 1: 3 0: 65292 -11,6: 0: 65535 -11,7: 0: 52431 - 4: 4352 + 3: 4352 -11,8: - 4: 1 + 3: 1 0: 65484 -10,5: 0: 65283 - 2: 12 + 1: 12 -10,6: 0: 65535 -10,7: @@ -11109,47 +11111,47 @@ entities: -10,8: 0: 30591 -9,5: - 2: 1 + 1: 1 0: 17732 -17,8: - 2: 3840 + 1: 3840 0: 6 -16,9: - 2: 29696 + 1: 29696 -16,10: - 2: 36079 + 1: 36079 -17,9: - 2: 61440 + 1: 61440 -15,9: 0: 4095 -15,10: - 2: 4097 + 1: 4097 -15,11: - 2: 35939 + 1: 35939 -14,9: 0: 3569 -14,11: - 2: 12834 + 1: 12834 -14,10: - 2: 8743 + 1: 8743 -14,12: - 2: 8866 + 1: 8866 0: 2056 -13,9: 0: 3568 -13,10: - 2: 132 + 1: 132 0: 8 -12,9: 0: 4080 -12,10: 0: 19655 - 2: 9008 + 1: 9008 -12,11: 0: 17476 -12,12: 0: 17733 - 2: 176 + 1: 176 -11,9: 0: 4080 -11,10: @@ -11158,19 +11160,19 @@ entities: 0: 6128 -10,10: 0: 819 - 2: 34952 + 1: 34952 -10,11: - 2: 34956 + 1: 34956 -10,12: - 2: 35000 + 1: 35000 0: 771 -9,12: - 2: 1 + 1: 1 -12,-12: - 2: 48 + 1: 48 0: 52416 -13,-12: - 2: 20208 + 1: 20208 -12,-11: 0: 30576 -13,-11: @@ -11181,77 +11183,77 @@ entities: 0: 35071 -11,-12: 0: 13104 - 2: 52428 + 1: 52428 -11,-11: 0: 48051 - 2: 8 + 1: 8 -11,-10: 0: 48059 -11,-13: - 2: 52224 + 1: 52224 0: 238 -10,-12: 0: 48048 - 2: 17472 + 1: 17472 -10,-11: 0: 65467 - 2: 68 + 1: 68 -10,-10: 0: 191 - 2: 47872 + 1: 47872 -9,-12: 0: 4368 -9,-11: 0: 13105 -9,-10: 0: 51 - 2: 4352 + 1: 4352 -13,12: 0: 3855 - 2: 240 + 1: 240 -12,13: 0: 17733 - 2: 176 + 1: 176 -13,13: 0: 3855 - 2: 240 + 1: 240 -12,14: 0: 17733 - 2: 176 + 1: 176 -13,14: 0: 3855 - 2: 240 + 1: 240 -12,15: 0: 325 - 2: 17584 + 1: 17584 -13,15: 0: 3855 - 2: 240 + 1: 240 -12,16: - 2: 61444 + 1: 61444 -11,12: - 2: 240 + 1: 240 0: 3855 -11,13: - 2: 240 + 1: 240 0: 3855 -11,14: - 2: 240 + 1: 240 0: 3855 -11,15: - 2: 240 + 1: 240 0: 3855 -10,13: 0: 771 - 2: 35000 + 1: 35000 -10,14: 0: 771 - 2: 35000 + 1: 35000 -10,15: 0: 771 - 2: 35000 + 1: 35000 -10,16: - 2: 64648 + 1: 64648 -11,-14: 0: 57344 -10,-14: @@ -11268,70 +11270,70 @@ entities: 0: 12526 21,8: 0: 19 - 2: 29696 + 1: 29696 22,6: 0: 13311 22,7: 0: 3 - 2: 36352 + 1: 36352 22,5: 0: 3816 23,7: - 2: 36608 + 1: 36608 22,8: - 2: 234 + 1: 234 23,5: 0: 1646 23,6: - 2: 10 + 1: 10 24,5: 0: 4087 24,7: - 2: 36608 + 1: 36608 23,8: - 2: 248 + 1: 248 24,6: 0: 238 25,5: 0: 8184 25,6: 0: 17 - 2: 1028 + 1: 1028 25,7: - 2: 36608 + 1: 36608 24,8: - 2: 248 + 1: 248 26,5: 0: 30590 26,6: 0: 30706 26,7: 0: 7 - 2: 36608 + 1: 36608 25,8: - 2: 248 + 1: 248 27,5: 0: 1 - 2: 63232 + 1: 63232 27,6: 0: 30576 27,7: 0: 7 - 2: 36608 + 1: 36608 26,8: - 2: 248 + 1: 248 28,4: 0: 4351 - 2: 8192 + 1: 8192 28,5: - 2: 63630 + 1: 63630 28,6: - 2: 117 + 1: 117 0: 12288 28,7: - 2: 36672 + 1: 36672 27,8: - 2: 248 + 1: 248 25,-4: 0: 52243 25,-3: @@ -11350,10 +11352,10 @@ entities: 0: 3581 26,-5: 0: 63255 - 2: 8 + 1: 8 27,-4: 0: 15 - 2: 8704 + 1: 8704 27,-3: 0: 65504 27,-2: @@ -11362,7 +11364,7 @@ entities: 0: 4095 27,-5: 0: 61440 - 2: 15 + 1: 15 28,-4: 0: 34959 28,-3: @@ -11373,10 +11375,10 @@ entities: 0: 2039 28,-5: 0: 65024 - 2: 1 + 1: 1 29,-4: 0: 62225 - 2: 4 + 1: 4 29,-3: 0: 29371 29,-2: @@ -11385,15 +11387,15 @@ entities: 0: 65399 29,-5: 0: 4352 - 2: 50176 + 1: 50176 29,0: 0: 65535 30,-4: 0: 4096 - 2: 33010 + 1: 33010 30,-3: 0: 28979 - 2: 136 + 1: 136 30,-2: 0: 63255 30,-1: @@ -11401,11 +11403,11 @@ entities: 30,0: 0: 65535 30,-5: - 2: 28672 + 1: 28672 31,-4: - 2: 240 + 1: 240 31,-3: - 2: 61441 + 1: 61441 31,-2: 0: 65520 31,-1: @@ -11413,15 +11415,15 @@ entities: 31,0: 0: 65535 32,-4: - 2: 20222 + 1: 20222 32,-3: - 2: 63044 + 1: 63044 32,-2: 0: 4368 - 2: 17476 + 1: 17476 32,-1: 0: 13185 - 2: 4 + 1: 4 28,3: 0: 34952 29,1: @@ -11432,66 +11434,66 @@ entities: 0: 16382 29,4: 0: 3 - 2: 4096 + 1: 4096 30,1: 0: 65535 30,2: 0: 3839 30,3: 0: 273 - 2: 50252 + 1: 50252 31,1: 0: 61135 31,3: - 2: 61440 + 1: 61440 32,0: 0: 13107 32,1: 0: 13065 - 2: 50368 + 1: 50368 32,3: - 2: 62528 + 1: 62528 29,5: - 2: 61441 + 1: 61441 29,7: - 2: 36608 + 1: 36608 28,8: - 2: 248 + 1: 248 30,5: - 2: 61440 + 1: 61440 30,7: - 2: 36608 + 1: 36608 29,8: - 2: 248 + 1: 248 31,5: - 2: 61440 + 1: 61440 31,7: - 2: 36608 + 1: 36608 30,8: - 2: 248 + 1: 248 32,5: - 2: 63044 + 1: 63044 32,7: - 2: 1860 + 1: 1860 31,8: - 2: 248 + 1: 248 32,6: - 2: 50246 + 1: 50246 32,4: - 2: 17476 + 1: 17476 33,5: - 2: 4369 + 1: 4369 33,6: - 2: 4369 + 1: 4369 33,4: - 2: 4369 + 1: 4369 33,3: - 2: 4352 + 1: 4352 33,7: - 2: 1 + 1: 1 33,1: 0: 3 - 2: 12848 + 1: 12848 33,0: 0: 43690 33,-1: @@ -11502,447 +11504,447 @@ entities: 0: 30464 35,0: 0: 17 - 1: 65262 + 2: 65262 35,1: - 1: 15 + 2: 15 34,1: - 2: 2048 + 1: 2048 35,-1: - 1: 61424 + 2: 61424 36,0: - 1: 4369 + 2: 4369 36,1: - 1: 1 - 2: 524 + 2: 1 + 1: 524 32,-5: - 2: 17484 + 1: 17484 33,-4: - 2: 9011 + 1: 9011 33,-3: - 2: 12834 + 1: 12834 33,-5: - 2: 8739 + 1: 8739 33,-2: - 2: 2 + 1: 2 34,-2: - 2: 32768 + 1: 32768 36,-1: - 1: 4368 - 2: 192 + 2: 4368 + 1: 192 32,-7: - 2: 61440 + 1: 61440 31,-7: - 2: 61440 + 1: 61440 32,-6: - 2: 18176 + 1: 18176 31,-6: - 2: 3976 + 1: 3976 33,-7: - 2: 12288 + 1: 12288 33,-6: - 2: 8706 + 1: 8706 24,-7: - 2: 30498 + 1: 30498 24,-6: 0: 12000 25,-8: - 2: 62532 + 1: 62532 25,-7: - 2: 65252 + 1: 65252 25,-6: - 2: 3722 + 1: 3722 25,-9: - 2: 50244 + 1: 50244 26,-8: - 2: 4369 + 1: 4369 26,-7: - 2: 61713 + 1: 61713 26,-6: - 2: 36744 + 1: 36744 26,-9: - 2: 4369 + 1: 4369 27,-7: - 2: 61440 + 1: 61440 27,-6: - 2: 3976 + 1: 3976 28,-7: - 2: 61440 + 1: 61440 28,-6: - 2: 8072 + 1: 8072 29,-7: - 2: 61440 + 1: 61440 29,-6: - 2: 3976 + 1: 3976 30,-7: - 2: 61440 + 1: 61440 30,-6: - 2: 3976 + 1: 3976 -20,5: - 2: 19 + 1: 19 -21,4: - 2: 45329 + 1: 45329 -21,5: - 2: 240 + 1: 240 -19,5: - 2: 19456 + 1: 19456 -19,6: - 2: 17484 + 1: 17484 -19,7: - 2: 19660 + 1: 19660 -19,8: - 2: 19660 + 1: 19660 -18,6: - 2: 15 + 1: 15 -18,7: - 2: 36092 + 1: 36092 -18,8: - 2: 3324 + 1: 3324 -19,9: - 2: 52292 + 1: 52292 -19,10: - 2: 3148 + 1: 3148 -18,9: - 2: 61440 + 1: 61440 20,9: 0: 4099 - 2: 26112 + 1: 26112 19,9: 0: 255 - 2: 61440 + 1: 61440 20,10: - 2: 17478 + 1: 17478 20,11: - 2: 1996 + 1: 1996 19,11: - 2: 3840 + 1: 3840 21,11: - 2: 1 + 1: 1 21,10: - 2: 16034 + 1: 16034 21,9: - 2: 8738 + 1: 8738 22,10: - 2: 19 + 1: 19 22,9: - 2: 8192 + 1: 8192 16,9: - 2: 35012 + 1: 35012 17,9: - 2: 41728 + 1: 41728 0: 142 17,10: - 2: 4371 + 1: 4371 17,11: - 2: 3889 + 1: 3889 18,9: 0: 255 - 2: 61440 + 1: 61440 18,11: - 2: 3840 + 1: 3840 -14,-12: - 2: 128 + 1: 128 -14,-11: 0: 2048 -14,-10: 0: 8 -14,13: - 2: 8866 + 1: 8866 0: 2056 -14,14: - 2: 8866 + 1: 8866 0: 2056 -14,15: - 2: 8866 + 1: 8866 0: 2056 -14,16: - 2: 58914 + 1: 58914 -13,16: - 2: 61440 + 1: 61440 -12,17: - 2: 240 + 1: 240 -13,17: - 2: 240 + 1: 240 -11,16: - 2: 61440 + 1: 61440 -11,17: - 2: 240 + 1: 240 -10,17: - 2: 242 + 1: 242 17,-9: - 2: 3840 + 1: 3840 18,-9: - 2: 3840 + 1: 3840 19,-9: - 2: 3954 + 1: 3954 19,-12: - 2: 8738 + 1: 8738 19,-13: - 2: 8738 + 1: 8738 19,-11: - 2: 8738 + 1: 8738 19,-10: - 2: 8738 + 1: 8738 20,-9: - 2: 3840 + 1: 3840 32,8: - 2: 240 + 1: 240 33,8: - 2: 17 + 1: 17 13,13: - 2: 4975 + 1: 4975 13,12: - 2: 32768 + 1: 32768 -14,17: - 2: 232 + 1: 232 -8,-14: - 2: 49152 + 1: 49152 -7,-14: - 2: 61440 + 1: 61440 -7,-13: - 2: 1 + 1: 1 -6,-14: - 2: 61440 + 1: 61440 20,-12: 0: 49344 - 2: 3072 + 1: 3072 20,-11: 0: 49344 - 2: 3072 + 1: 3072 20,-10: 0: 49344 - 2: 3072 + 1: 3072 21,-12: 0: 61680 - 2: 3840 + 1: 3840 21,-11: 0: 61680 - 2: 3840 + 1: 3840 21,-10: 0: 61680 - 2: 3840 + 1: 3840 21,-9: - 2: 256 + 1: 256 22,-12: - 2: 12066 + 1: 12066 0: 32896 22,-11: - 2: 12066 + 1: 12066 0: 32896 22,-10: - 2: 12066 + 1: 12066 0: 32896 22,-13: - 2: 12066 + 1: 12066 0: 32896 23,-12: 0: 61680 - 2: 3840 + 1: 3840 23,-11: 0: 61680 - 2: 3840 + 1: 3840 23,-10: 0: 61680 - 2: 3840 + 1: 3840 24,-12: 0: 4112 - 2: 256 + 1: 256 24,-11: 0: 4112 - 2: 256 + 1: 256 24,-10: 0: 4112 - 2: 256 + 1: 256 19,-15: - 2: 62960 + 1: 62960 19,-14: - 2: 8743 + 1: 8743 20,-15: - 2: 62704 + 1: 62704 -24,0: 0: 22355 - 2: 8236 + 1: 8236 -24,-1: 0: 4415 - 2: 192 + 1: 192 -25,0: 0: 61166 - 2: 1 + 1: 1 -24,1: 0: 22353 - 2: 8238 + 1: 8238 -25,1: 0: 61166 - 2: 1 + 1: 1 -24,2: 0: 12563 - 2: 49164 + 1: 49164 -25,2: 0: 61166 - 2: 1 + 1: 1 -24,3: 0: 255 - 2: 2048 + 1: 2048 -25,3: 0: 140 -23,0: 0: 32769 - 2: 4382 + 1: 4382 -23,1: 0: 137 - 2: 4374 + 1: 4374 -23,2: 0: 24065 - 2: 41246 + 1: 41246 -23,3: 0: 255 - 2: 4864 + 1: 4864 -23,-1: - 2: 4512 + 1: 4512 0: 3679 -23,4: - 2: 12561 + 1: 12561 -22,0: 0: 12289 - 2: 286 + 1: 286 -22,1: 0: 51 - 2: 4364 + 1: 4364 -22,2: 0: 19969 - 2: 45342 + 1: 45342 -22,3: 0: 255 - 2: 2048 + 1: 2048 -22,-1: - 2: 4528 + 1: 4528 0: 3663 -24,-4: - 2: 61440 + 1: 61440 -25,-4: - 2: 49152 + 1: 49152 -24,-2: 0: 61440 - 2: 2048 + 1: 2048 -25,-2: 0: 32768 - 2: 1 + 1: 1 -25,-1: 0: 61164 -23,-4: - 2: 61440 + 1: 61440 -24,-3: - 2: 128 + 1: 128 -23,-3: - 2: 4400 + 1: 4400 -23,-2: - 2: 785 + 1: 785 0: 61440 -22,-4: - 2: 61440 + 1: 61440 -22,-2: 0: 61440 - 2: 2048 + 1: 2048 -22,-3: - 2: 128 + 1: 128 -21,-2: - 2: 785 + 1: 785 0: 61440 -26,-3: - 2: 51200 + 1: 51200 -26,-2: - 2: 17476 + 1: 17476 -26,-1: - 2: 17476 + 1: 17476 -26,0: - 2: 17476 + 1: 17476 -25,-3: - 2: 14326 + 1: 14326 -26,1: - 2: 17476 + 1: 17476 -26,2: - 2: 17476 + 1: 17476 -26,3: - 2: 17476 + 1: 17476 -26,4: - 2: 2244 + 1: 2244 -24,5: - 2: 240 + 1: 240 -25,5: - 2: 198 + 1: 198 -24,4: - 2: 32768 + 1: 32768 -23,5: - 2: 240 + 1: 240 -22,5: - 2: 240 + 1: 240 -22,4: - 2: 32768 + 1: 32768 -25,4: - 2: 63281 + 1: 63281 20,-13: 0: 49344 - 2: 3072 + 1: 3072 21,-15: - 2: 62704 + 1: 62704 21,-13: 0: 61680 - 2: 3840 + 1: 3840 22,-15: - 2: 62704 + 1: 62704 22,-14: - 2: 8192 + 1: 8192 23,-15: - 2: 62704 + 1: 62704 23,-13: 0: 61680 - 2: 3840 + 1: 3840 24,-15: - 2: 62704 + 1: 62704 24,-13: 0: 4112 - 2: 256 + 1: 256 25,-12: - 2: 50244 + 1: 50244 25,-13: - 2: 50244 + 1: 50244 25,-11: - 2: 50244 + 1: 50244 25,-10: - 2: 50244 + 1: 50244 26,-12: - 2: 4369 + 1: 4369 26,-11: - 2: 4369 + 1: 4369 26,-10: - 2: 4369 + 1: 4369 26,-13: - 2: 4369 + 1: 4369 25,-15: - 2: 62576 + 1: 62576 25,-14: - 2: 50244 + 1: 50244 26,-15: - 2: 4368 + 1: 4368 26,-14: - 2: 4369 + 1: 4369 -18,-8: - 2: 17484 + 1: 17484 -18,-9: - 2: 17600 + 1: 17600 -18,-7: - 2: 17476 + 1: 17476 -18,-6: - 2: 17476 + 1: 17476 -17,-9: - 2: 16 + 1: 16 37,2: - 2: 1 + 1: 1 37,1: - 2: 8192 + 1: 8192 36,-2: - 2: 8192 + 1: 8192 37,-2: - 2: 528 + 1: 528 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -11959,21 +11961,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 235 - moles: - - 21.824879 - - 82.10312 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - volume: 2500 immutable: True moles: @@ -11990,10 +11977,10 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.14975 + temperature: 235 moles: - - 20.078888 - - 75.53487 + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -12070,6 +12057,7 @@ entities: - type: BecomesStation id: TheHive - type: SpreaderGrid + - type: Shuttle - uid: 8 components: - type: MetaData @@ -13029,6 +13017,8 @@ entities: - 10844 - 10843 - 10866 + - 673 + - 28529 - uid: 22250 components: - type: Transform @@ -14932,15 +14922,15 @@ entities: - DoorStatus: DoorBolt - proto: AirlockExternalGlassShuttleArrivals entities: - - uid: 9169 + - uid: 498 components: - type: Transform - pos: 1.5,-52.5 + pos: 4.5,-52.5 parent: 1 - - uid: 9170 + - uid: 28484 components: - type: Transform - pos: 8.5,-52.5 + pos: -2.5,-52.5 parent: 1 - proto: AirlockExternalGlassShuttleEmergencyLocked entities: @@ -15781,6 +15771,11 @@ entities: - type: Transform pos: -35.5,25.5 parent: 1 + - uid: 6505 + components: + - type: Transform + pos: -58.5,24.5 + parent: 1 - proto: AirlockMaintBarLocked entities: - uid: 2896 @@ -15897,6 +15892,11 @@ entities: rot: 1.5707963267948966 rad pos: -63.5,-2.5 parent: 1 + - uid: 3827 + components: + - type: Transform + pos: -60.5,15.5 + parent: 1 - uid: 4617 components: - type: Transform @@ -17496,6 +17496,15 @@ entities: - 28339 - 28342 - 28341 + - uid: 28529 + components: + - type: Transform + pos: -60.5,20.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 22248 + - 22249 - proto: AirTankFilled entities: - uid: 12467 @@ -18279,6 +18288,11 @@ entities: parent: 1 - proto: AtmosDeviceFanDirectional entities: + - uid: 497 + components: + - type: Transform + pos: 4.5,-52.5 + parent: 1 - uid: 3354 components: - type: Transform @@ -18296,11 +18310,6 @@ entities: - type: Transform pos: -68.5,-2.5 parent: 1 - - uid: 9167 - components: - - type: Transform - pos: 1.5,-52.5 - parent: 1 - uid: 9168 components: - type: Transform @@ -18391,10 +18400,10 @@ entities: rot: -1.5707963267948966 rad pos: 140.5,0.5 parent: 1 - - uid: 28060 + - uid: 28485 components: - type: Transform - pos: 8.5,-52.5 + pos: -2.5,-52.5 parent: 1 - proto: AtmosDeviceFanTiny entities: @@ -19981,6 +19990,13 @@ entities: - type: Transform pos: 55.749737,-17.289125 parent: 1 +- proto: Biofabricator + entities: + - uid: 28477 + components: + - type: Transform + pos: 6.5,14.5 + parent: 1 - proto: BiomassReclaimer entities: - uid: 7642 @@ -21441,12 +21457,12 @@ entities: - uid: 121 components: - type: Transform - pos: -62.5,12.5 + pos: -63.5,13.5 parent: 1 - uid: 183 components: - type: Transform - pos: -61.5,13.5 + pos: -62.5,14.5 parent: 1 - uid: 189 components: @@ -21908,6 +21924,11 @@ entities: - type: Transform pos: -10.5,-8.5 parent: 1 + - uid: 5030 + components: + - type: Transform + pos: -63.5,14.5 + parent: 1 - uid: 5053 components: - type: Transform @@ -21978,6 +21999,46 @@ entities: - type: Transform pos: 30.5,5.5 parent: 1 + - uid: 6415 + components: + - type: Transform + pos: -61.5,14.5 + parent: 1 + - uid: 6417 + components: + - type: Transform + pos: -60.5,20.5 + parent: 1 + - uid: 6531 + components: + - type: Transform + pos: -60.5,17.5 + parent: 1 + - uid: 6532 + components: + - type: Transform + pos: -60.5,22.5 + parent: 1 + - uid: 6534 + components: + - type: Transform + pos: -60.5,21.5 + parent: 1 + - uid: 6538 + components: + - type: Transform + pos: -60.5,15.5 + parent: 1 + - uid: 6539 + components: + - type: Transform + pos: -60.5,19.5 + parent: 1 + - uid: 6588 + components: + - type: Transform + pos: -60.5,16.5 + parent: 1 - uid: 6614 components: - type: Transform @@ -22023,6 +22084,11 @@ entities: - type: Transform pos: 31.5,19.5 parent: 1 + - uid: 7186 + components: + - type: Transform + pos: -60.5,14.5 + parent: 1 - uid: 7221 components: - type: Transform @@ -23021,17 +23087,12 @@ entities: - uid: 17638 components: - type: Transform - pos: -61.5,12.5 + pos: -60.5,23.5 parent: 1 - uid: 17640 components: - type: Transform - pos: -60.5,13.5 - parent: 1 - - uid: 17641 - components: - - type: Transform - pos: -59.5,13.5 + pos: -60.5,18.5 parent: 1 - uid: 17642 components: @@ -56634,6 +56695,17 @@ entities: parent: 1 - proto: Chair entities: + - uid: 499 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-49.5 + parent: 1 + - uid: 519 + components: + - type: Transform + pos: -5.5,-48.5 + parent: 1 - uid: 835 components: - type: Transform @@ -56857,6 +56929,18 @@ entities: rot: -1.5707963267948966 rad pos: 20.5,-8.5 parent: 1 + - uid: 9166 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-49.5 + parent: 1 + - uid: 9167 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-49.5 + parent: 1 - uid: 9309 components: - type: Transform @@ -56880,30 +56964,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-46.5 parent: 1 - - uid: 9363 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-49.5 - parent: 1 - - uid: 9364 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-49.5 - parent: 1 - - uid: 9365 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-49.5 - parent: 1 - - uid: 9366 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-49.5 - parent: 1 - uid: 9369 components: - type: Transform @@ -57882,6 +57942,12 @@ entities: rot: -1.5707963267948966 rad pos: 78.735176,31.755037 parent: 1 + - uid: 28517 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -59.30682,22.872543 + parent: 1 - proto: ChairFoldingSpawnFolded entities: - uid: 2989 @@ -59600,15 +59666,15 @@ entities: - type: Transform pos: 61.5,11.5 parent: 1 - - uid: 9358 + - uid: 9165 components: - type: Transform - pos: 3.5,-49.5 + pos: -0.5,-49.5 parent: 1 - - uid: 9359 + - uid: 9354 components: - type: Transform - pos: 4.5,-49.5 + pos: 0.5,-49.5 parent: 1 - uid: 9385 components: @@ -59671,10 +59737,15 @@ entities: parent: 1 - proto: ClosetFireFilled entities: - - uid: 6505 + - uid: 501 + components: + - type: Transform + pos: 2.5,-49.5 + parent: 1 + - uid: 639 components: - type: Transform - pos: -57.5,24.5 + pos: -56.5,38.5 parent: 1 - uid: 6783 components: @@ -59726,11 +59797,6 @@ entities: - type: Transform pos: 60.5,-0.5 parent: 1 - - uid: 9360 - components: - - type: Transform - pos: 6.5,-49.5 - parent: 1 - uid: 9386 components: - type: Transform @@ -60408,6 +60474,14 @@ entities: - type: Transform pos: 48.5,-8.5 parent: 1 +- proto: ClothingBackpackElectropack + entities: + - uid: 3797 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 64.49539,19.696146 + parent: 1 - proto: ClothingBeltBandolier entities: - uid: 3253 @@ -61230,6 +61304,16 @@ entities: - type: Transform pos: -4.4101806,34.616287 parent: 1 + - uid: 28530 + components: + - type: Transform + pos: -40.5154,-1.4141922 + parent: 1 + - uid: 28531 + components: + - type: Transform + pos: -41.525818,-1.4871597 + parent: 1 - proto: ClothingShoesSlippers entities: - uid: 5382 @@ -61737,6 +61821,12 @@ entities: rot: -1.5707963267948966 rad pos: 126.5,2.5 parent: 1 + - uid: 28060 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -48.5,22.5 + parent: 1 - proto: ComputerAnalysisConsole entities: - uid: 4631 @@ -62079,14 +62169,6 @@ entities: rot: 1.5707963267948966 rad pos: -48.5,-35.5 parent: 1 -- proto: ComputerShuttleSalvage - entities: - - uid: 5887 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -39.5,-51.5 - parent: 1 - proto: ComputerSolarControl entities: - uid: 2548 @@ -62524,6 +62606,27 @@ entities: - type: Transform pos: -9.5,24.5 parent: 1 + - uid: 23535 + components: + - type: Transform + pos: -34.5,-41.5 + parent: 1 + - uid: 23897 + components: + - type: Transform + pos: -34.5,-40.5 + parent: 1 + - uid: 23898 + components: + - type: Transform + pos: -34.5,-39.5 + parent: 1 + - uid: 23899 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -34.5,-38.5 + parent: 1 - uid: 25590 components: - type: Transform @@ -62554,6 +62657,12 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,-37.5 parent: 1 + - uid: 25757 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -35.5,-38.5 + parent: 1 - uid: 26861 components: - type: Transform @@ -62734,6 +62843,11 @@ entities: - type: Transform pos: 94.5,-21.5 parent: 1 + - uid: 28508 + components: + - type: Transform + pos: -59.5,25.5 + parent: 1 - proto: CrateEngineeringAMEJar entities: - uid: 6393 @@ -63527,6 +63641,23 @@ entities: - type: Transform pos: -40.5,13.5 parent: 1 +- proto: CurtainsOrangeOpen + entities: + - uid: 6530 + components: + - type: Transform + pos: -59.5,-2.5 + parent: 1 + - uid: 16018 + components: + - type: Transform + pos: -58.5,-2.5 + parent: 1 + - uid: 17641 + components: + - type: Transform + pos: -60.5,-2.5 + parent: 1 - proto: CurtainSpawner entities: - uid: 12360 @@ -64268,6 +64399,8 @@ entities: - type: Transform pos: -60.5,3.5 parent: 1 + - type: NavMapBeacon + text: Anchor - proto: DefaultStationBeaconTheater entities: - uid: 25893 @@ -75710,20 +75843,17 @@ entities: - type: Transform pos: 27.5,12.5 parent: 1 - - uid: 3052 + - uid: 2620 components: - type: Transform - pos: 22.5,19.5 + rot: -1.5707963267948966 rad + pos: 20.5,-42.5 parent: 1 - - uid: 5441 + - uid: 3052 components: - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-44.5 + pos: 22.5,19.5 parent: 1 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - uid: 5593 components: - type: Transform @@ -75736,6 +75866,12 @@ entities: rot: 1.5707963267948966 rad pos: 84.5,-8.5 parent: 1 + - uid: 9164 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-49.5 + parent: 1 - uid: 9654 components: - type: Transform @@ -75774,12 +75910,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-7.5 parent: 1 - - uid: 20148 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-49.5 - parent: 1 - uid: 20527 components: - type: Transform @@ -76515,63 +76645,7 @@ entities: - type: Transform pos: -13.006062,36.40738 parent: 1 -- proto: EncryptionKeyCargo - entities: - - uid: 6540 - components: - - type: Transform - parent: 6538 - - type: Physics - canCollide: False -- proto: EncryptionKeyCommand - entities: - - uid: 6533 - components: - - type: Transform - parent: 6532 - - type: Physics - canCollide: False -- proto: EncryptionKeyCommon - entities: - - uid: 6542 - components: - - type: Transform - parent: 6541 - - type: Physics - canCollide: False -- proto: EncryptionKeyEngineering - entities: - - uid: 21478 - components: - - type: Transform - parent: 6530 - - type: Physics - canCollide: False -- proto: EncryptionKeyJustice - entities: - - uid: 28392 - components: - - type: Transform - parent: 6534 - - type: Physics - canCollide: False -- proto: EncryptionKeyMedical - entities: - - uid: 6417 - components: - - type: Transform - parent: 6415 - - type: Physics - canCollide: False - proto: EncryptionKeyRobo - entities: - - uid: 6531 - components: - - type: Transform - parent: 6536 - - type: Physics - canCollide: False -- proto: EncryptionKeyScience entities: - uid: 6537 components: @@ -76579,22 +76653,6 @@ entities: parent: 6536 - type: Physics canCollide: False -- proto: EncryptionKeySecurity - entities: - - uid: 6535 - components: - - type: Transform - parent: 6534 - - type: Physics - canCollide: False -- proto: EncryptionKeyService - entities: - - uid: 6539 - components: - - type: Transform - parent: 6538 - - type: Physics - canCollide: False - proto: ExosuitFabricator entities: - uid: 7339 @@ -77069,6 +77127,11 @@ entities: - type: Transform pos: 74.5,18.5 parent: 1 + - uid: 28513 + components: + - type: Transform + pos: -61.5,17.5 + parent: 1 - proto: filingCabinetRandom entities: - uid: 2002 @@ -77873,6 +77936,8 @@ entities: - 22246 - 22244 - 22245 + - 673 + - 28529 - uid: 22251 components: - type: Transform @@ -78435,6 +78500,15 @@ entities: parent: 1 - proto: Firelock entities: + - uid: 673 + components: + - type: Transform + pos: -58.5,24.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 22248 + - 22249 - uid: 1302 components: - type: Transform @@ -80699,15 +80773,15 @@ entities: parent: 1 - proto: Floodlight entities: - - uid: 15759 + - uid: 6542 components: - type: Transform - pos: -47.93802,-4.385198 + pos: -38.65661,-12.441925 parent: 1 - - uid: 16018 + - uid: 15759 components: - type: Transform - pos: -39.255226,-12.371965 + pos: -47.93802,-4.385198 parent: 1 - uid: 16391 components: @@ -81367,6 +81441,12 @@ entities: rot: 1.5707963267948966 rad pos: 45.37556,8.424944 parent: 1 + - uid: 28512 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -60.973488,16.837103 + parent: 1 - proto: FoodApple entities: - uid: 16795 @@ -81801,6 +81881,13 @@ entities: rot: 3.141592653589793 rad pos: 50.361702,35.768944 parent: 1 +- proto: FoodKebabSkewer + entities: + - uid: 22779 + components: + - type: Transform + pos: -24.100885,16.586544 + parent: 1 - proto: FoodLollipop entities: - uid: 7633 @@ -81942,21 +82029,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 1083 - components: - - type: Transform - pos: 0.45228082,21.685434 - parent: 1 - - uid: 1084 - components: - - type: Transform - pos: 0.36894748,21.612469 - parent: 1 - - uid: 1085 - components: - - type: Transform - pos: 0.29603082,21.508228 - parent: 1 - uid: 22491 components: - type: Transform @@ -82087,18 +82159,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: FoodMeatFish - entities: - - uid: 1081 - components: - - type: Transform - pos: -1.5998026,21.633316 - parent: 1 - - uid: 1082 - components: - - type: Transform - pos: -1.4643859,21.466534 - parent: 1 - proto: FoodMeatMeatball entities: - uid: 5192 @@ -82158,13 +82218,6 @@ entities: parent: 28448 - type: Physics canCollide: False -- proto: FoodMeatRatKebab - entities: - - uid: 22779 - components: - - type: Transform - pos: -24.100885,16.586544 - parent: 1 - proto: FoodMothBakedCheesePlatter entities: - uid: 6613 @@ -82388,10 +82441,10 @@ entities: - type: InsideEntityStorage - proto: FoodSnackRaisins entities: - - uid: 4303 + - uid: 9355 components: - type: Transform - pos: -4.5202436,-49.423706 + pos: -5.600837,-49.436836 parent: 1 - proto: FoodSnackSus entities: @@ -121780,36 +121833,11 @@ entities: - type: Transform pos: 7.5,44.5 parent: 1 - - uid: 497 - components: - - type: Transform - pos: 3.5,-50.5 - parent: 1 - - uid: 498 - components: - - type: Transform - pos: 11.5,-50.5 - parent: 1 - - uid: 501 - components: - - type: Transform - pos: 5.5,-50.5 - parent: 1 - - uid: 505 - components: - - type: Transform - pos: 4.5,-50.5 - parent: 1 - uid: 506 components: - type: Transform pos: 6.5,-50.5 parent: 1 - - uid: 511 - components: - - type: Transform - pos: -1.5,-50.5 - parent: 1 - uid: 512 components: - type: Transform @@ -121825,25 +121853,15 @@ entities: - type: Transform pos: -5.5,-50.5 parent: 1 - - uid: 517 - components: - - type: Transform - pos: 10.5,-50.5 - parent: 1 - uid: 520 components: - type: Transform pos: -4.5,-50.5 parent: 1 - - uid: 521 - components: - - type: Transform - pos: -2.5,-50.5 - parent: 1 - uid: 525 components: - type: Transform - pos: -3.5,-50.5 + pos: 7.5,-50.5 parent: 1 - uid: 544 components: @@ -121935,6 +121953,26 @@ entities: - type: Transform pos: -0.5,13.5 parent: 1 + - uid: 1081 + components: + - type: Transform + pos: 0.5,-50.5 + parent: 1 + - uid: 1082 + components: + - type: Transform + pos: 1.5,-50.5 + parent: 1 + - uid: 1083 + components: + - type: Transform + pos: -3.5,-51.5 + parent: 1 + - uid: 1084 + components: + - type: Transform + pos: 9.5,-50.5 + parent: 1 - uid: 1119 components: - type: Transform @@ -123665,6 +123703,11 @@ entities: - type: Transform pos: -51.5,-43.5 parent: 1 + - uid: 5887 + components: + - type: Transform + pos: -1.5,-51.5 + parent: 1 - uid: 5898 components: - type: Transform @@ -123895,6 +123938,11 @@ entities: - type: Transform pos: -65.5,33.5 parent: 1 + - uid: 6535 + components: + - type: Transform + pos: 66.5,1.5 + parent: 1 - uid: 6558 components: - type: Transform @@ -124130,11 +124178,6 @@ entities: - type: Transform pos: 65.5,1.5 parent: 1 - - uid: 7181 - components: - - type: Transform - pos: 66.5,1.5 - parent: 1 - uid: 7182 components: - type: Transform @@ -124285,25 +124328,15 @@ entities: - type: Transform pos: -0.5,6.5 parent: 1 - - uid: 9157 - components: - - type: Transform - pos: 0.5,-51.5 - parent: 1 - - uid: 9158 - components: - - type: Transform - pos: 2.5,-51.5 - parent: 1 - - uid: 9159 + - uid: 9149 components: - type: Transform - pos: 7.5,-51.5 + pos: 2.5,-50.5 parent: 1 - - uid: 9160 + - uid: 9151 components: - type: Transform - pos: 9.5,-51.5 + pos: 8.5,-50.5 parent: 1 - uid: 9187 components: @@ -124400,6 +124433,11 @@ entities: - type: Transform pos: 108.5,-4.5 parent: 1 + - uid: 9366 + components: + - type: Transform + pos: 5.5,-51.5 + parent: 1 - uid: 9546 components: - type: Transform @@ -125820,6 +125858,11 @@ entities: - type: Transform pos: -77.5,2.5 parent: 1 + - uid: 16921 + components: + - type: Transform + pos: 3.5,-51.5 + parent: 1 - uid: 17033 components: - type: Transform @@ -127710,6 +127753,51 @@ entities: - type: Transform pos: 145.5,3.5 parent: 1 + - uid: 28487 + components: + - type: Transform + pos: -58.5,20.5 + parent: 1 + - uid: 28488 + components: + - type: Transform + pos: -58.5,19.5 + parent: 1 + - uid: 28489 + components: + - type: Transform + pos: -58.5,18.5 + parent: 1 + - uid: 28490 + components: + - type: Transform + pos: -58.5,17.5 + parent: 1 + - uid: 28491 + components: + - type: Transform + pos: -58.5,16.5 + parent: 1 + - uid: 28495 + components: + - type: Transform + pos: -61.5,24.5 + parent: 1 + - uid: 28496 + components: + - type: Transform + pos: -61.5,23.5 + parent: 1 + - uid: 28497 + components: + - type: Transform + pos: -61.5,22.5 + parent: 1 + - uid: 28498 + components: + - type: Transform + pos: -61.5,21.5 + parent: 1 - proto: GrilleBroken entities: - uid: 10310 @@ -130820,6 +130908,12 @@ entities: - type: Transform pos: 100.5,-5.5 parent: 1 + - uid: 28519 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -59.5,20.5 + parent: 1 - proto: LootSpawnerIndustrialFluff entities: - uid: 26860 @@ -130827,6 +130921,21 @@ entities: - type: Transform pos: 98.5,-12.5 parent: 1 +- proto: LootSpawnerMaterialsSurplus + entities: + - uid: 28518 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -59.5,16.5 + parent: 1 +- proto: LootSpawnerRandomCrateEngineering + entities: + - uid: 28507 + components: + - type: Transform + pos: -60.5,25.5 + parent: 1 - proto: LunchboxServiceFilledRandom entities: - uid: 28399 @@ -130965,6 +131074,11 @@ entities: - type: Transform pos: 97.5,-22.5 parent: 1 + - uid: 28510 + components: + - type: Transform + pos: -61.5,16.5 + parent: 1 - proto: MachineParticleAcceleratorEndCapCircuitboard entities: - uid: 24539 @@ -131572,21 +131686,6 @@ entities: - type: Transform pos: -27.56744,-29.258795 parent: 1 -- proto: MaterialReclaimer - entities: - - uid: 4115 - components: - - type: Transform - pos: -19.5,16.5 - parent: 1 -- proto: MaterialReclaimerMachineCircuitboard - entities: - - uid: 26575 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 74.434875,37.72442 - parent: 1 - proto: MaterialWoodPlank entities: - uid: 1973 @@ -132335,6 +132434,11 @@ entities: - type: StepTriggerActive - proto: Multitool entities: + - uid: 672 + components: + - type: Transform + pos: -64.03919,15.593154 + parent: 1 - uid: 2562 components: - type: Transform @@ -132362,11 +132466,6 @@ entities: rot: -1.5707963267948966 rad pos: -63.493557,30.22321 parent: 1 - - uid: 15819 - components: - - type: Transform - pos: -61.104473,14.268036 - parent: 1 - uid: 23468 components: - type: Transform @@ -132564,16 +132663,6 @@ entities: Quantity: 500 - proto: OatBushel entities: - - uid: 1086 - components: - - type: Transform - pos: -0.57993686,19.644781 - parent: 1 - - uid: 1089 - components: - - type: Transform - pos: -0.4653536,19.613508 - parent: 1 - uid: 4279 components: - type: Transform @@ -133694,6 +133783,42 @@ entities: rot: 3.141592653589793 rad pos: 121.267975,-8.274277 parent: 1 +- proto: PaperCNCSheet + entities: + - uid: 509 + components: + - type: Transform + pos: 33.744312,-15.581722 + parent: 1 + - uid: 511 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.37973,-15.362821 + parent: 1 + - uid: 513 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 33.37973,-14.518484 + parent: 1 + - uid: 517 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.619312,-14.612299 + parent: 1 + - uid: 518 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 34.66098,-15.289854 + parent: 1 + - uid: 28478 + components: + - type: Transform + pos: 34.41098,-15.498331 + parent: 1 - proto: PaperRolling1 entities: - uid: 1110 @@ -134022,6 +134147,24 @@ entities: - type: Transform pos: 100.689575,9.321493 parent: 1 + - uid: 28479 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.796398,-16.269701 + parent: 1 + - uid: 28480 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.775564,-16.384363 + parent: 1 + - uid: 28481 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 31.785982,-16.467754 + parent: 1 - proto: PersonalAI entities: - uid: 9884 @@ -135477,6 +135620,11 @@ entities: - type: Transform pos: 108.5,-3.5 parent: 1 + - uid: 9357 + components: + - type: Transform + pos: 9.5,-49.5 + parent: 1 - uid: 9387 components: - type: Transform @@ -136009,6 +136157,12 @@ entities: rot: 3.141592653589793 rad pos: 75.5,-9.5 parent: 1 + - uid: 9157 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-49.5 + parent: 1 - uid: 10065 components: - type: Transform @@ -136154,14 +136308,6 @@ entities: parent: 1 - type: ApcPowerReceiver powerLoad: 0 - - uid: 16919 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-49.5 - parent: 1 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 16920 components: - type: Transform @@ -137577,6 +137723,11 @@ entities: parent: 1 - proto: PoweredLightBlueInterior entities: + - uid: 1773 + components: + - type: Transform + pos: 11.5,-51.5 + parent: 1 - uid: 6757 components: - type: Transform @@ -137594,13 +137745,6 @@ entities: - type: Transform pos: 31.5,-51.5 parent: 1 - - uid: 16921 - components: - - type: Transform - pos: 12.5,-51.5 - parent: 1 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 17245 components: - type: Transform @@ -138058,6 +138202,14 @@ entities: parent: 1 - type: ApcPowerReceiver powerLoad: 0 + - uid: 6533 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -60.5,-3.5 + parent: 1 + - type: DeviceLinkSink + invokeCounter: 1 - uid: 6807 components: - type: Transform @@ -139056,8 +139208,20 @@ entities: rot: 1.5707963267948966 rad pos: 90.5,7.5 parent: 1 + - uid: 28506 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -59.5,25.5 + parent: 1 - proto: PoweredSmallLightMaintenanceRed entities: + - uid: 680 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -61.5,16.5 + parent: 1 - uid: 910 components: - type: Transform @@ -140627,12 +140791,6 @@ entities: - type: Transform pos: 85.5,-20.5 parent: 1 - - uid: 20580 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 123.5,5.5 - parent: 1 - uid: 21448 components: - type: Transform @@ -140844,6 +141002,11 @@ entities: rot: -1.5707963267948966 rad pos: 100.5,-10.5 parent: 1 + - uid: 28509 + components: + - type: Transform + pos: -61.5,18.5 + parent: 1 - proto: RadiationCollector entities: - uid: 24370 @@ -141742,6 +141905,11 @@ entities: - type: Transform pos: -0.5,-26.5 parent: 1 + - uid: 28515 + components: + - type: Transform + pos: -61.5,18.5 + parent: 1 - proto: RandomBook entities: - uid: 5519 @@ -142146,6 +142314,13 @@ entities: - type: Transform pos: -3.5,-32.5 parent: 1 +- proto: RandomIngredient + entities: + - uid: 3360 + components: + - type: Transform + pos: -0.46056283,19.584528 + parent: 1 - proto: RandomInstruments entities: - uid: 2286 @@ -142368,12 +142543,6 @@ entities: - type: Transform pos: 35.5,8.5 parent: 1 - - uid: 22631 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 123.5,5.5 - parent: 1 - uid: 22680 components: - type: Transform @@ -142410,6 +142579,18 @@ entities: - type: Transform pos: 97.5,-12.5 parent: 1 +- proto: RandomMeat + entities: + - uid: 2619 + components: + - type: Transform + pos: 0.46652067,21.544222 + parent: 1 + - uid: 4303 + components: + - type: Transform + pos: -1.4605628,21.544222 + parent: 1 - proto: RandomPainting entities: - uid: 3015 @@ -142693,6 +142874,11 @@ entities: - type: Transform pos: -3.5,-17.5 parent: 1 + - uid: 28514 + components: + - type: Transform + pos: -61.5,19.5 + parent: 1 - proto: RandomPosterLegit entities: - uid: 3219 @@ -142893,25 +143079,20 @@ entities: parent: 1 - proto: RandomProduce entities: - - uid: 5176 - components: - - type: Transform - pos: 73.5,25.5 - parent: 1 - - uid: 7326 + - uid: 3695 components: - type: Transform pos: -1.5,19.5 parent: 1 - - uid: 7327 + - uid: 4115 components: - type: Transform pos: -1.5,19.5 parent: 1 - - uid: 7328 + - uid: 5176 components: - type: Transform - pos: -1.5,19.5 + pos: 73.5,25.5 parent: 1 - uid: 18958 components: @@ -142923,11 +143104,6 @@ entities: - type: Transform pos: 73.5,25.5 parent: 1 - - uid: 25757 - components: - - type: Transform - pos: -1.5,19.5 - parent: 1 - uid: 28371 components: - type: Transform @@ -142999,6 +143175,13 @@ entities: - type: Transform pos: -22.5,25.5 parent: 1 +- proto: RandomSoakedCigarette + entities: + - uid: 28516 + components: + - type: Transform + pos: -61.83807,18.025427 + parent: 1 - proto: RandomSoap entities: - uid: 6344 @@ -143286,6 +143469,11 @@ entities: - type: Transform pos: -13.5,32.5 parent: 1 + - uid: 28511 + components: + - type: Transform + pos: -59.5,23.5 + parent: 1 - proto: RandomVending entities: - uid: 7064 @@ -143303,10 +143491,10 @@ entities: - type: Transform pos: 29.5,-9.5 parent: 1 - - uid: 9357 + - uid: 9169 components: - type: Transform - pos: 5.5,-49.5 + pos: 1.5,-49.5 parent: 1 - uid: 9367 components: @@ -143471,6 +143659,11 @@ entities: parent: 1 - proto: Recycler entities: + - uid: 507 + components: + - type: Transform + pos: -34.5,-40.5 + parent: 1 - uid: 3555 components: - type: Transform @@ -144999,25 +145192,15 @@ entities: - type: Transform pos: -55.5,23.5 parent: 1 - - uid: 509 - components: - - type: Transform - pos: -1.5,-50.5 - parent: 1 - uid: 510 components: - type: Transform pos: -5.5,-50.5 parent: 1 - - uid: 513 - components: - - type: Transform - pos: -2.5,-50.5 - parent: 1 - - uid: 519 + - uid: 521 components: - type: Transform - pos: -3.5,-50.5 + pos: 1.5,-50.5 parent: 1 - uid: 523 components: @@ -145044,6 +145227,16 @@ entities: - type: Transform pos: 13.5,-36.5 parent: 1 + - uid: 1085 + components: + - type: Transform + pos: -3.5,-51.5 + parent: 1 + - uid: 1089 + components: + - type: Transform + pos: 5.5,-51.5 + parent: 1 - uid: 1257 components: - type: Transform @@ -145889,6 +146082,11 @@ entities: - type: Transform pos: 88.5,1.5 parent: 1 + - uid: 5999 + components: + - type: Transform + pos: -1.5,-51.5 + parent: 1 - uid: 6016 components: - type: Transform @@ -146124,6 +146322,16 @@ entities: - type: Transform pos: 105.5,-3.5 parent: 1 + - uid: 7327 + components: + - type: Transform + pos: 2.5,-50.5 + parent: 1 + - uid: 7328 + components: + - type: Transform + pos: 0.5,-50.5 + parent: 1 - uid: 7478 components: - type: Transform @@ -146204,36 +146412,16 @@ entities: - type: Transform pos: -0.5,6.5 parent: 1 - - uid: 9149 - components: - - type: Transform - pos: 3.5,-50.5 - parent: 1 - uid: 9150 components: - type: Transform - pos: 4.5,-50.5 - parent: 1 - - uid: 9151 - components: - - type: Transform - pos: 5.5,-50.5 + pos: 7.5,-50.5 parent: 1 - uid: 9152 components: - type: Transform pos: 6.5,-50.5 parent: 1 - - uid: 9153 - components: - - type: Transform - pos: 10.5,-50.5 - parent: 1 - - uid: 9154 - components: - - type: Transform - pos: 11.5,-50.5 - parent: 1 - uid: 9155 components: - type: Transform @@ -146244,25 +146432,10 @@ entities: - type: Transform pos: 14.5,-50.5 parent: 1 - - uid: 9161 - components: - - type: Transform - pos: 0.5,-51.5 - parent: 1 - - uid: 9162 - components: - - type: Transform - pos: 2.5,-51.5 - parent: 1 - uid: 9163 components: - type: Transform - pos: 7.5,-51.5 - parent: 1 - - uid: 9164 - components: - - type: Transform - pos: 9.5,-51.5 + pos: 3.5,-51.5 parent: 1 - uid: 9202 components: @@ -147114,6 +147287,11 @@ entities: - type: Transform pos: 57.5,34.5 parent: 1 + - uid: 16919 + components: + - type: Transform + pos: 9.5,-50.5 + parent: 1 - uid: 17126 components: - type: Transform @@ -147164,6 +147342,11 @@ entities: - type: Transform pos: -63.5,-8.5 parent: 1 + - uid: 20148 + components: + - type: Transform + pos: 8.5,-50.5 + parent: 1 - uid: 20231 components: - type: Transform @@ -147539,6 +147722,51 @@ entities: - type: Transform pos: 79.5,40.5 parent: 1 + - uid: 28520 + components: + - type: Transform + pos: -58.5,16.5 + parent: 1 + - uid: 28521 + components: + - type: Transform + pos: -58.5,17.5 + parent: 1 + - uid: 28522 + components: + - type: Transform + pos: -58.5,18.5 + parent: 1 + - uid: 28523 + components: + - type: Transform + pos: -58.5,19.5 + parent: 1 + - uid: 28524 + components: + - type: Transform + pos: -58.5,20.5 + parent: 1 + - uid: 28525 + components: + - type: Transform + pos: -61.5,24.5 + parent: 1 + - uid: 28526 + components: + - type: Transform + pos: -61.5,23.5 + parent: 1 + - uid: 28527 + components: + - type: Transform + pos: -61.5,22.5 + parent: 1 + - uid: 28528 + components: + - type: Transform + pos: -61.5,21.5 + parent: 1 - proto: RemoteSignaller entities: - uid: 11599 @@ -147657,6 +147885,13 @@ entities: - type: Transform pos: 102.49735,24.384338 parent: 1 +- proto: Roboisseur + entities: + - uid: 2617 + components: + - type: Transform + pos: 10.5,22.5 + parent: 1 - proto: RobustHarvestChemistryBottle entities: - uid: 1208 @@ -147707,6 +147942,14 @@ entities: - type: Transform pos: 78.49963,25.49577 parent: 1 +- proto: RubberChicken + entities: + - uid: 508 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.567345,-28.532404 + parent: 1 - proto: SalvageCanisterSpawner entities: - uid: 6512 @@ -148900,14 +149143,6 @@ entities: rot: 3.141592653589793 rad pos: 29.332079,26.503263 parent: 1 -- proto: ShockCollar - entities: - - uid: 3797 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 64.49539,19.696146 - parent: 1 - proto: Shovel entities: - uid: 1203 @@ -150094,7 +150329,7 @@ entities: parent: 1 - type: DeviceLinkSource linkedPorts: - 17115: + 6533: - Status: Toggle - uid: 17178 components: @@ -151344,42 +151579,37 @@ entities: parent: 1 - proto: SignNanotrasen1 entities: - - uid: 2616 + - uid: 9162 components: - type: Transform - rot: 3.141592653589793 rad pos: 42.5,1.5 parent: 1 - proto: SignNanotrasen2 entities: - - uid: 2617 + - uid: 9161 components: - type: Transform - rot: 3.141592653589793 rad pos: 43.5,1.5 parent: 1 - proto: SignNanotrasen3 entities: - - uid: 2618 + - uid: 9160 components: - type: Transform - rot: 3.141592653589793 rad pos: 44.5,1.5 parent: 1 - proto: SignNanotrasen4 entities: - - uid: 2619 + - uid: 9159 components: - type: Transform - rot: 3.141592653589793 rad pos: 45.5,1.5 parent: 1 - proto: SignNanotrasen5 entities: - - uid: 2620 + - uid: 9158 components: - type: Transform - rot: 3.141592653589793 rad pos: 46.5,1.5 parent: 1 - proto: SignNews @@ -151725,13 +151955,6 @@ entities: - type: Transform pos: 78.5,-19.5 parent: 1 -- proto: SignTelecomms - entities: - - uid: 6588 - components: - - type: Transform - pos: -60.5,6.5 - parent: 1 - proto: SignToolStorage entities: - uid: 26236 @@ -151749,15 +151972,15 @@ entities: parent: 1 - proto: SilverDoor entities: - - uid: 9165 + - uid: 21480 components: - type: Transform - pos: 1.5,-50.5 + pos: 4.5,-50.5 parent: 1 - - uid: 9166 + - uid: 28486 components: - type: Transform - pos: 8.5,-50.5 + pos: -2.5,-50.5 parent: 1 - proto: SilverOre1 entities: @@ -153719,35 +153942,35 @@ entities: parent: 1 - proto: SpawnPointLatejoin entities: - - uid: 1763 + - uid: 500 components: - type: Transform - pos: 2.5,-49.5 + pos: -2.5,-49.5 parent: 1 - - uid: 1773 + - uid: 504 components: - type: Transform - pos: 7.5,-49.5 + pos: 5.5,-49.5 parent: 1 - - uid: 2984 + - uid: 505 components: - type: Transform - pos: 8.5,-49.5 + pos: 3.5,-49.5 parent: 1 - - uid: 3360 + - uid: 5441 components: - type: Transform - pos: 0.5,-49.5 + pos: 4.5,-49.5 parent: 1 - - uid: 3695 + - uid: 9358 components: - type: Transform - pos: 9.5,-49.5 + pos: -1.5,-49.5 parent: 1 - - uid: 5999 + - uid: 9364 components: - type: Transform - pos: 1.5,-49.5 + pos: -3.5,-49.5 parent: 1 - uid: 19601 components: @@ -153820,6 +154043,11 @@ entities: - type: Transform pos: 29.5,-13.5 parent: 1 + - uid: 9360 + components: + - type: Transform + pos: -4.5,-49.5 + parent: 1 - uid: 9505 components: - type: Transform @@ -153860,11 +154088,6 @@ entities: - type: Transform pos: 36.5,-36.5 parent: 1 - - uid: 21556 - components: - - type: Transform - pos: -5.5,-49.5 - parent: 1 - uid: 21557 components: - type: Transform @@ -153937,6 +154160,11 @@ entities: - type: Transform pos: 87.5,-14.5 parent: 1 + - uid: 9359 + components: + - type: Transform + pos: 6.5,-49.5 + parent: 1 - uid: 11575 components: - type: Transform @@ -153968,11 +154196,6 @@ entities: - type: Transform pos: 84.5,-14.5 parent: 1 - - uid: 23897 - components: - - type: Transform - pos: -0.5,-49.5 - parent: 1 - proto: SpawnPointMedicalIntern entities: - uid: 12107 @@ -154002,18 +154225,23 @@ entities: parent: 1 - proto: SpawnPointMime entities: - - uid: 13793 + - uid: 503 components: - type: Transform - pos: 20.5,-33.5 + pos: 12.5,-49.5 parent: 1 - - uid: 23898 + - uid: 13793 components: - type: Transform - pos: -2.5,-49.5 + pos: 20.5,-33.5 parent: 1 - proto: SpawnPointMusician entities: + - uid: 502 + components: + - type: Transform + pos: 8.5,-49.5 + parent: 1 - uid: 10037 components: - type: Transform @@ -154034,11 +154262,6 @@ entities: - type: Transform pos: 30.5,-36.5 parent: 1 - - uid: 23899 - components: - - type: Transform - pos: -3.5,-49.5 - parent: 1 - proto: SpawnPointObserver entities: - uid: 4719 @@ -154801,6 +155024,13 @@ entities: - type: Transform pos: -61.51701,-0.9163426 parent: 1 +- proto: StationAnchor + entities: + - uid: 7181 + components: + - type: Transform + pos: -60.5,4.5 + parent: 1 - proto: StationMap entities: - uid: 20588 @@ -155756,7 +155986,7 @@ entities: setupAvailableNetworks: - SurveillanceCameraEngineering nameSet: True - id: Telecomms Server Room + id: Station Anchor Room - uid: 618 components: - type: Transform @@ -155800,16 +156030,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Battery Room - - uid: 680 - components: - - type: Transform - pos: -57.5,24.5 - parent: 1 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Atmos 2 - uid: 716 components: - type: Transform @@ -155864,8 +156084,29 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Hallway-(Engine) + - uid: 28504 + components: + - type: Transform + pos: -52.5,24.5 + parent: 1 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Atmos 2 - proto: SurveillanceCameraGeneral entities: + - uid: 2984 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-46.5 + parent: 1 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Arrivals - uid: 14395 components: - type: Transform @@ -156035,16 +156276,6 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Hallway-(Park/Arcade) - - uid: 21505 - components: - - type: Transform - pos: 2.5,-49.5 - parent: 1 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: Arrivals - uid: 21511 components: - type: Transform @@ -158247,23 +158478,21 @@ entities: - type: Transform pos: 53.5,27.5 parent: 1 - - uid: 9354 + - uid: 9170 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-49.5 + pos: 7.5,-49.5 parent: 1 - - uid: 9355 + - uid: 9356 components: - type: Transform rot: 3.141592653589793 rad - pos: -1.5,-49.5 + pos: -1.5,-46.5 parent: 1 - - uid: 9356 + - uid: 9363 components: - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,-46.5 + pos: -5.5,-49.5 parent: 1 - uid: 9368 components: @@ -160191,103 +160420,19 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-37.5 parent: 1 -- proto: TelecomServer +- proto: TelecomServerCircuitboard entities: - - uid: 6415 - components: - - type: MetaData - name: medical telecommunication server - - type: Transform - pos: -61.5,3.5 - parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6417 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 6530 - components: - - type: MetaData - name: engineering telecommunication server - - type: Transform - pos: -59.5,5.5 - parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 21478 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 6532 + - uid: 6571 components: - - type: MetaData - name: command telecommunication server - type: Transform - pos: -60.5,5.5 - parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6533 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 6534 - components: - - type: MetaData - name: security telecommunication server - - type: Transform - pos: -61.5,5.5 + pos: -61.504536,-1.4635959 parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6535 - - 28392 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] +- proto: TelecomServerFilled + entities: - uid: 6536 components: - - type: MetaData - name: epistemics telecommunication server - type: Transform - pos: -59.5,3.5 + pos: 123.5,5.5 parent: 1 - type: ContainerContainer containers: @@ -160296,52 +160441,6 @@ entities: occludes: True ents: - 6537 - - 6531 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 6538 - components: - - type: MetaData - name: logistics/service telecommunication server - - type: Transform - pos: -61.5,2.5 - parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6540 - - 6539 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 6541 - components: - - type: MetaData - name: common telecommunication server - - type: Transform - pos: -59.5,2.5 - parent: 1 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 6542 machine_board: !type:Container showEnts: False occludes: True @@ -160350,13 +160449,6 @@ entities: showEnts: False occludes: True ents: [] -- proto: TelecomServerCircuitboard - entities: - - uid: 6571 - components: - - type: Transform - pos: -61.504536,-1.4635959 - parent: 1 - proto: ThermomachineHeaterMachineCircuitBoard entities: - uid: 6499 @@ -160972,6 +161064,37 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + - uid: 26575 + components: + - type: Transform + pos: -35.5,-40.5 + parent: 1 + - type: DeviceLinkSource + linkedPorts: + 23535: + - Left: Forward + - Right: Reverse + - Middle: Off + 507: + - Left: Forward + - Right: Reverse + - Middle: Off + 23897: + - Left: Forward + - Right: Reverse + - Middle: Off + 23898: + - Left: Forward + - Right: Reverse + - Middle: Off + 23899: + - Left: Forward + - Right: Reverse + - Middle: Off + 25757: + - Left: Forward + - Right: Reverse + - Middle: Off - proto: UnfinishedMachineFrame entities: - uid: 12302 @@ -160989,11 +161112,6 @@ entities: - type: Transform pos: -11.5,10.5 parent: 1 - - uid: 15813 - components: - - type: Transform - pos: -60.5,14.5 - parent: 1 - uid: 20597 components: - type: Transform @@ -161015,6 +161133,11 @@ entities: rot: 1.5707963267948966 rad pos: 97.5,-15.5 parent: 1 + - uid: 28505 + components: + - type: Transform + pos: -58.5,13.5 + parent: 1 - proto: UniformJabroni entities: - uid: 15982 @@ -162367,51 +162490,11 @@ entities: - type: Transform pos: -14.5,20.5 parent: 1 - - uid: 499 - components: - - type: Transform - pos: 2.5,-52.5 - parent: 1 - - uid: 500 - components: - - type: Transform - pos: 0.5,-50.5 - parent: 1 - - uid: 502 - components: - - type: Transform - pos: 9.5,-50.5 - parent: 1 - - uid: 503 - components: - - type: Transform - pos: 7.5,-52.5 - parent: 1 - - uid: 504 - components: - - type: Transform - pos: 2.5,-50.5 - parent: 1 - - uid: 507 - components: - - type: Transform - pos: 9.5,-52.5 - parent: 1 - - uid: 508 - components: - - type: Transform - pos: 7.5,-50.5 - parent: 1 - uid: 516 components: - type: Transform pos: -6.5,-50.5 parent: 1 - - uid: 518 - components: - - type: Transform - pos: 0.5,-52.5 - parent: 1 - uid: 522 components: - type: Transform @@ -162682,11 +162765,6 @@ entities: - type: Transform pos: -59.5,-7.5 parent: 1 - - uid: 639 - components: - - type: Transform - pos: -60.5,-7.5 - parent: 1 - uid: 649 components: - type: Transform @@ -162737,16 +162815,6 @@ entities: - type: Transform pos: -65.5,10.5 parent: 1 - - uid: 672 - components: - - type: Transform - pos: -60.5,15.5 - parent: 1 - - uid: 673 - components: - - type: Transform - pos: -59.5,15.5 - parent: 1 - uid: 674 components: - type: Transform @@ -163222,6 +163290,11 @@ entities: - type: Transform pos: 9.5,-34.5 parent: 1 + - uid: 1086 + components: + - type: Transform + pos: -3.5,-50.5 + parent: 1 - uid: 1087 components: - type: Transform @@ -164087,6 +164160,11 @@ entities: - type: Transform pos: -23.5,-7.5 parent: 1 + - uid: 1763 + components: + - type: Transform + pos: 3.5,-52.5 + parent: 1 - uid: 1770 components: - type: Transform @@ -165012,6 +165090,16 @@ entities: - type: Transform pos: -40.5,-2.5 parent: 1 + - uid: 2616 + components: + - type: Transform + pos: 11.5,-50.5 + parent: 1 + - uid: 2618 + components: + - type: Transform + pos: 10.5,-50.5 + parent: 1 - uid: 2691 components: - type: Transform @@ -166032,11 +166120,6 @@ entities: - type: Transform pos: -58.5,26.5 parent: 1 - - uid: 3682 - components: - - type: Transform - pos: -58.5,24.5 - parent: 1 - uid: 3687 components: - type: Transform @@ -166502,16 +166585,6 @@ entities: - type: Transform pos: -64.5,-5.5 parent: 1 - - uid: 3827 - components: - - type: Transform - pos: -62.5,15.5 - parent: 1 - - uid: 3828 - components: - - type: Transform - pos: -61.5,15.5 - parent: 1 - uid: 3830 components: - type: Transform @@ -167942,11 +168015,6 @@ entities: - type: Transform pos: -41.5,-13.5 parent: 1 - - uid: 5030 - components: - - type: Transform - pos: -40.5,-13.5 - parent: 1 - uid: 5033 components: - type: Transform @@ -169642,6 +169710,11 @@ entities: - type: Transform pos: -20.5,27.5 parent: 1 + - uid: 6541 + components: + - type: Transform + pos: -40.5,-13.5 + parent: 1 - uid: 6554 components: - type: Transform @@ -169917,6 +169990,11 @@ entities: - type: Transform pos: 56.5,-4.5 parent: 1 + - uid: 7326 + components: + - type: Transform + pos: -1.5,-50.5 + parent: 1 - uid: 7331 components: - type: Transform @@ -170632,6 +170710,16 @@ entities: - type: Transform pos: 43.5,39.5 parent: 1 + - uid: 9153 + components: + - type: Transform + pos: 3.5,-50.5 + parent: 1 + - uid: 9154 + components: + - type: Transform + pos: 5.5,-52.5 + parent: 1 - uid: 9171 components: - type: Transform @@ -170727,6 +170815,11 @@ entities: - type: Transform pos: 107.5,9.5 parent: 1 + - uid: 9365 + components: + - type: Transform + pos: 5.5,-50.5 + parent: 1 - uid: 9547 components: - type: Transform @@ -173597,11 +173690,6 @@ entities: - type: Transform pos: -63.5,-7.5 parent: 1 - - uid: 22836 - components: - - type: Transform - pos: -62.5,-7.5 - parent: 1 - uid: 22838 components: - type: Transform @@ -174717,6 +174805,56 @@ entities: - type: Transform pos: 135.5,7.5 parent: 1 + - uid: 28482 + components: + - type: Transform + pos: -1.5,-52.5 + parent: 1 + - uid: 28483 + components: + - type: Transform + pos: -3.5,-52.5 + parent: 1 + - uid: 28492 + components: + - type: Transform + pos: -58.5,21.5 + parent: 1 + - uid: 28493 + components: + - type: Transform + pos: -58.5,22.5 + parent: 1 + - uid: 28494 + components: + - type: Transform + pos: -61.5,25.5 + parent: 1 + - uid: 28499 + components: + - type: Transform + pos: -61.5,20.5 + parent: 1 + - uid: 28500 + components: + - type: Transform + pos: -61.5,19.5 + parent: 1 + - uid: 28501 + components: + - type: Transform + pos: -62.5,19.5 + parent: 1 + - uid: 28502 + components: + - type: Transform + pos: -62.5,18.5 + parent: 1 + - uid: 28503 + components: + - type: Transform + pos: -62.5,17.5 + parent: 1 - proto: WallSolid entities: - uid: 2 @@ -177839,6 +177977,11 @@ entities: - type: Transform pos: 32.5,38.5 parent: 1 + - uid: 3682 + components: + - type: Transform + pos: -62.5,-7.5 + parent: 1 - uid: 3686 components: - type: Transform @@ -177869,6 +178012,11 @@ entities: - type: Transform pos: 87.5,14.5 parent: 1 + - uid: 3828 + components: + - type: Transform + pos: -61.5,15.5 + parent: 1 - uid: 3875 components: - type: Transform @@ -180139,6 +180287,16 @@ entities: - type: Transform pos: -62.5,7.5 parent: 1 + - uid: 15813 + components: + - type: Transform + pos: -62.5,15.5 + parent: 1 + - uid: 15819 + components: + - type: Transform + pos: -59.5,15.5 + parent: 1 - uid: 16127 components: - type: Transform @@ -180654,6 +180812,11 @@ entities: - type: Transform pos: -64.5,11.5 parent: 1 + - uid: 22836 + components: + - type: Transform + pos: -60.5,-7.5 + parent: 1 - uid: 23448 components: - type: Transform @@ -180793,15 +180956,15 @@ entities: - type: Transform pos: 79.5,13.5 parent: 1 - - uid: 21480 + - uid: 21505 components: - type: Transform - pos: 76.5,23.5 + pos: 77.5,23.5 parent: 1 - - uid: 23535 + - uid: 21556 components: - type: Transform - pos: 77.5,23.5 + pos: 76.5,23.5 parent: 1 - proto: WallWood entities: @@ -182319,7 +182482,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -12887.691 + secondsUntilStateChange: -22246.982 state: Opening - uid: 5096 components: @@ -182341,7 +182504,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -12887.691 + secondsUntilStateChange: -22246.982 state: Opening - uid: 5498 components: @@ -182357,7 +182520,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -12611.309 + secondsUntilStateChange: -21970.6 state: Opening - uid: 8696 components: @@ -182390,7 +182553,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -12609.425 + secondsUntilStateChange: -21968.717 state: Opening - uid: 18835 components: @@ -182402,7 +182565,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -12606.426 + secondsUntilStateChange: -21965.717 state: Opening - uid: 23917 components: @@ -183141,6 +183304,11 @@ entities: - type: Transform pos: -44.5,11.5 parent: 1 + - uid: 6540 + components: + - type: Transform + pos: 66.5,1.5 + parent: 1 - uid: 6740 components: - type: Transform @@ -183196,11 +183364,6 @@ entities: - type: Transform pos: 65.5,1.5 parent: 1 - - uid: 7186 - components: - - type: Transform - pos: 66.5,1.5 - parent: 1 - uid: 7187 components: - type: Transform @@ -184166,6 +184329,21 @@ entities: rot: 3.141592653589793 rad pos: 71.5,-16.5 parent: 1 + - uid: 28474 + components: + - type: Transform + pos: -58.5,36.5 + parent: 1 + - uid: 28475 + components: + - type: Transform + pos: -57.5,36.5 + parent: 1 + - uid: 28476 + components: + - type: Transform + pos: -59.5,36.5 + parent: 1 - proto: Wirecutter entities: - uid: 21445 diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml index d02e1724476..08b5b78eb7d 100644 --- a/Resources/Maps/tortuga.yml +++ b/Resources/Maps/tortuga.yml @@ -284,7 +284,7 @@ entities: version: 6 3,1: ind: 3,1 - tiles: fAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAANwAAAAAANwAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAANwAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAATgAAAAAATgAAAAAANwAAAAAANwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAATgAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAABfAAAAAAATgAAAAAAQQAAAAAATgAAAAAAfAAAAAAATgAAAAAAQQAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAHgAAAAABQQAAAAAAQQAAAAAAQQAAAAAAHgAAAAACfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAewAAAAAAHgAAAAADHgAAAAADHgAAAAACHgAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAACHgAAAAABHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACQQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAAAAAAAAAHgAAAAABHgAAAAABfAAAAAAAHgAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACQQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAACfAAAAAAAHgAAAAABHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAACHgAAAAABHgAAAAAAHgAAAAABTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAANwAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATgAAAAAAfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAAANwAAAAAANwAAAAAANwAAAAAATgAAAAAAfAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATQAAAAAANwAAAAAANwAAAAAANwAAAAAATgAAAAAAXAAAAAAAfAAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAATQAAAAAANwAAAAAANwAAAAAANwAAAAAAfAAAAAAAXAAAAAABfAAAAAAATgAAAAAAQQAAAAAATgAAAAAAfAAAAAAATgAAAAAAQQAAAAAATgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAHgAAAAABQQAAAAAAQQAAAAAAQQAAAAAAHgAAAAACfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAewAAAAAAHgAAAAADHgAAAAADHgAAAAACHgAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAACHgAAAAABHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACQQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAAAAAAAAAHgAAAAABHgAAAAABfAAAAAAAHgAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACQQAAAAAAQQAAAAAAQQAAAAAAawAAAAAAfAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAACfAAAAAAAHgAAAAABHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAATgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAACHgAAAAABHgAAAAAAHgAAAAABTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,2: ind: 3,2 @@ -484,7 +484,7 @@ entities: version: 6 4,1: ind: 4,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAA version: 6 5,1: ind: 5,1 @@ -601,8 +601,8 @@ entities: - type: Broadphase - type: Physics bodyStatus: InAir - angularDamping: 10000 - linearDamping: 10000 + angularDamping: 0.05 + linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Fixtures @@ -11039,8 +11039,8 @@ entities: 0: 65535 7,16: 0: 255 - 3: 32768 - 4: 8192 + 4: 32768 + 6: 8192 8,12: 0: 30583 8,13: @@ -11291,10 +11291,10 @@ entities: 13,8: 0: 13071 14,4: - 1: 34947 - 0: 13056 + 1: 3 + 0: 64256 14,5: - 0: 45107 + 0: 45243 14,6: 0: 48059 14,7: @@ -11303,17 +11303,17 @@ entities: 0: 3 1: 35976 15,4: - 1: 3840 + 0: 30464 15,5: - 0: 12288 - 1: 34816 + 0: 12407 + 1: 32768 15,6: 0: 13107 1: 8 16,4: - 1: 3840 + 1: 7952 16,5: - 1: 61440 + 1: 61696 12,9: 0: 65535 11,9: @@ -11507,8 +11507,8 @@ entities: 0: 4359 8,16: 0: 255 - 5: 8192 - 6: 32768 + 3: 8192 + 5: 32768 9,12: 0: 14327 9,13: @@ -11521,7 +11521,7 @@ entities: 0: 30583 9,16: 0: 255 - 6: 40960 + 5: 40960 10,12: 0: 2032 10,13: @@ -11534,7 +11534,7 @@ entities: 0: 65535 10,16: 0: 255 - 6: 40960 + 5: 40960 11,12: 0: 30583 11,13: @@ -12068,11 +12068,11 @@ entities: 23,13: 0: 4369 8,17: - 5: 34 - 6: 136 + 3: 34 + 5: 136 7,17: - 3: 136 - 4: 34 + 4: 136 + 6: 34 8,18: 1: 61471 7,18: @@ -12086,7 +12086,7 @@ entities: 9,19: 1: 29936 9,17: - 6: 170 + 5: 170 9,20: 1: 62579 10,18: @@ -12094,7 +12094,7 @@ entities: 10,19: 1: 17532 10,17: - 6: 170 + 5: 170 10,20: 1: 29764 11,18: @@ -12786,10 +12786,10 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 - 0 - 0 - 0 + - 6666.982 - 0 - 0 - 0 @@ -12801,7 +12801,6 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - 6666.982 - 0 - 0 @@ -12813,13 +12812,14 @@ entities: - 0 - 0 - 0 + - 0 - volume: 2500 temperature: 293.15 moles: - 0 - 0 - 0 - - 6666.982 + - 0 - 0 - 0 - 0 @@ -12832,7 +12832,7 @@ entities: temperature: 293.15 moles: - 0 - - 0 + - 6666.982 - 0 - 0 - 0 @@ -12847,13 +12847,11 @@ entities: - type: BecomesStation id: Tortuga - type: OccluderTree - - type: Shuttle - angularDamping: 10000 - linearDamping: 10000 - type: GridPathfinding - type: RadiationGridResistance - type: GasTileOverlay - type: SpreaderGrid + - type: Shuttle - uid: 35 components: - type: MetaData @@ -15507,6 +15505,11 @@ entities: - type: Transform pos: 51.5,22.5 parent: 33 + - uid: 31594 + components: + - type: Transform + pos: 58.5,19.5 + parent: 33 - proto: AirlockChiefEngineerLocked entities: - uid: 8824 @@ -21599,6 +21602,13 @@ entities: parent: 31457 - type: Physics canCollide: False +- proto: Biofabricator + entities: + - uid: 8298 + components: + - type: Transform + pos: -19.5,38.5 + parent: 33 - proto: BiomassReclaimer entities: - uid: 4088 @@ -41588,6 +41598,26 @@ entities: - type: Transform pos: 56.5,-22.5 parent: 33 + - uid: 31597 + components: + - type: Transform + pos: 57.5,19.5 + parent: 33 + - uid: 31598 + components: + - type: Transform + pos: 58.5,19.5 + parent: 33 + - uid: 31599 + components: + - type: Transform + pos: 59.5,19.5 + parent: 33 + - uid: 31600 + components: + - type: Transform + pos: 59.5,20.5 + parent: 33 - proto: CableApcStack entities: - uid: 8123 @@ -63213,11 +63243,6 @@ entities: - type: Transform pos: -60.5,45.5 parent: 33 - - uid: 26995 - components: - - type: Transform - pos: 26.5,65.5 - parent: 33 - uid: 27705 components: - type: Transform @@ -65465,6 +65490,11 @@ entities: rot: -1.5707963267948966 rad pos: 34.5,18.5 parent: 33 + - uid: 3182 + components: + - type: Transform + pos: 26.5,65.5 + parent: 33 - uid: 3328 components: - type: Transform @@ -65828,14 +65858,6 @@ entities: rot: -1.5707963267948966 rad pos: 36.5,-17.5 parent: 33 -- proto: ComputerShuttleSalvage - entities: - - uid: 23868 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 59.5,-8.5 - parent: 33 - proto: ComputerSolarControl entities: - uid: 676 @@ -67535,29 +67557,11 @@ entities: - 0 - proto: CrateHydroponicsSeedsMedicinal entities: - - uid: 3182 + - uid: 31616 components: - type: Transform - pos: -19.5,38.5 + pos: -19.48779,34.864456 parent: 33 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 9.117112 - - 34.29771 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: CrateLivestock entities: - uid: 18614 @@ -68570,6 +68574,13 @@ entities: - type: Transform pos: 31.5,22.5 parent: 33 + - uid: 31596 + components: + - type: Transform + pos: 60.5,19.5 + parent: 33 + - type: NavMapBeacon + text: Anchor - proto: DefaultStationBeaconEngiOutpost entities: - uid: 11248 @@ -86481,18 +86492,6 @@ entities: - type: Transform pos: -9.06601,26.59333 parent: 33 -- proto: FoodMeat - entities: - - uid: 8318 - components: - - type: Transform - pos: -5.5087547,44.53925 - parent: 33 - - uid: 8319 - components: - - type: Transform - pos: -5.4879217,44.476707 - parent: 33 - proto: FoodMeatChicken entities: - uid: 6653 @@ -86572,23 +86571,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: FoodMeatChickenCutlet - entities: - - uid: 8322 - components: - - type: Transform - pos: -0.5508643,38.61676 - parent: 33 - - uid: 8323 - components: - - type: Transform - pos: -0.46753103,38.491673 - parent: 33 - - uid: 27307 - components: - - type: Transform - pos: -0.49878103,38.56464 - parent: 33 - proto: FoodMeatChickenFried entities: - uid: 6669 @@ -86624,28 +86606,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: FoodMeatMeatball - entities: - - uid: 8313 - components: - - type: Transform - pos: -1.5913324,38.67354 - parent: 33 - - uid: 8314 - components: - - type: Transform - pos: -1.4142492,38.590145 - parent: 33 - - uid: 8315 - components: - - type: Transform - pos: -1.5496657,38.465057 - parent: 33 - - uid: 8316 - components: - - type: Transform - pos: -1.3309157,38.465057 - parent: 33 - proto: FoodMeatRotten entities: - uid: 10681 @@ -90331,6 +90291,53 @@ entities: parent: 33 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 31602 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,20.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31603 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 54.5,18.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31604 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 57.5,18.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31605 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,19.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31606 + components: + - type: Transform + pos: 59.5,19.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31607 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 59.5,20.5 + parent: 33 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPipeFourway entities: - uid: 2955 @@ -117718,14 +117725,6 @@ entities: parent: 33 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 29089 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 55.5,20.5 - parent: 33 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 29090 components: - type: Transform @@ -117742,14 +117741,6 @@ entities: parent: 33 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 29092 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 56.5,20.5 - parent: 33 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 29093 components: - type: Transform @@ -119440,6 +119431,54 @@ entities: parent: 33 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 31608 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 58.5,19.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31609 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 56.5,18.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31610 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,18.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31611 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 54.5,19.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 31612 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,20.5 + parent: 33 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 31613 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 58.5,20.5 + parent: 33 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPipeTJunction entities: - uid: 633 @@ -119587,6 +119626,22 @@ entities: parent: 33 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 8322 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,20.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 8323 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,20.5 + parent: 33 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 9506 components: - type: Transform @@ -125840,6 +125895,13 @@ entities: parent: 33 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 31614 + components: + - type: Transform + pos: 59.5,21.5 + parent: 33 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasVentScrubber entities: - uid: 1551 @@ -127795,6 +127857,14 @@ entities: parent: 33 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 31615 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 59.5,18.5 + parent: 33 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasVolumePump entities: - uid: 4166 @@ -134891,6 +134961,16 @@ entities: - type: Transform pos: 0.5,70.5 parent: 33 + - uid: 29089 + components: + - type: Transform + pos: 58.5,20.5 + parent: 33 + - uid: 29092 + components: + - type: Transform + pos: 61.5,17.5 + parent: 33 - uid: 29173 components: - type: Transform @@ -135356,6 +135436,31 @@ entities: - type: Transform pos: -18.5,85.5 parent: 33 + - uid: 31581 + components: + - type: Transform + pos: 60.5,17.5 + parent: 33 + - uid: 31582 + components: + - type: Transform + pos: 62.5,17.5 + parent: 33 + - uid: 31585 + components: + - type: Transform + pos: 63.5,18.5 + parent: 33 + - uid: 31586 + components: + - type: Transform + pos: 63.5,19.5 + parent: 33 + - uid: 31587 + components: + - type: Transform + pos: 63.5,20.5 + parent: 33 - proto: GrilleBroken entities: - uid: 5569 @@ -139070,7 +139175,7 @@ entities: - type: Transform pos: 5.56503,-22.863274 parent: 33 -- proto: MailPAI +- proto: MailNFPAI entities: - uid: 6330 components: @@ -148967,6 +149072,58 @@ entities: rot: 1.5707963267948966 rad pos: -61.46199,29.57894 parent: 33 +- proto: PaperCNCSheet + entities: + - uid: 8299 + components: + - type: Transform + pos: -64.418884,-35.3573 + parent: 33 + - uid: 8300 + components: + - type: Transform + pos: -65.47096,-35.513657 + parent: 33 + - uid: 8315 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -67.512634,-34.460842 + parent: 33 + - uid: 8316 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -66.50221,-34.512962 + parent: 33 + - uid: 8318 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -65.47096,-34.48169 + parent: 33 + - uid: 8319 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -64.4918,-34.544235 + parent: 33 + - uid: 25143 + components: + - type: Transform + pos: -66.512634,-35.471962 + parent: 33 + - uid: 31617 + components: + - type: Transform + pos: -67.50221,-35.451115 + parent: 33 + - uid: 31618 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -70.21878,-28.42456 + parent: 33 - proto: PartRodMetal entities: - uid: 1803 @@ -151374,9 +151531,16 @@ entities: parent: 33 - uid: 28309 components: + - type: MetaData + desc: >2- + + It doesn't look very healthy... + name: wilted potted plant - type: Transform pos: -42.5,-34.5 parent: 33 + missingComponents: + - StealTarget - proto: PowerCellHigh entities: - uid: 4644 @@ -154781,6 +154945,11 @@ entities: rot: -1.5707963267948966 rad pos: 61.5,25.5 parent: 33 + - uid: 31601 + components: + - type: Transform + pos: 61.5,21.5 + parent: 33 - proto: PoweredSmallLight entities: - uid: 546 @@ -156534,15 +156703,15 @@ entities: - type: Transform pos: -68.5,-49.5 parent: 33 - - uid: 27026 + - uid: 27011 components: - type: Transform - pos: 54.5,19.5 + pos: 57.5,20.5 parent: 33 - - uid: 27030 + - uid: 27026 components: - type: Transform - pos: 54.5,18.5 + pos: 54.5,19.5 parent: 33 - uid: 27310 components: @@ -157590,6 +157759,23 @@ entities: - type: Transform pos: -103.5,4.5 parent: 33 +- proto: RandomIngredient + entities: + - uid: 23868 + components: + - type: Transform + pos: -8.544202,44.595825 + parent: 33 + - uid: 24769 + components: + - type: Transform + pos: -10.471286,44.606247 + parent: 33 + - uid: 25006 + components: + - type: Transform + pos: -7.440036,44.668793 + parent: 33 - proto: RandomInstruments entities: - uid: 2507 @@ -157802,6 +157988,23 @@ entities: - type: Transform pos: -25.5,117.5 parent: 33 +- proto: RandomMeat + entities: + - uid: 8301 + components: + - type: Transform + pos: -5.5172763,44.512432 + parent: 33 + - uid: 8313 + components: + - type: Transform + pos: -1.4860258,38.508263 + parent: 33 + - uid: 8314 + components: + - type: Transform + pos: -0.5276926,38.508263 + parent: 33 - proto: RandomPainting entities: - uid: 4656 @@ -160631,11 +160834,6 @@ entities: - type: Transform pos: -26.525337,35.575306 parent: 33 - - uid: 8300 - components: - - type: Transform - pos: -7.53673,44.657608 - parent: 33 - proto: ReagentContainerOliveoil entities: - uid: 6667 @@ -160648,25 +160846,6 @@ entities: - type: Transform pos: -8.569332,43.625645 parent: 33 -- proto: ReagentContainerRice - entities: - - uid: 8301 - components: - - type: Transform - pos: -10.475582,44.657608 - parent: 33 -- proto: ReagentContainerSugar - entities: - - uid: 8298 - components: - - type: Transform - pos: -8.515896,44.730576 - parent: 33 - - uid: 8299 - components: - - type: Transform - pos: -8.359646,44.647186 - parent: 33 - proto: ReagentGrinderMachineCircuitboard entities: - uid: 17159 @@ -164969,6 +165148,11 @@ entities: - type: Transform pos: -64.5,-45.5 parent: 33 + - uid: 26948 + components: + - type: Transform + pos: 58.5,20.5 + parent: 33 - uid: 26958 components: - type: Transform @@ -165229,6 +165413,36 @@ entities: - type: Transform pos: 58.5,-25.5 parent: 33 + - uid: 31588 + components: + - type: Transform + pos: 63.5,20.5 + parent: 33 + - uid: 31589 + components: + - type: Transform + pos: 63.5,19.5 + parent: 33 + - uid: 31590 + components: + - type: Transform + pos: 63.5,18.5 + parent: 33 + - uid: 31591 + components: + - type: Transform + pos: 62.5,17.5 + parent: 33 + - uid: 31592 + components: + - type: Transform + pos: 61.5,17.5 + parent: 33 + - uid: 31593 + components: + - type: Transform + pos: 60.5,17.5 + parent: 33 - proto: RemoteSignaller entities: - uid: 27714 @@ -166088,10 +166302,10 @@ entities: parent: 33 - proto: SheetGlass10 entities: - - uid: 9222 + - uid: 27030 components: - type: Transform - pos: 54.60101,18.570824 + pos: 57.601383,20.563738 parent: 33 - uid: 27346 components: @@ -166311,10 +166525,10 @@ entities: parent: 33 - proto: SheetPlastic10 entities: - - uid: 26948 + - uid: 31595 components: - type: Transform - pos: 54.517677,18.591671 + pos: 57.445133,20.532467 parent: 33 - proto: SheetRGlass entities: @@ -173104,15 +173318,15 @@ entities: - type: Transform pos: 56.5,18.5 parent: 33 - - uid: 24769 + - uid: 9222 components: - type: Transform - pos: 56.5,20.5 + pos: 54.5,18.5 parent: 33 - - uid: 25143 + - uid: 26995 components: - type: Transform - pos: 57.5,20.5 + pos: 55.5,18.5 parent: 33 - proto: SpawnMobFoxRenault entities: @@ -174364,6 +174578,13 @@ entities: - type: Transform pos: -2.5,-9.5 parent: 33 +- proto: StationAnchor + entities: + - uid: 27307 + components: + - type: Transform + pos: 61.5,20.5 + parent: 33 - proto: StationMap entities: - uid: 3765 @@ -193000,11 +193221,6 @@ entities: - type: Transform pos: 53.5,17.5 parent: 33 - - uid: 25006 - components: - - type: Transform - pos: 58.5,19.5 - parent: 33 - uid: 25144 components: - type: Transform @@ -193315,11 +193531,6 @@ entities: - type: Transform pos: 47.5,82.5 parent: 33 - - uid: 27011 - components: - - type: Transform - pos: 58.5,20.5 - parent: 33 - uid: 27043 components: - type: Transform @@ -193965,6 +194176,26 @@ entities: - type: Transform pos: 71.5,69.5 parent: 33 + - uid: 31577 + components: + - type: Transform + pos: 63.5,22.5 + parent: 33 + - uid: 31579 + components: + - type: Transform + pos: 59.5,17.5 + parent: 33 + - uid: 31583 + components: + - type: Transform + pos: 63.5,17.5 + parent: 33 + - uid: 31584 + components: + - type: Transform + pos: 63.5,21.5 + parent: 33 - proto: WallReinforcedRust entities: - uid: 31423 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 6470a0437cb..aab8ad92871 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -76,7 +76,6 @@ - id: ClothingUniformJumpsuitHosFormal # - id: ClothingOuterWinterHoS # DeltaV - removed for incongruence - id: ClothingOuterCoatStasecHoS # DeltaV - add winter coat - - id: ClothingOuterGreatcoatStasecHoS # DeltaV - add greatcoat - id: ClothingShoesBootsWinterHeadOfSecurity # DeltaV - add HoS winter boots - type: entity @@ -120,5 +119,4 @@ - id: ClothingHeadHatWarden - id: ClothingHeadHatBeretWarden - id: ClothingOuterCoatStasecWarden # DeltaV - add winter coat - - id: ClothingOuterGreatcoatStasecWarden # DeltaV - add greatcoat - id: ClothingShoesBootsWinterWarden # DeltaV - add winter boots diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index b19ed1da6c5..178fea40b10 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -26,7 +26,6 @@ ClothingHeadsetPrison: 3 # DeltaV - prison headsets in secdrobe ClothingOuterStasecSweater: 2 # DeltaV - add sweaters to secdrobe ClothingOuterCoatStasec: 2 # DeltaV - replace ClothingOuterWinterSec - ClothingOuterGreatcoatStasec: 2 # DeltaV - added greatcoats to SecDrobe. Surplus, reminds the officers of the good times. ## ClothingOuterArmorBasic: 2 # DeltaV - moved body armour from SecDrobe to SecTech ## ClothingOuterArmorBasicSlim: 2 ClothingNeckScarfStripedRed: 3 diff --git a/Resources/Prototypes/Decals/Overlays/grayscale.yml b/Resources/Prototypes/Decals/Overlays/grayscale.yml index 86365081b8d..dfebeee3f91 100644 --- a/Resources/Prototypes/Decals/Overlays/grayscale.yml +++ b/Resources/Prototypes/Decals/Overlays/grayscale.yml @@ -3,7 +3,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: fulltile_overlay - type: decal @@ -115,7 +115,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle Consistency + sprite: Decals/Overlays/greyscale.rsi state: halftile_overlay - type: decal @@ -123,7 +123,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle Consistency + sprite: Decals/Overlays/greyscale.rsi state: halftile_overlay_90 - type: decal @@ -131,7 +131,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: halftile_overlay_180 - type: decal @@ -139,7 +139,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: halftile_overlay_270 - type: decal @@ -147,7 +147,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: quartertile_overlay - type: decal @@ -155,7 +155,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: quartertile_overlay_90 - type: decal @@ -163,7 +163,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: quartertile_overlay_180 - type: decal @@ -171,7 +171,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: quartertile_overlay_270 - type: decal @@ -179,7 +179,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: threequartertile_overlay - type: decal @@ -187,7 +187,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: threequartertile_overlay_90 - type: decal @@ -195,7 +195,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: threequartertile_overlay_180 - type: decal @@ -203,7 +203,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: threequartertile_overlay_270 - type: decal @@ -219,7 +219,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: checkerNESW - type: decal @@ -227,7 +227,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: checkerNWSE - type: decal @@ -235,7 +235,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: diagonal - type: decal @@ -243,7 +243,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: diagonal_checker_a - type: decal @@ -251,7 +251,7 @@ tags: ["station", "overlay"] defaultCustomColor: true sprite: - sprite: DeltaV/Decals/Overlays/greyscale.rsi #DeltaV - Artstyle consistency + sprite: Decals/Overlays/greyscale.rsi state: diagonal_checker_b - type: decal diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml index c1d472c5379..3bd5213a91a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml @@ -48,7 +48,7 @@ name: robo-neuroticist visor description: The Robo-Neuroticist's advanced heads-up display, designed for quick diagnosis of their Neurolings. components: - - type: ShowHealthBars + - type: ShowHealthIcons damageContainers: - Biological - Inorganic diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml index bdb5ad85d9a..3dcda0fd5ee 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml @@ -193,6 +193,17 @@ - type: Clothing sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretDet + name: detective's beret + description: For forensic specialists and dogged investigators. + components: + - type: Sprite + sprite: DeltaV/Clothing/Head/Hats/beret_det.rsi + - type: Clothing + sprite: DeltaV/Clothing/Head/Hats/beret_det.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatCJToque diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml index fcc8033551b..ce4ee91cfef 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml @@ -73,7 +73,7 @@ parent: ClothingOuterStasecSweater id: ClothingOuterCoatStasecHoS name: head of security's coat - description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. Bears HoS arm flashes. + description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version is adorned with gold trim. components: - type: Sprite sprite: DeltaV/Clothing/OuterClothing/WinterCoats/hoscoat.rsi @@ -84,7 +84,7 @@ parent: ClothingOuterStasecSweater id: ClothingOuterCoatStasecWarden name: warden's coat - description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. Sports warden arm flashes. + description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version features ice-white trim. components: - type: Sprite sprite: DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi @@ -92,44 +92,23 @@ sprite: DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi - type: entity - parent: ClothingOuterStorageFoldableBase - id: ClothingOuterGreatcoatStasec - name: station security greatcoat - description: A long and heavy greatcoat, yet to be phased out of use for Station Security. It's hard to tell what's so great about it, but it sure is warm and sturdy. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecgreatcoat.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecgreatcoat.rsi - - type: TemperatureProtection - coolingCoefficient: 0.1 - - type: Armor - modifiers: - coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.75 - Heat: 0.75 - - type: AllowSuitStorage - -- type: entity - parent: ClothingOuterGreatcoatStasec - id: ClothingOuterGreatcoatStasecHoS - name: head of security's greatcoat - description: A long and heavy greatcoat, yet to be phased out of use for Station Security. Bears HoS arm flashes. + parent: ClothingOuterStasecSweater + id: ClothingOuterCoatStasecDet + name: detective's coat + description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version is detective plum. components: - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/hosgreatcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/hosgreatcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi - type: entity - parent: ClothingOuterGreatcoatStasec - id: ClothingOuterGreatcoatStasecWarden - name: warden's greatcoat - description: A long and heavy greatcoat, yet to be phased out of use for Station Security. Sports warden arm flashes. + parent: ClothingOuterStasecSweater + id: ClothingOuterCoatStasecCorpsman + name: corpsman's coat + description: A warm and comfortable winter coat, reinforced with durathread and compliant with Station Security uniform standards. This version is corpsman blue. components: - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/armourergreatcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/armourergreatcoat.rsi + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 40e5381b843..33077504a70 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -46,6 +46,19 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi +# Corpsman alt uniforms + +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpskirtBrigmedicTurtle + name: corpsman's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the dedication to reach the position of Corpsman. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi + # Detective uniform - type: entity @@ -59,6 +72,17 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpskirtDetTurtle + name: detective's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Detective. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi + # Senior Officer uniform - type: entity @@ -96,6 +120,17 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/armourer_grey.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpskirtWardenTurtle + name: warden's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the patience to reach the position of Warden. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi + # HoS alt uniforms - type: entity @@ -120,6 +155,17 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpskirtHoSTurtle + name: head of security's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the tenacity to reach the position of Head of Security. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi + # Central Command Uniform - ported from Velta - type: entity diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index b2820be18ee..28629cbc255 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -8,7 +8,7 @@ sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi - + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitHoPFormal @@ -209,6 +209,19 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/secformalsuit.rsi +# Corpsman alt uniforms + +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitBrigmedicTurtle + name: corpsman's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the dedication to reach the position of Corpsman. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi + # Detective uniform - type: entity @@ -222,6 +235,17 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitDetTurtle + name: detective's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Detective. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi + # Senior Officer uniform - type: entity @@ -259,6 +283,30 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_grey.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitWardenTurtle + name: warden's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the patience to reach the position of Warden. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi + +# HoS alt uniforms + +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitHoSTurtle + name: head of security's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the tenacity to reach the position of Head of Security. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi + # Central Command Uniform - ported from Velta - type: entity diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/radio.yml index dcda62a95a4..8fa228df154 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/radio.yml @@ -1,8 +1,8 @@ - type: entity - name: syndicate radio - description: A nefarious syndicate radio. parent: RadioHandheld id: RadioHandheldSyndicate + name: syndicate radio + description: A nefarious syndicate radio. components: - type: RadioMicrophone broadcastChannel: Syndicate diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/rechargingsyndicatecrewmonitor.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/rechargingsyndicatecrewmonitor.yml index 8ee2e288fbd..351a6319a07 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/rechargingsyndicatecrewmonitor.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Medical/rechargingsyndicatecrewmonitor.yml @@ -1,8 +1,8 @@ - type: entity + parent: SyndiCrewMonitor id: SyndiCrewMonitorRecharging name: syndicate crew monitor recharging description: The syndicated version of crew monitor, intercepts information from the server. - parent: SyndiCrewMonitor components: - type: PowerCellDraw useRate: 10 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index fe43e578bcf..94ace625e2d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -96,8 +96,8 @@ - WeaponEnergyGunMiniRecharging - type: entity - id: BorgModuleRadioJammerRecharging # locked behind Syndie exofab parent: [ BaseBorgModule, BaseProviderBorgModule ] + id: BorgModuleRadioJammerRecharging # locked behind Syndie exofab description: "A module that comes with a recharging radio jammer." name: radio jammer cyborg module components: @@ -110,8 +110,8 @@ - RechargingRadioJammer - type: entity - id: BorgModuleBlades # locked behind Syndie exofab parent: [ BaseBorgModule, BaseProviderBorgModule ] + id: BorgModuleBlades # locked behind Syndie exofab name: blade cyborg module description: "A module that comes with enough knives to poke your eye out." components: @@ -127,8 +127,8 @@ - KnifePlastic - type: entity - id: BorgModuleCHIMP # locked behind Syndie exofab parent: [ BaseBorgModule, BaseProviderBorgModule ] + id: BorgModuleCHIMP # locked behind Syndie exofab name: Experimental C.H.I.M.P. cyborg module description: "A module that comes with an unrechargable experimental C.H.I.M.P. handcannon." components: @@ -141,8 +141,8 @@ - WeaponPistolCHIMPUpgraded - type: entity - id: BorgModuleSyndicateRadio # locked behind Syndie exofab parent: [ BaseBorgModule, BaseProviderBorgModule, ClothingEyesHudSyndicate] + id: BorgModuleSyndicateRadio # locked behind Syndie exofab name: syndicate radio cyborg module description: "A module that comes with a syndicate handheld radio and PDA." components: @@ -156,13 +156,13 @@ - SyndiPDA - type: ShowSyndicateIcons - type: ShowJobIcons - - type: ShowHealthBars + - type: ShowHealthIcons damageContainers: - Biological - type: entity - id: BorgModuleCrewMonitor # locked behind Syndie exofab parent: [ BaseBorgModule, BaseProviderBorgModule] + id: BorgModuleCrewMonitor # locked behind Syndie exofab name: crew monitoring module description: "A module that comes with a crew monitor." components: diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml index 5b35ab9d1a9..42c7f2c89aa 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Security/brigmedic.yml @@ -15,6 +15,16 @@ equipment: jumpsuit: ClothingUniformJumpskirtBrigmedic +- type: loadout + id: BrigMedicTurtlesuit + equipment: + jumpsuit: ClothingUniformJumpsuitBrigmedicTurtle + +- type: loadout + id: BrigMedicTurtleskirt + equipment: + jumpsuit: ClothingUniformJumpskirtBrigmedicTurtle + # Back - type: loadout id: BrigMedicBackpack @@ -30,3 +40,10 @@ id: BrigMedicDuffel equipment: back: ClothingBackpackDuffelBrigmedic + +# OuterClothing + +- type: loadout + id: StasecWinterCoatCorpsman + equipment: + outerClothing: ClothingOuterCoatStasecCorpsman diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 9d35f9e582a..fe14a7a3d8d 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -94,6 +94,16 @@ loadouts: - BrigMedicJumpsuit - BrigMedicJumpskirt + - BrigMedicTurtlesuit + - BrigMedicTurtleskirt + +- type: loadoutGroup + id: BrigMedicOuterClothing + name: loadout-group-brig-medic-outerclothing + loadouts: + - StasecWinterCoatCorpsman + - PlateCarrier + - DuraVest - type: loadoutGroup id: BrigMedicBack diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index 0757fb27844..8b9e3988e0a 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -23,9 +23,9 @@ - BrigMedicJumpsuit - BrigMedicBack - SecurityShoes - - SecurityOuterClothing + - BrigMedicOuterClothing - MedicalGloves - - SurvivalSecurity # DeltaV - replace SurvivalCorpsman for incongruence + - SurvivalSecurity - Trinkets - GroupSpeciesBreathToolCorpsman diff --git a/Resources/Prototypes/DeltaV/Objectives/roboticist.yml b/Resources/Prototypes/DeltaV/Objectives/roboticist.yml index d0b3c945890..e1c234135e2 100644 --- a/Resources/Prototypes/DeltaV/Objectives/roboticist.yml +++ b/Resources/Prototypes/DeltaV/Objectives/roboticist.yml @@ -11,7 +11,7 @@ - RoboticistRole - type: entity - parent: [BaseRoboticistObjective, BaseSurviveObjective] + parent: [ BaseRoboticistObjective, BaseSurviveObjective ] id: RoboticistSurviveObjective description: As precious as they are, your cyborgs are less valuable than your own life. name: Survive @@ -22,7 +22,7 @@ state: icon - type: entity - parent: [BaseRoboticistObjective, BaseSurviveObjective] + parent: [ BaseRoboticistObjective, BaseSurviveObjective ] id: RoboticistBorgObjective description: The crew of this station is yours to command, turn them into cyborgs till your have reaped your fill. name: Conspiracy to Convert @@ -33,7 +33,7 @@ state: state-laws - type: entity - parent: [BaseRoboticistObjective, BaseKillObjective] + parent: [ BaseRoboticistObjective, BaseKillObjective ] id: RoboticistKillObjective description: Your dossier indicates that there is one very appealing neural pattern on the crew. Turn them into a Cyborg. components: @@ -49,8 +49,7 @@ requireDead: true - type: entity - noSpawn: true - parent: [BaseRoboticistObjective, BaseTraitorStealObjective] + parent: [ BaseRoboticistObjective, BaseTraitorStealObjective ] id: RoboticistPlutoniumCoreStealObjective components: - type: Objective diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml index b97c0cb36a9..03ac0d4203a 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml @@ -57,11 +57,6 @@ parent: BaseBorgLimbRecipe id: TorsoBorgSecurity result: TorsoBorgSecurity - category: Robotics - completetime: 2 - materials: - Steel: 250 - Glass: 100 - type: latheRecipe id: BorgModuleSyndicateWeapon diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml index 25ff782108a..3bde2042cf1 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml @@ -52,7 +52,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.35,-0.4,0.35,0.4" + bounds: "-0.15,-0.2,0.15,0.2" # DeltaV: make it smaller density: 1000 layer: - WallLayer @@ -104,7 +104,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.1,-0.3,0.1,0.3" + bounds: "-0.1,-0.2,0.1,0.2" # DeltaV: make it smaller density: 4000 layer: - WallLayer @@ -122,7 +122,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.18,-0.35,0.18,0.35" + bounds: "-0.18,-0.2,0.18,0.2" # DeltaV: make it smaller density: 2000 layer: - WallLayer @@ -140,7 +140,7 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.1,-0.35,0.1,0.35" + bounds: "-0.1,-0.2,0.1,0.2" # DeltaV: make it smaller density: 3500 layer: - WallLayer diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml index 775b6182dd8..c464c70a15f 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml @@ -5,7 +5,7 @@ suffix: Atmospherics components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/atmospherics.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/atmospherics.rsi state: "assembly" - type: entity @@ -14,7 +14,7 @@ suffix: Atmospherics, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/atmospherics.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/atmospherics.rsi state: "assembly" #Cargo @@ -24,7 +24,7 @@ suffix: Cargo components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/cargo.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/cargo.rsi state: "assembly" - type: entity @@ -33,7 +33,7 @@ suffix: Cargo, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/cargo.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/cargo.rsi state: "assembly" #Clockwork @@ -68,7 +68,7 @@ suffix: Command components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/command.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/command.rsi state: "assembly" - type: entity @@ -77,7 +77,7 @@ suffix: Command, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/command.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/command.rsi state: "assembly" #Engineering @@ -87,7 +87,7 @@ suffix: Engineering components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/engineering.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/engineering.rsi state: "assembly" - type: entity @@ -96,7 +96,7 @@ suffix: Engineering, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/engineering.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/engineering.rsi state: "assembly" #External @@ -106,7 +106,7 @@ suffix: External components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/external.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/external.rsi state: "assembly" - type: entity @@ -115,7 +115,7 @@ suffix: External, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/external.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/external.rsi state: "assembly" #Public (Glass Airlock) @@ -125,7 +125,7 @@ suffix: Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/glass.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/glass.rsi state: "assembly" #Freezer @@ -135,7 +135,7 @@ suffix: Freezer components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/freezer.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/freezer.rsi state: "assembly" #Maintenance @@ -145,7 +145,7 @@ suffix: Maintenance components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/maint.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/maint.rsi state: "assembly" - type: entity @@ -154,7 +154,7 @@ suffix: Maintenance, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/maint.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/maint.rsi state: "assembly" #Medical @@ -164,7 +164,7 @@ suffix: Medical components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/medical.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/medical.rsi state: "assembly" - type: entity @@ -173,7 +173,7 @@ suffix: Medical, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/medical.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/medical.rsi state: "assembly" #Science @@ -183,7 +183,7 @@ suffix: Science components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/science.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/science.rsi state: "assembly" - type: entity @@ -192,7 +192,7 @@ suffix: Science, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/science.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/science.rsi state: "assembly" #Security @@ -202,7 +202,7 @@ suffix: Security components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/security.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/security.rsi state: "assembly" - type: entity @@ -211,7 +211,7 @@ suffix: Security, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/security.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/security.rsi state: "assembly" #Shuttle @@ -221,7 +221,7 @@ suffix: Shuttle components: - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/shuttle.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/shuttle.rsi state: "assembly" - type: entity @@ -230,7 +230,7 @@ suffix: Shuttle, Glass components: - type: Sprite - sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi state: "assembly" #Virology @@ -240,7 +240,7 @@ suffix: Virology components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/virology.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/virology.rsi state: "assembly" - type: entity @@ -249,7 +249,7 @@ suffix: Virology, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/virology.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/virology.rsi state: "assembly" #CentralCommand @@ -259,7 +259,7 @@ suffix: CentralCommand components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/centcomm.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/centcomm.rsi state: "assembly" - type: entity @@ -268,7 +268,7 @@ suffix: CentralCommand, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/centcomm.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi state: "assembly" #Mining @@ -297,7 +297,7 @@ suffix: Syndicate components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/syndicate.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi state: "assembly" - type: entity @@ -306,7 +306,7 @@ suffix: Syndicate, Glass components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/syndicate.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi state: "assembly" #ShuttleSyndicate @@ -316,7 +316,7 @@ suffix: ShuttleSyndicate components: - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi state: "assembly" - type: entity @@ -325,7 +325,7 @@ suffix: ShuttleSyndicate, Glass components: - type: Sprite - sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi state: "assembly" #High Security @@ -335,5 +335,5 @@ suffix: HighSec components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/highsec/highsec.rsi #Delta V - Resprite Doors + sprite: Structures/Doors/Airlocks/highsec/highsec.rsi state: "assembly" diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 26d1fcf3f80..2eda24a90be 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -421,6 +421,7 @@ description: A sign indicating the chapel. components: - type: Sprite + sprite: DeltaV/Structures/Wallmounts/signs.rsi # DeltaV: Epi-themed chapel sprite state: chapel - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 2c4f0f4ce73..3f8ada3bd8a 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -659,7 +659,7 @@ base: reinf_over - type: entity - parent: BaseWallDiagonal #DeltaV: Frontier Diagonal Walls port + parent: WallShuttleDiagonal id: WallReinforcedDiagonal name: reinforced wall suffix: diagonal @@ -670,14 +670,14 @@ components: - type: Sprite drawdepth: Walls - sprite: _NF/Structures/Walls/solid_reinforced_diagonal.rsi #DeltaV: Using Frontier sprites to go with the artstyle + sprite: Structures/Walls/reinforced_diagonal.rsi state: state0 - type: IconSmooth mode: Diagonal key: walls base: state - type: Icon - sprite: _NF/Structures/Walls/solid_reinforced_diagonal.rsi #DeltaV: Using Frontier sprites to go with the artstyle + sprite: Structures/Walls/reinforced_diagonal.rsi state: state0 # Riveting @@ -1027,7 +1027,7 @@ base: solid - type: entity - parent: BaseWallDiagonal #DeltaV: Frontier Diagonal Walls port + parent: WallShuttleDiagonal id: WallSolidDiagonal name: solid wall suffix: diagonal diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index d2cca17d281..cfda9849b83 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -9,6 +9,11 @@ equipment: head: ClothingHeadHatFedoraGrey +- type: loadout # DeltaV + id: DetBeret + equipment: + head: ClothingHeadHatBeretDet + # Neck - type: loadout id: DetectiveTie @@ -46,6 +51,16 @@ equipment: jumpsuit: ClothingUniformJumpskirtForensicSpec +- type: loadout # DeltaV + id: ForensicSpecTurtlesuit + equipment: + jumpsuit: ClothingUniformJumpsuitDetTurtle + +- type: loadout # DeltaV + id: ForensicSpecTurtleskirt + equipment: + jumpsuit: ClothingUniformJumpskirtDetTurtle + # OuterClothing - type: loadout id: DetectiveArmorVest @@ -56,3 +71,8 @@ id: DetectiveCoat equipment: outerClothing: ClothingOuterCoatDetectiveLoadout + +- type: loadout # DeltaV + id: StasecWinterCoatDet + equipment: + outerClothing: ClothingOuterCoatStasecDet diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index 6e35e8ca032..9b762ffd3f5 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -32,12 +32,12 @@ - type: loadout id: HeadofSecurityTurtleneck equipment: - jumpsuit: ClothingUniformJumpsuitHoSAlt + jumpsuit: ClothingUniformJumpsuitHoSTurtle # DeltaV - replace ClothingUniformJumpsuitHoSAlt - type: loadout id: HeadofSecurityTurtleneckSkirt equipment: - jumpsuit: ClothingUniformJumpskirtHoSAlt + jumpsuit: ClothingUniformJumpskirtHoSTurtle # DeltaV - replace ClothingUniformJumpsuitHoSAlt - type: loadout id: HeadofSecurityFormalSuit @@ -97,11 +97,6 @@ equipment: outerClothing: ClothingOuterCoatStasecHoS -- type: loadout # DeltaV - security greatcoat - id: StasecGreatcoatHoS - equipment: - outerClothing: ClothingOuterGreatcoatStasecHoS - # Shoes - DeltaV - type: loadout # DeltaV id: HeadOfSecurityWinterBoots diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index f55a23e17d6..d2f105fdb13 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -165,11 +165,6 @@ equipment: outerClothing: ClothingOuterCoatStasec -- type: loadout # DeltaV - security greatcoat - id: StasecGreatcoat - equipment: - outerClothing: ClothingOuterGreatcoatStasec - # Shoes - type: loadout id: CombatBoots diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index 06cb118ec5d..54f1bb0c210 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -40,6 +40,16 @@ equipment: jumpsuit: ClothingUniformJumpskirtWardenBlue +- type: loadout + id: WardenTurtlesuit + equipment: + jumpsuit: ClothingUniformJumpsuitWardenTurtle # DeltaV + +- type: loadout + id: WardenTurtleskirt + equipment: + jumpsuit: ClothingUniformJumpskirtWardenTurtle # DeltaV + # OuterClothing - type: loadout id: WardenCoat @@ -55,8 +65,3 @@ id: StasecWinterCoatWarden equipment: outerClothing: ClothingOuterCoatStasecWarden - -- type: loadout # DeltaV - security greatcoat - id: StasecGreatcoatWarden - equipment: - outerClothing: ClothingOuterGreatcoatStasecWarden diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index c0d2d2153cd..8bfb6b6484b 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1088,8 +1088,8 @@ - HeadofSecurityJumpskirtGrey # DeltaV - HeadofSecurityJumpsuitBlue # DeltaV - HeadofSecurityJumpskirtBlue # DeltaV - - HeadofSecurityTurtleneck # DeltaV - - HeadofSecurityTurtleneckSkirt # DeltaV + - HeadofSecurityTurtleneck + - HeadofSecurityTurtleneckSkirt - HeadofSecurityFormalSuit - HeadofSecurityFormalSkirt # - HeadofSecurityParadeSuit # DeltaV - removed for incongruence @@ -1113,7 +1113,6 @@ - PlateCarrier # DeltaV - DuraVest # DeltaV - StasecWinterCoatHoS # DeltaV - - StasecGreatcoatHoS # DeltaV - type: loadoutGroup # DeltaV id: HeadofSecurityShoes @@ -1142,6 +1141,8 @@ - WardenJumpskirtGrey # DeltaV - WardenJumpsuitBlue # DeltaV - WardenJumpskirtBlue # DeltaV + - WardenTurtlesuit # DeltaV + - WardenTurtleskirt # DeltaV - type: loadoutGroup id: WardenOuterClothing @@ -1152,7 +1153,6 @@ - PlateCarrier # DeltaV - DuraVest # DeltaV - StasecWinterCoatWarden # DeltaV - - StasecGreatcoatWarden # DeltaV - type: loadoutGroup id: SecurityHead @@ -1205,7 +1205,6 @@ # - SecurityOfficerWintercoat - removed for incongruence - StasecSweater # DeltaV - StasecWinterCoat # DeltaV - - StasecGreatcoat # DeltaV - type: loadoutGroup id: SecurityShoes @@ -1233,8 +1232,9 @@ name: loadout-group-detective-head minLimit: 0 loadouts: - - DetectiveFedora - - DetectiveFedoraGrey +# - DetectiveFedora # DeltaV - removed for incongruence +# - DetectiveFedoraGrey # DeltaV - removed for incongruence + - DetBeret # DeltaV - type: loadoutGroup id: DetectiveNeck @@ -1254,14 +1254,19 @@ # - NoirJumpskirt # DeltaV - removed for incongruence - ForensicSpecJumpsuit # DeltaV - ForensicSpecJumpskirt # DeltaV + - ForensicSpecTurtlesuit # DeltaV + - ForensicSpecTurtleskirt # DeltaV - type: loadoutGroup id: DetectiveOuterClothing name: loadout-group-detective-outerclothing minLimit: 0 loadouts: - - DetectiveArmorVest - - DetectiveCoat +# - DetectiveArmorVest # DeltaV - removed for incongruence +# - DetectiveCoat # DeltaV - removed for incongruence + - StasecWinterCoatDet # DeltaV + - PlateCarrier # DeltaV + - DuraVest # DeltaV - type: loadoutGroup id: SecurityCadetJumpsuit diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 8181b634335..7f6b5a81b1f 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -406,11 +406,11 @@ id: JobDetective groups: - GroupTankHarness - - SecurityHead # DeltaV - replace DetectiveHead for incongruence + - DetectiveHead - SecurityNeck # DeltaV - replace DetectiveNeck for incongruence - DetectiveJumpsuit - SecurityBackpack - - SecurityOuterClothing # DeltaV - replace DetectiveOuterClothing for incongruence + - DetectiveOuterClothing - SecurityShoes - SurvivalSecurity - Trinkets diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml index 9749a4295d2..6b22117afae 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml @@ -145,11 +145,8 @@ collection: MetalBreak - !type:SpillBehavior solution: vat_oil - - !type:SpawnEntitiesBehavior - spawn: - MachineFrameDestroyed: - min: 1 - max: 1 + - !type:ChangeConstructionNodeBehavior + node: machineFrame - type: ApcPowerReceiver powerLoad: 300 - type: Machine diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/secret_door.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/secret_door.yml deleted file mode 100644 index e6f0fae88cb..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/secret_door.yml +++ /dev/null @@ -1,81 +0,0 @@ -#reinforced secret door -- type: entity - id: ReinforcedSecretDoorAssembly - name: secret reinforced door assembly - parent: BaseSecretDoorAssembly - components: - - type: Sprite - sprite: _NF/Structures/Doors/secret_door_reinforced.rsi - state: assembly - - type: Construction - graph: ReinforcedSecretDoorGraph - node: assembly - -- type: entity - id: SolidReinforcedSecretDoor - name: reinforced wall - parent: BaseSecretDoor - components: - - type: Construction - graph: ReinforcedSecretDoorGraph - node: ReinforcedSecretDoorNode - containers: - - battery-container - - type: Sprite - sprite: _NF/Structures/Doors/secret_door_reinforced.rsi - -#wood secret door -- type: entity - id: WoodSecretDoorAssembly - name: secret wood door assembly - parent: BaseSecretDoorAssembly - components: - - type: Sprite - sprite: _NF/Structures/Doors/secret_door_wood.rsi - state: assembly - - type: Construction - graph: WoodSecretDoorGraph - node: assembly - placement: - mode: SnapgridCenter - -- type: entity - id: WoodSecretDoor - name: wood wall - parent: BaseSecretDoor - components: - - type: Sprite - sprite: _NF/Structures/Doors/secret_door_wood.rsi - - type: Construction - graph: WoodSecretDoorGraph - node: WoodSecretDoorNode - containers: - - battery-container - -#uranium secret door -- type: entity - id: UraniumSecretDoorAssembly - name: secret uranium door assembly - parent: BaseSecretDoorAssembly - components: - - type: Sprite - sprite: _NF/Structures/Doors/secret_door_uranium.rsi - state: assembly - - type: Construction - graph: UraniumSecretDoorGraph - node: assembly - placement: - mode: SnapgridCenter - -- type: entity - id: UraniumSecretDoor - name: uranium wall - parent: BaseSecretDoor - components: - - type: Sprite - sprite: _NF/Structures/Doors/secret_door_uranium.rsi - - type: Construction - graph: UraniumSecretDoorGraph - node: UraniumSecretDoorNode - containers: - - battery-container diff --git a/Resources/Prototypes/_NF/Entities/Structures/Walls/diagonal_walls.yml b/Resources/Prototypes/_NF/Entities/Structures/Walls/diagonal_walls.yml deleted file mode 100644 index 83528566b4f..00000000000 --- a/Resources/Prototypes/_NF/Entities/Structures/Walls/diagonal_walls.yml +++ /dev/null @@ -1,118 +0,0 @@ -# Base Diagonal Wall -- type: entity - abstract: true - parent: BaseStructure - id: BaseWallDiagonal - name: basewall - suffix: diagonal - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: Transform - anchored: true - - type: Clickable - - type: Tag - tags: - - Wall - - type: Sprite - drawdepth: Walls - state: state0 - - type: IconSmooth - mode: Diagonal - key: walls - base: state - - type: Icon - state: state0 - - type: Airtight - noAirWhenFullyAirBlocked: false - airBlockedDirection: - - South - - East - - type: Fixtures - fixtures: - fix1: - shape: - !type:PolygonShape - vertices: - - "-0.5,-0.5" - - "0.5,0.5" - - "0.5,-0.5" - mask: - - FullTileMask - layer: - - WallLayer - -# Wall variations -- type: entity - parent: [ WallWood, BaseWallDiagonal ] - id: WallWoodDiagonal - name: wood wall - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: Sprite - drawdepth: Walls - sprite: _NF/Structures/Walls/wood_diagonal.rsi - state: state0 - - type: IconSmooth - mode: Diagonal - key: walls - base: state - - type: Icon - sprite: _NF/Structures/Walls/wood_diagonal.rsi - state: state0 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PolygonShape - vertices: - - "-0.5,-0.5" - - "0.5,0.5" - - "0.5,-0.5" - mask: - - FullTileMask - layer: - - WallLayer - - type: Occluder - enabled: false - -- type: entity - parent: [ WallUranium, BaseWallDiagonal ] - id: WallUraniumDiagonal - name: uranium wall - placement: - mode: SnapgridCenter - snap: - - Wall - components: - - type: Sprite - drawdepth: Walls - sprite: _NF/Structures/Walls/uranium_diagonal.rsi - state: state0 - - type: IconSmooth - mode: Diagonal - key: walls - base: state - - type: Icon - sprite: _NF/Structures/Walls/uranium_diagonal.rsi - state: state0 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PolygonShape - vertices: - - "-0.5,-0.5" - - "0.5,0.5" - - "0.5,-0.5" - mask: - - FullTileMask - layer: - - WallLayer - - type: Occluder - enabled: false diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/structures/secretdoor.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/structures/secretdoor.yml deleted file mode 100644 index b54c267ec00..00000000000 --- a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/structures/secretdoor.yml +++ /dev/null @@ -1,251 +0,0 @@ -- type: constructionGraph - id: ReinforcedSecretDoorGraph - start: start - graph: - - node: start - edges: - - to: assembly - completed: - - !type:SetAnchor - value: false - steps: - - material: Steel - amount: 4 - doAfter: 4 - - material: Plasteel - amount: 4 - doAfter: 4 - - material: MetalRod - amount: 4 - doAfter: 4 - - node: assembly - entity: ReinforcedSecretDoorAssembly - actions: - - !type:SnapToGrid {} - - !type:SetAnchor {} - edges: - - to: wired - conditions: - - !type:EntityAnchored {} - steps: - - material: Cable - amount: 4 - doAfter: 2.5 - - to: start - conditions: - - !type:EntityAnchored - anchored: false - completed: - - !type:SpawnPrototype - prototype: SheetSteel1 - amount: 2 - - !type:SpawnPrototype - prototype: SheetPlasteel1 - amount: 2 - - !type:DeleteEntity {} - steps: - - tool: Welding - doAfter: 3 - - node: wired - entity: ReinforcedSecretDoorAssembly - edges: - - to: electronics - steps: - - component: PowerCell - name: power cell - store: battery-container - icon: - sprite: Objects/Power/power_cells.rsi - state: small - doAfter: 1 - - to: assembly - completed: - - !type:GivePrototype - prototype: CableApcStack1 - amount: 4 - steps: - - tool: Cutting - doAfter: 2 - - node: electronics - entity: ReinforcedSecretDoorAssembly - edges: - - to: ReinforcedSecretDoorNode - steps: - - tool: Screwing - doAfter: 2 - - node: ReinforcedSecretDoorNode - entity: SolidReinforcedSecretDoor - edges: - - to: wired - conditions: - - !type:EntityAnchored {} - - !type:DoorWelded {} - completed: - - !type:EmptyAllContainers {} - steps: - - tool: Prying - doAfter: 5 - -- type: constructionGraph - id: WoodSecretDoorGraph - start: start - graph: - - node: start - edges: - - to: assembly - completed: - - !type:SetAnchor - value: false - steps: - - material: WoodPlank - amount: 4 - doAfter: 4 - - material: MetalRod - amount: 4 - doAfter: 4 - - node: assembly - entity: WoodSecretDoorAssembly - actions: - - !type:SnapToGrid {} - - !type:SetAnchor {} - edges: - - to: wired - conditions: - - !type:EntityAnchored {} - steps: - - material: Cable - amount: 4 - doAfter: 2.5 - - to: start - conditions: - - !type:EntityAnchored - anchored: false - completed: - - !type:SpawnPrototype - prototype: MaterialWoodPlank1 - amount: 4 - - !type:DeleteEntity {} - steps: - - tool: Welding - doAfter: 3 - - node: wired - entity: WoodSecretDoorAssembly - edges: - - to: electronics - steps: - - component: PowerCell - name: power cell - store: battery-container - icon: - sprite: Objects/Power/power_cells.rsi - state: small - doAfter: 1 - - to: assembly - completed: - - !type:GivePrototype - prototype: CableApcStack1 - amount: 4 - steps: - - tool: Cutting - doAfter: 2 - - node: electronics - entity: WoodSecretDoorAssembly - edges: - - to: WoodSecretDoorNode - steps: - - tool: Screwing - doAfter: 2 - - node: WoodSecretDoorNode - entity: WoodSecretDoor - edges: - - to: wired - conditions: - - !type:EntityAnchored {} - - !type:DoorWelded {} - completed: - - !type:EmptyAllContainers {} - steps: - - tool: Prying - doAfter: 5 - -- type: constructionGraph - id: UraniumSecretDoorGraph - start: start - graph: - - node: start - edges: - - to: assembly - completed: - - !type:SetAnchor - value: false - steps: - - material: Uranium - amount: 4 - doAfter: 4 - - material: MetalRod - amount: 4 - doAfter: 4 - - node: assembly - entity: UraniumSecretDoorAssembly - actions: - - !type:SnapToGrid {} - - !type:SetAnchor {} - edges: - - to: wired - conditions: - - !type:EntityAnchored {} - steps: - - material: Cable - amount: 4 - doAfter: 2.5 - - to: start - conditions: - - !type:EntityAnchored - anchored: false - completed: - - !type:SpawnPrototype - prototype: SheetUranium1 - amount: 4 - - !type:DeleteEntity {} - steps: - - tool: Welding - doAfter: 3 - - node: wired - entity: UraniumSecretDoorAssembly - edges: - - to: electronics - steps: - - component: PowerCell - name: power cell - store: battery-container - icon: - sprite: Objects/Power/power_cells.rsi - state: small - doAfter: 1 - - to: assembly - completed: - - !type:GivePrototype - prototype: CableApcStack1 - amount: 4 - steps: - - tool: Cutting - doAfter: 2 - - node: electronics - entity: UraniumSecretDoorAssembly - edges: - - to: UraniumSecretDoorNode - steps: - - tool: Screwing - doAfter: 2 - - node: UraniumSecretDoorNode - entity: UraniumSecretDoor - edges: - - to: wired - conditions: - - !type:EntityAnchored {} - - !type:DoorWelded {} - completed: - - !type:EmptyAllContainers {} - steps: - - tool: Prying - doAfter: 5 diff --git a/Resources/Prototypes/_NF/Recipes/Construction/structures.yml b/Resources/Prototypes/_NF/Recipes/Construction/structures.yml deleted file mode 100644 index dd5fd22c6e7..00000000000 --- a/Resources/Prototypes/_NF/Recipes/Construction/structures.yml +++ /dev/null @@ -1,50 +0,0 @@ -- type: construction - name: reinforced secret door - id: SolidReinforcedSecretDoorConstruction - graph: ReinforcedSecretDoorGraph - startNode: start - targetNode: ReinforcedSecretDoorNode - category: construction-category-structures - description: A secret door for the wall. - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - icon: - sprite: _NF/Structures/Doors/secret_door_reinforced.rsi - state: closed - conditions: - - !type:TileNotBlocked - -- type: construction - name: wood secret door - id: WoodSecretDoorConstruction - graph: WoodSecretDoorGraph - startNode: start - targetNode: WoodSecretDoorNode - category: construction-category-structures - description: A secret door for the wall. - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - icon: - sprite: _NF/Structures/Doors/secret_door_wood.rsi - state: closed - conditions: - - !type:TileNotBlocked - -- type: construction - name: uranium secret door - id: UraniumSecretDoorConstruction - graph: UraniumSecretDoorGraph - startNode: start - targetNode: UraniumSecretDoorNode - category: construction-category-structures - description: A secret door for the wall. - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - icon: - sprite: _NF/Structures/Doors/secret_door_uranium.rsi - state: closed - conditions: - - !type:TileNotBlocked \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/Mobs/Diona.xml b/Resources/ServerInfo/Guidebook/Mobs/Diona.xml index eedf23b14f2..890efb356d3 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Diona.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Diona.xml @@ -6,7 +6,7 @@ They can't wear shoes, but are not slowed by Kudzu. - They get hungry and thirsty slower. + They get hungry slower and thirsty faster. Their "blood" is tree sap and can't be metabolised from Iron. Being plants, Weed Killer poisons them, while Robust Harvest heals them (but not without risk when overused!) diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..48c56cd6750 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/icon.png new file mode 100644 index 00000000000..6bf993c708f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-left.png new file mode 100644 index 00000000000..f170e5e2c4e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-right.png new file mode 100644 index 00000000000..921befb3ff6 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/meta.json new file mode 100644 index 00000000000..0b2e116c645 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_det.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi/equipped-OUTERCLOTHING.png index 020cba2a873..4353e774c00 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi/icon.png index 55731fcae25..bd9f40050b7 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi/icon.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/armourercoat.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..1d8343408d3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/icon.png new file mode 100644 index 00000000000..3c6baa9826f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/inhand-left.png new file mode 100644 index 00000000000..40b2530a17f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/inhand-right.png new file mode 100644 index 00000000000..1c7979dd1a1 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/meta.json new file mode 100644 index 00000000000..5c6ea2d1ef5 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpsmancoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..e3140e56391 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/icon.png new file mode 100644 index 00000000000..8346b09e7e0 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/inhand-left.png new file mode 100644 index 00000000000..40b2530a17f Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/inhand-right.png new file mode 100644 index 00000000000..1c7979dd1a1 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/meta.json new file mode 100644 index 00000000000..5c6ea2d1ef5 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/detcoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/hoscoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/hoscoat.rsi/equipped-OUTERCLOTHING.png index f901627c4be..3e4a60ba6f3 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/hoscoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/hoscoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/hoscoat.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/hoscoat.rsi/icon.png index f280cbb3bfc..109b15f31bf 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/hoscoat.rsi/icon.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/hoscoat.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/staseccoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/staseccoat.rsi/equipped-OUTERCLOTHING.png index 9932b889343..8f98501808c 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/staseccoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/staseccoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/staseccoat.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/staseccoat.rsi/icon.png index f504fd0c7c9..d1746a61db6 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/staseccoat.rsi/icon.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/staseccoat.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/equipped-OUTERCLOTHING.png index a776184398a..2a0b09fc075 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png index ccec2493f64..de10ebafd2d 100644 Binary files a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png and b/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..3025c109020 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/icon.png new file mode 100644 index 00000000000..a8db587aab3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/inhand-left.png new file mode 100644 index 00000000000..e435949e0da Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/inhand-right.png new file mode 100644 index 00000000000..039cc1fd356 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..32a79d8054b Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/armourer_alt.rsi/rolled-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..2d6b1f2739e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/icon.png new file mode 100644 index 00000000000..258401dc4ca Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/inhand-left.png new file mode 100644 index 00000000000..1f07a4271bc Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/inhand-right.png new file mode 100644 index 00000000000..aca67e73835 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..6a803250e61 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic_alt.rsi/rolled-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..901251c5891 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/icon.png new file mode 100644 index 00000000000..ad4965b1970 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/inhand-left.png new file mode 100644 index 00000000000..603ac15e811 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/inhand-right.png new file mode 100644 index 00000000000..aabe0f3a79d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..e7c2600368e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/detective_alt.rsi/rolled-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..81930232ff3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png new file mode 100644 index 00000000000..635eb5e1322 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-left.png new file mode 100644 index 00000000000..d73e872ccff Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-right.png new file mode 100644 index 00000000000..b7b752f01e3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..7af7311a7ae Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/rolled-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..65eb5e5fb80 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/icon.png new file mode 100644 index 00000000000..66118f2fdc3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/inhand-left.png new file mode 100644 index 00000000000..e435949e0da Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/inhand-right.png new file mode 100644 index 00000000000..039cc1fd356 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..1dd9575b96e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi/rolled-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..9e46ed7b330 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/icon.png new file mode 100644 index 00000000000..e266077fb89 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/inhand-left.png new file mode 100644 index 00000000000..1f07a4271bc Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/inhand-right.png new file mode 100644 index 00000000000..aca67e73835 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..6dfd0af7c38 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi/rolled-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..7907e0e543c Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/icon.png new file mode 100644 index 00000000000..feecd435a3e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/inhand-left.png new file mode 100644 index 00000000000..603ac15e811 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/inhand-right.png new file mode 100644 index 00000000000..aabe0f3a79d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..a591968dd37 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi/rolled-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..9468844dc02 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png new file mode 100644 index 00000000000..f0a6bc8f174 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png new file mode 100644 index 00000000000..d73e872ccff Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-right.png new file mode 100644 index 00000000000..b7b752f01e3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..2ebe09f87fd Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/rolled-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/checkerNESW.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/checkerNESW.png deleted file mode 100644 index 845f5b424b9..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/checkerNESW.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/checkerNWSE.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/checkerNWSE.png deleted file mode 100644 index 6b897771f28..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/checkerNWSE.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal.png deleted file mode 100644 index d6f22b645a0..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png deleted file mode 100644 index 8d55de009e0..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png deleted file mode 100644 index ddc2abc4acf..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/fulltile_overlay.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/fulltile_overlay.png deleted file mode 100644 index 0b7d604bde8..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/fulltile_overlay.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay.png deleted file mode 100644 index ce50ddfca4d..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png deleted file mode 100644 index b3fdf5edab3..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png deleted file mode 100644 index ddbc67b6dfe..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png deleted file mode 100644 index 93fced6eed4..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/meta.json b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/meta.json deleted file mode 100644 index 9d2204a0708..00000000000 --- a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/meta.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-SA-3.0", - "copyright": "mirrorcult, texturized by aexxie, diagonal / quartertile / halftile / fulltile / checker modified by Adeinitas of Delta-V to go with the paradise artstyle", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "fulltile_overlay" - }, - { - "name": "halftile_overlay" - }, - { - "name": "halftile_overlay_90" - }, - { - "name": "halftile_overlay_180" - }, - { - "name": "halftile_overlay_270" - }, - { - "name": "quartertile_overlay" - }, - { - "name": "quartertile_overlay_90" - }, - { - "name": "quartertile_overlay_180" - }, - { - "name": "quartertile_overlay_270" - }, - { - "name": "threequartertile_overlay" - }, - { - "name": "threequartertile_overlay_90" - }, - { - "name": "threequartertile_overlay_180" - }, - { - "name": "threequartertile_overlay_270" - }, - { - "name": "checkerNESW" - }, - { - "name": "checkerNWSE" - }, - { - "name": "diagonal" - }, - { - "name": "diagonal_checker_a" - }, - { - "name": "diagonal_checker_b" - } - ] - } - \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay.png deleted file mode 100644 index 866343f5dca..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png deleted file mode 100644 index 516b0765294..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png deleted file mode 100644 index 4b1071b67ef..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png deleted file mode 100644 index 542426c90a0..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png deleted file mode 100644 index 449069e70db..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png deleted file mode 100644 index d1a73b251d4..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png deleted file mode 100644 index 28d47935ef4..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png b/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png deleted file mode 100644 index 4d786df12af..00000000000 Binary files a/Resources/Textures/DeltaV/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/chapel.png b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/chapel.png new file mode 100644 index 00000000000..587fa467233 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/chapel.png differ diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json index ab3feb6715c..13aab65cbce 100644 --- a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers | direction_court, direction_justice by leonardo_dabepis (Discord)", + "copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers | direction_court, direction_justice by leonardo_dabepis (Discord) | chapel modified from upstream sprite by Lyndomen (github)", "size": { "x": 32, "y": 32 @@ -22,6 +22,9 @@ { "name": "direction_justice", "directions": 4 + }, + { + "name": "chapel" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/DeltaV/Tiles/attributions.yml b/Resources/Textures/DeltaV/Tiles/attributions.yml index 343e8e95232..0e0fc5cfa1c 100644 --- a/Resources/Textures/DeltaV/Tiles/attributions.yml +++ b/Resources/Textures/DeltaV/Tiles/attributions.yml @@ -23,7 +23,7 @@ - files: ["wood.png"] license: "CC-BY-SA-3.0" - copyright: "Taken from https://github.com/ParadiseSS13/Paradise/. Modified by Aikakakah." + copyright: "Taken from https://github.com/ParadiseSS13/Paradise/" source: "https://github.com/ParadiseSS13/Paradise/" - files: ["super_reinforced.png"] @@ -53,15 +53,15 @@ - files: ["steel_maint.png", "grating_maint.png", "wood_tile.png"] license: "CC-BY-SA-3.0" - copyright: "Taken from https://github.com/ParadiseSS13/Paradise/. wood_tile Modified by Aikakakah." + copyright: "Taken from https://github.com/ParadiseSS13/Paradise/" source: "https://github.com/ParadiseSS13/Paradise/" - files: ["wood_broken.png"] license: "CC-BY-SA-3.0" - copyright: "Taken from https://github.com/ParadiseSS13/Paradise/. Modified by Aikakakah" + copyright: "Taken from https://github.com/ParadiseSS13/Paradise/" source: "https://github.com/ParadiseSS13/Paradise" - files: ["wood_large.png"] license: "CC0-1.0" - copyright: "Taken from https://github.com/ParadiseSS13/Paradise/. Modified by Aikakakah" + copyright: "Taken from https://github.com/ParadiseSS13/Paradise/" source: "https://github.com/ParadiseSS13/Paradise/" diff --git a/Resources/Textures/DeltaV/Tiles/wood.png b/Resources/Textures/DeltaV/Tiles/wood.png index 97bc02093b7..56e745a42cb 100644 Binary files a/Resources/Textures/DeltaV/Tiles/wood.png and b/Resources/Textures/DeltaV/Tiles/wood.png differ diff --git a/Resources/Textures/DeltaV/Tiles/wood_broken.png b/Resources/Textures/DeltaV/Tiles/wood_broken.png index d4b3135ec0a..bc653c3f7cb 100644 Binary files a/Resources/Textures/DeltaV/Tiles/wood_broken.png and b/Resources/Textures/DeltaV/Tiles/wood_broken.png differ diff --git a/Resources/Textures/DeltaV/Tiles/wood_large.png b/Resources/Textures/DeltaV/Tiles/wood_large.png index 437c3859f26..e9ecaad5aa6 100644 Binary files a/Resources/Textures/DeltaV/Tiles/wood_large.png and b/Resources/Textures/DeltaV/Tiles/wood_large.png differ diff --git a/Resources/Textures/DeltaV/Tiles/wood_tile.png b/Resources/Textures/DeltaV/Tiles/wood_tile.png index bee2ac2d830..db75301576d 100644 Binary files a/Resources/Textures/DeltaV/Tiles/wood_tile.png and b/Resources/Textures/DeltaV/Tiles/wood_tile.png differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/assembly.png deleted file mode 100644 index c5e502d1f9d..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/assembly.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closed.png deleted file mode 100644 index e677fb00249..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closed.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closing.png deleted file mode 100644 index c96b6ab401b..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/closing.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/meta.json b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/meta.json deleted file mode 100644 index c1f0d5e09ec..00000000000 --- a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/meta.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "assembly" - }, - { - "name": "closed", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "closing", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "open", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "opening", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/open.png deleted file mode 100644 index 71f56ae15b1..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/open.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/opening.png deleted file mode 100644 index 8d14635c6de..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_reinforced.rsi/opening.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/assembly.png deleted file mode 100644 index a32da6cdb7c..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/assembly.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closed.png deleted file mode 100644 index 680aee0efdd..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closed.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closing.png deleted file mode 100644 index 916e062da27..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/closing.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/meta.json b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/meta.json deleted file mode 100644 index c1f0d5e09ec..00000000000 --- a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/meta.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "assembly" - }, - { - "name": "closed", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "closing", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "open", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "opening", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/open.png deleted file mode 100644 index bd6c53c076a..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/open.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/opening.png deleted file mode 100644 index 10f1d3103fc..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_shuttle.rsi/opening.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/assembly.png deleted file mode 100644 index a4835963628..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/assembly.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closed.png deleted file mode 100644 index 12b9ac2d1d5..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closed.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closing.png deleted file mode 100644 index 65089f40cb0..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/closing.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/meta.json b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/meta.json deleted file mode 100644 index c1f0d5e09ec..00000000000 --- a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/meta.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "assembly" - }, - { - "name": "closed", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "closing", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "open", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "opening", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/open.png deleted file mode 100644 index 5652978135c..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/open.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/opening.png deleted file mode 100644 index 29f1e96e76f..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_uranium.rsi/opening.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/assembly.png deleted file mode 100644 index 0c3c643ed22..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/assembly.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closed.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closed.png deleted file mode 100644 index 5ff2725b0fe..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closed.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closing.png deleted file mode 100644 index 5638d3aabb1..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/closing.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/meta.json b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/meta.json deleted file mode 100644 index c1f0d5e09ec..00000000000 --- a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/meta.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "assembly" - }, - { - "name": "closed", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "closing", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "open", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] - }, - { - "name": "opening", - "directions": 1, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/open.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/open.png deleted file mode 100644 index 4c56ed292e6..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/open.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/opening.png b/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/opening.png deleted file mode 100644 index 9bb4c9e4512..00000000000 Binary files a/Resources/Textures/_NF/Structures/Doors/secret_door_wood.rsi/opening.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/meta.json b/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/meta.json deleted file mode 100644 index 30760f072aa..00000000000 --- a/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by erhardsteinhauer (discord) for Space Station 14 New Frontier server", - "states": [ - { - "name": "state0" - }, - { - "name": "state1" - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/state0.png b/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/state0.png deleted file mode 100644 index d437ad8b738..00000000000 Binary files a/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/state0.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/state1.png b/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/state1.png deleted file mode 100644 index a0ce5d516e8..00000000000 Binary files a/Resources/Textures/_NF/Structures/Walls/solid_reinforced_diagonal.rsi/state1.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi/meta.json b/Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi/meta.json deleted file mode 100644 index 30760f072aa..00000000000 --- a/Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by erhardsteinhauer (discord) for Space Station 14 New Frontier server", - "states": [ - { - "name": "state0" - }, - { - "name": "state1" - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi/state0.png b/Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi/state0.png deleted file mode 100644 index 7be0038f527..00000000000 Binary files a/Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi/state0.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi/state1.png b/Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi/state1.png deleted file mode 100644 index 7be0038f527..00000000000 Binary files a/Resources/Textures/_NF/Structures/Walls/uranium_diagonal.rsi/state1.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi/meta.json b/Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi/meta.json deleted file mode 100644 index 30760f072aa..00000000000 --- a/Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Sprited by erhardsteinhauer (discord) for Space Station 14 New Frontier server", - "states": [ - { - "name": "state0" - }, - { - "name": "state1" - } - ] -} diff --git a/Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi/state0.png b/Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi/state0.png deleted file mode 100644 index b9c2a97a1d6..00000000000 Binary files a/Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi/state0.png and /dev/null differ diff --git a/Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi/state1.png b/Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi/state1.png deleted file mode 100644 index 56f7cc2ff6d..00000000000 Binary files a/Resources/Textures/_NF/Structures/Walls/wood_diagonal.rsi/state1.png and /dev/null differ diff --git a/Resources/mapping_actions_alarms.yml b/Resources/mapping_actions_alarms.yml new file mode 100644 index 00000000000..ce569d7d052 --- /dev/null +++ b/Resources/mapping_actions_alarms.yml @@ -0,0 +1,139 @@ +- action: !type:InstantActionComponent + icon: + entity: AirAlarm + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: AirAlarm + assignments: + - 0: 1 + name: Air Alarm +- action: !type:InstantActionComponent + icon: + entity: FireAlarm + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: FireAlarm + assignments: + - 0: 2 + name: Fire Alarm +- action: !type:InstantActionComponent + icon: + entity: AirSensor + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: AirSensor + assignments: + - 0: 3 + name: Air Sensor +- action: !type:InstantActionComponent + icon: + entity: Firelock + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: Firelock + assignments: + - 0: 4 + name: Firelock +- action: !type:InstantActionComponent + icon: + entity: FirelockGlass + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: FirelockGlass + assignments: + - 0: 5 + name: Firelock Glass +- action: !type:InstantActionComponent + icon: + entity: FirelockEdge + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: FirelockEdge + assignments: + - 0: 6 + name: Firelock Edge +- action: !type:InstantActionComponent + icon: + entity: Multitool + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: Multitool + assignments: + - 0: 7 + name: Multitool +- action: !type:InstantActionComponent + icon: + entity: GasVentScrubber + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasVentScrubber + assignments: + - 0: 8 + name: Gas Vent Scrubber +- action: !type:InstantActionComponent + icon: + entity: GasVentPump + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasVentPump + assignments: + - 0: 9 + name: Gas Vent Pump +- action: !type:InstantActionComponent + icon: Interface/VerbIcons/delete.svg.192dpi.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + eraser: True + assignments: + - 0: 0 + name: action-name-mapping-erase +... diff --git a/Resources/mapping_actions_deltav.yml b/Resources/mapping_actions_deltav.yml new file mode 100644 index 00000000000..2cf8994595d --- /dev/null +++ b/Resources/mapping_actions_deltav.yml @@ -0,0 +1,136 @@ +- action: !type:InstantActionComponent + icon: + entity: WallSolid + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: WallSolid + assignments: + - 0: 1 + name: Wall Solid +- action: !type:InstantActionComponent + icon: + entity: WallReinforced + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: WallReinforced + assignments: + - 0: 2 + name: WallReinforced +- action: !type:InstantActionComponent + icon: + entity: Window + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: Window + assignments: + - 0: 3 + name: Window +- action: !type:InstantActionComponent + icon: + entity: ReinforcedWindow + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: ReinforcedWindow + assignments: + - 0: 4 + name: ReinforcedWindow +- action: !type:InstantActionComponent + icon: + entity: Grille + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: Grille + assignments: + - 0: 5 + name: Grille +- action: !type:InstantActionComponent + icon: /Textures/Tiles/steel.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: AlignTileAny + tileId: FloorSteel + assignments: + - 0: 6 + name: steel floor +- action: !type:InstantActionComponent + icon: + entity: Firelock + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: Firelock + assignments: + - 0: 7 + name: Firelock +- action: !type:InstantActionComponent + icon: /Textures/Tiles/plating.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: AlignTileAny + tileId: Plating + assignments: + - 0: 8 + name: plating +- action: !type:InstantActionComponent + icon: /Textures/Tiles/cropped_parallax.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: AlignTileAny + tileId: Space + assignments: + - 0: 9 + name: space +- action: !type:InstantActionComponent + icon: Interface/VerbIcons/delete.svg.192dpi.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + eraser: True + assignments: + - 0: 0 + name: action-name-mapping-erase +... diff --git a/Resources/mapping_actions_disposals.yml b/Resources/mapping_actions_disposals.yml new file mode 100644 index 00000000000..bcccbefc17e --- /dev/null +++ b/Resources/mapping_actions_disposals.yml @@ -0,0 +1,140 @@ + +- action: !type:InstantActionComponent + icon: + entity: DisposalUnit + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalUnit + assignments: + - 0: 1 + name: Disposal Unit +- action: !type:InstantActionComponent + icon: + entity: DisposalTrunk + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalTrunk + assignments: + - 0: 2 + name: Disposal Trunk +- action: !type:InstantActionComponent + icon: + entity: DisposalPipe + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalPipe + assignments: + - 0: 3 + name: Disposal Pipe +- action: !type:InstantActionComponent + icon: + entity: DisposalBend + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalBend + assignments: + - 0: 4 + name: Disposal Bend +- action: !type:InstantActionComponent + icon: + entity: DisposalJunction + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalJunction + assignments: + - 0: 5 + name: Disposal Junction +- action: !type:InstantActionComponent + icon: + entity: DisposalJunctionFlipped + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalJunctionFlipped + assignments: + - 0: 6 + name: Disposal Junction Flipped +- action: !type:InstantActionComponent + icon: + entity: DisposalYJunction + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalYJunction + assignments: + - 0: 7 + name: Disposal Y-Junction +- action: !type:InstantActionComponent + icon: + entity: DisposalTagger + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: DisposalTagger + assignments: + - 0: 8 + name: Disposal Tagger +- action: !type:InstantActionComponent + icon: + entity: SignDisposalSpace + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: SignDisposalSpace + assignments: + - 0: 9 + name: Sign Disposal Space +- action: !type:InstantActionComponent + icon: Interface/VerbIcons/delete.svg.192dpi.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + eraser: True + assignments: + - 0: 0 + name: action-name-mapping-erase +... diff --git a/Resources/mapping_actions_pipes.yml b/Resources/mapping_actions_pipes.yml new file mode 100644 index 00000000000..5799fead740 --- /dev/null +++ b/Resources/mapping_actions_pipes.yml @@ -0,0 +1,139 @@ +- action: !type:InstantActionComponent + icon: + entity: GasPipeStraight + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasPipeStraight + assignments: + - 0: 1 + name: Gas Pipe Straight +- action: !type:InstantActionComponent + icon: + entity: GasPipeBend + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasPipeBend + assignments: + - 0: 2 + name: Gas Pipe Bend +- action: !type:InstantActionComponent + icon: + entity: GasPipeTJunction + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasPipeTJunction + assignments: + - 0: 3 + name: Gas Pipe T-Junction +- action: !type:InstantActionComponent + icon: + entity: GasPipeFourway + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasPipeFourway + assignments: + - 0: 4 + name: Gas Pipe Fourway +- action: !type:InstantActionComponent + icon: + entity: GasVentScrubber + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasVentScrubber + assignments: + - 0: 5 + name: Gas Vent Scrubber +- action: !type:InstantActionComponent + icon: + entity: GasVentPump + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasVentPump + assignments: + - 0: 6 + name: Gas Vent Pump +- action: !type:InstantActionComponent + icon: + entity: GasVolumePump + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasVolumePump + assignments: + - 0: 7 + name: Gas Volume Pump +- action: !type:InstantActionComponent + EntityIcon: + entity: GasPort + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasPort + assignments: + - 0: 8 + name: Gas Port +- action: !type:InstantActionComponent + icon: + entity: GasPressurePump + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: GasPressurePump + assignments: + - 0: 9 + name: Gas Pressure Pump +- action: !type:InstantActionComponent + icon: Interface/VerbIcons/delete.svg.192dpi.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + eraser: True + assignments: + - 0: 0 + name: action-name-mapping-erase +... diff --git a/Resources/mapping_actions_power.yml b/Resources/mapping_actions_power.yml new file mode 100644 index 00000000000..f1e59b9789b --- /dev/null +++ b/Resources/mapping_actions_power.yml @@ -0,0 +1,139 @@ +- action: !type:InstantActionComponent + icon: + entity: APCBasic + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: APCBasic + assignments: + - 0: 1 + name: APC Basic +- action: !type:InstantActionComponent + icon: + entity: CableApcExtension + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: CableApcExtension + assignments: + - 0: 2 + name: Cable ApcExtension +- action: !type:InstantActionComponent + icon: + entity: CableMV + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: CableMV + assignments: + - 0: 3 + name: Cable MV +- action: !type:InstantActionComponent + icon: + entity: CableHV + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: CableHV + assignments: + - 0: 4 + name: Cable HV +- action: !type:InstantActionComponent + icon: + entity: SubstationBasic + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: SubstationBasic + assignments: + - 0: 5 + name: Substation Basic +- action: !type:InstantActionComponent + icon: + entity: SMESBasic + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: SMESBasic + assignments: + - 0: 6 + name: SMES Basic +- action: !type:InstantActionComponent + icon: + entity: CableTerminal + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: CableTerminal + assignments: + - 0: 7 + name: Cable Terminal +- action: !type:InstantActionComponent + icon: + entity: Poweredlight + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: Poweredlight + assignments: + - 0: 8 + name: Powered light +- action: !type:InstantActionComponent + icon: + entity: PoweredSmallLightMaintenance + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + placementOption: SnapgridCenter + entityType: PoweredSmallLightMaintenance + assignments: + - 0: 9 + name: Small Light Maintenance +- action: !type:InstantActionComponent + icon: Interface/VerbIcons/delete.svg.192dpi.png + keywords: [] + checkCanInteract: False + clientExclusive: True + autoPopulate: False + temporary: True + event: !type:StartPlacementActionEvent + eraser: True + assignments: + - 0: 0 + name: action-name-mapping-erase +...