diff --git a/Content.Client/Jittering/JitteringSystem.cs b/Content.Client/Jittering/JitteringSystem.cs index 185bd490d3b..aafaf318bb9 100644 --- a/Content.Client/Jittering/JitteringSystem.cs +++ b/Content.Client/Jittering/JitteringSystem.cs @@ -45,7 +45,7 @@ private void OnShutdown(EntityUid uid, JitteringComponent jittering, ComponentSh private void OnAnimationCompleted(EntityUid uid, JitteringComponent jittering, AnimationCompletedEvent args) { - if(args.Key != _jitterAnimationKey) + if (args.Key != _jitterAnimationKey || jittering.LifeStage >= ComponentLifeStage.Stopping) return; if (TryComp(uid, out AnimationPlayerComponent? animationPlayer) diff --git a/Content.Server/Clothing/Systems/LoadoutSystem.Functions.cs b/Content.Server/Clothing/Systems/LoadoutSystem.Functions.cs new file mode 100644 index 00000000000..99ca8b15c28 --- /dev/null +++ b/Content.Server/Clothing/Systems/LoadoutSystem.Functions.cs @@ -0,0 +1,30 @@ +using JetBrains.Annotations; +using Robust.Shared.Serialization.Manager; +using Content.Shared.Clothing.Loadouts.Prototypes; +using Content.Server.NPC.Components; +using Content.Server.NPC.Systems; +using Content.Server.NPC.HTN; +using Content.Server.NPC; +using Robust.Shared.Map; +using System.Numerics; + +namespace Content.Server.Clothing.Systems; + +[UsedImplicitly] +public sealed partial class LoadoutMakeFollower : LoadoutFunction +{ + public override void OnPlayerSpawn(EntityUid character, + EntityUid loadoutEntity, + IComponentFactory factory, + IEntityManager entityManager, + ISerializationManager serializationManager) + { + var npc = entityManager.System(); + var htn = entityManager.System(); + if (!entityManager.TryGetComponent(loadoutEntity, out var hTNComponent)) + return; + + npc.SetBlackboard(loadoutEntity, NPCBlackboard.FollowTarget, new EntityCoordinates(character, Vector2.Zero), hTNComponent); + htn.Replan(hTNComponent); + } +} diff --git a/Content.Server/Clothing/Systems/LoadoutSystem.cs b/Content.Server/Clothing/Systems/LoadoutSystem.cs index 1527db0be85..4c357c58642 100644 --- a/Content.Server/Clothing/Systems/LoadoutSystem.cs +++ b/Content.Server/Clothing/Systems/LoadoutSystem.cs @@ -13,7 +13,6 @@ using Content.Shared.Storage; using Content.Shared.Storage.EntitySystems; using Content.Shared.Traits.Assorted.Components; -using Content.Shared.Whitelist; using Robust.Shared.Configuration; using Robust.Shared.Prototypes; using Robust.Shared.Random; @@ -33,6 +32,7 @@ public sealed class LoadoutSystem : EntitySystem [Dependency] private readonly IPrototypeManager _protoMan = default!; [Dependency] private readonly ISerializationManager _serialization = default!; [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly IComponentFactory _componentFactory = default!; public override void Initialize() @@ -103,6 +103,9 @@ public void ApplyCharacterLoadout( comp.Owner = loadout.Item1; EntityManager.AddComponent(loadout.Item1, comp); } + + foreach (var function in loadoutProto.Functions) + function.OnPlayerSpawn(uid, loadout.Item1, _componentFactory, EntityManager, _serialization); } diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs index 75771a57432..7a028b381ad 100644 --- a/Content.Server/Traits/TraitSystem.cs +++ b/Content.Server/Traits/TraitSystem.cs @@ -1,14 +1,23 @@ using System.Linq; +using Content.Server.Administration.Logs; +using Content.Server.Administration.Systems; +using Content.Server.Chat.Managers; using Content.Server.GameTicking; using Content.Server.Players.PlayTimeTracking; +using Content.Shared.CCVar; +using Content.Shared.Chat; using Content.Shared.Customization.Systems; +using Content.Shared.Database; using Content.Shared.Players; using Content.Shared.Roles; using Content.Shared.Traits; +using Robust.Server.Player; using Robust.Shared.Configuration; using Robust.Shared.Prototypes; +using Robust.Shared.Random; using Robust.Shared.Serialization.Manager; using Robust.Shared.Utility; +using Timer = Robust.Shared.Timing.Timer; namespace Content.Server.Traits; @@ -20,6 +29,11 @@ public sealed class TraitSystem : EntitySystem [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!; [Dependency] private readonly IConfigurationManager _configuration = default!; [Dependency] private readonly IComponentFactory _componentFactory = default!; + [Dependency] private readonly IAdminLogManager _adminLog = default!; + [Dependency] private readonly AdminSystem _adminSystem = default!; + [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly IChatManager _chatManager = default!; public override void Initialize() { @@ -31,6 +45,9 @@ public override void Initialize() // When the player is spawned in, add all trait components selected during character creation private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args) { + var pointsTotal = _configuration.GetCVar(CCVars.GameTraitsDefaultPoints); + var traitSelections = _configuration.GetCVar(CCVars.GameTraitsMax); + foreach (var traitId in args.Profile.TraitPreferences) { if (!_prototype.TryIndex(traitId, out var traitPrototype)) @@ -47,8 +64,15 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args) out _)) continue; + // To check for cheaters. :FaridaBirb.png: + pointsTotal += traitPrototype.Points; + --traitSelections; + AddTrait(args.Mob, traitPrototype); } + + if (pointsTotal < 0 || traitSelections < 0) + PunishCheater(args.Mob); } /// @@ -59,4 +83,41 @@ public void AddTrait(EntityUid uid, TraitPrototype traitPrototype) foreach (var function in traitPrototype.Functions) function.OnPlayerSpawn(uid, _componentFactory, EntityManager, _serialization); } + + /// + /// On a non-cheating client, it's not possible to save a character with a negative number of traits. This can however + /// trigger incorrectly if a character was saved, and then at a later point in time an admin changes the traits Cvars to reduce the points. + /// Or if the points costs of traits is increased. + /// + private void PunishCheater(EntityUid uid) + { + _adminLog.Add(LogType.AdminMessage, LogImpact.High, + $"{ToPrettyString(uid):entity} attempted to spawn with an invalid trait list. This might be a mistake, or they might be cheating"); + + if (!_configuration.GetCVar(CCVars.TraitsPunishCheaters) + || !_playerManager.TryGetSessionByEntity(uid, out var targetPlayer)) + return; + + // For maximum comedic effect, this is plenty of time for the cheater to get on station and start interacting with people. + var timeToDestroy = _random.NextFloat(120, 360); + + Timer.Spawn(TimeSpan.FromSeconds(timeToDestroy), () => VaporizeCheater(targetPlayer)); + } + + /// + /// https://www.youtube.com/watch?v=X2QMN0a_TrA + /// + private void VaporizeCheater (Robust.Shared.Player.ICommonSession targetPlayer) + { + _adminSystem.Erase(targetPlayer); + + var feedbackMessage = $"[font size=24][color=#ff0000]{"You have spawned in with an illegal trait point total. If this was a result of cheats, then your nonexistence is a skill issue. Otherwise, feel free to click 'Return To Lobby', and fix your trait selections."}[/color][/font]"; + _chatManager.ChatMessageToOne( + ChatChannel.Emotes, + feedbackMessage, + feedbackMessage, + EntityUid.Invalid, + false, + targetPlayer.Channel); + } } diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 427e6efe44c..349a6732e7b 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -381,6 +381,13 @@ public static readonly CVarDef public static readonly CVarDef GameTraitsDefaultPoints = CVarDef.Create("game.traits_default_points", 10, CVar.REPLICATED); + /// + /// Whether the game will SMITE people who used cheat engine to spawn with all of the traits. + /// Illegal trait totals will still be logged even if this is disabled. + /// If you are intending to decrease the trait points availability, or modify the costs of traits, consider temporarily disabling this. + /// + public static readonly CVarDef TraitsPunishCheaters = + CVarDef.Create("game.traits_punish_cheaters", true, CVar.REPLICATED); /// /// Whether to allow characters to select loadout items. diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs index 38a356b1e0d..ecb3c3fd6c5 100644 --- a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs +++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs @@ -1,5 +1,6 @@ using Content.Shared.Customization.Systems; using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.Manager; namespace Content.Shared.Clothing.Loadouts.Prototypes; @@ -45,4 +46,19 @@ public sealed partial class LoadoutPrototype : IPrototype [DataField] public string GuideEntry { get; } = ""; + + [DataField(serverOnly: true)] + public LoadoutFunction[] Functions { get; private set; } = Array.Empty(); +} + +/// This serves as a hook for loadout functions to modify one or more entities upon spawning in. +[ImplicitDataDefinitionForInheritors] +public abstract partial class LoadoutFunction +{ + public abstract void OnPlayerSpawn( + EntityUid character, + EntityUid loadoutEntity, + IComponentFactory factory, + IEntityManager entityManager, + ISerializationManager serializationManager); } diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 96e64517caa..95604a1e21c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -8713,3 +8713,77 @@ Entries: id: 6583 time: '2024-12-18T01:32:32.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1357 +- author: VMSolidus + changes: + - type: Fix + message: Fixed the Saltern bridge being a hard vacuum at roundstart. + id: 6584 + time: '2024-12-19T22:52:32.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1359 +- author: VMSolidus + changes: + - type: Add + message: >- + Added labels to all generic colorable items in loadouts, so that players + can see which items have custom colors as customization options. + - type: Remove + message: >- + Removed all 'specific color' variants of colorable items from Loadouts, + such as "Blue Jumpsuit" when a colorable jumpsuit exists. + id: 6585 + time: '2024-12-21T18:02:28.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1364 +- author: VMSolidus + changes: + - type: Add + message: >- + Added colorable variants of fingerless gloves, headbands, berets, + hairflowers, cloth masks, and the neck gaiter. + id: 6586 + time: '2024-12-21T19:25:13.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1365 +- author: VMSolidus + changes: + - type: Add + message: Loadouts can now apply modular functions to items upon spawning in. + - type: Add + message: >- + A new LoadoutMakeFollower function, which lets you buy NPC followers in + loadouts. + - type: Add + message: >- + added Pet Mice, Cockroach, Mothroach, and Hamster to Loadouts. All of + which use the new LoadoutMakeFollower function. + id: 6587 + time: '2024-12-22T10:26:41.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1366 +- author: juniwoofs + changes: + - type: Add + message: two new cuddly friends to the station! (harpy and morty plush) + id: 6588 + time: '2024-12-22T19:24:58.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1369 +- author: VMSolidus + changes: + - type: Add + message: >- + Implemented Anti-cheat for Traits. Attempting to join a round with an + illegal traits list will result in hilarious consequences. + id: 6589 + time: '2024-12-22T19:55:22.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1358 +- author: VMSolidus + changes: + - type: Add + message: Prisoners now spawn with a Pacifier Implant. + id: 6590 + time: '2024-12-22T19:56:21.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1341 +- author: sleepyyapril + changes: + - type: Fix + message: Fixed jittering displacing your character when shaken. + id: 6591 + time: '2024-12-22T19:57:10.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1334 diff --git a/Resources/Locale/en-US/forensics/fibers.ftl b/Resources/Locale/en-US/forensics/fibers.ftl index c95b292c966..a625847fc2b 100644 --- a/Resources/Locale/en-US/forensics/fibers.ftl +++ b/Resources/Locale/en-US/forensics/fibers.ftl @@ -23,3 +23,4 @@ fibers-white = white fibers-yellow = yellow fibers-regal-blue = regal blue fibers-olive = olive +fibers-dyed = dyed fibers \ No newline at end of file diff --git a/Resources/Locale/en-US/loadouts/generic/back.ftl b/Resources/Locale/en-US/loadouts/generic/back.ftl new file mode 100644 index 00000000000..2925981849e --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/back.ftl @@ -0,0 +1,3 @@ +loadout-name-LoadoutBackpack = grey backpack (colorable) +loadout-name-LoadoutBackpackDuffel = grey duffelbag (colorable) +loadout-name-LoadoutBackpackSatchel = grey satchel (colorable) diff --git a/Resources/Locale/en-US/loadouts/eyes.ftl b/Resources/Locale/en-US/loadouts/generic/eyes.ftl similarity index 84% rename from Resources/Locale/en-US/loadouts/eyes.ftl rename to Resources/Locale/en-US/loadouts/generic/eyes.ftl index 93c4d9faa64..4d345190474 100644 --- a/Resources/Locale/en-US/loadouts/eyes.ftl +++ b/Resources/Locale/en-US/loadouts/generic/eyes.ftl @@ -3,3 +3,5 @@ loadout-description-LoadoutEyesBlindfold = Why would you want this? loadout-name-LoadoutItemBlindfoldFake = "blind"fold loadout-description-LoadoutItemBlindfoldFake = This product may not work as advertised. + +loadout-name-LoadoutEyesGlasses = glasses (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/hands.ftl b/Resources/Locale/en-US/loadouts/generic/hands.ftl new file mode 100644 index 00000000000..3ceed69d176 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/hands.ftl @@ -0,0 +1,2 @@ +loadout-name-LoadoutHandsColorWhite = gloves (colorable) +loadout-name-LoadoutHandsGlovesFingerlessWhite = fingerless gloves (colorable) \ No newline at end of file diff --git a/Resources/Locale/en-US/loadouts/generic/head.ftl b/Resources/Locale/en-US/loadouts/generic/head.ftl new file mode 100644 index 00000000000..d2a6d511284 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/head.ftl @@ -0,0 +1,15 @@ +loadout-description-LoadoutHeadBeaverHat = Gentlemen. +loadout-description-LoadoutHeadTophat = A stylish black tophat. + +loadout-name-LoadoutHeadFedoraWhite = fedora (colorable) +loadout-name-LoadoutHeadHatCowboyWhite = cowboy hat (colorable) +loadout-name-LoadoutHeadHatMimesoft = baseball cap (colorable) +loadout-name-LoadoutHeadHatMimesoftFlipped = baseball cap (colorable, flipped) +loadout-name-LoadoutHeadHijabColorable = hijab (colorable) +loadout-name-LoadoutHeadTurbanColorable = turban (colorable) +loadout-name-LoadoutHeadKippahColorable = kippah (colorable) +loadout-name-LoadoutHeadTinfoil = tinfoil hat (colorable) +loadout-name-LoadoutHeadHatCowboyBountyHunter = bounty hunter hat (colorable) +loadout-name-LoadoutHeadBandWhite = headband (colorable) +loadout-name-LoadoutHeadBeretWhite = beret (colorable) +loadout-name-LoadoutHeadPoppyWhite = hair flower (colorable) \ No newline at end of file diff --git a/Resources/Locale/en-US/loadouts/items.ftl b/Resources/Locale/en-US/loadouts/generic/items.ftl similarity index 87% rename from Resources/Locale/en-US/loadouts/items.ftl rename to Resources/Locale/en-US/loadouts/generic/items.ftl index c2ec9a1c847..37ca4f91fe3 100644 --- a/Resources/Locale/en-US/loadouts/items.ftl +++ b/Resources/Locale/en-US/loadouts/generic/items.ftl @@ -35,3 +35,15 @@ loadout-name-LoadoutItemBoxSurvivalSecurity = survival box (security) loadout-name-LoadoutItemBoxSurvivalBrigmedic = survival box (corpsman) loadout-name-LoadoutItemBoxSurvivalMedical = survival box (medical) loadout-name-LoadoutItemBoxHug = box of hugs (clown) + +loadout-name-LoadoutItemLighter = lighter (colorable) +loadout-name-LoadoutItemLighterCheap = cheap lighter (colorable) +loadout-name-LoadoutItemLighterFlippo = flippo lighter (colorable) +loadout-name-LoadoutItemDrinkShinyFlask = shiny flask (colorable) +loadout-name-LoadoutItemDrinkLithiumFlask = lithium flask (colorable) +loadout-name-LoadoutItemDrinkVacuumFlask = vacuum flask (colorable) + +loadout-name-LoadoutItemPetMouse = pet mouse +loadout-name-LoadoutItemPetHamster = pet hamster +loadout-name-LoadoutItemPetMothroach = pet mothroach +loadout-name-LoadoutItemPetCockroach = pet cockroach diff --git a/Resources/Locale/en-US/loadouts/generic/mask.ftl b/Resources/Locale/en-US/loadouts/generic/mask.ftl new file mode 100644 index 00000000000..79ebf9b2885 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/mask.ftl @@ -0,0 +1,3 @@ +loadout-name-LoadoutMaskBandWhite = cloth mask (colorable) +loadout-name-LoadoutMaskNeckGaiterWhite = neck gaiter (colorable) +loadout-name-LoadoutMaskSterile = sterile mask (colorable) \ No newline at end of file diff --git a/Resources/Locale/en-US/loadouts/generic/neck.ftl b/Resources/Locale/en-US/loadouts/generic/neck.ftl new file mode 100644 index 00000000000..8a9abb76664 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/neck.ftl @@ -0,0 +1,4 @@ +loadout-name-LoadoutNeckOldMantle = old mantle (colorable) +loadout-name-LoadoutNeckUnathiMantle = unathi mantle (colorable) +loadout-name-LoadoutNeckTieWhite = suit tie (colorable) +loadout-name-LoadoutNeckBedsheetWhite = bedsheet (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/outerClothing.ftl b/Resources/Locale/en-US/loadouts/generic/outerClothing.ftl new file mode 100644 index 00000000000..e312968b8e9 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/outerClothing.ftl @@ -0,0 +1,11 @@ +loadout-description-LoadoutOuterGhostSheet = Spooky... +loadout-description-LoadoutOuterCoatBomberjacket = A sleek bomber jacket. +loadout-description-LoadoutOuterCoatHoodieBlack = A warm hoodie. +loadout-description-LoadoutOuterCoatHoodieGrey = A warm hoodie. +loadout-description-LoadoutOuterCoatWinterCoat = For keeping nice and snug. + +loadout-name-LoadoutOuterCoatHoodieGrey = grey hoodie (colorable) +loadout-name-LoadoutOuterCoatWinterCoat = winter coat (colorable) +loadout-name-LoadoutOuterCoatHyenhSweater = sweater (colorable) +loadout-name-LoadoutOuterWinterCoatLong = long winter coat (colorable) +loadout-name-LoadoutOuterCoatMNKWhiteHoodie = MNK hoodie (colorable) diff --git a/Resources/Locale/en-US/loadouts/shoes.ftl b/Resources/Locale/en-US/loadouts/generic/shoes.ftl similarity index 83% rename from Resources/Locale/en-US/loadouts/shoes.ftl rename to Resources/Locale/en-US/loadouts/generic/shoes.ftl index 79a8dd9c436..15631952f76 100644 --- a/Resources/Locale/en-US/loadouts/shoes.ftl +++ b/Resources/Locale/en-US/loadouts/generic/shoes.ftl @@ -8,3 +8,9 @@ loadout-description-LoadoutShoesRed = Embrace the spirit of exploration with the loadout-description-LoadoutShoesWhite = Elevate your style with these pristine white shoes, a symbol of innovation and progress. loadout-description-LoadoutShoesYellow = Light up the space station with these radiant yellow shoes, bringing a burst of energy to your every step. loadout-description-LoadoutShoesSlippersDuck = Quack up your downtime with these adorable duck slippers that waddle the line between comfort and quirkiness. + +loadout-name-LoadoutShoesWhite = shoes (colorable) +loadout-name-LoadoutShoesBootsCowboyWhite = cowboy boots (colorable) +loadout-name-LoadoutShoesBootsCowboyFancy = fancy cowboy boots (colorable) +loadout-name-LoadoutShoesMiscWhite = misc shoes (colorable) +loadout-name-LoadoutShoesClothWrap = cloth foot wraps (colorable) diff --git a/Resources/Locale/en-US/loadouts/generic/uniform.ftl b/Resources/Locale/en-US/loadouts/generic/uniform.ftl new file mode 100644 index 00000000000..fa4eccbdb17 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/uniform.ftl @@ -0,0 +1,12 @@ +loadout-description-LoadoutUniformAncientJumpsuit = The legend of the Greytide. + +loadout-name-LoadoutUniformJumpsuitColorWhite = jumpsuit (colorable) +loadout-name-LoadoutUniformJumpskirtColorWhite = jumpskirt (colorable) +loadout-name-LoadoutUniformMartialGi = gi (colorable) +loadout-name-LoadoutClothingJumpsuitKimono = kimono (colorable) +loadout-name-LoadoutClothingMNKOfficeSkirt = MNK office skirt (colorable) +loadout-name-LoadoutClothingMNKUnderGarment = MNK under garment (colorable) +loadout-name-LoadoutClothingMNKGymBra = MNK gym bra (colorable) +loadout-name-LoadoutClothingJumpsuitSuitWhite = business suit (colorable) +loadout-name-LoadoutClothingJumpsuitSuitWhiteAlt = business suit (alt, colorable) +loadout-name-LoadoutClothingJumpsuitSuitWhiteMob = mob suit (colorable) diff --git a/Resources/Locale/en-US/loadouts/head.ftl b/Resources/Locale/en-US/loadouts/head.ftl deleted file mode 100644 index be10f7d2fd2..00000000000 --- a/Resources/Locale/en-US/loadouts/head.ftl +++ /dev/null @@ -1,2 +0,0 @@ -loadout-description-LoadoutHeadBeaverHat = Gentlemen. -loadout-description-LoadoutHeadTophat = A stylish black tophat. diff --git a/Resources/Locale/en-US/loadouts/itemgroups.ftl b/Resources/Locale/en-US/loadouts/itemgroups.ftl index b6221e85850..8af87679c45 100644 --- a/Resources/Locale/en-US/loadouts/itemgroups.ftl +++ b/Resources/Locale/en-US/loadouts/itemgroups.ftl @@ -17,6 +17,7 @@ character-item-group-LoadoutInstrumentsAny = Musical Instruments (Non-Musician) character-item-group-LoadoutSmokes = Smokeables character-item-group-LoadoutBoxKits = Survival Kits character-item-group-LoadoutWritables = Writing Tools +character-item-group-LoadoutPets = Pets # Job Specific Template character-item-group-LoadoutJOBBackpacks = JOB Backpacks diff --git a/Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl b/Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl new file mode 100644 index 00000000000..1831174bd46 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/jobs/engineering/uncategorized.ftl @@ -0,0 +1 @@ +loadout-name-LoadoutEngineeringHeadHardhatWhite = hardhat (colorable) diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl index 27069b6ff88..1cb2a615991 100644 --- a/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl +++ b/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl @@ -10,3 +10,6 @@ loadout-description-LoadoutCommandCapHatCapcap = The Captain's cap, pretty nice. loadout-description-LoadoutCommandCapHatBeret = The Captain's beret, very nice. loadout-description-LoadoutCommandCapMaskGas = Why would the captain need this? I don't know, but it looks cool. loadout-description-LoadoutCommandCapItemDrinkFlask = The finest of flasks, for the finest of drinks. + +loadout-name-LoadoutCaptainDrinkFlask = captain's drink flask (colorable) +loadout-name-LoadoutCaptainGlovesInspection = inspection gloves (colorable) diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl index 8dc606f65dd..5c717e95839 100644 --- a/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl +++ b/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl @@ -2,3 +2,5 @@ loadout-description-LoadoutCommandHOPNeckMantle = To show who has the authority loadout-description-LoadoutCommandHOPNeckCloak = To really show who has the authority around here. loadout-description-LoadoutCommandHOPBackIan = A backpack that looks like Ian, how cute! loadout-description-LoadoutCommandHOPHatCap = The HOP's cap, pretty nice. + +loadout-name-LoadoutHeadOfPersonnelGlovesInspection = inspection gloves (colorable) diff --git a/Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl b/Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl new file mode 100644 index 00000000000..973c2f23711 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/jobs/logistics/salvageSpecialist.ftl @@ -0,0 +1,14 @@ +loadout-name-LoadoutSalvageBackpackBackpack = salvage backpack (colorable) +loadout-name-LoadoutSalvageBackpackSatchel = salvage satchel (colorable) +loadout-name-LoadoutSalvageBackpackDuffel = salvage duffelbag (colorable) +loadout-name-LoadoutSalvageBeltMilitaryWebbing = military webbing (colorable) +loadout-name-LoadoutSalvageWeaponsCombatKnife = combat knife (colorable) +loadout-name-LoadoutSalvageWeaponsKitchenKnife = kitchen knife (colorable) +loadout-name-LoadoutSalvageWeaponsSurvivalKnife = survival knife (colorable) +loadout-name-LoadoutSalvageWeaponsKukriKnife = kukri (colorable) +loadout-name-LoadoutSalvageWeaponsCleaver = cleaver (colorable) +loadout-name-LoadoutSalvageWeaponsThrowingKnife = throwing knives (x3, colorable) +loadout-name-LoadoutSalvageWeaponsMachete = machete (colorable) +loadout-name-LoadoutSalvageWeaponsCutlass = cutlass (colorable) +loadout-name-LoadoutSalvageWeaponsKatana = katana (colorable) +loadout-name-LoadoutSalvageWeaponsWakizashi = wakizashi (colorable) diff --git a/Resources/Locale/en-US/loadouts/neck.ftl b/Resources/Locale/en-US/loadouts/neck.ftl deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Locale/en-US/loadouts/outerClothing.ftl b/Resources/Locale/en-US/loadouts/outerClothing.ftl deleted file mode 100644 index 7dc09f552e0..00000000000 --- a/Resources/Locale/en-US/loadouts/outerClothing.ftl +++ /dev/null @@ -1,5 +0,0 @@ -loadout-description-LoadoutOuterGhostSheet = Spooky... -loadout-description-LoadoutOuterCoatBomberjacket = A sleek bomber jacket. -loadout-description-LoadoutOuterCoatHoodieBlack = A warm hoodie. -loadout-description-LoadoutOuterCoatHoodieGrey = A warm hoodie. -loadout-description-LoadoutOuterCoatWinterCoat = For keeping nice and snug. diff --git a/Resources/Locale/en-US/loadouts/uniform.ftl b/Resources/Locale/en-US/loadouts/uniform.ftl deleted file mode 100644 index b32bd92b3a4..00000000000 --- a/Resources/Locale/en-US/loadouts/uniform.ftl +++ /dev/null @@ -1 +0,0 @@ -loadout-description-LoadoutUniformAncientJumpsuit = The legend of the Greytide. diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index adb89e10095..e88865dc9b1 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -278,23 +278,25 @@ entities: -5,-4: 0: 61695 -4,-3: - 0: 47871 + 0: 14591 -4,-2: - 0: 12731 - 1: 49152 + 0: 703 + 1: 57344 + -5,-3: + 0: 57975 -5,-2: - 0: 47935 - -5,-1: - 0: 65528 + 0: 61422 -4,-1: + 1: 14 0: 61056 - 1: 12 + -5,-1: + 0: 32760 -4,0: 0: 61695 -3,-4: - 0: 54527 + 0: 24063 -3,-3: - 0: 3581 + 0: 3549 -3,-2: 0: 247 1: 28672 @@ -306,9 +308,9 @@ entities: -3,0: 0: 61695 -2,-4: - 0: 53503 + 0: 57599 -2,-3: - 0: 65529 + 0: 65294 -2,-2: 0: 65520 -2,-1: @@ -318,9 +320,9 @@ entities: -2,0: 0: 63487 -1,-4: - 0: 53503 + 0: 53759 -1,-3: - 0: 48124 + 0: 48108 -1,-2: 0: 65520 -1,-1: @@ -330,7 +332,7 @@ entities: -1,0: 0: 61695 0,-4: - 0: 52991 + 0: 20222 0,-3: 0: 56573 0,-2: @@ -350,13 +352,13 @@ entities: -4,3: 0: 61424 -5,3: - 0: 16241 + 0: 32577 -4,4: 0: 61070 -3,1: - 0: 41215 + 0: 53503 -3,2: - 0: 65450 + 0: 65421 -3,3: 0: 64988 -3,4: @@ -372,9 +374,9 @@ entities: -1,1: 0: 58623 -1,2: - 0: 16142 + 0: 65294 -1,3: - 0: 3003 + 0: 4095 -1,4: 0: 4095 0,0: @@ -384,7 +386,7 @@ entities: 0,2: 0: 56797 0,3: - 0: 52701 + 0: 19933 0,-5: 0: 65263 1,-4: @@ -408,7 +410,7 @@ entities: 2,-1: 0: 65535 2,-5: - 0: 30511 + 0: 30479 2,0: 0: 61695 3,-4: @@ -420,7 +422,7 @@ entities: 3,-1: 0: 64985 3,-5: - 0: 65295 + 0: 65359 3,0: 0: 61661 4,-4: @@ -515,43 +517,44 @@ entities: -1,5: 0: 58623 0,6: - 0: 51711 + 0: 36351 -1,6: 0: 3822 0,7: - 0: 65503 + 0: 65279 -1,7: - 0: 61166 + 0: 41967 0,8: - 0: 15 - 2: 3840 + 0: 65535 1,5: 0: 53439 1,6: - 0: 7421 + 0: 3581 1,7: - 0: 65503 + 0: 4369 + 2: 17484 1,8: - 0: 15 - 2: 40704 + 0: 4369 + 2: 17476 2,5: 0: 53367 2,6: 0: 1405 2,7: - 0: 4915 - 2: 34944 - 2,8: - 2: 36 + 2: 7 3,5: - 0: 4181 + 0: 4210 + 2: 32768 3,6: - 0: 4881 + 0: 13073 + 2: 8 + 3,7: + 2: 4 4,5: 0: 273 - 2: 17476 + 2: 29764 -8,0: - 0: 61678 + 0: 61550 -9,0: 0: 64413 -8,1: @@ -569,32 +572,34 @@ entities: -8,4: 0: 477 2: 49152 + -8,-1: + 0: 26208 -7,0: - 0: 64671 + 0: 63487 -7,1: 0: 40191 -7,2: 0: 49087 -7,3: - 0: 20472 - -7,4: - 0: 58983 + 0: 53240 -7,-1: - 0: 52732 + 0: 65407 + -7,4: + 0: 61039 -6,0: - 0: 62363 + 0: 61678 -6,1: - 0: 5119 + 0: 5115 -6,2: 0: 6007 -6,3: - 0: 4092 - -6,-1: - 0: 48051 + 0: 65436 -6,4: - 0: 61567 + 0: 65151 + -6,-1: + 0: 61152 -5,4: - 0: 30527 + 0: 30310 4,-5: 0: 61152 5,-4: @@ -639,7 +644,7 @@ entities: 0: 65524 0,-9: 0: 52416 - 2: 275 + 2: 273 1,-8: 0: 65488 1,-7: @@ -664,91 +669,88 @@ entities: 3,-6: 0: 64733 4,-8: - 0: 39299 + 0: 4483 2: 17484 4,-7: - 0: 65289 - 2: 4 + 0: 65281 + 2: 12 4,-6: 0: 61152 4,-9: - 2: 17476 - 0: 34952 + 2: 16384 + 0: 32768 5,-8: 2: 21855 - 0: 43680 + 0: 160 5,-7: - 2: 5 - 0: 63242 + 2: 15 + 0: 63232 5,-9: - 2: 21845 - 0: 43690 + 2: 20480 + 0: 40960 5,-6: 0: 26214 6,-8: 2: 21855 - 0: 43680 + 0: 160 6,-7: - 2: 5 - 0: 56586 + 2: 15 + 0: 56576 6,-6: 0: 61919 6,-9: - 2: 21845 - 0: 43690 + 2: 20480 + 0: 40960 7,-8: - 2: 4383 - 0: 8736 + 2: 21855 + 0: 160 7,-7: - 2: 8749 - 0: 2 + 2: 8751 7,-5: - 0: 36614 + 0: 36846 7,-9: - 2: 4369 - 0: 8738 + 2: 20767 + 0: 40960 7,-6: - 2: 1570 + 2: 3618 8,-8: - 2: 1 + 2: 21855 + 0: 160 8,-7: 2: 15 - 0: 65280 8,-6: - 0: 13119 - 2: 2048 + 2: 3840 8,-5: - 0: 3891 + 0: 4016 -4,5: 0: 238 -4,6: 0: 255 2: 61440 + -5,5: + 0: 58982 -5,6: 0: 238 2: 61440 - -4,7: - 2: 2289 - -5,7: - 2: 240 -3,5: 0: 3295 -3,6: 0: 255 - 2: 12288 + 2: 61440 -3,7: - 2: 8816 + 2: 51406 -3,8: - 2: 3086 + 2: 14 + 0: 52224 -2,5: 0: 52701 -2,6: - 0: 63743 + 0: 59647 -2,7: - 0: 255 + 0: 61166 -1,8: - 0: 8 - 2: 36640 + 0: 34952 + 2: 13104 -9,4: 0: 7400 -8,5: @@ -764,32 +766,36 @@ entities: 2: 43695 0: 21840 -8,7: - 2: 242 + 2: 2039 -9,7: - 2: 240 + 2: 28671 -7,6: - 2: 62465 + 2: 63249 0: 14 -7,7: 2: 16 -7,5: 0: 1038 + 2: 4352 -6,5: - 0: 65319 + 0: 65327 -6,6: 0: 255 - -6,7: - 2: 240 - -5,5: - 0: 26215 + 2: 61440 + -3,9: + 0: 12 + 2: 3584 -2,8: - 2: 7967 + 0: 30560 + -2,9: + 0: 7 + 2: 3840 -1,9: - 2: 142 + 2: 405 0,9: - 2: 15 + 2: 240 4,6: - 2: 4 + 2: 550 0: 34816 5,5: 0: 30583 @@ -801,32 +807,26 @@ entities: 0: 255 2: 53248 6,6: - 2: 35049 + 2: 35561 7,5: 0: 36063 2: 4096 7,6: 2: 53196 - 7,7: - 2: 12 8,4: 0: 4351 2: 57344 8,5: 0: 272 - 3: 17472 + 4: 17472 8,6: - 2: 65521 - 8,7: - 2: 15 + 2: 4081 1,9: - 2: 15 - 2,9: - 2: 1 + 2: 18 9,0: 0: 65102 9,1: - 0: 3839 + 0: 3838 9,2: 0: 61917 9,3: @@ -855,10 +855,10 @@ entities: 0: 53759 11,2: 0: 4319 - 4: 49152 + 3: 49152 11,3: 0: 61457 - 4: 204 + 3: 204 11,-1: 0: 30583 11,4: @@ -870,9 +870,9 @@ entities: 0: 28791 12,2: 0: 119 - 4: 28672 + 3: 28672 12,3: - 4: 119 + 3: 119 0: 61440 12,-1: 0: 29311 @@ -901,9 +901,9 @@ entities: 14,2: 0: 15235 14,3: - 2: 32760 + 2: 65528 14,4: - 2: 28979 + 2: 62455 15,0: 0: 56797 15,1: @@ -911,14 +911,14 @@ entities: 15,2: 0: 3548 15,3: - 2: 28671 + 2: 32767 15,4: - 2: 8754 + 2: 12850 15,-1: - 0: 52428 + 0: 52701 16,0: 0: 13116 - 4: 52416 + 3: 52416 16,1: 0: 65484 16,2: @@ -936,22 +936,29 @@ entities: 9,-2: 0: 58999 9,-5: - 0: 18176 + 0: 18288 10,-4: 0: 65024 + 2: 8 10,-3: 0: 65520 10,-2: 0: 63743 + 10,-5: + 2: 34956 11,-4: 0: 13056 - 2: 128 + 2: 2184 11,-3: 0: 43946 11,-2: 0: 30250 + 11,-5: + 0: 32776 + 2: 17968 12,-4: - 2: 1265 + 0: 7 + 2: 1272 12,-3: 0: 65535 12,-2: @@ -993,16 +1000,15 @@ entities: -1,-6: 0: 30065 -8,-8: - 0: 52227 - 2: 8712 + 0: 35331 + 2: 8 -8,-9: 0: 12288 - 2: 35056 + 2: 35064 -9,-8: - 0: 65356 - 2: 1 + 0: 56653 -8,-7: - 0: 63740 + 0: 63742 -9,-7: 0: 46079 -8,-6: @@ -1041,7 +1047,7 @@ entities: 0: 61440 2: 34 -6,-7: - 0: 36494 + 0: 52878 -6,-4: 0: 62463 -5,-9: @@ -1051,27 +1057,23 @@ entities: 0: 34952 2: 800 -8,-3: - 0: 65039 + 0: 3663 -9,-3: 0: 56797 -8,-2: - 0: 60942 + 0: 59119 -9,-2: - 0: 56829 + 0: 57309 -9,-1: - 0: 56797 - -8,-1: - 0: 3808 - -7,-3: - 0: 64907 + 0: 56781 -7,-2: - 0: 57293 + 0: 65262 + -7,-3: + 0: 44782 -6,-3: - 0: 63291 + 0: 41915 -6,-2: - 0: 30583 - -5,-3: - 0: 28791 + 0: 61166 -12,0: 0: 3855 -13,0: @@ -1133,16 +1135,15 @@ entities: -10,-5: 2: 32776 12,-5: - 2: 61440 - 0: 127 + 0: 62079 + 13,-4: + 2: 2808 13,-3: 0: 48059 13,-2: 0: 63243 - 13,-4: - 2: 2280 13,-5: - 2: 35304 + 2: 39912 14,-4: 2: 1039 14,-3: @@ -1151,56 +1152,59 @@ entities: 14,-2: 0: 65283 14,-1: - 0: 2047 + 0: 4095 14,-5: - 2: 17476 + 2: 17600 15,-4: 2: 8739 15,-3: 2: 62066 15,-2: - 0: 4352 + 0: 7424 2: 206 15,-5: - 2: 8704 + 2: 8721 16,-3: 2: 61440 16,-2: 2: 255 + 0: 3840 16,-1: 0: 53247 + 8,-9: + 2: 24143 + 0: 41120 + 9,-8: + 2: 15 9,-7: 2: 15 - 0: 65280 9,-6: - 0: 15 2: 3840 + 10,-8: + 2: 55703 10,-7: - 2: 7 - 0: 65280 + 2: 8743 + 0: 34816 10,-6: - 0: 15 - 2: 34560 - 10,-8: - 2: 34816 + 2: 50978 + 0: 8 + 10,-9: + 2: 40847 + 11,-8: + 2: 54 + 0: 2048 11,-7: - 0: 65534 + 0: 64988 11,-6: - 0: 61183 - 10,-5: - 2: 8 - 11,-8: - 2: 52 - 0: 59392 - 11,-5: - 2: 33840 - 0: 8 + 0: 3293 + 11,-9: + 2: 49921 12,-8: - 0: 65392 + 0: 12144 12,-7: - 0: 65535 + 0: 63743 12,-6: - 0: 65535 + 0: 24568 20,-1: 2: 256 19,-1: @@ -1209,36 +1213,48 @@ entities: 2: 16179 19,0: 2: 39118 + 0: 17441 20,1: 2: 14135 19,1: 2: 39321 + 0: 17476 20,2: 2: 29495 19,2: 2: 53179 + 0: 8260 20,3: 2: 35 19,3: 2: 4095 + 12,-9: + 2: 61440 13,-8: - 2: 34913 - 0: 12288 + 2: 35043 13,-7: - 0: 65395 + 0: 64849 13,-6: - 0: 13183 + 0: 349 2: 32768 + 13,-9: + 2: 4096 + 14,-8: + 2: 6144 14,-7: - 2: 26213 + 2: 8739 14,-6: - 2: 17766 - 14,-8: - 2: 17476 - 14,-9: - 2: 17476 + 2: 4898 + 15,-8: + 2: 4352 + 15,-7: + 2: 4369 + 15,-6: + 2: 4369 -11,5: 2: 35916 + -11,7: + 2: 35840 -10,5: 2: 39296 0: 17488 @@ -1247,10 +1263,15 @@ entities: -10,6: 0: 21569 2: 35230 + -10,7: + 2: 4040 + -11,8: + 2: 34952 -10,4: 0: 61152 - -10,7: - 2: 192 + -9,8: + 0: 2827 + 2: 25844 0,-12: 2: 79 0: 12288 @@ -1268,7 +1289,7 @@ entities: 0: 255 2: 36864 -1,-9: - 2: 3513 + 2: 3257 1,-12: 2: 4375 1,-11: @@ -1287,46 +1308,51 @@ entities: 2: 18240 3,-9: 2: 1396 - 4,-10: - 2: 17408 - 0: 34816 - 5,-10: - 2: 22000 - 0: 43520 - 6,-10: - 2: 22000 - 0: 43520 + 7,-12: + 2: 7455 + 7,-11: + 2: 7453 7,-10: - 2: 4592 - 0: 8704 + 2: 4381 + 8,-12: + 2: 20303 + 8,-11: + 2: 20303 8,-10: - 2: 240 + 2: 20047 + 0: 40960 9,5: 5: 4368 - 4: 17472 + 3: 17472 9,6: - 2: 8176 + 2: 12272 10,5: - 4: 4368 + 3: 4368 6: 17472 10,6: 2: 4080 11,5: - 4: 21840 + 3: 21840 11,6: - 2: 4080 + 2: 61424 + 11,7: + 2: 12 12,5: 2: 65535 12,6: - 2: 255 + 2: 65535 + 12,7: + 2: 15 13,5: 2: 55705 13,6: - 2: 127 + 2: 16383 + 13,7: + 2: 1 + 14,5: + 2: 30591 14,6: 2: 7 - 14,5: - 2: 17484 15,5: 2: 35 -4,-10: @@ -1341,7 +1367,6 @@ entities: 0: 34944 -2,-10: 0: 1019 - 2: 16384 -2,-11: 2: 544 0: 2176 @@ -1349,19 +1374,21 @@ entities: 2: 61696 17,-2: 2: 3327 + 0: 768 17,-1: 0: 4369 - 2: 52416 + 2: 52428 17,0: - 0: 17921 + 0: 19969 2: 8 - 4: 4368 + 3: 4368 18,-3: 2: 4096 18,-2: - 2: 63477 + 2: 59381 18,-1: 2: 15358 + 0: 33792 18,0: 2: 65399 19,-2: @@ -1379,30 +1406,89 @@ entities: 2: 2190 18,3: 2: 40959 + 12,-10: + 2: 61440 + 11,-10: + 2: 61440 + 13,-10: + 2: 7936 14,-10: - 2: 17520 + 2: 256 + 9,-12: + 2: 1807 + 9,-11: + 2: 1799 9,-10: - 2: 16 + 2: 7 + 9,-9: + 2: 3855 + 10,-12: + 2: 4369 + 10,-11: + 2: 4369 + 10,-10: + 2: 4369 + -12,-8: + 2: 64170 + -13,-8: + 2: 64170 + -12,-7: + 2: 64170 + -13,-7: + 2: 64170 + -12,-9: + 2: 61440 -11,-8: - 2: 60074 + 2: 64170 -11,-7: - 2: 2730 + 2: 64170 + -11,-9: + 2: 61440 -10,-8: - 2: 12846 - 0: 34816 + 2: 12834 + 0: 34828 -10,-7: - 2: 8738 + 2: 12834 0: 34952 + -10,-9: + 2: 13288 + 0: 32768 -10,-6: 2: 57378 0: 8 -9,-9: - 2: 4600 - 0: 49152 + 0: 61440 + 2: 248 + -13,-9: + 2: 61440 + -11,-10: + 2: 8 + -10,-10: + 2: 63631 + -10,-12: + 2: 59592 + -9,-12: + 2: 63743 + -10,-11: + 2: 34952 + -9,-11: + 2: 63736 -9,-10: - 2: 63728 + 2: 63736 + -9,-13: + 2: 61440 + -8,-12: + 2: 63743 + -8,-11: + 2: 63736 -8,-10: - 2: 28784 + 2: 63736 + -8,-13: + 2: 29696 + -7,-12: + 2: 1808 + -7,-11: + 2: 240 -6,-11: 2: 8192 -6,-10: @@ -1412,9 +1498,53 @@ entities: -14,2: 0: 3598 -14,-3: - 0: 3272 + 0: 3276 -13,-4: 0: 4096 + -11,9: + 2: 35980 + -11,10: + 2: 51336 + -10,8: + 2: 497 + 0: 3084 + -10,9: + 2: 449 + 0: 3084 + -10,10: + 2: 4593 + 0: 3084 + -10,11: + 2: 227 + -9,9: + 0: 2827 + 2: 21748 + -9,10: + 0: 2827 + 2: 58612 + -9,11: + 2: 254 + -8,8: + 0: 1799 + 2: 112 + -8,9: + 0: 1799 + 2: 4208 + -8,10: + 0: 1799 + 2: 112 + -8,11: + 2: 48 + -15,-8: + 2: 34944 + -14,-8: + 2: 64443 + -15,-7: + 2: 136 + -14,-7: + 2: 64443 + -14,-9: + 2: 61440 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -1465,7 +1595,7 @@ entities: temperature: 293.15 moles: - 0 - - 6666.982 + - 0 - 0 - 0 - 0 @@ -1480,7 +1610,7 @@ entities: temperature: 293.15 moles: - 0 - - 0 + - 6666.982 - 0 - 0 - 0 @@ -1534,55 +1664,55 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 552: -12,-30 + 446: -12,-30 - node: color: '#FFFFFFFF' id: Arrows decals: - 489: 20,17 - 504: 20,17 - 508: 20,27 - 553: -12,-29 + 383: 20,17 + 398: 20,17 + 402: 20,27 + 447: -12,-29 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: Arrows decals: - 505: 22,17 - 509: 22,27 + 399: 22,17 + 403: 22,27 - node: color: '#C3C3C3FF' id: Bot decals: - 904: -35,-24 - 909: -32,-32 - 910: -31,-32 + 757: -35,-24 + 762: -32,-32 + 763: -31,-32 - node: color: '#FFFFFFFF' id: Bot decals: - 483: -35,6 - 484: -30,11 - 514: -3,-31 - 760: 31,8 - 761: 31,9 + 377: -35,6 + 378: -30,11 + 408: -3,-31 + 613: 31,8 + 614: 31,9 - node: zIndex: 1 color: '#FFFFFFFF' id: Bot decals: - 607: 20,7 - 608: 21,7 - 609: 22,7 - 681: -7,-26 - 682: -6,-26 + 481: 20,7 + 482: 21,7 + 483: 22,7 + 550: -7,-26 + 551: -6,-26 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: Bot decals: - 506: 20,17 - 507: 22,17 + 400: 20,17 + 401: 22,17 - node: color: '#FFFFFFFF' id: BotRight @@ -1593,688 +1723,688 @@ entities: color: '#C3C3C3FF' id: Box decals: - 922: -33,-29 - 923: -33,-28 + 775: -33,-29 + 776: -33,-28 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkCornerNe decals: - 687: -9,-28 + 556: -9,-28 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkCornerNw decals: - 688: -10,-28 + 557: -10,-28 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkCornerSe decals: - 686: -9,-30 + 555: -9,-30 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkCornerSw decals: - 685: -10,-30 + 554: -10,-30 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: - 759: -11,20 + 612: -11,20 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: - 619: 6,17 + 488: 6,17 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 661: 0,-25 - 883: -1,29 - 884: -1,28 + 530: 0,-25 + 736: -1,29 + 737: -1,28 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 689: -9,-29 + 558: -9,-29 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 656: -6,-23 - 657: -5,-23 - 658: -4,-23 - 881: 3,30 - 882: 4,30 + 525: -6,-23 + 526: -5,-23 + 527: -4,-23 + 734: 3,30 + 735: 4,30 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 696: 12,-14 - 697: 13,-14 - 698: 14,-14 - 699: 15,-14 + 565: 12,-14 + 566: 13,-14 + 567: 14,-14 + 568: 15,-14 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 756: -8,20 - 757: -9,20 - 758: -10,20 + 609: -8,20 + 610: -9,20 + 611: -10,20 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 615: 10,17 - 616: 9,17 - 617: 8,17 - 618: 7,17 + 484: 10,17 + 485: 9,17 + 486: 8,17 + 487: 7,17 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 700: 12,-18 - 701: 13,-18 - 702: 14,-18 - 703: 15,-18 + 569: 12,-18 + 570: 13,-18 + 571: 14,-18 + 572: 15,-18 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 662: -2,-25 + 531: -2,-25 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 690: -10,-29 + 559: -10,-29 - node: zIndex: 2 color: '#D381C9FF' id: BrickTileSteelCornerNe decals: - 684: -6,-26 + 553: -6,-26 - node: color: '#D381C9FF' id: BrickTileSteelCornerNw decals: - 670: -4,-26 + 539: -4,-26 - node: color: '#D381C9FF' id: BrickTileSteelCornerSe decals: - 676: -8,-24 + 545: -8,-24 - node: color: '#D381C9E5' id: BrickTileSteelCornerSw decals: - 543: -12,-32 + 437: -12,-32 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSw decals: - 772: 25,19 + 625: 25,19 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileSteelEndE decals: - 594: -36,-11 - 595: -41,-11 - 596: -47,-11 + 468: -36,-11 + 469: -41,-11 + 470: -47,-11 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileSteelEndW decals: - 591: -50,-11 - 592: -43,-11 - 593: -38,-11 + 465: -50,-11 + 466: -43,-11 + 467: -38,-11 - node: color: '#C3C3C3FF' id: BrickTileSteelInnerNe decals: - 898: -34,-32 - 927: -35,-27 + 751: -34,-32 + 780: -35,-27 - node: color: '#D381C9E5' id: BrickTileSteelInnerNe decals: - 547: -10,-26 + 441: -10,-26 - node: color: '#D381C9FF' id: BrickTileSteelInnerNe decals: - 660: -6,-27 - 675: 0,-29 - 680: -13,-19 + 529: -6,-27 + 544: 0,-29 + 549: -13,-19 - node: color: '#D381C9FF' id: BrickTileSteelInnerNw decals: - 669: -4,-27 - 671: -3,-26 + 538: -4,-27 + 540: -3,-26 - node: color: '#C3C3C3FF' id: BrickTileSteelInnerSe decals: - 908: -34,-30 - 918: -36,-28 - 919: -33,-30 + 761: -34,-30 + 771: -36,-28 + 772: -33,-30 - node: color: '#D381C9E5' id: BrickTileSteelInnerSe decals: - 537: -18,-28 - 540: -7,-33 + 431: -18,-28 + 434: -7,-33 - node: color: '#D381C9FF' id: BrickTileSteelInnerSe decals: - 672: 0,-26 - 677: -8,-23 + 541: 0,-26 + 546: -8,-23 - node: color: '#C3C3C3FF' id: BrickTileSteelInnerSw decals: - 885: -34,-28 + 738: -34,-28 - node: color: '#D381C9E5' id: BrickTileSteelInnerSw decals: - 519: -12,-20 - 544: -12,-31 + 413: -12,-20 + 438: -12,-31 - node: color: '#C3C3C3FF' id: BrickTileSteelLineE decals: - 895: -33,-29 - 896: -33,-28 - 897: -34,-31 - 902: -35,-26 - 903: -35,-25 - 906: -33,-30 - 917: -36,-29 - 926: -36,-30 + 748: -33,-29 + 749: -33,-28 + 750: -34,-31 + 755: -35,-26 + 756: -35,-25 + 759: -33,-30 + 770: -36,-29 + 779: -36,-30 - node: color: '#D381C9FF' id: BrickTileSteelLineE decals: - 673: 0,-27 - 674: 0,-28 + 542: 0,-27 + 543: 0,-28 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileSteelLineE decals: - 605: -36,-9 + 479: -36,-9 - node: color: '#C3C3C3FF' id: BrickTileSteelLineN decals: - 893: -37,-24 - 894: -36,-24 - 899: -33,-32 - 900: -33,-27 - 901: -34,-27 + 746: -37,-24 + 747: -36,-24 + 752: -33,-32 + 753: -33,-27 + 754: -34,-27 - node: color: '#D381C9E5' id: BrickTileSteelLineN decals: - 521: -8,-19 - 522: -9,-19 - 523: -10,-19 - 524: -11,-19 - 546: -9,-26 + 415: -8,-19 + 416: -9,-19 + 417: -10,-19 + 418: -11,-19 + 440: -9,-26 - node: color: '#D381C9FF' id: BrickTileSteelLineN decals: - 659: -8,-26 - 679: -12,-19 + 528: -8,-26 + 548: -12,-19 - node: zIndex: 2 color: '#D381C9FF' id: BrickTileSteelLineN decals: - 683: -7,-26 + 552: -7,-26 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 515: -11,-24 + 409: -11,-24 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 597: -49,-11 - 598: -48,-11 - 599: -42,-11 - 600: -37,-11 + 471: -49,-11 + 472: -48,-11 + 473: -42,-11 + 474: -37,-11 - node: color: '#C3C3C3FF' id: BrickTileSteelLineS decals: - 888: -33,-33 - 907: -33,-30 - 911: -34,-33 - 916: -37,-30 - 924: -35,-28 - 925: -36,-30 + 741: -33,-33 + 760: -33,-30 + 764: -34,-33 + 769: -37,-30 + 777: -35,-28 + 778: -36,-30 - node: color: '#D381C9E5' id: BrickTileSteelLineS decals: - 520: -13,-20 - 533: -17,-28 - 534: -16,-28 - 535: -15,-28 - 536: -14,-28 - 538: -5,-33 - 539: -6,-33 - 542: -11,-32 - 545: -13,-31 + 414: -13,-20 + 427: -17,-28 + 428: -16,-28 + 429: -15,-28 + 430: -14,-28 + 432: -5,-33 + 433: -6,-33 + 436: -11,-32 + 439: -13,-31 - node: color: '#D381C9FF' id: BrickTileSteelLineS decals: - 678: -9,-24 + 547: -9,-24 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 629: 57,5 - 630: 56,5 - 769: 26,19 - 770: 27,19 - 771: 28,19 + 498: 57,5 + 499: 56,5 + 622: 26,19 + 623: 27,19 + 624: 28,19 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 601: -48,-11 - 602: -49,-11 - 603: -42,-11 - 604: -37,-11 + 475: -48,-11 + 476: -49,-11 + 477: -42,-11 + 478: -37,-11 - node: color: '#C3C3C3FF' id: BrickTileSteelLineW decals: - 886: -34,-29 - 887: -34,-32 - 889: -37,-27 - 890: -37,-26 - 891: -37,-25 - 892: -37,-24 - 905: -34,-30 - 915: -37,-28 + 739: -34,-29 + 740: -34,-32 + 742: -37,-27 + 743: -37,-26 + 744: -37,-25 + 745: -37,-24 + 758: -34,-30 + 768: -37,-28 - node: color: '#D381C9E5' id: BrickTileSteelLineW decals: - 516: -12,-23 - 517: -12,-22 - 518: -12,-21 + 410: -12,-23 + 411: -12,-22 + 412: -12,-21 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 773: 25,20 - 774: 25,21 + 626: 25,20 + 627: 25,21 - node: zIndex: 1 color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 606: -38,-9 + 480: -38,-9 - node: color: '#689F54FF' id: BrickTileWhiteCornerNe decals: - 957: -21,-5 + 791: -21,-5 - node: color: '#689F54FF' id: BrickTileWhiteCornerNw decals: - 958: -23,-5 + 792: -23,-5 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteCornerSe decals: - 736: -8,7 + 592: -8,7 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteCornerSw decals: - 726: 7,-18 + 588: 7,-18 - node: color: '#A4610696' id: BrickTileWhiteCornerSw decals: - 779: 18,15 + 632: 18,15 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteCornerSw decals: - 737: -14,7 + 593: -14,7 - node: color: '#52B4E996' id: BrickTileWhiteEndE decals: - 643: 49,-12 + 512: 49,-12 - node: color: '#9FED5896' id: BrickTileWhiteEndE decals: - 639: 52,-10 + 508: 52,-10 - node: color: '#A4610696' id: BrickTileWhiteEndE decals: - 646: 52,-8 + 515: 52,-8 - node: color: '#D381C996' id: BrickTileWhiteEndE decals: - 642: 52,-12 + 511: 52,-12 - node: color: '#D4D4D496' id: BrickTileWhiteEndE decals: - 638: 49,-10 + 507: 49,-10 - node: color: '#EFB34196' id: BrickTileWhiteEndE decals: - 631: 49,-8 + 500: 49,-8 - node: color: '#334E6DC8' id: BrickTileWhiteEndN decals: - 633: 57,-8 + 502: 57,-8 - node: color: '#DE3A3A96' id: BrickTileWhiteEndN decals: - 636: 57,-11 + 505: 57,-11 - node: color: '#334E6DC8' id: BrickTileWhiteEndS decals: - 634: 57,-9 + 503: 57,-9 - node: color: '#DE3A3A96' id: BrickTileWhiteEndS decals: - 635: 57,-12 + 504: 57,-12 - node: color: '#52B4E996' id: BrickTileWhiteEndW decals: - 644: 48,-12 + 513: 48,-12 - node: color: '#9FED5896' id: BrickTileWhiteEndW decals: - 640: 51,-10 + 509: 51,-10 - node: color: '#A4610696' id: BrickTileWhiteEndW decals: - 645: 51,-8 + 514: 51,-8 - node: color: '#D381C996' id: BrickTileWhiteEndW decals: - 641: 51,-12 + 510: 51,-12 - node: color: '#D4D4D496' id: BrickTileWhiteEndW decals: - 637: 48,-10 + 506: 48,-10 - node: color: '#EFB34196' id: BrickTileWhiteEndW decals: - 632: 48,-8 + 501: 48,-8 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteInnerSe decals: - 712: 19,-13 + 581: 19,-13 - node: color: '#A4610696' id: BrickTileWhiteInnerSe decals: - 777: 22,15 + 630: 22,15 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteInnerSw decals: - 711: 17,-13 + 580: 17,-13 - node: color: '#A4610696' id: BrickTileWhiteInnerSw decals: - 778: 19,15 + 631: 19,15 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileWhiteInnerSw decals: - 707: 20,-18 + 576: 20,-18 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteLineE decals: - 709: 19,-14 + 578: 19,-14 - node: color: '#689F54FF' id: BrickTileWhiteLineE decals: - 955: -21,-8 - 956: -21,-7 + 789: -21,-8 + 790: -21,-7 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteLineE decals: - 738: -8,8 + 594: -8,8 - node: color: '#689F54FF' id: BrickTileWhiteLineN decals: - 959: -22,-5 + 793: -22,-5 - node: color: '#A4610696' id: BrickTileWhiteLineN decals: - 765: 26,10 - 766: 27,10 + 618: 26,10 + 619: 27,10 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteLineS decals: - 720: 8,-18 - 721: 9,-18 - 727: 10,-18 + 582: 8,-18 + 583: 9,-18 + 589: 10,-18 - node: color: '#A4610696' id: BrickTileWhiteLineS decals: - 767: 26,8 - 768: 27,8 - 775: 24,15 - 776: 23,15 - 782: 26,15 - 783: 27,15 - 784: 28,15 + 620: 26,8 + 621: 27,8 + 628: 24,15 + 629: 23,15 + 635: 26,15 + 636: 27,15 + 637: 28,15 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteLineS decals: - 734: -9,7 - 735: -13,7 + 590: -9,7 + 591: -13,7 - node: zIndex: 2 color: '#FFFFFFFF' id: BrickTileWhiteLineS decals: - 704: 17,-18 - 705: 18,-18 - 706: 19,-18 + 573: 17,-18 + 574: 18,-18 + 575: 19,-18 - node: zIndex: 2 color: '#52B4E996' id: BrickTileWhiteLineW decals: - 710: 17,-14 - 722: 7,-17 - 723: 7,-16 - 724: 7,-15 - 725: 7,-14 + 579: 17,-14 + 584: 7,-17 + 585: 7,-16 + 586: 7,-15 + 587: 7,-14 - node: color: '#689F54FF' id: BrickTileWhiteLineW decals: - 952: -23,-7 - 953: -23,-6 - 960: -23,-8 + 787: -23,-7 + 788: -23,-6 + 794: -23,-8 - node: color: '#A4610696' id: BrickTileWhiteLineW decals: - 780: 18,16 - 781: 18,17 + 633: 18,16 + 634: 18,17 - node: color: '#EFB34196' id: BrickTileWhiteLineW decals: - 789: 48,-6 - 790: 48,-5 - 791: 48,-4 - 792: 48,-3 + 642: 48,-6 + 643: 48,-5 + 644: 48,-4 + 645: 48,-3 - node: zIndex: 2 color: '#EFB34196' id: BrickTileWhiteLineW decals: - 739: -14,8 + 595: -14,8 - node: color: '#FFFFFFFF' id: Caution decals: - 655: 58,-5 + 524: 58,-5 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Caution decals: - 116: 53,2 + 81: 53,2 - node: color: '#52B4E996' id: CheckerNWSE decals: - 376: 21,-8 - 377: 21,-7 - 378: 21,-6 - 379: 21,-5 - 380: 22,-8 - 381: 22,-7 - 382: 22,-6 - 383: 22,-5 - 384: 23,-8 - 385: 23,-7 - 386: 23,-6 - 387: 23,-5 - 388: 24,-8 - 389: 24,-7 - 390: 24,-6 - 391: 24,-5 + 270: 21,-8 + 271: 21,-7 + 272: 21,-6 + 273: 21,-5 + 274: 22,-8 + 275: 22,-7 + 276: 22,-6 + 277: 22,-5 + 278: 23,-8 + 279: 23,-7 + 280: 23,-6 + 281: 23,-5 + 282: 24,-8 + 283: 24,-7 + 284: 24,-6 + 285: 24,-5 - node: color: '#D381C996' id: CheckerNWSE decals: - 439: -3,-23 + 333: -3,-23 - node: color: '#D4D4D428' id: CheckerNWSE decals: - 448: -40,4 - 449: -40,5 - 450: -40,6 - 451: -36,4 - 452: -36,5 - 453: -36,6 - 464: -37,0 - 465: -37,1 - 466: -37,2 - 467: -37,8 - 468: -37,9 - 469: -37,10 - 485: -37,-8 - 486: -37,-7 - 487: -37,-6 - 488: -37,-5 + 342: -40,4 + 343: -40,5 + 344: -40,6 + 345: -36,4 + 346: -36,5 + 347: -36,6 + 358: -37,0 + 359: -37,1 + 360: -37,2 + 361: -37,8 + 362: -37,9 + 363: -37,10 + 379: -37,-8 + 380: -37,-7 + 381: -37,-6 + 382: -37,-5 - node: color: '#FFFFFFFF' id: Delivery decals: - 541: -8,-33 - 664: -1,-31 + 435: -8,-33 + 533: -1,-31 - node: color: '#FFFFFFFF' id: DirtHeavy decals: - 294: -16,10 - 295: -17,11 + 259: -16,10 + 260: -17,11 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavy decals: - 499: -24,-25 + 393: -24,-25 - node: cleanable: True zIndex: 2 color: '#FFFFFFFF' id: DirtHeavy decals: - 744: -20,10 - 748: -20,9 - 749: -18,9 + 597: -20,10 + 601: -20,9 + 602: -18,9 - node: cleanable: True zIndex: 2 color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 747: -20,8 + 600: -20,8 - node: color: '#FFFFFFFF' id: DirtLight decals: - 298: -18,10 - 299: -17,9 + 263: -18,10 + 264: -17,9 - node: cleanable: True color: '#FFFFFFFF' @@ -2306,42 +2436,42 @@ entities: 69: 34,-5 70: 33,0 71: 7,5 - 118: 52,1 - 119: 53,3 - 120: 57,4 - 121: 45,5 - 122: 35,2 - 470: -40,0 - 471: -36,1 - 472: -38,7 - 473: -40,8 - 474: -38,-4 - 475: -36,-8 - 476: -24,-9 - 477: -24,3 - 478: -25,2 - 479: -7,3 - 481: -36,8 - 482: -38,9 - 490: -23,-24 - 491: -25,-23 - 492: -23,-22 - 493: -25,-25 - 494: -24,-24 - 495: -24,-22 + 83: 52,1 + 84: 53,3 + 85: 57,4 + 86: 45,5 + 87: 35,2 + 364: -40,0 + 365: -36,1 + 366: -38,7 + 367: -40,8 + 368: -38,-4 + 369: -36,-8 + 370: -24,-9 + 371: -24,3 + 372: -25,2 + 373: -7,3 + 375: -36,8 + 376: -38,9 + 384: -23,-24 + 385: -25,-23 + 386: -23,-22 + 387: -25,-25 + 388: -24,-24 + 389: -24,-22 - node: cleanable: True zIndex: 2 color: '#FFFFFFFF' id: DirtLight decals: - 745: -19,9 + 598: -19,9 - node: color: '#FFFFFFFF' id: DirtMedium decals: - 296: -17,10 - 297: -18,8 + 261: -17,10 + 262: -18,8 - node: cleanable: True color: '#FFFFFFFF' @@ -2350,68 +2480,68 @@ entities: 43: 26,17 44: 24,17 65: 37,6 - 117: 53,1 - 480: -35,8 - 496: -23,-25 - 497: -25,-22 - 498: -25,-24 + 82: 53,1 + 374: -35,8 + 390: -23,-25 + 391: -25,-22 + 392: -25,-24 - node: cleanable: True zIndex: 2 color: '#FFFFFFFF' id: DirtMedium decals: - 743: -19,10 - 746: -19,8 + 596: -19,10 + 599: -19,8 - node: color: '#52B4E996' id: FullTileOverlayGreyscale decals: - 132: 13,-7 - 407: 10,-7 - 408: 9,-7 - 423: 10,-10 - 424: 10,-9 - 425: 9,-10 - 426: 10,-11 - 427: 11,-10 + 97: 13,-7 + 301: 10,-7 + 302: 9,-7 + 317: 10,-10 + 318: 10,-9 + 319: 9,-10 + 320: 10,-11 + 321: 11,-10 - node: zIndex: 2 color: '#52B4E996' id: FullTileOverlayGreyscale decals: - 691: 9,-3 - 692: 9,-2 - 693: 10,-2 - 694: 8,-2 - 695: 9,-1 + 560: 9,-3 + 561: 9,-2 + 562: 10,-2 + 563: 8,-2 + 564: 9,-1 - node: color: '#EFB34196' id: FullTileOverlayGreyscale decals: - 213: 36,3 - 214: 36,4 - 215: 36,5 - 300: 30,3 + 178: 36,3 + 179: 36,4 + 180: 36,5 + 265: 30,3 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale decals: - 123: 19,-5 - 124: 18,-5 - 125: 17,-5 - 126: 16,-5 - 127: 15,-5 - 128: 14,-5 - 152: 6,1 - 153: 7,1 - 154: 8,1 - 155: 9,1 - 156: 10,1 - 157: 11,1 - 409: 9,-8 - 410: 10,-8 - 411: 11,-8 + 88: 19,-5 + 89: 18,-5 + 90: 17,-5 + 91: 16,-5 + 92: 15,-5 + 93: 14,-5 + 117: 6,1 + 118: 7,1 + 119: 8,1 + 120: 9,1 + 121: 10,1 + 122: 11,1 + 303: 9,-8 + 304: 10,-8 + 305: 11,-8 - node: color: '#A4610696' id: HalfTileOverlayGreyscale @@ -2424,105 +2554,105 @@ entities: color: '#BD575DFF' id: HalfTileOverlayGreyscale decals: - 1016: -9,17 - 1017: -8,17 - 1018: -7,17 - 1045: -11,11 - 1046: -12,11 - 1047: -13,11 + 808: -9,17 + 809: -8,17 + 810: -7,17 + 820: -11,11 + 821: -12,11 + 822: -13,11 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale decals: - 168: 0,5 - 169: -1,5 - 170: -2,5 - 171: -4,5 - 172: -3,5 - 173: -7,5 - 174: -8,5 - 175: -9,5 - 176: -10,5 - 177: -11,5 - 178: -12,5 - 179: -13,5 - 180: -14,5 - 181: -15,5 - 182: -16,5 - 183: -17,5 - 184: -18,5 + 133: 0,5 + 134: -1,5 + 135: -2,5 + 136: -4,5 + 137: -3,5 + 138: -7,5 + 139: -8,5 + 140: -9,5 + 141: -10,5 + 142: -11,5 + 143: -12,5 + 144: -13,5 + 145: -14,5 + 146: -15,5 + 147: -16,5 + 148: -17,5 + 149: -18,5 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale decals: 27: 30,-2 - 223: 49,5 - 224: 48,5 - 225: 47,5 - 226: 46,5 - 227: 45,5 - 232: 43,9 - 234: 42,9 - 239: 41,6 - 240: 40,6 - 241: 39,6 - 242: 38,6 + 188: 49,5 + 189: 48,5 + 190: 47,5 + 191: 46,5 + 192: 45,5 + 197: 43,9 + 199: 42,9 + 204: 41,6 + 205: 40,6 + 206: 39,6 + 207: 38,6 - node: color: '#FFD886FF' id: HalfTileOverlayGreyscale decals: - 141: 19,1 - 142: 18,1 - 143: 17,1 - 144: 16,1 - 145: 15,1 - 146: 14,1 + 106: 19,1 + 107: 18,1 + 108: 17,1 + 109: 16,1 + 110: 15,1 + 111: 14,1 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale180 decals: - 166: 5,30 + 131: 5,30 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale180 decals: - 401: 11,-6 - 402: 10,-6 - 403: 9,-6 - 404: 8,-6 - 405: 7,-6 - 406: 6,-6 - 416: 11,-12 - 417: 10,-12 - 418: 9,-12 - 433: 15,-12 - 434: 16,-12 + 295: 11,-6 + 296: 10,-6 + 297: 9,-6 + 298: 8,-6 + 299: 7,-6 + 300: 6,-6 + 310: 11,-12 + 311: 10,-12 + 312: 9,-12 + 327: 15,-12 + 328: 16,-12 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale180 decals: - 1004: -7,10 - 1005: -8,10 - 1006: -9,10 - 1042: -11,10 - 1043: -12,10 - 1044: -13,10 + 798: -7,10 + 799: -8,10 + 800: -9,10 + 817: -11,10 + 818: -12,10 + 819: -13,10 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale180 decals: - 203: -13,13 - 204: -14,13 - 205: -15,13 + 168: -13,13 + 169: -14,13 + 170: -15,13 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale180 decals: - 161: 34,-5 - 162: 33,-5 - 163: 32,-5 - 164: 31,-5 - 165: 30,-5 + 126: 34,-5 + 127: 33,-5 + 128: 32,-5 + 129: 31,-5 + 130: 30,-5 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale270 @@ -2531,31 +2661,31 @@ entities: 6: 0,24 7: 0,25 8: 0,26 - 270: 1,16 - 271: 1,17 - 272: 1,18 - 273: 1,19 - 274: 1,20 - 275: 1,21 - 276: 6,7 - 277: 6,8 - 278: 6,9 - 279: 6,10 - 280: 6,11 + 235: 1,16 + 236: 1,17 + 237: 1,18 + 238: 1,19 + 239: 1,20 + 240: 1,21 + 241: 6,7 + 242: 6,8 + 243: 6,9 + 244: 6,10 + 245: 6,11 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale270 decals: - 130: 14,-6 - 131: 14,-7 - 419: 6,-12 - 420: 6,-11 - 421: 6,-9 - 422: 6,-8 - 428: 14,-8 - 429: 14,-9 - 430: 14,-10 - 431: 14,-11 + 95: 14,-6 + 96: 14,-7 + 313: 6,-12 + 314: 6,-11 + 315: 6,-9 + 316: 6,-8 + 322: 14,-8 + 323: 14,-9 + 324: 14,-10 + 325: 14,-11 - node: color: '#A4610696' id: HalfTileOverlayGreyscale270 @@ -2564,18 +2694,18 @@ entities: 10: 12,10 11: 12,11 12: 12,12 - 189: 12,6 - 190: 12,7 + 154: 12,6 + 155: 12,7 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale270 decals: - 1010: -10,11 - 1011: -10,12 - 1012: -10,13 - 1013: -10,14 - 1014: -10,15 - 1015: -10,16 + 802: -10,11 + 803: -10,12 + 804: -10,13 + 805: -10,14 + 806: -10,15 + 807: -10,16 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 @@ -2598,53 +2728,53 @@ entities: 25: 29,-2 29: 31,-1 30: 31,0 - 207: 31,6 - 216: 37,2 - 217: 37,3 - 218: 37,4 - 219: 37,5 - 220: 37,6 - 236: 42,8 - 237: 42,7 - 628: 55,2 + 172: 31,6 + 181: 37,2 + 182: 37,3 + 183: 37,4 + 184: 37,5 + 185: 37,6 + 201: 42,8 + 202: 42,7 + 497: 55,2 - node: color: '#FFD886FF' id: HalfTileOverlayGreyscale270 decals: - 148: 14,0 - 149: 14,-1 - 150: 14,-2 - 151: 14,-3 + 113: 14,0 + 114: 14,-1 + 115: 14,-2 + 116: 14,-3 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale90 decals: - 264: 5,16 - 265: 5,17 - 266: 5,18 - 267: 5,19 - 268: 5,20 - 269: 5,21 - 281: 10,7 - 282: 10,8 - 283: 10,9 - 284: 10,10 - 285: 10,11 + 229: 5,16 + 230: 5,17 + 231: 5,18 + 232: 5,19 + 233: 5,20 + 234: 5,21 + 246: 10,7 + 247: 10,8 + 248: 10,9 + 249: 10,10 + 250: 10,11 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale90 decals: - 133: 12,-6 - 134: 12,-5 - 135: 12,-4 - 136: 12,-3 - 137: 12,-2 - 138: 12,-1 - 139: 12,0 - 140: 12,1 - 413: 12,-9 - 414: 12,-10 - 801: 12,-11 + 98: 12,-6 + 99: 12,-5 + 100: 12,-4 + 101: 12,-3 + 102: 12,-2 + 103: 12,-1 + 104: 12,0 + 105: 12,1 + 307: 12,-9 + 308: 12,-10 + 654: 12,-11 - node: color: '#A4610696' id: HalfTileOverlayGreyscale90 @@ -2652,39 +2782,39 @@ entities: 38: 16,11 39: 16,10 40: 16,9 - 191: 16,7 - 192: 16,6 - 193: 24,13 - 194: 24,12 - 195: 24,11 - 196: 24,10 - 197: 24,9 - 198: 24,8 + 156: 16,7 + 157: 16,6 + 158: 24,13 + 159: 24,12 + 160: 24,11 + 161: 24,10 + 162: 24,9 + 163: 24,8 - node: color: '#BD575DFF' id: HalfTileOverlayGreyscale90 decals: - 964: -5,8 - 1019: -6,16 - 1020: -6,15 - 1026: -5,12 + 797: -5,8 + 811: -6,16 + 812: -6,15 + 816: -5,12 - node: color: '#C05B60FF' id: HalfTileOverlayGreyscale90 decals: - 1096: -5,13 - 1097: -5,11 - 1109: -5,10 + 845: -5,13 + 846: -5,11 + 858: -5,10 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale90 decals: 76: -5,6 77: -5,7 - 199: -12,13 - 200: -12,14 - 201: -12,15 - 202: -12,16 + 164: -12,13 + 165: -12,14 + 166: -12,15 + 167: -12,16 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale90 @@ -2695,91 +2825,91 @@ entities: 34: 35,-2 35: 35,-1 36: 35,0 - 208: 35,2 - 209: 35,3 - 210: 35,4 - 211: 35,5 - 212: 35,6 - 221: 50,5 - 229: 44,6 - 245: 29,3 - 246: 29,4 - 247: 29,5 - 248: 29,6 + 173: 35,2 + 174: 35,3 + 175: 35,4 + 176: 35,5 + 177: 35,6 + 186: 50,5 + 194: 44,6 + 210: 29,3 + 211: 29,4 + 212: 29,5 + 213: 29,6 - node: color: '#FFFFFFFF' id: MiniTileDarkLineN decals: - 513: -16,-25 + 407: -16,-25 - node: color: '#D381C9E5' id: MiniTileSteelCornerSe decals: - 525: -14,-23 + 419: -14,-23 - node: color: '#D381C9E5' id: MiniTileSteelCornerSw decals: - 531: -18,-24 + 425: -18,-24 - node: color: '#D381C9E5' id: MiniTileSteelInnerSe decals: - 526: -15,-23 + 420: -15,-23 - node: color: '#D381C9E5' id: MiniTileSteelInnerSw decals: - 532: -17,-24 + 426: -17,-24 - node: color: '#D381C9E5' id: MiniTileSteelLineE decals: - 527: -14,-22 + 421: -14,-22 - node: color: '#D381C9E5' id: MiniTileSteelLineW decals: - 528: -18,-21 - 529: -18,-22 - 530: -18,-23 + 422: -18,-21 + 423: -18,-22 + 424: -18,-23 - node: color: '#FFFFFFFF' id: MiniTileSteelLineW decals: - 1069: -5,-13 - 1070: -5,-12 + 825: -5,-13 + 826: -5,-12 - node: color: '#3AB3DA99' id: MiniTileWhiteInnerSe decals: - 583: -51,-12 - 584: -44,-12 + 457: -51,-12 + 458: -44,-12 - node: color: '#3AB3DA99' id: MiniTileWhiteInnerSw decals: - 582: -46,-12 - 585: -53,-12 - 588: -39,-12 + 456: -46,-12 + 459: -53,-12 + 462: -39,-12 - node: color: '#3AB3DA99' id: MiniTileWhiteLineS decals: - 574: -50,-12 - 575: -49,-12 - 576: -48,-12 - 577: -47,-12 - 578: -43,-12 - 579: -42,-12 - 580: -41,-12 - 581: -40,-12 + 448: -50,-12 + 449: -49,-12 + 450: -48,-12 + 451: -47,-12 + 452: -43,-12 + 453: -42,-12 + 454: -41,-12 + 455: -40,-12 - node: color: '#3AB3DA99' id: MiniTileWhiteLineW decals: - 586: -54,-11 - 587: -54,-10 + 460: -54,-11 + 461: -54,-10 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale @@ -2791,39 +2921,39 @@ entities: color: '#52B4E996' id: QuarterTileOverlayGreyscale decals: - 158: 12,1 + 123: 12,1 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale decals: - 459: -36,3 - 460: -37,3 - 461: -38,3 - 462: -39,3 - 463: -40,3 + 353: -36,3 + 354: -37,3 + 355: -38,3 + 356: -39,3 + 357: -40,3 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale decals: - 186: 1,5 - 187: -6,5 + 151: 1,5 + 152: -6,5 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale decals: 28: 31,-2 - 222: 50,5 - 233: 44,9 - 238: 42,6 - 627: 55,1 + 187: 50,5 + 198: 44,9 + 203: 42,6 + 496: 55,1 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale180 decals: - 435: 19,-11 - 436: 19,-10 - 437: 19,-9 - 438: 19,-8 + 329: 19,-11 + 330: 19,-10 + 331: 19,-9 + 332: 19,-8 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale180 @@ -2833,551 +2963,551 @@ entities: color: '#D4D4D428' id: QuarterTileOverlayGreyscale180 decals: - 454: -37,7 - 455: -38,7 - 456: -39,7 - 457: -40,7 - 458: -36,7 + 348: -37,7 + 349: -38,7 + 350: -39,7 + 351: -40,7 + 352: -36,7 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale180 decals: - 159: 29,-5 - 230: 44,7 + 124: 29,-5 + 195: 44,7 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale270 decals: - 129: 14,-5 - 400: 12,-6 + 94: 14,-5 + 294: 12,-6 - node: color: '#C05B60FF' id: QuarterTileOverlayGreyscale270 decals: - 1108: -6,10 + 857: -6,10 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale270 decals: - 206: -12,13 + 171: -12,13 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale270 decals: - 160: 35,-5 - 235: 42,9 - 626: 55,3 + 125: 35,-5 + 200: 42,9 + 495: 55,3 - node: color: '#FFD886FF' id: QuarterTileOverlayGreyscale270 decals: - 147: 14,1 + 112: 14,1 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale90 decals: 3: 4,24 4: 4,25 - 167: 4,23 + 132: 4,23 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale90 decals: 13: 12,12 - 392: 16,5 - 393: 17,5 - 394: 18,5 - 395: 19,5 - 396: 20,5 - 397: 21,5 - 398: 22,5 - 399: 23,5 + 286: 16,5 + 287: 17,5 + 288: 18,5 + 289: 19,5 + 290: 20,5 + 291: 21,5 + 292: 22,5 + 293: 23,5 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale90 decals: - 185: -19,5 - 188: -5,5 + 150: -19,5 + 153: -5,5 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale90 decals: 26: 29,-2 - 228: 44,5 - 231: 44,9 - 243: 37,6 - 244: 50,4 - 249: 28,6 - 250: 27,6 - 251: 26,6 - 252: 25,6 + 193: 44,5 + 196: 44,9 + 208: 37,6 + 209: 50,4 + 214: 28,6 + 215: 27,6 + 216: 26,6 + 217: 25,6 - node: color: '#8F6CFFAD' id: Rust decals: - 934: -31,-3 - 935: -30,-3 - 936: -30,0 - 937: -31,0 - 938: -31,1 - 939: -30,1 + 781: -31,-3 + 782: -30,-3 + 783: -30,0 + 784: -31,0 + 785: -31,1 + 786: -30,1 - node: color: '#FFFFFFFF' id: StandClear decals: - 502: 21,24 - 589: -52,-12 - 590: -45,-12 - 663: 1,-30 + 396: 21,24 + 463: -52,-12 + 464: -45,-12 + 532: 1,-30 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: StandClear decals: - 263: 60,2 + 228: 60,2 - node: color: '#BD575DFF' id: ThreeQuarterTileOverlayGreyscale decals: - 1023: -10,17 - 1049: -14,11 + 815: -10,17 + 824: -14,11 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 415: 12,-12 + 309: 12,-12 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale270 decals: - 432: 14,-12 + 326: 14,-12 - node: color: '#BD575DFF' id: ThreeQuarterTileOverlayGreyscale270 decals: - 1009: -10,10 - 1048: -14,10 + 801: -10,10 + 823: -14,10 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 412: 12,-8 + 306: 12,-8 - node: color: '#BD575DFF' id: ThreeQuarterTileOverlayGreyscale90 decals: - 1021: -5,14 - 1022: -6,17 + 813: -5,14 + 814: -6,17 - node: color: '#FF0000FF' id: WarnBox decals: - 842: 69,2 + 695: 69,2 - node: color: '#FFFFFFFF' id: WarnBox decals: - 375: -26,24 + 269: -26,24 - node: color: '#FF0000FF' id: WarnCornerNE decals: - 845: 68,3 + 698: 68,3 - node: color: '#FFFFFFFF' id: WarnCornerNE decals: - 793: -41,-6 + 646: -41,-6 - node: color: '#FF0000FF' id: WarnCornerNW decals: - 846: 66,3 + 699: 66,3 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: - 794: -43,-6 + 647: -43,-6 - node: color: '#FF0000FF' id: WarnCornerSE decals: - 844: 68,1 + 697: 68,1 - node: color: '#FFFFFFFF' id: WarnCornerSE decals: - 795: -41,-4 + 648: -41,-4 - node: color: '#FF0000FF' id: WarnCornerSW decals: - 843: 66,1 + 696: 66,1 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: - 796: -43,-4 + 649: -43,-4 - node: color: '#FFFFFFFF' id: WarnEndE decals: - 800: 12,-12 + 653: 12,-12 - node: color: '#FF0000FF' id: WarnEndN decals: - 841: 70,3 + 694: 70,3 - node: color: '#FF0000FF' id: WarnEndS decals: - 840: 70,2 + 693: 70,2 - node: color: '#FFFFFFFF' id: WarnEndW decals: - 799: 11,-12 + 652: 11,-12 - node: color: '#C3C3C3FF' id: WarnLineE decals: - 914: -36,-33 + 767: -36,-33 - node: color: '#FF0000FF' id: WarnLineE decals: - 814: 60,7 - 815: 60,6 - 847: 68,2 + 667: 60,7 + 668: 60,6 + 700: 68,2 - node: color: '#FFFFFFFF' id: WarnLineE decals: - 548: -15,-30 - 549: -15,-31 - 647: 54,-4 - 648: 54,-5 - 649: 54,-6 - 803: 57,7 - 804: 57,6 - 805: 57,8 - 806: 57,5 - 807: 57,4 - 808: 57,3 - 809: 57,2 - 810: 57,1 - 811: 57,0 - 961: -21,-6 + 442: -15,-30 + 443: -15,-31 + 516: 54,-4 + 517: 54,-5 + 518: 54,-6 + 656: 57,7 + 657: 57,6 + 658: 57,8 + 659: 57,5 + 660: 57,4 + 661: 57,3 + 662: 57,2 + 663: 57,1 + 664: 57,0 + 795: -21,-6 - node: color: '#FF0000FF' id: WarnLineN decals: - 835: 62,0 - 836: 63,0 - 837: 63,5 - 838: 62,5 - 839: 67,1 + 688: 62,0 + 689: 63,0 + 690: 63,5 + 691: 62,5 + 692: 67,1 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 510: 20,26 - 511: 21,26 - 512: 22,26 - 650: 56,-4 - 651: 57,-4 - 652: 58,-4 - 653: 59,-4 - 654: 60,-4 - 665: -3,-29 - 666: -2,-29 - 667: -1,-29 - 668: 0,-29 - 797: -42,-4 - 850: 70,5 + 404: 20,26 + 405: 21,26 + 406: 22,26 + 519: 56,-4 + 520: 57,-4 + 521: 58,-4 + 522: 59,-4 + 523: 60,-4 + 534: -3,-29 + 535: -2,-29 + 536: -1,-29 + 537: 0,-29 + 650: -42,-4 + 703: 70,5 - node: color: '#C3C3C3FF' id: WarnLineS decals: - 912: -34,-33 - 913: -36,-33 - 920: -37,-30 - 921: -37,-29 + 765: -34,-33 + 766: -36,-33 + 773: -37,-30 + 774: -37,-29 - node: color: '#FF0000FF' id: WarnLineS decals: - 816: 62,10 - 817: 62,8 - 818: 62,9 - 819: 62,7 - 820: 62,6 - 821: 62,5 - 822: 62,4 - 823: 62,3 - 824: 62,2 - 825: 62,1 - 826: 62,0 - 827: 62,-1 - 828: 62,-2 - 829: 62,-3 - 830: 62,-4 - 848: 66,2 + 669: 62,10 + 670: 62,8 + 671: 62,9 + 672: 62,7 + 673: 62,6 + 674: 62,5 + 675: 62,4 + 676: 62,3 + 677: 62,2 + 678: 62,1 + 679: 62,0 + 680: 62,-1 + 681: 62,-2 + 682: 62,-3 + 683: 62,-4 + 701: 66,2 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 550: -17,-31 - 551: -17,-30 - 752: -15,18 - 753: -15,19 - 754: -15,20 - 755: -15,21 - 812: 59,7 - 813: 59,6 - 962: -19,-6 + 444: -17,-31 + 445: -17,-30 + 605: -15,18 + 606: -15,19 + 607: -15,20 + 608: -15,21 + 665: 59,7 + 666: 59,6 + 796: -19,-6 - node: color: '#FF0000FF' id: WarnLineW decals: - 831: 62,4 - 832: 63,4 - 833: 63,-1 - 834: 62,-1 - 849: 67,3 + 684: 62,4 + 685: 63,4 + 686: 63,-1 + 687: 62,-1 + 702: 67,3 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 500: 21,24 - 501: 22,24 - 503: 20,24 - 798: -42,-6 + 394: 21,24 + 395: 22,24 + 397: 20,24 + 651: -42,-6 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLine decals: - 440: -40,0 - 441: -40,1 - 442: -40,2 - 443: -40,8 - 444: -40,9 - 445: -40,10 + 334: -40,0 + 335: -40,1 + 336: -40,2 + 337: -40,8 + 338: -40,9 + 339: -40,10 - node: color: '#FFFFFFFF' id: WarningLine decals: - 253: 46,7 - 254: 47,7 - 255: 48,7 - 256: 49,7 - 257: 50,7 - 286: 8,7 - 290: 7,7 - 291: 9,7 + 218: 46,7 + 219: 47,7 + 220: 48,7 + 221: 49,7 + 222: 50,7 + 251: 8,7 + 255: 7,7 + 256: 9,7 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLine decals: - 113: 53,1 - 114: 53,2 - 115: 53,3 - 258: 60,0 - 259: 60,1 - 260: 60,2 - 261: 60,3 - 262: 60,4 - 372: -1,16 - 373: -1,17 - 374: -1,18 + 78: 53,1 + 79: 53,2 + 80: 53,3 + 223: 60,0 + 224: 60,1 + 225: 60,2 + 226: 60,3 + 227: 60,4 + 266: -1,16 + 267: -1,17 + 268: -1,18 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: WarningLine decals: - 287: 8,11 + 252: 8,11 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLineCorner decals: - 446: -40,3 + 340: -40,3 - node: color: '#FFFFFFFF' id: WarningLineCorner decals: - 293: 6,7 + 258: 6,7 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: WarningLineCorner decals: - 288: 9,11 + 253: 9,11 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 447: -40,7 + 341: -40,7 - node: color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 292: 10,7 + 257: 10,7 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 289: 7,11 + 254: 7,11 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 852: 0,1 - 1081: -18,-11 - 1095: 0,14 + 705: 0,1 + 830: -18,-11 + 844: 0,14 - node: zIndex: 1 color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 625: -4,-6 + 494: -4,-6 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: - 851: -10,1 - 1080: -21,-11 - 1094: -4,14 + 704: -10,1 + 829: -21,-11 + 843: -4,14 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: - 853: 0,-7 - 1082: -18,-13 - 1098: 0,10 + 706: 0,-7 + 831: -18,-13 + 847: 0,10 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: - 855: -10,-2 - 1083: -21,-13 - 1093: -4,10 + 708: -10,-2 + 832: -21,-13 + 842: -4,10 - node: zIndex: 2 color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: - 750: -37,19 + 603: -37,19 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSw decals: - 854: -8,-2 + 707: -8,-2 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 867: 0,0 - 868: 0,-1 - 869: 0,-2 - 870: 0,-3 - 871: 0,-5 - 872: 0,-4 - 873: 0,-6 - 1084: -18,-12 - 1101: 0,11 - 1102: 0,12 - 1103: 0,13 + 720: 0,0 + 721: 0,-1 + 722: 0,-2 + 723: 0,-3 + 724: 0,-5 + 725: 0,-4 + 726: 0,-6 + 833: -18,-12 + 850: 0,11 + 851: 0,12 + 852: 0,13 - node: zIndex: 1 color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 624: -4,-7 - 762: 27,10 - 763: 27,9 - 764: 27,8 + 493: -4,-7 + 615: 27,10 + 616: 27,9 + 617: 27,8 - node: zIndex: 2 color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 708: 20,-12 + 577: 20,-12 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 858: -8,1 - 859: -9,1 - 860: -7,1 - 861: -6,1 - 862: -5,1 - 863: -4,1 - 864: -3,1 - 865: -2,1 - 866: -1,1 - 1085: -19,-11 - 1086: -20,-11 - 1104: -1,14 - 1105: -2,14 - 1106: -3,14 + 711: -8,1 + 712: -9,1 + 713: -7,1 + 714: -6,1 + 715: -5,1 + 716: -4,1 + 717: -3,1 + 718: -2,1 + 719: -1,1 + 834: -19,-11 + 835: -20,-11 + 853: -1,14 + 854: -2,14 + 855: -3,14 - node: zIndex: 1 color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 620: -8,-6 - 621: -7,-6 - 622: -6,-6 - 623: -5,-6 + 489: -8,-6 + 490: -7,-6 + 491: -6,-6 + 492: -5,-6 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 785: 37,0 - 786: 38,0 - 787: 39,0 - 788: 40,0 - 874: -1,-7 - 875: -2,-7 - 876: -3,-7 - 880: -9,-2 - 1088: -20,-13 - 1089: -19,-13 - 1099: -1,10 - 1100: -2,10 - 1107: -3,10 + 638: 37,0 + 639: 38,0 + 640: 39,0 + 641: 40,0 + 727: -1,-7 + 728: -2,-7 + 729: -3,-7 + 733: -9,-2 + 837: -20,-13 + 838: -19,-13 + 848: -1,10 + 849: -2,10 + 856: -3,10 - node: zIndex: 2 color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 751: -36,19 + 604: -36,19 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: - 856: -10,-1 - 857: -10,0 - 877: -8,-5 - 878: -8,-4 - 879: -8,-3 - 1078: -14,-12 - 1079: -14,-11 - 1087: -21,-12 - 1090: -4,13 - 1091: -4,12 - 1092: -4,11 + 709: -10,-1 + 710: -10,0 + 730: -8,-5 + 731: -8,-4 + 732: -8,-3 + 827: -14,-12 + 828: -14,-11 + 836: -21,-12 + 839: -4,13 + 840: -4,12 + 841: -4,11 - node: color: '#FFFF00FF' id: radiation decals: - 802: 59,7 + 655: 59,7 - type: OccluderTree - type: SpreaderGrid - type: Shuttle @@ -3390,6 +3520,7 @@ entities: - type: MetaData - type: Transform - type: Map + mapPaused: True - type: PhysicsMap - type: GridTree - type: MovedGrids @@ -4121,7 +4252,7 @@ entities: pos: 3.5,22.5 parent: 31 - type: Door - secondsUntilStateChange: -17127.416 + secondsUntilStateChange: -17204.738 state: Opening - type: DeviceLinkSource lastSignals: @@ -7743,6 +7874,26 @@ entities: - type: Transform pos: -23.5,-13.5 parent: 31 + - uid: 420 + components: + - type: Transform + pos: -30.5,0.5 + parent: 31 + - uid: 421 + components: + - type: Transform + pos: -30.5,-0.5 + parent: 31 + - uid: 422 + components: + - type: Transform + pos: -32.5,-9.5 + parent: 31 + - uid: 437 + components: + - type: Transform + pos: -32.5,-10.5 + parent: 31 - uid: 528 components: - type: Transform @@ -78820,6 +78971,9 @@ entities: rot: 1.5707963267948966 rad pos: 50.5,-24.5 parent: 31 + - type: DeviceLinkSink + links: + - 1234 - uid: 8689 components: - type: Transform diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml index e8ec6f3d255..f712e18e24d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/gloveGroup.yml @@ -1,24 +1,6 @@ - type: characterItemGroup id: LoadoutGloves items: - - type: loadout - id: LoadoutHandsColorPurple - - type: loadout - id: LoadoutHandsColorRed - - type: loadout - id: LoadoutHandsColorBlack - - type: loadout - id: LoadoutHandsColorBlue - - type: loadout - id: LoadoutHandsColorBrown - - type: loadout - id: LoadoutHandsColorGray - - type: loadout - id: LoadoutHandsColorGreen - - type: loadout - id: LoadoutHandsColorLightBrown - - type: loadout - id: LoadoutHandsColorOrange - type: loadout id: LoadoutHandsColorWhite - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml index d5ba07f5805..26f93d6531d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml @@ -5,28 +5,12 @@ id: LoadoutHeadBeaverHat - type: loadout id: LoadoutHeadTophat - - type: loadout - id: LoadoutHeadFedoraBlack - - type: loadout - id: LoadoutHeadFedoraBrown - - type: loadout - id: LoadoutHeadFedoraGrey - - type: loadout - id: LoadoutHeadFedoraChoc - type: loadout id: LoadoutHeadFedoraWhite - type: loadout id: LoadoutHeadFlatBlack - type: loadout id: LoadoutHeadFlatBrown - - type: loadout - id: LoadoutHeadHatCowboyBrown - - type: loadout - id: LoadoutHeadHatCowboyBlack - - type: loadout - id: LoadoutHeadHatCowboyGrey - - type: loadout - id: LoadoutHeadHatCowboyRed - type: loadout id: LoadoutHeadHatCowboyWhite - type: loadout @@ -38,57 +22,19 @@ - type: loadout id: LoadoutHeadPoppy - type: loadout - id: LoadoutHeadHatBluesoft - - type: loadout - id: LoadoutHeadHatBluesoftFlipped + id: LoadoutHeadPoppyWhite - type: loadout id: LoadoutHeadHatCorpsoft - type: loadout id: LoadoutHeadHatCorpsoftFlipped - - type: loadout - id: LoadoutHeadHatGreensoft - - type: loadout - id: LoadoutHeadHatGreensoftFlipped - - type: loadout - id: LoadoutHeadHatGreysoft - - type: loadout - id: LoadoutHeadHatGreysoftFlipped - type: loadout id: LoadoutHeadHatMimesoft - type: loadout id: LoadoutHeadHatMimesoftFlipped - type: loadout - id: LoadoutHeadHatOrangesoft - - type: loadout - id: LoadoutHeadHatOrangesoftFlipped - - type: loadout - id: LoadoutHeadHatPurplesoft - - type: loadout - id: LoadoutHeadHatPurplesoftFlipped - - type: loadout - id: LoadoutHeadHatRedsoft - - type: loadout - id: LoadoutHeadHatRedsoftFlipped - - type: loadout - id: LoadoutHeadHatYellowsoft - - type: loadout - id: LoadoutHeadHatYellowsoftFlipped - - type: loadout - id: LoadoutHeadBandBlack - - type: loadout - id: LoadoutHeadBandBlue - - type: loadout - id: LoadoutHeadBandGold - - type: loadout - id: LoadoutHeadBandGreen - - type: loadout - id: LoadoutHeadBandGrey - - type: loadout - id: LoadoutHeadBandRed + id: LoadoutHeadBandWhite - type: loadout id: LoadoutHeadBandSkull - - type: loadout - id: LoadoutHeadBandMerc - type: loadout id: LoadoutHeadBandBrown - type: loadout @@ -104,19 +50,7 @@ - type: loadout id: LoadoutHeadBrownFlatcap - type: loadout - id: LoadoutHeadBeret - - type: loadout - id: LoadoutHeadBeretFrench - - type: loadout - id: LoadoutHeadCowboyBrown - - type: loadout - id: LoadoutHeadCowboyBlack - - type: loadout - id: LoadoutHeadCowboyWhite - - type: loadout - id: LoadoutHeadCowboyGrey - - type: loadout - id: LoadoutHeadCowboyRed + id: LoadoutHeadBeretWhite - type: loadout id: LoadoutHeadHijabColorable - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml b/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml index 66b7d32ea74..dcf9bbec8aa 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/itemGroups.yml @@ -7,66 +7,10 @@ items: - type: loadout id: LoadoutUniformAncientJumpsuit - - type: loadout - id: LoadoutUniformJumpsuitColorBlack - - type: loadout - id: LoadoutUniformJumpskirtColorBlack - - type: loadout - id: LoadoutUniformJumpsuitColorBlue - - type: loadout - id: LoadoutUniformJumpskirtColorBlue - - type: loadout - id: LoadoutUniformJumpsuitColorBrown - - type: loadout - id: LoadoutUniformJumpskirtColorBrown - - type: loadout - id: LoadoutUniformJumpsuitColorDarkBlue - - type: loadout - id: LoadoutUniformJumpskirtColorDarkBlue - - type: loadout - id: LoadoutUniformJumpsuitColorDarkGreen - - type: loadout - id: LoadoutUniformJumpskirtColorDarkGreen - - type: loadout - id: LoadoutUniformJumpsuitColorGreen - - type: loadout - id: LoadoutUniformJumpskirtColorGreen - - type: loadout - id: LoadoutUniformJumpsuitColorLightBrown - - type: loadout - id: LoadoutUniformJumpskirtColorLightBrown - - type: loadout - id: LoadoutUniformJumpsuitColorMaroon - - type: loadout - id: LoadoutUniformJumpskirtColorMaroon - - type: loadout - id: LoadoutUniformJumpsuitColorOrange - - type: loadout - id: LoadoutUniformJumpskirtColorOrange - - type: loadout - id: LoadoutUniformJumpsuitColorPink - - type: loadout - id: LoadoutUniformJumpskirtColorPink - - type: loadout - id: LoadoutUniformJumpsuitColorPurple - - type: loadout - id: LoadoutUniformJumpskirtColorPurple - - type: loadout - id: LoadoutUniformJumpsuitColorRed - - type: loadout - id: LoadoutUniformJumpskirtColorRed - - type: loadout - id: LoadoutUniformJumpsuitColorTeal - - type: loadout - id: LoadoutUniformJumpskirtColorTeal - type: loadout id: LoadoutUniformJumpsuitColorWhite - type: loadout id: LoadoutUniformJumpskirtColorWhite - - type: loadout - id: LoadoutUniformJumpsuitColorYellow - - type: loadout - id: LoadoutUniformJumpskirtColorYellow - type: loadout id: LoadoutUniformJumpsuitFlannel - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml index ffe37fc0426..fe78d84c9e9 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml @@ -7,25 +7,9 @@ id: LoadoutMaskMuzzle - type: loadout id: LoadoutMaskGas - - type: loadout - id: LoadoutMaskBandBlack - - type: loadout - id: LoadoutMaskBandBlue - - type: loadout - id: LoadoutMaskBandGold - - type: loadout - id: LoadoutMaskBandGreen - - type: loadout - id: LoadoutMaskBandGrey - - type: loadout - id: LoadoutMaskBandRed - type: loadout id: LoadoutMaskBandSkull - type: loadout - id: LoadoutMaskBandMerc - - type: loadout - id: LoadoutMaskBandBrown - - type: loadout - id: LoadoutMaskNeckGaiter + id: LoadoutMaskBandWhite - type: loadout - id: LoadoutMaskNeckGaiterRed + id: LoadoutMaskNeckGaiterWhite diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/miscItemGroups.yml b/Resources/Prototypes/CharacterItemGroups/Generic/miscItemGroups.yml index 3cad4423f52..cc1e82ceb69 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/miscItemGroups.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/miscItemGroups.yml @@ -121,3 +121,16 @@ id: LoadoutBookRandom - type: loadout id: LoadoutPen + +- type: characterItemGroup + id: LoadoutPets + maxItems: 1 + items: + - type: loadout + id: LoadoutItemPetMouse + - type: loadout + id: LoadoutItemPetHamster + - type: loadout + id: LoadoutItemPetMothroach + - type: loadout + id: LoadoutItemPetCockroach diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml index 2a7add033e0..ef3f40891a7 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/neckGroup.yml @@ -25,16 +25,8 @@ id: LoadoutNeckScarfStripedPurple - type: loadout id: LoadoutNeckScarfStripedZebra - - type: loadout - id: LoadoutNeckTieRed - type: loadout id: LoadoutNeckTieWhite - - type: loadout - id: LoadoutNeckTieBlack - - type: loadout - id: LoadoutNeckTieBlue - - type: loadout - id: LoadoutNeckTieGreen - type: loadout id: LoadoutItemsPrideLGBTPin - type: loadout @@ -53,29 +45,11 @@ id: LoadoutItemsPridePansexualPin - type: loadout id: LoadoutItemsPrideTransPin - - type: loadout - id: LoadoutNeckBedsheetBlack - - type: loadout - id: LoadoutNeckBedsheetBlue - - type: loadout - id: LoadoutNeckBedsheetBrown - type: loadout id: LoadoutNeckBedsheetCosmos - - type: loadout - id: LoadoutNeckBedsheetGreen - - type: loadout - id: LoadoutNeckBedsheetGrey - - type: loadout - id: LoadoutNeckBedsheetOrange - - type: loadout - id: LoadoutNeckBedsheetPurple - type: loadout id: LoadoutNeckBedsheetRainbow - - type: loadout - id: LoadoutNeckBedsheetRed - type: loadout id: LoadoutNeckBedsheetWhite - - type: loadout - id: LoadoutNeckBedsheetYellow - type: loadout id: LoadoutNeckBedsheetNT diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml index e3b71e7977e..ea56881c555 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/shoeGroup.yml @@ -1,24 +1,8 @@ - type: characterItemGroup id: LoadoutShoes items: - - type: loadout - id: LoadoutShoesBlack - - type: loadout - id: LoadoutShoesBlue - - type: loadout - id: LoadoutShoesBrown - - type: loadout - id: LoadoutShoesGreen - - type: loadout - id: LoadoutShoesOrange - - type: loadout - id: LoadoutShoesPurple - - type: loadout - id: LoadoutShoesRed - type: loadout id: LoadoutShoesWhite - - type: loadout - id: LoadoutShoesYellow - type: loadout id: LoadoutShoesGeta - type: loadout @@ -29,10 +13,6 @@ id: LoadoutShoesBootsLaceup - type: loadout id: LoadoutShoesBootsWinter - - type: loadout - id: LoadoutShoesBootsCowboyBrown - - type: loadout - id: LoadoutShoesBootsCowboyBlack - type: loadout id: LoadoutShoesBootsCowboyWhite - type: loadout diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 2abe1f0a80f..fdec5232026 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -300,6 +300,20 @@ fiberMaterial: fibers-synthetic fiberColor: fibers-black +- type: entity + parent: ClothingHandsButcherable + id: ClothingHandsGlovesFingerlessWhite + name: fingerless gloves + description: Plain gloves without fingertips. + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/fingerlesswhite.rsi + - type: Clothing + sprite: Clothing/Hands/Gloves/fingerlesswhite.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-dyed + - type: entity parent: ClothingHandsBase id: ClothingHandsGlovesFingerlessInsulated diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml index 51a56f1f1d6..29a99ce6440 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml @@ -24,6 +24,11 @@ tags: - Bandana +- type: entity + parent: [ClothingHeadBandBase, ClothingMaskBandWhite] + id: ClothingHeadBandWhite + name: bandana + - type: entity parent: [ClothingHeadBandBase, ClothingMaskBandBlack] id: ClothingHeadBandBlack diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 5b5d281362d..fe590c55628 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -25,6 +25,17 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadHatBeret + id: ClothingHeadHatBeretWhite + name: beret + description: A beret, an artists favorite headwear. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beretwhite.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beretwhite.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretFrench diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index 163d9937f2e..60a175e7de4 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -167,7 +167,7 @@ - type: entity parent: ClothingHeadHeadHatBaseFlippable id: ClothingHeadHatMimesoft - name: mime cap + name: baseball cap description: "It's a baseball hat in a tasteless white colour." components: - type: Sprite @@ -178,7 +178,7 @@ - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatMimesoft] id: ClothingHeadHatMimesoftFlipped - name: mime cap + name: baseball cap - type: entity parent: ClothingHeadHeadHatBaseFlippable diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml index f5ad2fb6c83..f1f7ebc4cc5 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml @@ -30,6 +30,17 @@ - Snout hideOnToggle: true +- type: entity + parent: ClothingMaskBandanaBase + id: ClothingMaskBandWhite + name: bandana + description: A bandana to make you look cool. + components: + - type: Sprite + sprite: Clothing/Head/Bandanas/white.rsi + - type: Clothing + sprite: Clothing/Head/Bandanas/white.rsi + - type: entity parent: ClothingMaskBandanaBase id: ClothingMaskBandBlack diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index c470605bb79..383e32e99d6 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -562,6 +562,16 @@ - WhitelistChameleon - IPCMaskWearable # Estacao Pirata - IPCs +- type: entity + parent: ClothingMaskNeckGaiter + id: ClothingMaskNeckGaiterWhite + name: neck gaiter + components: + - type: Sprite + sprite: Clothing/Mask/neckgaiterwhite.rsi + - type: Clothing + sprite: Clothing/Mask/neckgaiterwhite.rsi + - type: entity parent: ClothingMaskNeckGaiter id: ClothingMaskNeckGaiterRed diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index 96b5f7aa8c5..62c9e48ca65 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -69,6 +69,8 @@ - PlushieTrystan - PlushieSlips - PlushieJester + - PlushieHarpy + - PlushieMort chance: 0.5 offset: 0.2 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 6e369389a90..1ee20cdcb61 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -404,6 +404,21 @@ speaks: [Hissing] understands: [Hissing] +- type: entity + parent: MobCockroach + id: MobCockroachPet + components: + - type: HTN + rootTask: + task: FollowCompound + blackboard: + IdleRange: !type:Single + 1.5 + FollowCloseRange: !type:Single + 1.0 + FollowRange: !type:Single + 2.0 + - type: entity name: glockroach parent: MobCockroach @@ -575,6 +590,21 @@ enum.SurgeryUIKey.Key: type: SurgeryBui +- type: entity + parent: MobMothroach + id: MobMothroachPet + components: + - type: HTN + rootTask: + task: FollowCompound + blackboard: + IdleRange: !type:Single + 1.5 + FollowCloseRange: !type:Single + 1.0 + FollowRange: !type:Single + 2.0 + # Note that the mallard duck is actually a male drake mallard, with the brown duck being the female variant of the same species, however ss14 lacks sex specific textures # The white duck is more akin to a pekin or call duck. @@ -1769,6 +1799,21 @@ enum.SurgeryUIKey.Key: type: SurgeryBui +- type: entity + parent: MobMouse + id: MobMousePet + components: + - type: HTN + rootTask: + task: FollowCompound + blackboard: + IdleRange: !type:Single + 1.5 + FollowCloseRange: !type:Single + 1.0 + FollowRange: !type:Single + 2.0 + - type: entity parent: MobMouse suffix: Dead @@ -3418,6 +3463,21 @@ sprite: Mobs/Effects/onfire.rsi normalState: Mouse_burning +- type: entity + parent: MobHamster + id: MobHamsterPet + components: + - type: HTN + rootTask: + task: FollowCompound + blackboard: + IdleRange: !type:Single + 1.5 + FollowCloseRange: !type:Single + 1.0 + FollowRange: !type:Single + 2.0 + - type: entity name: pig parent: SimpleMobBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 3bf253f773b..f9bd17860c8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1249,6 +1249,14 @@ tags: - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be +- type: entity + name: hairflower + id: FoodPoppyWhite + parent: FoodPoppy + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/poppywhite.rsi + - type: entity name: lily parent: FoodPoppy diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index a547f33b59a..d5ee3e0b4d5 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1966,3 +1966,63 @@ - type: Sprite sprite: Objects/Fun/toys.rsi state: shadowkin + +- type: entity + parent: BasePlushie + id: PlushieMort + name: morty plushie + description: A plushie of the lovely Morty. It's a resilient, yet sensitive type of plush. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: mortplush + +- type: entity + parent: BasePlushie + id: PlushieHarpy + name: harpy plushie + description: A soft plushie of a harpy! A small tag on it guarantees that all feathers are ethically sourced. + components: + - type: Sprite + sprite: Objects/Fun/toys.rsi + state: harpyplushie + - type: StaminaDamageOnHit + damage: 0.8 + - type: EmitSoundOnActivate + sound: + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg + params: + variation: 0.05 + - type: EmitSoundOnUse + sound: + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg + params: + variation: 0.05 + - type: EmitSoundOnLand + sound: + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg + params: + variation: 0.05 + - type: UseDelay + delay: 0.8 + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 0.5 + damage: + types: + Blunt: 0 + soundHit: + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg + params: + variation: 0.05 + soundSwing: + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg + params: + variation: 0.05 + soundNoDamage: + path: /Audio/DeltaV/Voice/Harpy/caw1.ogg + params: + variation: 0.05 \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/Generic/hands.yml b/Resources/Prototypes/Loadouts/Generic/hands.yml index 524a6de9183..2a35910a17c 100644 --- a/Resources/Prototypes/Loadouts/Generic/hands.yml +++ b/Resources/Prototypes/Loadouts/Generic/hands.yml @@ -1,102 +1,3 @@ -- type: loadout - id: LoadoutHandsColorPurple - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorPurple - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorRed - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorBlack - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorBlue - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorBrown - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorGray - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorGray - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorGreen - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorLightBrown - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorLightBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - -- type: loadout - id: LoadoutHandsColorOrange - category: Hands - cost: 0 - exclusive: true - items: - - ClothingHandsGlovesColorOrange - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutGloves - - type: loadout id: LoadoutHandsColorWhite category: Hands @@ -160,12 +61,13 @@ group: LoadoutGloves - type: loadout - id: LoadoutHandsGlovesFingerless + id: LoadoutHandsGlovesFingerlessWhite category: Hands cost: 0 exclusive: true + customColorTint: true items: - - ClothingHandsGlovesFingerless + - ClothingHandsGlovesFingerlessWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutGloves diff --git a/Resources/Prototypes/Loadouts/Generic/head.yml b/Resources/Prototypes/Loadouts/Generic/head.yml index b8d3c8c7ac4..3efef2fac4a 100644 --- a/Resources/Prototypes/Loadouts/Generic/head.yml +++ b/Resources/Prototypes/Loadouts/Generic/head.yml @@ -25,58 +25,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadFedoraBlack - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatFedoraBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadFedoraBrown - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatFedoraBrown - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadFedoraGrey - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatFedoraGrey - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadFedoraChoc - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatFedoraChoc - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadFedoraWhite category: Head @@ -115,50 +63,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadHatCowboyBrown - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatCowboyBlack - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatCowboyGrey - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyGrey - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatCowboyRed - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadHatCowboyWhite category: Head @@ -218,37 +122,19 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -# Color Hats -- type: loadout - id: LoadoutHeadHatBluesoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatBluesoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout - id: LoadoutHeadHatBluesoftFlipped + id: LoadoutHeadPoppyWhite category: Head cost: 0 exclusive: true + customColorTint: true items: - - ClothingHeadHatBluesoftFlipped + - FoodPoppyWhite requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - !type:CharacterItemGroupRequirement group: LoadoutHead +# Color Hats - type: loadout id: LoadoutHeadHatCorpsoft category: Head @@ -271,58 +157,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadHatGreensoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatGreensoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatGreensoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatGreensoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatGreysoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatGreysoft - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatGreysoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatGreysoftFlipped - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadHatMimesoft category: Head @@ -347,197 +181,15 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadHatOrangesoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatOrangesoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatOrangesoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatOrangesoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatPurplesoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatPurplesoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatPurplesoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatPurplesoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatRedsoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatRedsoft - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatRedsoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatRedsoftFlipped - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatYellowsoft - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatYellowsoft - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadHatYellowsoftFlipped - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadHatYellowsoftFlipped - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - # Headbands - type: loadout - id: LoadoutHeadBandBlack - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandBlue - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandBlue - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandGold - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandGold - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandGreen - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandGreen - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandGrey - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandGrey - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandRed + id: LoadoutHeadBandWhite category: Head cost: 0 exclusive: true + customColorTint: true items: - - ClothingHeadBandRed + - ClothingHeadBandWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutHead @@ -554,36 +206,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadBandMerc - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadBandMerc - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandBrown - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandBrown - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadFishCap category: Head @@ -665,84 +287,13 @@ # Berets - type: loadout - id: LoadoutHeadBeret - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatBeret - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBeretFrench - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatBeretFrench - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -# Cowboy hats -- type: loadout - id: LoadoutHeadCowboyBrown - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyBrown - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadCowboyBlack - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadCowboyWhite + id: LoadoutHeadBeretWhite category: Head cost: 1 exclusive: true customColorTint: true items: - - ClothingHeadHatCowboyWhite - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadCowboyGrey - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyGrey - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadCowboyRed - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatCowboyRed + - ClothingHeadHatBeretWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutHead diff --git a/Resources/Prototypes/Loadouts/Generic/items.yml b/Resources/Prototypes/Loadouts/Generic/items.yml index dafe7c9ffa5..2c42955c08f 100644 --- a/Resources/Prototypes/Loadouts/Generic/items.yml +++ b/Resources/Prototypes/Loadouts/Generic/items.yml @@ -766,3 +766,56 @@ customColorTint: true items: - DrinkVacuumFlask + +# Pets +- type: loadout + id: LoadoutItemPetMouse + category: Items + cost: 2 + canBeHeirloom: true + items: + - MobMousePet + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPets + functions: + - !type:LoadoutMakeFollower + +- type: loadout + id: LoadoutItemPetHamster + category: Items + cost: 2 + canBeHeirloom: true + items: + - MobHamsterPet + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPets + functions: + - !type:LoadoutMakeFollower + +- type: loadout + id: LoadoutItemPetMothroach + category: Items + cost: 2 + canBeHeirloom: true + items: + - MobMothroachPet + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPets + functions: + - !type:LoadoutMakeFollower + +- type: loadout + id: LoadoutItemPetCockroach + category: Items + cost: 2 + canBeHeirloom: true + items: + - MobCockroachPet + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutPets + functions: + - !type:LoadoutMakeFollower diff --git a/Resources/Prototypes/Loadouts/Generic/mask.yml b/Resources/Prototypes/Loadouts/Generic/mask.yml index 3d3754c6f7d..6445071d548 100644 --- a/Resources/Prototypes/Loadouts/Generic/mask.yml +++ b/Resources/Prototypes/Loadouts/Generic/mask.yml @@ -3,6 +3,7 @@ category: Mask cost: 0 exclusive: true + customColorTint: true items: - ClothingMaskSterile requirements: @@ -34,83 +35,13 @@ # Maskbands - type: loadout - id: LoadoutMaskBandBlack + id: LoadoutMaskBandWhite category: Mask cost: 0 exclusive: true + customColorTint: true items: - - ClothingMaskBandBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandBlue - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandBlue - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandGold - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandGold - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandGreen - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandGreen - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandGrey - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandGrey - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandRed - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandRed + - ClothingMaskBandWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutMasks @@ -127,55 +58,15 @@ - !type:CharacterItemGroupRequirement group: LoadoutMasks -- type: loadout - id: LoadoutMaskBandMerc - category: Mask - cost: 1 - exclusive: true - items: - - ClothingMaskBandMerc - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandBrown - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandBrown - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - # Gaiters - type: loadout - id: LoadoutMaskNeckGaiter - category: Mask - cost: 1 - exclusive: true - items: - - ClothingMaskNeckGaiter - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskNeckGaiterRed + id: LoadoutMaskNeckGaiterWhite category: Mask cost: 1 exclusive: true + customColorTint: true items: - - ClothingMaskNeckGaiterRed + - ClothingMaskNeckGaiterWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutMasks diff --git a/Resources/Prototypes/Loadouts/Generic/neck.yml b/Resources/Prototypes/Loadouts/Generic/neck.yml index 30f65770b12..c18c33984fb 100644 --- a/Resources/Prototypes/Loadouts/Generic/neck.yml +++ b/Resources/Prototypes/Loadouts/Generic/neck.yml @@ -147,18 +147,6 @@ group: LoadoutNeck # Ties -- type: loadout - id: LoadoutNeckTieRed - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTieRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - type: loadout id: LoadoutNeckTieWhite category: Neck @@ -172,42 +160,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutNeck -- type: loadout - id: LoadoutNeckTieBlack - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTieBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutNeckTieBlue - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTieBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - -- type: loadout - id: LoadoutNeckTieGreen - category: Neck - cost: 0 - exclusive: true - canBeHeirloom: true - items: - - ClothingNeckTieGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - #Pride Accessories - type: loadout id: LoadoutItemsPrideLGBTPin @@ -309,60 +261,6 @@ group: LoadoutNeck # Bedsheets -- type: loadout - id: LoadoutNeckBedsheetBlack - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutNeckBedsheetBlue - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutNeckBedsheetBrown - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - - type: loadout id: LoadoutNeckBedsheetCosmos category: Neck @@ -382,80 +280,6 @@ departments: - Command -- type: loadout - id: LoadoutNeckBedsheetGreen - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutNeckBedsheetGrey - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetGrey - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutNeckBedsheetOrange - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetOrange - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Logistics - - !type:CharacterJobRequirement - inverted: true - jobs: - - HeadOfPersonnel # Need to blacklist HoP and not command so other heads can wear this bedsheet - -- type: loadout - id: LoadoutNeckBedsheetPurple - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetPurple - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Epistemics - - !type:CharacterJobRequirement - inverted: true - jobs: - - HeadOfPersonnel # Need to blacklist HoP and not command so other heads can wear this bedsheet - - type: loadout id: LoadoutNeckBedsheetRainbow category: Neck @@ -474,25 +298,6 @@ departments: - Command -- type: loadout - id: LoadoutNeckBedsheetRed - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterJobRequirement - inverted: true - jobs: - - HeadOfPersonnel # Need to blacklist HoP and not command so other heads can wear this bedsheet - - type: loadout id: LoadoutNeckBedsheetWhite category: Neck @@ -512,25 +317,6 @@ departments: - Command -- type: loadout - id: LoadoutNeckBedsheetYellow - category: Neck - cost: 1 - exclusive: true - items: - - BedsheetYellow - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutNeck - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Engineering - - !type:CharacterJobRequirement - inverted: true - jobs: - - HeadOfPersonnel # Need to blacklist HoP and not command so other heads can wear this bedsheet - - type: loadout id: LoadoutNeckBedsheetNT category: Neck diff --git a/Resources/Prototypes/Loadouts/Generic/shoes.yml b/Resources/Prototypes/Loadouts/Generic/shoes.yml index 08f22753250..fb8487981bd 100644 --- a/Resources/Prototypes/Loadouts/Generic/shoes.yml +++ b/Resources/Prototypes/Loadouts/Generic/shoes.yml @@ -1,81 +1,4 @@ # Colored -- type: loadout - id: LoadoutShoesBlack - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorBlack - -- type: loadout - id: LoadoutShoesBlue - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorBlue - -- type: loadout - id: LoadoutShoesBrown - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorBrown - -- type: loadout - id: LoadoutShoesGreen - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorGreen - -- type: loadout - id: LoadoutShoesOrange - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorOrange - -- type: loadout - id: LoadoutShoesPurple - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorPurple - -- type: loadout - id: LoadoutShoesRed - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorRed - - type: loadout id: LoadoutShoesWhite category: Shoes @@ -88,17 +11,6 @@ items: - ClothingShoesColorWhite -- type: loadout - id: LoadoutShoesYellow - category: Shoes - cost: 0 - exclusive: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesColorYellow - - type: loadout id: LoadoutShoesGeta category: Shoes @@ -166,30 +78,6 @@ items: - ClothingShoesBootsWinter -- type: loadout - id: LoadoutShoesBootsCowboyBrown - category: Shoes - cost: 1 - exclusive: true - canBeHeirloom: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesBootsCowboyBrown - -- type: loadout - id: LoadoutShoesBootsCowboyBlack - category: Shoes - cost: 1 - exclusive: true - canBeHeirloom: true - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutShoes - items: - - ClothingShoesBootsCowboyBlack - - type: loadout id: LoadoutShoesBootsCowboyWhite category: Shoes diff --git a/Resources/Prototypes/Loadouts/Generic/uniform.yml b/Resources/Prototypes/Loadouts/Generic/uniform.yml index da16bcc10e5..960f70b54c0 100644 --- a/Resources/Prototypes/Loadouts/Generic/uniform.yml +++ b/Resources/Prototypes/Loadouts/Generic/uniform.yml @@ -16,229 +16,6 @@ # Colored jumpsuits # Someone please alphabetically order these... - -- type: loadout - id: LoadoutUniformJumpsuitColorBlack - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorBlack - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorBlue - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Medical - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorBlue - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Medical - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorGreen - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorGreen - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorOrange - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorOrange - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorOrange - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorOrange - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorPink - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorPink - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorPink - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorPink - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorRed - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorRed - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorRed - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Security - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - - type: loadout id: LoadoutUniformJumpsuitColorWhite category: Uniform @@ -281,298 +58,6 @@ departments: - Command -- type: loadout - id: LoadoutUniformJumpsuitColorYellow - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorYellow - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Engineering - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorYellow - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorYellow - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Engineering - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorDarkBlue - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorDarkBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorDarkBlue - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorDarkBlue - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorTeal - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorTeal - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorTeal - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorTeal - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorPurple - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorPurple - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Epistemics - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorPurple - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorPurple - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - Epistemics - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorDarkGreen - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorDarkGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorDarkGreen - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorDarkGreen - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorLightBrown - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorLightBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorLightBrown - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorLightBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorBrown - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorBrown - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorBrown - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpsuitColorMaroon - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpsuitColorMaroon - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - -- type: loadout - id: LoadoutUniformJumpskirtColorMaroon - category: Uniform - cost: 0 - exclusive: true - items: - - ClothingUniformJumpskirtColorMaroon - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutUniformsCivilian - - !type:CharacterDepartmentRequirement - departments: - - Civilian - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Command - - type: loadout id: LoadoutUniformJumpsuitFlannel category: Uniform diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml index 0ca17947425..638aaecd2cf 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -22,6 +22,10 @@ - !type:CharacterTraitRequirement traits: - ShadowkinBlackeye + special: + - !type:AddComponentSpecial + components: + - type: Pacified - type: startingGear id: PrisonerGear diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/equipped-HAND.png new file mode 100644 index 00000000000..36170c46610 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/icon.png new file mode 100644 index 00000000000..b4bda7cfddf Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-left.png new file mode 100644 index 00000000000..7fc12be332e Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-right.png new file mode 100644 index 00000000000..b2046039fab Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/meta.json new file mode 100644 index 00000000000..e47f13296a6 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.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/54ecdcc05bcaf335489938b1253a2a733ba12271", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..909b786581c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..62de52505ab Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK-vox.png new file mode 100644 index 00000000000..b47625c11d1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK.png new file mode 100644 index 00000000000..8b592ff678e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon.png new file mode 100644 index 00000000000..a471b2b6ec3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon_mask.png new file mode 100644 index 00000000000..f7ffc9c4a36 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon_mask.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-left.png new file mode 100644 index 00000000000..8a0b841c1c4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-right.png new file mode 100644 index 00000000000..e959b046eca Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/meta.json new file mode 100644 index 00000000000..a39a46ac810 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_mask" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..7e54273cf3a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/icon.png new file mode 100644 index 00000000000..f4d7a07d370 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-left.png new file mode 100644 index 00000000000..ba9c6174815 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-right.png new file mode 100644 index 00000000000..f816479e2cf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/meta.json new file mode 100644 index 00000000000..a470e009443 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/beretwhite.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", + "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/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-reptilian.png new file mode 100644 index 00000000000..24a8d78449d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-vox.png new file mode 100644 index 00000000000..e425a136df3 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK.png new file mode 100644 index 00000000000..3512302b5fc Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/icon.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/icon.png new file mode 100644 index 00000000000..af3948b8f42 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-left.png new file mode 100644 index 00000000000..65acefa0c34 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-right.png new file mode 100644 index 00000000000..2f39874647c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/meta.json new file mode 100644 index 00000000000..4da74959ddc --- /dev/null +++ b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by belay5 (Discord) | equipped-MASK-vox sprited by PuroSlavKing (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Logo/logo.png b/Resources/Textures/Logo/logo.png index 60aa041cced..f06485e27f1 100644 Binary files a/Resources/Textures/Logo/logo.png and b/Resources/Textures/Logo/logo.png differ diff --git a/Resources/Textures/Logo/source/EE_logo-light.svg b/Resources/Textures/Logo/source/EE_logo-light.svg index 236919fe2f5..2a6efd96d98 100644 --- a/Resources/Textures/Logo/source/EE_logo-light.svg +++ b/Resources/Textures/Logo/source/EE_logo-light.svg @@ -1,12 +1,46 @@ - - - - diff --git a/Resources/Textures/Logo/source/EE_logo.svg b/Resources/Textures/Logo/source/EE_logo.svg new file mode 100644 index 00000000000..236919fe2f5 --- /dev/null +++ b/Resources/Textures/Logo/source/EE_logo.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Resources/Textures/Objects/Fun/toys.rsi/harpyplushie.png b/Resources/Textures/Objects/Fun/toys.rsi/harpyplushie.png new file mode 100644 index 00000000000..d93178d3f7b Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/harpyplushie.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index cc03557e0b4..7dafd603638 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -389,6 +389,12 @@ }, { "name": "shadowkin" + }, + { + "name": "mortplush" + }, + { + "name": "harpyplushie" } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Fun/toys.rsi/mortplush.png b/Resources/Textures/Objects/Fun/toys.rsi/mortplush.png new file mode 100644 index 00000000000..28b3f1c6ebb Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/mortplush.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/dead.png new file mode 100644 index 00000000000..849b4242b4e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..221e35fbc39 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/harvest.png new file mode 100644 index 00000000000..99ad68a5d28 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/meta.json new file mode 100644 index 00000000000..b49b49cc850 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, equipped-HELMET taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/produce.png new file mode 100644 index 00000000000..84caa94b9a1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/seed.png new file mode 100644 index 00000000000..4197b68f37a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-1.png new file mode 100644 index 00000000000..1e582f92314 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-2.png new file mode 100644 index 00000000000..090715f6a01 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-3.png new file mode 100644 index 00000000000..edcd8617dc7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-3.png differ diff --git a/RobustToolbox b/RobustToolbox index 92b0e7f1a85..9c30fdf5fd7 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 92b0e7f1a853979a1361ed24d2fb5ffc11f43f66 +Subproject commit 9c30fdf5fd7261ea424f80478c2746e2001326e8