diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index 0e228f1a589..bfe457c94bd 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -26,6 +26,7 @@ using Content.Shared.Stacks; using Content.Shared.Storage; using Content.Shared.Verbs; +using Content.Shared._Goobstation.EatToGrow; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Utility; @@ -284,6 +285,8 @@ private void OnDoAfter(Entity entity, ref ConsumeDoAfterEvent arg _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion); _stomach.TryTransferSolution(stomachToUse!.Value.Owner, split, stomachToUse); + var afterEatingEv = new AfterEatingEvent(entity.Owner); + RaiseLocalEvent(args.Target.Value, ref afterEatingEv); var flavors = args.FlavorMessage; if (forceFeed) diff --git a/Content.Server/_Goobstation/Dash/DashActionChatSystem.cs b/Content.Server/_Goobstation/Dash/DashActionChatSystem.cs new file mode 100644 index 00000000000..b35380c6acb --- /dev/null +++ b/Content.Server/_Goobstation/Dash/DashActionChatSystem.cs @@ -0,0 +1,33 @@ +using Content.Server.Chat.Systems; +using Content.Shared._Goobstation.Dash; +using Content.Shared.Chat.Prototypes; +using Robust.Shared.Prototypes; + +namespace Content.Server._Goobstation.Dash; + +public sealed class DashActionChatSystem : EntitySystem +{ + [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private readonly IPrototypeManager _prototype = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnDash); + } + + private void OnDash(DashActionEvent args) + { + if (args.Emote == null) + return; + + if (!_prototype.TryIndex(args.Emote.Value, out var emote)) + return; + + _chat.TryEmoteWithChat( + args.Performer, + emote, + forceEmote: true); + } +} \ No newline at end of file diff --git a/Content.Server/_Goobstation/EatToGrow/EatToGrowSystem.cs b/Content.Server/_Goobstation/EatToGrow/EatToGrowSystem.cs new file mode 100644 index 00000000000..0e5dfb34c61 --- /dev/null +++ b/Content.Server/_Goobstation/EatToGrow/EatToGrowSystem.cs @@ -0,0 +1,81 @@ +using Content.Shared._Goobstation.EatToGrow; +using Content.Shared.Mobs; +using Robust.Server.GameObjects; +using Robust.Shared.Physics; +using Robust.Shared.Physics.Collision.Shapes; +using Robust.Shared.Physics.Systems; +using System.Numerics; +using Content.Shared.Sprite; + +namespace Content.Server._Goobstation.EatToGrow; + + +public sealed class EatToGrowSystem : EntitySystem +{ + [Dependency] private readonly AppearanceSystem _appearance = default!; + [Dependency] private readonly SharedPhysicsSystem _physics = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnFoodEaten); + SubscribeLocalEvent(ShrinkOnDeath); + } + + private void OnFoodEaten(Entity ent, ref AfterEatingEvent args) + { + Grow(ent.Owner, ent.Comp, 1); + } + + private void Grow(EntityUid eater, EatToGrowComponent comp, float scale) + { + // if growing would go over the limit, return + if (comp.CurrentScale >= comp.MaxGrowth) + return; + // Uses scale variable to multiply the growth, mainly used for shrinking + // Add growth + comp.CurrentScale += comp.Growth; + comp.CurrentScale = MathF.Min(comp.CurrentScale, comp.MaxGrowth); + + EnsureComp(eater); + + var appearanceComponent = EnsureComp(eater); + if (!_appearance.TryGetData(eater, ScaleVisuals.Scale, out var oldScale, appearanceComponent)) + oldScale = Vector2.One; + + _appearance.SetData(eater, ScaleVisuals.Scale, oldScale + scale * new Vector2(comp.Growth, comp.Growth), appearanceComponent); + + Dirty(eater, comp); // Sync updated growth to client. + + // add 1 to times grown + comp.TimesGrown += 1; + + // Grow the fixture by 1/4 the growth + if (TryComp(eater, out FixturesComponent? manager)) + { + foreach (var (id, fixture) in manager.Fixtures) + { + if (fixture.Shape is PhysShapeCircle circle) + { + _physics.SetPositionRadius( + eater, id, fixture, circle, + circle.Position, circle.Radius + scale * (comp.Growth / 4), manager); + } + } + } + } + private void ShrinkOnDeath(Entity eater, ref MobStateChangedEvent args) + { + // Copied from TryGrow, just need to grow in reverse + if (args.NewMobState != MobState.Dead || !TryComp(eater, out var comp) || comp.ShrinkOnDeath == false) + return; + + // shrink the entity + Grow(eater, comp, -comp.TimesGrown); // uses the negative of times grown to shrink the entity back to normal + + // Reset data on shrink + comp.CurrentScale = 1f; + comp.TimesGrown = 0; + } +}; diff --git a/Content.Server/_Goobstation/Ingestion/GoobEatingEvents.cs b/Content.Server/_Goobstation/Ingestion/GoobEatingEvents.cs new file mode 100644 index 00000000000..2e021b943f6 --- /dev/null +++ b/Content.Server/_Goobstation/Ingestion/GoobEatingEvents.cs @@ -0,0 +1,13 @@ +namespace Content.Server._Goobstation.Ingestion; + +/// +/// Raised directed at the eater after finishing eating the food before it's deleted. +/// +[ByRefEvent] +public readonly record struct AfterEatingEvent(EntityUid Food) +{ + /// + /// The UID of the food entity that was fully eaten. + /// + public readonly EntityUid Food = Food; +} diff --git a/Content.Shared/Clothing/EntitySystems/HideLayerClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/HideLayerClothingSystem.cs index c300a801335..297026c088d 100644 --- a/Content.Shared/Clothing/EntitySystems/HideLayerClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/HideLayerClothingSystem.cs @@ -36,7 +36,7 @@ private void OnHideGotUnequipped(Entity ent, ref Clo private void SetLayerVisibility( Entity clothing, - Entity user, + EntityUid user, bool hideLayers) { if (_timing.ApplyingState) @@ -45,12 +45,15 @@ private void SetLayerVisibility( if (!Resolve(clothing.Owner, ref clothing.Comp1, ref clothing.Comp2)) return; - if (!Resolve(user.Owner, ref user.Comp)) + if (!TryComp(user, out var humanoid)) return; + + var humanoidEntity = new Entity(user, humanoid); - hideLayers &= IsEnabled(clothing!); + hideLayers &= IsEnabled(new Entity( clothing.Owner, clothing.Comp1!, clothing.Comp2! )); - var hideable = user.Comp.HideLayersOnEquip; + var hideable = humanoid.HideLayersOnEquip; + var inSlot = clothing.Comp2.InSlotFlag ?? SlotFlags.NONE; // This method should only be getting called while the clothing is equipped (though possibly currently in @@ -70,7 +73,7 @@ private void SetLayerVisibility( // Only update this layer if we are currently equipped to the relevant slot. if (validSlots.HasFlag(inSlot)) - _humanoid.SetLayerVisibility(user!, layer, !hideLayers, inSlot, ref dirty); + _humanoid.SetLayerVisibility(humanoidEntity, layer, !hideLayers, inSlot, ref dirty); } // Fallback for obsolete field: assume we want to hide **all** layers, as long as we are equipped to any @@ -82,12 +85,12 @@ private void SetLayerVisibility( foreach (var layer in slots) { if (hideable.Contains(layer)) - _humanoid.SetLayerVisibility(user!, layer, !hideLayers, inSlot, ref dirty); + _humanoid.SetLayerVisibility(humanoidEntity, layer, !hideLayers, inSlot, ref dirty); } } if (dirty) - Dirty(user!); + Dirty(user, humanoid); } private bool IsEnabled(Entity clothing) diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs new file mode 100644 index 00000000000..e61577cc50a --- /dev/null +++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs @@ -0,0 +1 @@ +using Content.Shared._Goobstation.EatToGrow; \ No newline at end of file diff --git a/Content.Shared/_Goobstation/Dash/DashActionComponent.cs b/Content.Shared/_Goobstation/Dash/DashActionComponent.cs new file mode 100644 index 00000000000..245a28ca7b5 --- /dev/null +++ b/Content.Shared/_Goobstation/Dash/DashActionComponent.cs @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + +using Content.Shared.Actions; +using Content.Shared.Chat.Prototypes; +using Robust.Shared.Prototypes; + +namespace Content.Shared._Goobstation.Dash; + +[RegisterComponent] +public sealed partial class DashActionComponent : Component +{ + [DataField] + public string? ActionProto; + + [ViewVariables(VVAccess.ReadOnly)] + public EntityUid? ActionUid; +} + +public sealed partial class DashActionEvent : WorldTargetActionEvent +{ + [DataField] + public float Distance = 4.65f; + + [DataField] + public float Speed = 9.65f; + + [DataField] + public float? StaminaDrain; + + /// + /// Whether you need gravity to perform the dash. Keep in mind there's no friction without gravity so if this + /// is false, the performer gets every chance to be launched straight to Ohio on dashing without gravity. + /// + [DataField] + public bool NeedsGravity = true; + + /// + /// Whether dash distance and speed are affected by performer's speed modifiers. Should be true most of the time. + /// + [DataField] + public bool AffectedBySpeed = true; + + /// + /// Animated emote to play on successful dash. + /// + [DataField] + public ProtoId? Emote = "Flip"; +} diff --git a/Content.Shared/_Goobstation/Dash/DashActionSystem.cs b/Content.Shared/_Goobstation/Dash/DashActionSystem.cs new file mode 100644 index 00000000000..f0d6b753b93 --- /dev/null +++ b/Content.Shared/_Goobstation/Dash/DashActionSystem.cs @@ -0,0 +1,71 @@ +// SPDX-License-Identifier: AGPL-3.0-or-later + +using Content.Shared.Emoting; +using Content.Shared.Actions; +using Content.Shared.Damage; +using Content.Shared.Damage.Components; +using Content.Shared.Damage.Systems; +using Content.Shared.Gravity; +using Content.Shared.Movement.Components; +using Content.Shared.Throwing; + +namespace Content.Shared._Goobstation.Dash; + +public sealed class DashActionSystem : EntitySystem +{ + [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private readonly SharedGravitySystem _gravity = default!; + [Dependency] private readonly ThrowingSystem _throwing = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly StaminaSystem _stamina = default!; + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnDashAction); + + SubscribeLocalEvent(OnComponentInit); + SubscribeLocalEvent(OnComponentShutdown); + } + + private void OnDashAction(DashActionEvent args) + { + if (args.Handled) + return; + + if (args.NeedsGravity && _gravity.IsWeightless(args.Performer)) + return; + + args.Handled = true; + var vec = (_transform.ToMapCoordinates(args.Target).Position - + _transform.GetMapCoordinates(args.Performer).Position).Normalized() * args.Distance; + var speed = args.Speed; + + if (args.AffectedBySpeed && TryComp(args.Performer, out var speedcomp)) + { + vec *= speedcomp.CurrentSprintSpeed / speedcomp.BaseSprintSpeed; + speed *= speedcomp.CurrentSprintSpeed / speedcomp.BaseSprintSpeed; + } + + _throwing.TryThrow(args.Performer, vec, speed, animated: false); + + if (args.StaminaDrain != null) + _stamina.TakeStaminaDamage(args.Performer, args.StaminaDrain.Value, visual: false, immediate: false); + + if (args.Emote != null && TryComp(args.Performer, out var emotes)) + { + emotes.Emote = args.Emote; + Dirty(args.Performer, emotes); + } + } + + private void OnComponentInit(EntityUid uid, DashActionComponent comp, ref ComponentInit args) + { + comp.ActionUid = _actions.AddAction(uid, comp.ActionProto); + } + + private void OnComponentShutdown(EntityUid uid, DashActionComponent comp, ref ComponentShutdown args) + { + _actions.RemoveAction(comp.ActionUid); + } +} diff --git a/Content.Shared/_Goobstation/EatToGrow/AfterEatingEvent.cs b/Content.Shared/_Goobstation/EatToGrow/AfterEatingEvent.cs new file mode 100644 index 00000000000..f01df5eeebe --- /dev/null +++ b/Content.Shared/_Goobstation/EatToGrow/AfterEatingEvent.cs @@ -0,0 +1,8 @@ +using Robust.Shared.GameObjects; + +namespace Content.Shared._Goobstation.EatToGrow; +/// +/// Raised directed at the eater after finishing eating the food before it is deleted. +/// +[ByRefEvent] +public readonly record struct AfterEatingEvent(EntityUid Food); \ No newline at end of file diff --git a/Content.Shared/_Goobstation/EatToGrow/EatToGrowComponent.cs b/Content.Shared/_Goobstation/EatToGrow/EatToGrowComponent.cs new file mode 100644 index 00000000000..e0a26627740 --- /dev/null +++ b/Content.Shared/_Goobstation/EatToGrow/EatToGrowComponent.cs @@ -0,0 +1,22 @@ +using Content.Shared.Damage; +using Robust.Shared.GameStates; + +namespace Content.Shared._Goobstation.EatToGrow; +[RegisterComponent, NetworkedComponent] +public sealed partial class EatToGrowComponent : Component +{ + [DataField] + public float Growth = 0.1f; // percentage growth + + [DataField] + public float MaxGrowth = 5.0f; // max allowed scale multiplier + + [DataField] + public float CurrentScale = 1.0f; // current scale + + [DataField] + public bool ShrinkOnDeath = true; // Revert to original size on death? + + [DataField] + public int TimesGrown = 0; // how many times have they grown? +} diff --git a/Content.Shared/_Goobstation/EatToGrow/EatToGrowComponentState.cs b/Content.Shared/_Goobstation/EatToGrow/EatToGrowComponentState.cs new file mode 100644 index 00000000000..ae5add8b454 --- /dev/null +++ b/Content.Shared/_Goobstation/EatToGrow/EatToGrowComponentState.cs @@ -0,0 +1,23 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Serialization; + +namespace Content.Shared._Goobstation.EatToGrow; + +[Serializable, NetSerializable] +public sealed class EatToGrowComponentState : ComponentState +{ + public readonly float Growth; + public readonly float MaxGrowth; + + public readonly float CurrentScale; + public readonly bool ShrinkOnDeath; + public readonly int TimesGrown; + public EatToGrowComponentState(float growth, float maxGrowth, float currentScale, bool shrinkOnDeath, int timesGrown) + { + Growth = growth; + MaxGrowth = maxGrowth; + CurrentScale = currentScale; + ShrinkOnDeath = shrinkOnDeath; + TimesGrown = timesGrown; + } +} diff --git a/Resources/Audio/_Goobstation/Effects/attributions.yml b/Resources/Audio/_Goobstation/Effects/attributions.yml new file mode 100644 index 00000000000..cae33d20951 --- /dev/null +++ b/Resources/Audio/_Goobstation/Effects/attributions.yml @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: AGPL-3.0-or-later + +- files: ["moth_wings.ogg"] + license: "CC0-1.0" + copyright: "Original by tothrec2" + source: "https://freesound.org/people/tothrec2/sounds/596541/" \ No newline at end of file diff --git a/Resources/Audio/_Goobstation/Effects/moth_wings.ogg b/Resources/Audio/_Goobstation/Effects/moth_wings.ogg new file mode 100644 index 00000000000..1197c38f12b Binary files /dev/null and b/Resources/Audio/_Goobstation/Effects/moth_wings.ogg differ diff --git a/Resources/Locale/en-US/_Goobstation/emotes.ftl b/Resources/Locale/en-US/_Goobstation/emotes.ftl index 82afec0f5f5..b667ceeac45 100644 --- a/Resources/Locale/en-US/_Goobstation/emotes.ftl +++ b/Resources/Locale/en-US/_Goobstation/emotes.ftl @@ -1,7 +1,10 @@ chat-emote-name-spin = Spin chat-emote-name-jump = Jump +chat-emote-name-flip = Do a flip chat-emote-msg-spin = spins! chat-emote-msg-jump = jumps! +chat-emote-msg-flip = does a flip! + # Names chat-emote-name-trill = Trill diff --git a/Resources/Locale/en-US/_Mono/store/pdv-uplink-catalog.ftl b/Resources/Locale/en-US/_Mono/store/pdv-uplink-catalog.ftl index 35d775d0e8c..98911ba3934 100644 --- a/Resources/Locale/en-US/_Mono/store/pdv-uplink-catalog.ftl +++ b/Resources/Locale/en-US/_Mono/store/pdv-uplink-catalog.ftl @@ -236,6 +236,9 @@ uplink-pirate-c4-desc = Use it to breach walls, dispose of bodies, break equipme uplink-pirate-c4-bundle-name = C-4 Bundle uplink-pirate-c4-bundle-desc = Enough C-4 to blow your way into a vault and out through the back. +uplink-pirate-MobMothSyndy-name = Syndiroach +uplink-pirate-MobMothSyndy-desc = Call in a handy syndiroach equipped with a microbomb implant. Explodes when seriously injured. Can use harsh language and upset feelings. + uplink-pirate-empgrenade-box-name = EMP Grenade Box uplink-pirate-empgrenade-box-desc = A box containing 4 EMP grenades. diff --git a/Resources/Locale/en-US/_NF/store/security-uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/security-uplink-catalog.ftl index e6af06c3081..4997c873326 100644 --- a/Resources/Locale/en-US/_NF/store/security-uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/security-uplink-catalog.ftl @@ -162,3 +162,5 @@ uplink-security-contraband-forensics-module-name = Contraband Forenics Module uplink-security-contraband-forensics-module-desc = A program for scanning and reporting contraband dead drops and pods for bounties. Slots into a forensic scanner. uplink-security-mechpulserifle-name = CL-94 Pulse Emitter uplink-security-mechpulserifle-desc = A mech-mounted Pulse Rifle. +uplink-security-implanter-tsf-name = Tsf Implanter +uplink-security-implanter-tsf-desc = Implants an Tsf radio, allowing covert communication without a headset. diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index 6f1af23fa26..f82718dcdbc 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -35,6 +35,28 @@ ghost-role-information-mouse-description = A hungry and mischievous mouse. ghost-role-information-mothroach-name = Mothroach ghost-role-information-mothroach-description = A cute but mischievous mothroach. +ghost-role-information-moproach-name = Moproach +ghost-role-information-moproach-description = A cute mothroach with more cute moplike shoes on its feet. + +ghost-role-information-boomroach-name = Boomroach +ghost-role-information-boomroach-description = This little mothroach has a chinalake strapped to its back! Why and how? + +ghost-role-information-syndiroach-name = SyndiRoach +ghost-role-information-syndiroach-description = Repurposed by the PDV You are the highly trained and faithful pet of a PDV operative equiped with a microbomb. Serve your master to the death! +ghost-role-information-syndiroach-rules = You are a [color=red][bold]Team PDV[/bold][/color] with the agent who summoned you. + +ghost-role-information-mothroachmustard-name = mustard mothroach +ghost-role-information-mothroachmustard-description = A delightful result of the world's chefs crossing meat with sauce. + +ghost-role-information-mothroachleopard-name = leopard mothroach +ghost-role-information-mothroachleopard-description = A charming result of numerous attempts to crossbreed insects with predators. + +ghost-role-information-mothroachcecropia-name = cecropia mothroach +ghost-role-information-mothroachcecropia-description = A charming result of numerous attempts to cross a genus of the nettle family with cockroaches. + +ghost-role-information-mothroachlunar-name = lunar mothroach +ghost-role-information-mothroachlunar-description = Someone left the moth under the moonlight. + ghost-role-information-snail-name = Snail ghost-role-information-snail-description = A little snail who doesn't mind a bit of space. Just stay on grid! diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml index 03f765e40fa..5c7d8866728 100644 --- a/Resources/Prototypes/Body/Parts/animal.yml +++ b/Resources/Prototypes/Body/Parts/animal.yml @@ -63,6 +63,58 @@ partType: Foot slotId: feet # Shitmed +- type: entity + id: LeftLegsAnimal + name: "left animal legs" + parent: [ PartAnimalBase, BaseLeftLeg, BaseAnimalOrgan ] + components: + - type: Sprite + sprite: Mobs/Species/Reptilian/parts.rsi + layers: + - state: l_leg + - state: r_leg + - type: Icon + state: l_leg # cba to make a state for it + +- type: entity + id: RightLegsAnimal + name: "right animal legs" + parent: [ PartAnimalBase, BaseRightLeg, BaseAnimalOrgan ] + components: + - type: Sprite + sprite: Mobs/Species/Reptilian/parts.rsi + layers: + - state: l_leg + - state: r_leg + - type: Icon + state: l_leg # cba to make a state for it + +- type: entity + id: LeftAnimalFeet + name: "left animal feet" + parent: [ PartAnimalBase, BaseLeftFoot, BaseAnimalOrgan ] + components: + - type: Sprite + sprite: Mobs/Species/Reptilian/parts.rsi + layers: + - state: r_foot + - state: l_foot + - type: Icon + state: l_foot # cba to make a state for it + +- type: entity + id: RightAnimalFeet + name: "right animal feet" + parent: [ PartAnimalBase, BaseRightFoot, BaseAnimalOrgan ] + components: + - type: Sprite + sprite: Mobs/Species/Reptilian/parts.rsi + layers: + - state: r_foot + - state: l_foot + - type: Icon + state: l_foot # cba to make a state for it + - type: entity parent: [ PartAnimalBase, BaseTorso ] id: TorsoAnimal diff --git a/Resources/Prototypes/Body/Prototypes/Animal/animal.yml b/Resources/Prototypes/Body/Prototypes/Animal/animal.yml index a8c81f9eb60..a87fcbb7789 100644 --- a/Resources/Prototypes/Body/Prototypes/Animal/animal.yml +++ b/Resources/Prototypes/Body/Prototypes/Animal/animal.yml @@ -3,41 +3,71 @@ name: "animal" root: torso slots: + head: + part: HeadAnimal + connections: + - torso + organs: + brain: OrganAnimalBrain + eyes: OrganAnimalEyes torso: part: TorsoAnimal connections: - - legs + - right leg + - left leg + - head # Shitmed organs: lungs: OrganAnimalLungs stomach: OrganAnimalStomach liver: OrganAnimalLiver heart: OrganAnimalHeart kidneys: OrganAnimalKidneys - legs: - part: LegsAnimal + right leg: + part: RightLegsAnimal + connections: + - right foot + left leg: + part: LeftLegsAnimal connections: - - feet - feet: - part: FeetAnimal + - left foot + right foot: + part: RightAnimalFeet + left foot: + part: LeftAnimalFeet - type: body id: Mouse name: "mouse" root: torso slots: + head: + part: HeadAnimal + connections: + - torso + organs: + brain: OrganAnimalBrain + eyes: OrganAnimalEyes torso: part: TorsoAnimal connections: - - legs + - right leg + - left leg + - head # Shitmed organs: lungs: OrganAnimalLungs stomach: OrganMouseStomach liver: OrganAnimalLiver heart: OrganAnimalHeart kidneys: OrganAnimalKidneys - legs: - part: LegsAnimal + right leg: + part: RightLegsAnimal + connections: + - right foot + left leg: + part: LeftLegsAnimal connections: - - feet - feet: - part: FeetAnimal \ No newline at end of file + - left foot + right foot: + part: RightAnimalFeet + left foot: + part: LeftAnimalFeet \ No newline at end of file diff --git a/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml b/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml index cd3ab1fdd78..6433ff4b029 100644 --- a/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml +++ b/Resources/Prototypes/Body/Prototypes/Animal/ruminant.yml @@ -3,10 +3,19 @@ name: "ruminant" root: torso slots: + head: + part: HeadAnimal + connections: + - torso + organs: + brain: OrganAnimalBrain + eyes: OrganAnimalEyes torso: part: TorsoAnimal connections: - - legs + - right leg + - left leg + - head # Shitmed organs: lungs: OrganAnimalLungs stomach: OrganAnimalRuminantStomach @@ -14,9 +23,15 @@ liver: OrganAnimalLiver heart: OrganAnimalHeart kidneys: OrganAnimalKidneys - legs: - part: LegsAnimal + right leg: + part: RightLegsAnimal + connections: + - right foot + left leg: + part: LeftLegsAnimal connections: - - feet - feet: - part: FeetAnimal + - left foot + right foot: + part: RightAnimalFeet + left foot: + part: LeftAnimalFeet \ No newline at end of file diff --git a/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml b/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml index ef5df769def..cac4cbdb985 100644 --- a/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml +++ b/Resources/Prototypes/Body/Prototypes/Specific/mothroach.yml @@ -3,11 +3,34 @@ name: "mothroach" root: torso slots: + head: + part: HeadAnimal + connections: + - torso + organs: + brain: OrganAnimalBrain + eyes: OrganAnimalEyes torso: part: TorsoAnimal + connections: + - right leg + - left leg + - head # Shitmed organs: lungs: OrganAnimalLungs stomach: OrganMothStomach liver: OrganAnimalLiver heart: OrganAnimalHeart kidneys: OrganAnimalKidneys + right leg: + part: RightLegsAnimal + connections: + - right foot + left leg: + part: LeftLegsAnimal + connections: + - left foot + right foot: + part: RightAnimalFeet + left foot: + part: LeftAnimalFeet \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index f2bd530fd71..5f57180c041 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -26,6 +26,7 @@ KoboldCubeBox: 2 # Frontier PoultryCubeBox: 2 # Frontier RuminantCubeBox: 2 # Frontier + MustardMothroachCubeBox: 1 FoodContainerEgg: 3 DrinkMilkCarton: 2 DrinkSoyMilkCarton: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 05c070c71fc..cab17871460 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -13,6 +13,9 @@ damage: types: Blunt: 7 + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingEyesBase @@ -32,7 +35,10 @@ damage: types: Blunt: 10 - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesBase id: ClothingEyesGlassesGarGiga @@ -51,7 +57,10 @@ damage: types: Blunt: 10 - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesBase id: ClothingEyesGlassesMeson @@ -67,7 +76,10 @@ coverage: EYES - type: StaticPrice # Frontier price: 135 # Frontier - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesBase id: ClothingEyesGlasses @@ -83,6 +95,7 @@ tags: - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingEyesBase @@ -97,6 +110,7 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable - type: entity parent: ClothingEyesBase @@ -113,6 +127,7 @@ tags: - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingEyesBase @@ -126,6 +141,9 @@ sprite: Clothing/Eyes/Glasses/outlawglasses.rsi - type: VisionCorrection - type: IdentityBlocker + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingEyesBase @@ -141,6 +159,7 @@ tags: - HamsterWearable - WhitelistChameleon + - PetWearable - type: IdentityBlocker coverage: EYES @@ -158,6 +177,7 @@ - Sunglasses - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: [ClothingEyesBase, ShowSecurityIcons] @@ -179,6 +199,7 @@ tags: - HamsterWearable - WhitelistChameleon + - PetWearable # - Antagonists # Frontier: guidebook entry removed - type: IdentityBlocker coverage: EYES @@ -200,6 +221,7 @@ tags: - HamsterWearable - WhitelistChameleon + - PetWearable - type: IdentityBlocker coverage: EYES - type: ShowJobIcons @@ -219,6 +241,9 @@ protectionTime: 5 - type: IdentityBlocker coverage: EYES + - type: Tag + tags: + - PetWearable #Make a scanner category when these actually function and we get the trayson - type: entity @@ -241,6 +266,9 @@ - type: ThermalSight - type: StaticPrice # Mono price: 60 + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingEyesBase @@ -255,7 +283,10 @@ - type: SolutionScanner - type: IdentityBlocker coverage: EYES - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesBase] id: ClothingEyesVisorNinja @@ -276,3 +307,6 @@ action: ActionToggleNightVision phosphorColor: "#41D7D9" lightingColor: "#FFFFFF32" + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index e87e853094d..6996a4e1b6d 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -29,6 +29,9 @@ damageContainers: - Inorganic - Silicon + - type: Tag + tags: + - PetWearable - type: entity parent: [ClothingEyesBase, ShowMedicalIcons] @@ -43,6 +46,7 @@ - type: Tag tags: - HudMedical + - PetWearable - type: StaticPrice # Frontier price: 30 # Frontier @@ -59,6 +63,7 @@ - type: Tag tags: - HudSecurity + - PetWearable - type: entity parent: ClothingEyesBase @@ -71,6 +76,9 @@ - type: Clothing sprite: Clothing/Eyes/Hud/command.rsi - type: ShowJobIcons + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingEyesBase @@ -86,7 +94,10 @@ - type: StealTarget stealGroup: ClothingEyesHudBeer - type: SolutionScanner - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesBase id: ClothingEyesHudFriedOnion @@ -110,7 +121,10 @@ flavors: - onion - greasey - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesBase id: ClothingEyesHudOnionBeer @@ -123,7 +137,10 @@ sprite: Clothing/Eyes/Hud/onionbeer.rsi - type: ShowHungerIcons - type: ShowThirstIcons - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesBase, ShowMedicalIcons] id: ClothingEyesHudMedOnion @@ -135,7 +152,10 @@ - type: Clothing sprite: Clothing/Eyes/Hud/medonion.rsi - type: ShowHungerIcons - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesBase, ShowMedicalIcons] id: ClothingEyesHudMedOnionBeer @@ -148,7 +168,10 @@ sprite: Clothing/Eyes/Hud/medonionbeer.rsi - type: ShowHungerIcons - type: ShowThirstIcons - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons] id: ClothingEyesHudMedSec @@ -162,7 +185,10 @@ - type: Construction graph: HudMedSec node: medsecHud - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons] id: ClothingEyesHudMultiversal @@ -178,7 +204,10 @@ - Biological - Inorganic - type: ShowSyndicateIcons - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons] id: ClothingEyesHudOmni @@ -196,7 +225,10 @@ - type: ShowHungerIcons - type: ShowThirstIcons - type: ShowSyndicateIcons - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesBase, ShowSecurityIcons] id: ClothingEyesHudSyndicate @@ -208,7 +240,10 @@ - type: Clothing sprite: Clothing/Eyes/Hud/synd.rsi - type: ShowSyndicateIcons - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesBase, ShowSecurityIcons] id: ClothingEyesHudSyndicateAgent @@ -221,7 +256,10 @@ sprite: Clothing/Eyes/Hud/syndagent.rsi - type: ShowSyndicateIcons - type: ShowHealthBars - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesGlassesSunglasses, ShowSecurityIcons] id: ClothingEyesGlassesHiddenSecurity @@ -237,7 +275,10 @@ sprite: Clothing/Eyes/Hud/medpatch.rsi - type: Clothing sprite: Clothing/Eyes/Hud/medpatch.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesEyepatchHudMedical, ClothingHeadEyeBaseFlipped] id: ClothingEyesEyepatchHudMedicalFlipped @@ -253,7 +294,10 @@ sprite: Clothing/Eyes/Hud/secpatch.rsi - type: Clothing sprite: Clothing/Eyes/Hud/secpatch.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesEyepatchHudSecurity, ClothingHeadEyeBaseFlipped] id: ClothingEyesEyepatchHudSecurityFlipped @@ -269,7 +313,10 @@ sprite: Clothing/Eyes/Hud/beerpatch.rsi - type: Clothing sprite: Clothing/Eyes/Hud/beerpatch.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesEyepatchHudBeer, ClothingHeadEyeBaseFlipped] id: ClothingEyesEyepatchHudBeerFlipped @@ -285,7 +332,10 @@ sprite: Clothing/Eyes/Hud/diagpatch.rsi - type: Clothing sprite: Clothing/Eyes/Hud/diagpatch.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesEyepatchHudDiag, ClothingHeadEyeBaseFlipped] id: ClothingEyesEyepatchHudDiagFlipped diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml index 81de8a61bce..2bc4a52224d 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml @@ -15,7 +15,10 @@ graph: Blindfold node: blindfold - type: FlashImmunity - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEyeBaseFlippable id: ClothingEyesEyepatch @@ -28,7 +31,10 @@ sprite: Clothing/Eyes/Misc/eyepatch.rsi - type: EyeProtection protectionTime: 5 - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesEyepatch, ClothingHeadEyeBaseFlipped] id: ClothingEyesEyepatchFlipped diff --git a/Resources/Prototypes/Entities/Clothing/Head/animals.yml b/Resources/Prototypes/Entities/Clothing/Head/animals.yml index 83fa2f75610..f14fb31aa44 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/animals.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/animals.yml @@ -8,7 +8,10 @@ sprite: Clothing/Head/Animals/cat.rsi - type: Clothing sprite: Clothing/Head/Animals/cat.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatAnimalCatBrown @@ -19,7 +22,10 @@ sprite: Clothing/Head/Animals/cat2.rsi - type: Clothing sprite: Clothing/Head/Animals/cat2.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatAnimalCatBlack @@ -30,7 +36,10 @@ sprite: Clothing/Head/Animals/cat3.rsi - type: Clothing sprite: Clothing/Head/Animals/cat3.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatAnimalHeadslime @@ -41,7 +50,10 @@ sprite: Clothing/Head/Animals/headslime.rsi - type: Clothing sprite: Clothing/Head/Animals/headslime.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatAnimalMonkey @@ -52,3 +64,7 @@ sprite: Clothing/Head/Animals/monkey.rsi - type: Clothing sprite: Clothing/Head/Animals/monkey.rsi + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml index 5fa70f6adb4..42e3df67c25 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml @@ -28,7 +28,8 @@ tags: - Bandana - ClothMade - + - PetWearable + - type: entity parent: [ClothingHeadBandBase, ClothingMaskBandBlack] id: ClothingHeadBandBlack diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml index 19a3a70778d..f3cbfe74fa2 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml @@ -13,6 +13,7 @@ tags: - HelmetEVA - WhitelistChameleon + - PetWearable #Large EVA Helmet - type: entity @@ -25,7 +26,10 @@ sprite: Clothing/Head/Helmets/eva_large.rsi - type: Clothing sprite: Clothing/Head/Helmets/eva_large.rsi - + - type: Tag + tags: + - PetWearable + #Syndicate EVA Helmet - type: entity parent: [ClothingHeadEVAHelmetBase] @@ -37,6 +41,9 @@ sprite: Clothing/Head/Helmets/eva_syndicate.rsi - type: Clothing sprite: Clothing/Head/Helmets/eva_syndicate.rsi + - type: Tag + tags: + - PetWearable #Cosmonaut Helmet - type: entity @@ -49,6 +56,9 @@ sprite: Clothing/Head/Helmets/cosmonaut.rsi - type: Clothing sprite: Clothing/Head/Helmets/cosmonaut.rsi + - type: Tag + tags: + - PetWearable #Ancient Void Helmet - type: entity @@ -61,6 +71,9 @@ sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi - type: Clothing sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi + - type: Tag + tags: + - PetWearable #Paramedic Void Helmet - type: entity @@ -95,3 +108,6 @@ radius: 6 # 5->6 Mono energy: 3 # 2->3 Mono color: "#00ffff" + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml index e0c6557c97c..dbbf5ef2328 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml @@ -66,6 +66,7 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadHatHardhatBase @@ -77,6 +78,9 @@ sprite: Clothing/Head/Hardhats/blue.rsi - type: Clothing sprite: Clothing/Head/Hardhats/blue.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatHardhatBase @@ -88,7 +92,10 @@ sprite: Clothing/Head/Hardhats/orange.rsi - type: Clothing sprite: Clothing/Head/Hardhats/orange.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHardhatBase id: ClothingHeadHatHardhatRed @@ -99,7 +106,10 @@ sprite: Clothing/Head/Hardhats/red.rsi - type: Clothing sprite: Clothing/Head/Hardhats/red.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHardhatBase id: ClothingHeadHatHardhatWhite @@ -110,7 +120,10 @@ sprite: Clothing/Head/Hardhats/white.rsi - type: Clothing sprite: Clothing/Head/Hardhats/white.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHardhatBase id: ClothingHeadHatHardhatYellow @@ -121,7 +134,10 @@ sprite: Clothing/Head/Hardhats/yellow.rsi - type: Clothing sprite: Clothing/Head/Hardhats/yellow.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHardhatBase id: ClothingHeadHatHardhatYellowDark @@ -132,7 +148,10 @@ sprite: Clothing/Head/Hardhats/dark_yellow.rsi - type: Clothing sprite: Clothing/Head/Hardhats/dark_yellow.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHardhatBase id: ClothingHeadHatHardhatArmored @@ -150,3 +169,7 @@ Slash: 0.8 Piercing: 0.9 Heat: 0.8 + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 7f88e380316..c060e47f9d7 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -8,7 +8,10 @@ sprite: Clothing/Head/Hats/beaver_hat.rsi - type: Clothing sprite: Clothing/Head/Hats/beaver_hat.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatCapVizier @@ -19,7 +22,10 @@ sprite: Clothing/Head/Hats/browncap.rsi - type: Clothing sprite: Clothing/Head/Hats/browncap.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeret @@ -35,6 +41,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -52,6 +59,7 @@ tags: - ClothMade - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -68,6 +76,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -83,6 +92,7 @@ tags: - ClothMade - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -94,6 +104,9 @@ sprite: Clothing/Head/Hats/casa.rsi - type: Clothing sprite: Clothing/Head/Hats/casa.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -110,6 +123,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -126,6 +140,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -142,6 +157,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -158,6 +174,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -169,7 +186,10 @@ sprite: Clothing/Head/Hats/beret_warden.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_warden.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretSeniorPhysician @@ -180,7 +200,10 @@ sprite: Clothing/Head/Hats/beret_physician.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_physician.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretBrigmedic @@ -191,7 +214,10 @@ sprite: Clothing/Head/Hats/beret_brigmedic.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_brigmedic.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ ClothingHeadBase ] id: ClothingHeadHatBeretMercenary # Frontier: Merc to Mercenary @@ -202,7 +228,10 @@ sprite: Clothing/Head/Hats/beret_merc.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_merc.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBowlerHat @@ -213,7 +242,10 @@ sprite: Clothing/Head/Hats/bowler_hat.rsi - type: Clothing sprite: Clothing/Head/Hats/bowler_hat.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatCaptain @@ -229,6 +261,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -244,6 +277,9 @@ proto: robot - type: IdentityBlocker - type: IngestionBlocker + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -255,6 +291,9 @@ sprite: Clothing/Head/Hats/centcom.rsi - type: Clothing sprite: Clothing/Head/Hats/centcom.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -285,6 +324,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: CatWearable # Frontier - type: entity @@ -302,6 +342,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -313,6 +354,9 @@ sprite: Clothing/Head/Hats/greyfedora.rsi - type: Clothing sprite: Clothing/Head/Hats/greyfedora.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -324,6 +368,9 @@ sprite: Clothing/Head/Hats/fez.rsi - type: Clothing sprite: Clothing/Head/Hats/fez.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -340,6 +387,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -356,6 +404,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -367,6 +416,9 @@ sprite: Clothing/Head/Hats/outlawhat.rsi - type: Clothing sprite: Clothing/Head/Hats/outlawhat.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -378,6 +430,9 @@ sprite: Clothing/Head/Hats/witchhat.rsi - type: Clothing sprite: Clothing/Head/Hats/witchhat.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -389,6 +444,9 @@ sprite: Clothing/Head/Hats/paper.rsi - type: Clothing sprite: Clothing/Head/Hats/paper.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -401,6 +459,9 @@ - type: Clothing sprite: Clothing/Head/Hats/pirate.rsi - type: CatWearable # Frontier + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -416,6 +477,7 @@ tags: - WhitelistChameleon - ClothMade + - PetWearable - type: HideLayerClothing slots: - Hair @@ -432,6 +494,9 @@ sprite: Clothing/Head/Hats/redwizard.rsi - type: Clothing sprite: Clothing/Head/Hats/redwizard.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -443,7 +508,10 @@ sprite: Clothing/Head/Hats/santahat.rsi - type: Clothing sprite: Clothing/Head/Hats/santahat.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatSombrero @@ -456,7 +524,10 @@ sprite: Clothing/Head/Hats/sombrero.rsi - type: AddAccentClothing accent: SpanishAccent - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatSurgcapBlue @@ -472,6 +543,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -483,6 +555,9 @@ sprite: Clothing/Head/Hats/surgcap_green.rsi - type: Clothing sprite: Clothing/Head/Hats/surgcap_green.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -494,6 +569,9 @@ sprite: Clothing/Head/Hats/surgcap_purple.rsi - type: Clothing sprite: Clothing/Head/Hats/surgcap_purple.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -510,6 +588,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: [ClothingHeadBase, BaseFoldable] @@ -535,7 +614,9 @@ - state: icon-up map: ["foldedLayer"] visible: false - + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatWizardBase @@ -547,6 +628,9 @@ sprite: Clothing/Head/Hats/violetwizard.rsi - type: Clothing sprite: Clothing/Head/Hats/violetwizard.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -560,6 +644,9 @@ sprite: Clothing/Head/Hats/warden.rsi - type: StealTarget stealGroup: ClothingHeadHatWarden + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -576,6 +663,7 @@ tags: - WhitelistChameleon - ClothMade + - PetWearable - type: HideLayerClothing slots: - Hair @@ -590,14 +678,20 @@ sprite: Clothing/Head/Hats/wizard_fake.rsi - type: Clothing sprite: Clothing/Head/Hats/wizard_fake.rsi - + - type: Tag + tags: + - PetWearable + - type: entity abstract: true parent: ClothingHeadBase id: ClothingHeadHatWizardBase components: - type: WizardClothes - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatWizardBase id: ClothingHeadHatWizard @@ -613,6 +707,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -624,6 +719,9 @@ sprite: Clothing/Head/Hats/xmascrown.rsi - type: Clothing sprite: Clothing/Head/Hats/xmascrown.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -635,7 +733,10 @@ sprite: Clothing/Head/Hats/truckershat.rsi - type: Clothing sprite: Clothing/Head/Hats/truckershat.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadBase] id: ClothingHeadPyjamaSyndicateBlack @@ -646,7 +747,10 @@ sprite: Clothing/Head/Hats/pyjamasyndicateblack.rsi - type: Clothing sprite: Clothing/Head/Hats/pyjamasyndicateblack.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadBase] id: ClothingHeadPyjamaSyndicatePink @@ -657,7 +761,10 @@ sprite: Clothing/Head/Hats/pyjamasyndicatepink.rsi - type: Clothing sprite: Clothing/Head/Hats/pyjamasyndicatepink.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadBase] id: ClothingHeadPyjamaSyndicateRed @@ -668,7 +775,10 @@ sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi - type: Clothing sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadPaperSack @@ -680,7 +790,10 @@ - type: Clothing sprite: Clothing/Head/Hats/papersack.rsi - type: IdentityBlocker - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadPaperSackSmile @@ -692,7 +805,10 @@ - type: Clothing sprite: Clothing/Head/Hats/papersacksmile.rsi - type: IdentityBlocker - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadFishCap @@ -703,7 +819,10 @@ sprite: Clothing/Head/Hats/fishcap.rsi - type: Clothing sprite: Clothing/Head/Hats/fishcap.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadNurseHat @@ -719,6 +838,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -730,7 +850,10 @@ sprite: Clothing/Head/Hats/rasta.rsi - type: Clothing sprite: Clothing/Head/Hats/rasta.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadSafari @@ -741,7 +864,10 @@ sprite: Clothing/Head/Hats/safarihat.rsi - type: Clothing sprite: Clothing/Head/Hats/safarihat.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatJester @@ -755,7 +881,10 @@ - type: EmitsSoundOnMove #Mono soundCollection: collection: FootstepJester - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatJester id: ClothingHeadHatJesterAlt @@ -764,6 +893,9 @@ sprite: Clothing/Head/Hats/jester2.rsi - type: Clothing sprite: Clothing/Head/Hats/jester2.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -780,6 +912,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -791,6 +924,9 @@ sprite: Clothing/Head/Hats/piratetricord.rsi - type: Clothing sprite: Clothing/Head/Hats/piratetricord.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -806,7 +942,10 @@ modifiers: coefficients: Blunt: 0.95 - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatHolyWatermelon @@ -821,7 +960,10 @@ modifiers: coefficients: Caustic: 0.95 - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadBase] id: ClothingHeadHatSyndie @@ -832,7 +974,10 @@ sprite: Clothing/Head/Hats/syndiecap.rsi - type: Clothing sprite: Clothing/Head/Hats/syndiecap.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadBase] id: ClothingHeadHatSyndieMAA @@ -843,7 +988,10 @@ sprite: Clothing/Head/Hats/syndiecap_maa.rsi - type: Clothing sprite: Clothing/Head/Hats/syndiecap_maa.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatTacticalMaidHeadband @@ -854,7 +1002,10 @@ sprite: Clothing/Head/Hats/tacticalmaidheadband.rsi - type: Clothing sprite: Clothing/Head/Hats/tacticalmaidheadband.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatHetmanHat @@ -865,7 +1016,10 @@ sprite: Clothing/Head/Hats/hetman_hat.rsi - type: Clothing sprite: Clothing/Head/Hats/hetman_hat.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatMagician @@ -899,7 +1053,9 @@ containers: storagebase: !type:Container - type: Tag - + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatCapcap @@ -915,6 +1071,7 @@ - ClothMade - WhitelistChameleon - HamsterWearable + - PetWearable - type: SentienceTarget flavorKind: station-event-random-sentience-flavor-inanimate weight: 0.0002 # 5,000 times less likely than 1 regular animal @@ -935,6 +1092,7 @@ - ClothMade - WhitelistChameleon - HamsterWearable + - PetWearable - type: entity parent: ClothingHeadBase @@ -946,6 +1104,9 @@ sprite: Clothing/Head/Hats/gladiator.rsi - type: Clothing sprite: Clothing/Head/Hats/gladiator.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -961,6 +1122,7 @@ tags: - WhitelistChameleon - HamsterWearable + - PetWearable - type: entity parent: ClothingHeadHatPartyRed @@ -971,6 +1133,9 @@ sprite: Clothing/Head/Hats/party_yellow.rsi - type: Clothing sprite: Clothing/Head/Hats/party_yellow.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatPartyRed @@ -981,6 +1146,9 @@ sprite: Clothing/Head/Hats/party_green.rsi - type: Clothing sprite: Clothing/Head/Hats/party_green.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatPartyRed @@ -991,6 +1159,9 @@ sprite: Clothing/Head/Hats/party_blue.rsi - type: Clothing sprite: Clothing/Head/Hats/party_blue.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatPartyRed @@ -1002,7 +1173,10 @@ sprite: Clothing/Head/Hats/party_water_cup.rsi - type: Clothing sprite: Clothing/Head/Hats/party_water_cup.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatGreyFlatcap @@ -1012,6 +1186,7 @@ - type: Tag tags: - BrimFlatcapGrey + - PetWearable - type: Sprite sprite: Clothing/Head/Hats/greyflatcap.rsi - type: Clothing @@ -1026,6 +1201,7 @@ - type: Tag tags: - BrimFlatcapBrown + - PetWearable - type: Sprite sprite: Clothing/Head/Hats/brownflatcap.rsi - type: Clothing @@ -1044,7 +1220,10 @@ - type: AddAccentClothing accent: ReplacementAccent replacement: cowboy - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatCowboyBrown id: ClothingHeadHatCowboyBlack @@ -1054,6 +1233,9 @@ sprite: Clothing/Head/Hats/cowboyhatblack.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatblack.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatCowboyBrown @@ -1064,7 +1246,10 @@ sprite: Clothing/Head/Hats/cowboyhatgrey.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatgrey.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatCowboyBrown id: ClothingHeadHatCowboyRed @@ -1074,7 +1259,10 @@ sprite: Clothing/Head/Hats/cowboyhatred.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatred.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatCowboyBrown id: ClothingHeadHatCowboyWhite @@ -1084,7 +1272,10 @@ sprite: Clothing/Head/Hats/cowboyhatwhite.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatwhite.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatCowboyBrown id: ClothingHeadHatCowboyBountyHunter @@ -1094,7 +1285,10 @@ sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi - type: Clothing sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatStrawHat @@ -1111,6 +1305,7 @@ - type: Tag tags: - HamsterWearable + - PetWearable - type: Flammable fireSpread: true canResistFire: false @@ -1149,3 +1344,6 @@ sprite: Clothing/Head/Hats/beret_medic.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_medic.rsi + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index de7d88fde69..527c25e84fc 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -16,6 +16,7 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable - type: HideLayerClothing slots: - HeadTop @@ -44,6 +45,7 @@ tags: - WhitelistChameleon - SecurityHelmet + - PetWearable #Mercenary Helmet - type: entity @@ -56,6 +58,9 @@ sprite: Clothing/Head/Helmets/merc_helmet.rsi - type: Clothing sprite: Clothing/Head/Helmets/merc_helmet.rsi + - type: Tag + tags: + - PetWearable #SWAT Helmet - type: entity @@ -79,6 +84,9 @@ Caustic: 0.95 - type: ExplosionResistance damageCoefficient: 0.75 + - type: Tag + tags: + - PetWearable #Syndicate SWAT Helmet - type: entity @@ -92,7 +100,10 @@ sprite: Clothing/Head/Helmets/swat_syndicate.rsi - type: Clothing sprite: Clothing/Head/Helmets/swat_syndicate.rsi - + - type: Tag + tags: + - PetWearable + #Light Riot Helmet - type: entity parent: ClothingHeadBase @@ -111,7 +122,10 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.95 - + - type: Tag + tags: + - PetWearable + #Bombsuit Helmet - type: entity parent: ClothingHeadBase @@ -138,7 +152,10 @@ - Snout - HeadTop - HeadSide - + - type: Tag + tags: + - PetWearable + #Janitorial Bombsuit Helmet - type: entity parent: ClothingHeadHelmetBombSuit @@ -151,7 +168,10 @@ sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi - type: Clothing sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi - + - type: Tag + tags: + - PetWearable + #Cult Helmet - type: entity parent: [ClothingHeadBase] @@ -171,7 +191,10 @@ Slash: 0.8 Piercing: 0.9 Heat: 0.9 - + - type: Tag + tags: + - PetWearable + #Space Ninja Helmet - type: entity parent: [ClothingHeadEVAHelmetBase] @@ -186,6 +209,7 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable - type: IngestionBlocker - type: IdentityBlocker - type: HideLayerClothing @@ -208,7 +232,10 @@ sprite: Clothing/Head/Helmets/templar.rsi - type: IngestionBlocker - type: IdentityBlocker - + - type: Tag + tags: + - PetWearable + #Thunderdome Helmet - type: entity parent: ClothingHeadBase @@ -220,7 +247,10 @@ sprite: Clothing/Head/Helmets/thunderdome.rsi - type: Clothing sprite: Clothing/Head/Helmets/thunderdome.rsi - + - type: Tag + tags: + - PetWearable + #Wizard Helmet - type: entity parent: [ClothingHeadBase] @@ -234,7 +264,10 @@ sprite: Clothing/Head/Helmets/wizardhelm.rsi - type: IngestionBlocker - type: IdentityBlocker - + - type: Tag + tags: + - PetWearable + #Fire Helmet - type: entity parent: ClothingHeadLightBase @@ -258,6 +291,7 @@ tags: - WhitelistChameleon - FireHelmet + - PetWearable - type: HideLayerClothing slots: - Hair @@ -291,6 +325,7 @@ tags: - WhitelistChameleon - FireHelmet + - PetWearable - type: HideLayerClothing slots: - Hair @@ -317,6 +352,9 @@ Slash: 0.5 Piercing: 0.5 Heat: 0.9 + - type: Tag + tags: + - PetWearable #ERT HELMETS #ERT Leader Helmet @@ -330,7 +368,10 @@ sprite: Clothing/Head/Helmets/ert_leader.rsi - type: Clothing sprite: Clothing/Head/Helmets/ert_leader.rsi - + - type: Tag + tags: + - PetWearable + #ERT Security Helmet - type: entity parent: ClothingHeadHelmetBase @@ -342,7 +383,10 @@ sprite: Clothing/Head/Helmets/ert_security.rsi - type: Clothing sprite: Clothing/Head/Helmets/ert_security.rsi - + - type: Tag + tags: + - PetWearable + #ERT Medic Helmet - type: entity parent: ClothingHeadHelmetBase @@ -354,7 +398,10 @@ sprite: Clothing/Head/Helmets/ert_medic.rsi - type: Clothing sprite: Clothing/Head/Helmets/ert_medic.rsi - + - type: Tag + tags: + - PetWearable + #ERT Engineer Helmet - type: entity parent: ClothingHeadHelmetBase @@ -366,7 +413,10 @@ sprite: Clothing/Head/Helmets/ert_engineer.rsi - type: Clothing sprite: Clothing/Head/Helmets/ert_engineer.rsi - + - type: Tag + tags: + - PetWearable + #ERT Janitor Helmet - type: entity parent: ClothingHeadHelmetBase @@ -378,7 +428,10 @@ sprite: Clothing/Head/Helmets/ert_janitor.rsi - type: Clothing sprite: Clothing/Head/Helmets/ert_janitor.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHelmetBase id: ClothingHeadHelmetRaid @@ -396,7 +449,10 @@ Slash: 0.85 Piercing: 0.85 Heat: 0.85 - + - type: Tag + tags: + - PetWearable + #Bone Helmet - type: entity parent: ClothingHeadHelmetBase @@ -411,7 +467,10 @@ - type: Construction graph: BoneHelmet node: helmet - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHelmetBase id: ClothingHeadHelmetPodWars @@ -422,7 +481,10 @@ sprite: Clothing/Head/Helmets/podwars_helmet.rsi - type: Clothing sprite: Clothing/Head/Helmets/podwars_helmet.rsi - + - type: Tag + tags: + - PetWearable + #Justice Helmet - type: entity parent: ClothingHeadHelmetBase @@ -493,7 +555,10 @@ - type: Construction graph: HelmetJustice node: helmet - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHelmetJustice id: ClothingHeadHelmetJusticeEmpty @@ -503,7 +568,10 @@ slots: cell_slot: name: power-cell-slot-component-slot-name-default - + - type: Tag + tags: + - PetWearable + - type: entity id: ActionToggleJusticeHelm name: Toggle Justice Helm diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 4afb214c45d..c1822b0d10d 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -14,6 +14,7 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable - type: HideLayerClothing slots: - Hair @@ -33,6 +34,9 @@ sprite: Clothing/Head/Hoods/Bio/cmo.rsi - type: Clothing sprite: Clothing/Head/Hoods/Bio/cmo.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatHoodBioGeneral @@ -46,7 +50,10 @@ sprite: Clothing/Head/Hoods/Bio/janitor.rsi - type: Clothing sprite: Clothing/Head/Hoods/Bio/janitor.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodBioGeneral id: ClothingHeadHatHoodBioScientist @@ -59,7 +66,10 @@ sprite: Clothing/Head/Hoods/Bio/scientist.rsi - type: Clothing sprite: Clothing/Head/Hoods/Bio/scientist.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodBioGeneral id: ClothingHeadHatHoodBioSecurity @@ -72,7 +82,10 @@ sprite: Clothing/Head/Hoods/Bio/security.rsi - type: Clothing sprite: Clothing/Head/Hoods/Bio/security.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodBioGeneral id: ClothingHeadHatHoodBioVirology @@ -85,7 +98,10 @@ sprite: Clothing/Head/Hoods/Bio/virology.rsi - type: Clothing sprite: Clothing/Head/Hoods/Bio/virology.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoodChaplainHood @@ -101,6 +117,7 @@ tags: - HamsterWearable - WhitelistChameleon + - PetWearable - type: HideLayerClothing slots: - Hair @@ -118,6 +135,7 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable - type: HideLayerClothing slots: - Hair @@ -136,6 +154,7 @@ tags: - HamsterWearable - WhitelistChameleon + - PetWearable - type: HideLayerClothing slots: - Hair @@ -163,6 +182,9 @@ - Snout - HeadTop - HeadSide + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -177,6 +199,7 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable - type: HideLayerClothing slots: - Hair @@ -195,6 +218,9 @@ - type: HideLayerClothing slots: - Hair + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -210,6 +236,9 @@ - type: HideLayerClothing slots: - Hair + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatHoodCarp @@ -227,6 +256,9 @@ # wear carp suit and security helmet, they'll know you are fake - type: FactionClothing faction: Dragon + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -242,6 +274,7 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable - type: HideLayerClothing slots: - Hair @@ -260,6 +293,9 @@ sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatHoodWinterBase @@ -271,7 +307,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodbartender.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodbartender.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCaptain @@ -283,7 +322,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodcaptain.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodcaptain.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCargo @@ -294,7 +336,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodcargo.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodcargo.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCE @@ -305,7 +350,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodce.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodce.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCentcom @@ -317,7 +365,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodcentcom.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodcentcom.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterChem @@ -328,7 +379,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodchemist.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodchemist.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCMO @@ -339,7 +393,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodcmo.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodcmo.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterEngineer @@ -350,7 +407,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodengi.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodengi.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHOP @@ -361,7 +421,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodhop.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodhop.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHOS @@ -372,7 +435,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodhos.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodhos.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHydro @@ -383,7 +449,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodhydro.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodhydro.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterJani @@ -394,7 +463,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodjani.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodjani.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterMed @@ -405,7 +477,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodmed.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodmed.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterMime @@ -416,7 +491,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodmime.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodmime.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterMiner @@ -427,7 +505,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodminer.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodminer.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterPara @@ -438,7 +519,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodpara.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodpara.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterQM @@ -449,7 +533,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodqm.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodqm.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterRD @@ -460,7 +547,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodrd.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodrd.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterRobo @@ -471,7 +561,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodrobo.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodrobo.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterSci @@ -482,7 +575,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodsci.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodsci.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterSec @@ -493,7 +589,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodsec.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodsec.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterSyndie @@ -504,7 +603,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodsyndicate.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodsyndicate.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterWarden @@ -515,7 +617,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodsec.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodsec.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterWeb @@ -526,7 +631,10 @@ sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorBlack @@ -546,7 +654,10 @@ - state: coatybits-equipped-HELMET color: "#3f3f3f" - state: winterbits-equipped-HELMET - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorPurple @@ -566,7 +677,10 @@ - state: coatybits-equipped-HELMET color: "#9C0DE1" - state: winterbits-equipped-HELMET - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorRed @@ -586,7 +700,10 @@ - state: coatybits-equipped-HELMET color: "#940000" - state: winterbits-equipped-HELMET - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorBlue @@ -606,7 +723,10 @@ - state: coatybits-equipped-HELMET color: "#0089EF" - state: winterbits-equipped-HELMET - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorBrown @@ -626,7 +746,10 @@ - state: coatybits-equipped-HELMET color: "#723A02" - state: winterbits-equipped-HELMET - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorGray @@ -646,7 +769,10 @@ - state: coatybits-equipped-HELMET color: "#999999" - state: winterbits-equipped-HELMET - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorGreen @@ -666,7 +792,10 @@ - state: coatybits-equipped-HELMET color: "#5ABF2F" - state: winterbits-equipped-HELMET - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorLightBrown @@ -686,7 +815,10 @@ - state: coatybits-equipped-HELMET color: "#C09F72" - state: winterbits-equipped-HELMET - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorOrange @@ -706,7 +838,10 @@ - state: coatybits-equipped-HELMET color: "#EF8100" - state: winterbits-equipped-HELMET - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorWhite @@ -726,7 +861,10 @@ - state: coatybits-equipped-HELMET color: "#EAE8E8" - state: winterbits-equipped-HELMET - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorYellow @@ -746,7 +884,10 @@ - state: coatybits-equipped-HELMET color: "#EBE216" - state: winterbits-equipped-HELMET - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoodVoidCloak @@ -760,6 +901,7 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable - type: HideLayerClothing slots: - Hair diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 69136f503fb..d1681cb8788 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -8,6 +8,9 @@ sprite: Clothing/Head/Misc/bunny.rsi - type: Clothing sprite: Clothing/Head/Misc/bunny.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -19,7 +22,10 @@ sprite: Clothing/Head/Misc/cake.rsi - type: Clothing sprite: Clothing/Head/Misc/cake.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatChickenhead @@ -32,7 +38,10 @@ sprite: Clothing/Head/Misc/chickenhead.rsi - type: IngestionBlocker - type: IdentityBlocker - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatFlowerWreath @@ -49,7 +58,10 @@ - type: Construction graph: flowerwreath node: flowerwreath - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadLightBase id: ClothingHeadHatPumpkin @@ -74,7 +86,10 @@ slots: cell_slot: name: power-cell-slot-component-slot-name-default - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatPwig @@ -85,7 +100,10 @@ sprite: _NF/Clothing/Head/Misc/pwig.rsi # Frontier: add _NF prefix - type: Clothing sprite: _NF/Clothing/Head/Misc/pwig.rsi # Frontier: add _NF prefix - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadMirror @@ -96,7 +114,10 @@ sprite: Clothing/Head/Misc/head_mirror.rsi - type: Clothing sprite: Clothing/Head/Misc/head_mirror.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatRichard @@ -109,7 +130,10 @@ sprite: Clothing/Head/Misc/richard.rsi - type: IngestionBlocker - type: IdentityBlocker - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatSkub @@ -122,7 +146,10 @@ sprite: Clothing/Head/Misc/skubhead.rsi - type: IngestionBlocker - type: IdentityBlocker - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatShrineMaidenWig @@ -137,6 +164,7 @@ tags: - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadBase @@ -155,6 +183,9 @@ Plastic: 100 - type: StaticPrice price: 25 + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBase @@ -170,7 +201,10 @@ price: 3000 - type: AddAccentClothing accent: MobsterAccent - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatCatEars @@ -231,7 +265,10 @@ sprite: Clothing/Head/Hats/dogears.rsi - type: AddAccentClothing accent: BarkAccent - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatSquid @@ -244,7 +281,10 @@ sprite: Clothing/Head/Misc/squiddy.rsi - type: IngestionBlocker - type: IdentityBlocker - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatRedRacoon @@ -255,7 +295,10 @@ sprite: Clothing/Head/Misc/red_racoon.rsi - type: Clothing sprite: Clothing/Head/Misc/red_racoon.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: Clothing id: WaterDropletHat @@ -311,6 +354,7 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable - type: StaticPrice price: 1 @@ -324,3 +368,6 @@ sprite: Clothing/Head/Misc/hairflower.rsi - type: Clothing sprite: Clothing/Head/Misc/hairflower.rsi + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml index d063b8e8534..cba72224994 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml @@ -18,7 +18,10 @@ - state: icon_flipped map: ["foldedLayer"] visible: false - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHeadHatBaseFlippable id: ClothingHeadHeadHatBaseFlipped @@ -39,7 +42,10 @@ - state: icon_flipped map: ["foldedLayer"] visible: true - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHeadHatBaseFlippable id: ClothingHeadHatBluesoft @@ -50,7 +56,10 @@ sprite: Clothing/Head/Soft/bluesoft.rsi - type: Clothing sprite: Clothing/Head/Soft/bluesoft.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBluesoft] id: ClothingHeadHatBluesoftFlipped @@ -71,6 +80,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCargosoft] @@ -82,6 +92,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadHeadHatBaseFlippable @@ -93,7 +104,10 @@ sprite: Clothing/Head/Soft/qmsoft.rsi - type: Clothing sprite: Clothing/Head/Soft/qmsoft.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatQMsoft] id: ClothingHeadHatQMsoftFlipped @@ -109,7 +123,10 @@ sprite: Clothing/Head/Soft/corpsoft.rsi - type: Clothing sprite: Clothing/Head/Soft/corpsoft.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCorpsoft] id: ClothingHeadHatCorpsoftFlipped @@ -125,7 +142,10 @@ sprite: Clothing/Head/Soft/greensoft.rsi - type: Clothing sprite: Clothing/Head/Soft/greensoft.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatGreensoft] id: ClothingHeadHatGreensoftFlipped @@ -141,7 +161,10 @@ sprite: Clothing/Head/Soft/blacksoft.rsi - type: Clothing sprite: Clothing/Head/Soft/blacksoft.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBlacksoft] id: ClothingHeadHatBlacksoftFlipped @@ -157,7 +180,10 @@ sprite: Clothing/Head/Soft/greysoft.rsi - type: Clothing sprite: Clothing/Head/Soft/greysoft.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatGreysoft] id: ClothingHeadHatGreysoftFlipped @@ -173,7 +199,10 @@ sprite: Clothing/Head/Soft/mimesoft.rsi - type: Clothing sprite: Clothing/Head/Soft/mimesoft.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatMimesoft] id: ClothingHeadHatMimesoftFlipped @@ -189,7 +218,10 @@ sprite: Clothing/Head/Soft/orangesoft.rsi - type: Clothing sprite: Clothing/Head/Soft/orangesoft.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatOrangesoft] id: ClothingHeadHatOrangesoftFlipped @@ -210,6 +242,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatPurplesoft] @@ -221,6 +254,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: ClothingHeadHeadHatBaseFlippable @@ -232,6 +266,9 @@ sprite: Clothing/Head/Soft/redsoft.rsi - type: Clothing sprite: Clothing/Head/Soft/redsoft.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatRedsoft] @@ -248,6 +285,9 @@ sprite: Clothing/Head/Soft/secsoft.rsi - type: Clothing sprite: Clothing/Head/Soft/secsoft.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatSecsoft] @@ -264,7 +304,10 @@ sprite: Clothing/Head/Soft/yellowsoft.rsi - type: Clothing sprite: Clothing/Head/Soft/yellowsoft.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatYellowsoft] id: ClothingHeadHatYellowsoftFlipped @@ -280,7 +323,10 @@ sprite: Clothing/Head/Soft/bizarresoft.rsi - type: Clothing sprite: Clothing/Head/Soft/bizarresoft.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBizarreSoft] id: ClothingHeadHatBizarreSoftFlipped @@ -301,6 +347,7 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable - type: entity parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatParamedicsoft] @@ -312,3 +359,4 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml index 659c63f343f..f20c9c1b82e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml @@ -20,6 +20,7 @@ tags: - WhitelistChameleon - WeldingMask + - PetWearable - type: HideLayerClothing slots: - Snout @@ -39,6 +40,7 @@ - HamsterWearable - WhitelistChameleon - WeldingMask + - PetWearable - type: entity parent: WeldingMaskBase @@ -50,6 +52,9 @@ sprite: Clothing/Head/Welding/flame_welding_mask.rsi - type: Clothing sprite: Clothing/Head/Welding/flame_welding_mask.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: WeldingMaskBase @@ -61,7 +66,10 @@ sprite: Clothing/Head/Welding/blue_flame_welding_mask.rsi - type: Clothing sprite: Clothing/Head/Welding/blue_flame_welding_mask.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: WeldingMaskBase id: ClothingHeadHatWeldingMaskPainted @@ -71,4 +79,8 @@ - type: Sprite sprite: Clothing/Head/Welding/paintedwelding.rsi - type: Clothing - sprite: Clothing/Head/Welding/paintedwelding.rsi \ No newline at end of file + sprite: Clothing/Head/Welding/paintedwelding.rsi + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml index 871f4345796..ea70f1f8d26 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml @@ -31,6 +31,7 @@ tags: - Bandana - ClothMade + - PetWearable - type: HideLayerClothing slots: - Snout @@ -46,6 +47,9 @@ sprite: Clothing/Head/Bandanas/black.rsi - type: Clothing sprite: Clothing/Head/Bandanas/black.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBandanaBase @@ -57,6 +61,9 @@ sprite: Clothing/Head/Bandanas/blue.rsi - type: Clothing sprite: Clothing/Head/Bandanas/blue.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBandanaBase @@ -72,6 +79,7 @@ tags: - WhitelistChameleon - ClothMade + - PetWearable - type: entity parent: ClothingMaskBandanaBase @@ -83,6 +91,9 @@ sprite: Clothing/Head/Bandanas/gold.rsi - type: Clothing sprite: Clothing/Head/Bandanas/gold.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBandanaBase @@ -94,6 +105,9 @@ sprite: Clothing/Head/Bandanas/green.rsi - type: Clothing sprite: Clothing/Head/Bandanas/green.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBandanaBase @@ -105,6 +119,9 @@ sprite: Clothing/Head/Bandanas/grey.rsi - type: Clothing sprite: Clothing/Head/Bandanas/grey.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBandanaBase @@ -116,6 +133,9 @@ sprite: Clothing/Head/Bandanas/red.rsi - type: Clothing sprite: Clothing/Head/Bandanas/red.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBandanaBase @@ -127,6 +147,9 @@ sprite: Clothing/Head/Bandanas/skull.rsi - type: Clothing sprite: Clothing/Head/Bandanas/skull.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBandanaBase @@ -138,6 +161,9 @@ sprite: Clothing/Head/Bandanas/merc.rsi - type: Clothing sprite: Clothing/Head/Bandanas/merc.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBandanaBase @@ -149,3 +175,6 @@ sprite: Clothing/Head/Bandanas/brown.rsi - type: Clothing sprite: Clothing/Head/Bandanas/brown.rsi + - type: Tag + tags: + - PetWearable diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 0df658b238c..4de921a04dd 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -14,6 +14,7 @@ - type: Tag tags: - HamsterWearable + - PetWearable - WhitelistChameleon - type: HideLayerClothing layers: @@ -39,6 +40,9 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.95 + - type: Tag + tags: + - PetWearable - type: entity parent: [ClothingMaskGas] @@ -59,6 +63,9 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.95 + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskGas @@ -74,6 +81,9 @@ modifiers: coefficients: Heat: 0.90 # Frontier 0.80<0.90 + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskGasAtmos @@ -87,6 +97,9 @@ sprite: Clothing/Mask/gascaptain.rsi - type: BreathMask - type: IngestionBlocker + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskGasAtmos @@ -100,7 +113,9 @@ sprite: Clothing/Mask/gascentcom.rsi - type: BreathMask - type: IngestionBlocker - + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskGas id: ClothingMaskGasExplorer @@ -118,6 +133,9 @@ Slash: 0.95 # Frontier 0.90<0.95 Piercing: 0.95 Heat: 0.95 + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskPullableBase @@ -157,7 +175,10 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.95 - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingMaskPullableBase id: ClothingMaskBreath @@ -202,6 +223,7 @@ - WhitelistChameleon - IPCMaskWearable # EE - IPCs - Mask + - PetWearable - type: HideLayerClothing slots: - Snout @@ -216,6 +238,7 @@ - HamsterWearable - WhitelistChameleon - IPCMaskWearable # EE - IPCs + - PetWearable - type: HideLayerClothing slots: - Snout @@ -232,6 +255,9 @@ - type: Construction graph: BananaClownMask node: mask + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskClown @@ -250,6 +276,9 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.95 + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBase @@ -266,6 +295,9 @@ - type: HideLayerClothing slots: - Snout + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBase @@ -283,6 +315,7 @@ tags: - HamsterWearable - WhitelistChameleon + - PetWearable - type: HideLayerClothing slots: - Snout @@ -305,6 +338,9 @@ - type: PhysicalComposition materialComposition: Plastic: 25 + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBase @@ -326,6 +362,9 @@ - type: Construction graph: Muzzle node: muzzle + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskPullableBase @@ -344,6 +383,9 @@ slots: - Snout hideOnToggle: true + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskClownBase @@ -359,6 +401,9 @@ - type: Unremoveable - type: AddAccentClothing accent: StutteringAccent + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskGas @@ -373,6 +418,7 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable - type: HideLayerClothing slots: - Hair @@ -405,6 +451,9 @@ Heat: 0.95 - type: PirateBountyItem # Frontier id: ClothingMaskGasMercenary # Frontier + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskGas @@ -418,6 +467,7 @@ sprite: Clothing/Mask/ert.rsi - type: Tag tags: + - PetWearable - WhitelistChameleon - type: HideLayerClothing slots: @@ -451,6 +501,9 @@ Slash: 0.80 Piercing: 0.90 Heat: 0.90 + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBase @@ -468,6 +521,7 @@ - HamsterWearable - WhitelistChameleon - IPCMaskWearable # EE - IPCs + - PetWearable - type: HideLayerClothing slots: - Snout @@ -491,6 +545,7 @@ - type: Tag tags: - IPCMaskWearable # EE - IPCs + - PetWearable - type: entity parent: ClothingMaskBase @@ -510,6 +565,7 @@ - type: Tag tags: - IPCMaskWearable # EE - IPCs + - PetWearable - type: entity parent: ClothingMaskBase @@ -529,6 +585,7 @@ - type: Tag tags: - IPCMaskWearable # EE - IPCs + - PetWearable - type: entity parent: ClothingMaskBase @@ -548,6 +605,7 @@ - type: Tag tags: - IPCMaskWearable # EE - IPCs + - PetWearable - type: entity parent: ClothingMaskBase @@ -567,6 +625,7 @@ - type: Tag tags: - IPCMaskWearable # EE - IPCs + - PetWearable - type: entity parent: ClothingMaskBase @@ -586,6 +645,7 @@ - type: Tag tags: - IPCMaskWearable # EE - IPCs + - PetWearable - type: entity parent: ClothingMaskBase @@ -604,6 +664,7 @@ tags: - WhitelistChameleon - IPCMaskWearable # EE - IPCs + - PetWearable - type: entity parent: ClothingMaskNeckGaiter @@ -614,6 +675,9 @@ sprite: Clothing/Mask/neckgaiterred.rsi - type: Clothing sprite: Clothing/Mask/neckgaiterred.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskClownBase @@ -625,6 +689,9 @@ sprite: Clothing/Mask/blushingclown.rsi - type: Clothing sprite: Clothing/Mask/blushingclown.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskMime @@ -636,6 +703,9 @@ sprite: Clothing/Mask/blushingmime.rsi - type: Clothing sprite: Clothing/Mask/blushingmime.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskMime @@ -647,6 +717,9 @@ sprite: Clothing/Mask/sadmime.rsi - type: Clothing sprite: Clothing/Mask/sadmime.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskMime @@ -658,6 +731,9 @@ sprite: Clothing/Mask/scaredmime.rsi - type: Clothing sprite: Clothing/Mask/scaredmime.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBase @@ -674,6 +750,9 @@ - type: AddAccentClothing accent: ReplacementAccent replacement: italian + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingMaskBase @@ -693,6 +772,7 @@ - type: Tag tags: - IPCMaskWearable # EE - IPCs + - PetWearable - type: entity parent: ClothingMaskGas @@ -716,3 +796,4 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml index 641d4cb13ac..806ba49a976 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml @@ -42,6 +42,7 @@ - type: Tag tags: - IPCMaskWearable # EE - IPCs + - PetWearable - type: entity parent: ClothingMaskBase diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml index 4b44bd78458..64e90332a08 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml @@ -23,6 +23,7 @@ - type: Tag tags: - Medal + - PetWearable - type: entity parent: ClothingNeckBase @@ -50,6 +51,7 @@ - type: Tag tags: - Medal + - PetWearable - type: entity parent: ClothingNeckBase @@ -75,6 +77,7 @@ - type: Tag tags: - Medal + - PetWearable - type: entity parent: ClothingNeckBase @@ -100,6 +103,7 @@ - type: Tag tags: - Medal + - PetWearable - type: entity parent: ClothingNeckBase @@ -125,6 +129,7 @@ - type: Tag tags: - Medal + - PetWearable - type: entity parent: ClothingNeckBase @@ -150,6 +155,7 @@ - type: Tag tags: - Medal + - PetWearable - type: entity parent: ClothingNeckBase @@ -175,7 +181,8 @@ - type: Tag tags: - Medal - + - PetWearable + - type: entity parent: ClothingNeckBase id: ClothingNeckClownmedal @@ -202,3 +209,4 @@ - type: Tag tags: - Medal + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml index 24af2b0f1ba..e67fb4d96f2 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml @@ -30,6 +30,9 @@ path: /Audio/Items/flashlight_on.ogg soundDeactivate: path: /Audio/Items/flashlight_off.ogg + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingNeckBase @@ -42,7 +45,10 @@ - type: Clothing sprite: Clothing/Neck/Misc/stethoscope.rsi - type: Stethoscope - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckBase id: ClothingNeckBling @@ -53,7 +59,10 @@ sprite: Clothing/Neck/Misc/bling.rsi - type: Clothing sprite: Clothing/Neck/Misc/bling.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckBase id: ClothingNeckLawyerbadge @@ -66,7 +75,10 @@ sprite: Clothing/Neck/Misc/lawyerbadge.rsi - type: TypingIndicatorClothing proto: lawyer - + - type: Tag + tags: + - PetWearable + - type: entity id: ActionStethoscope name: Listen with stethoscope @@ -94,3 +106,4 @@ tags: - Trash - WhitelistChameleon + - PetWearable diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index f586a2c0bde..47d493adbac 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -11,6 +11,9 @@ sprite: Clothing/Neck/Misc/pins.rsi - type: Clothing sprite: Clothing/Neck/Misc/pins.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingNeckPinBase @@ -22,6 +25,9 @@ state: lgbt - type: Clothing equippedPrefix: lgbt + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingNeckPinBase @@ -33,7 +39,10 @@ state: ally - type: Clothing equippedPrefix: ally - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckAromanticPin @@ -44,7 +53,10 @@ state: aro - type: Clothing equippedPrefix: aro - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckAsexualPin @@ -55,7 +67,10 @@ state: asex - type: Clothing equippedPrefix: asex - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckBisexualPin @@ -66,7 +81,10 @@ state: bi - type: Clothing equippedPrefix: bi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckGayPin @@ -77,7 +95,10 @@ state: gay - type: Clothing equippedPrefix: gay - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckIntersexPin @@ -88,7 +109,10 @@ state: inter - type: Clothing equippedPrefix: inter - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckLesbianPin @@ -99,7 +123,10 @@ state: les - type: Clothing equippedPrefix: les - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckNonBinaryPin @@ -110,7 +137,10 @@ state: non - type: Clothing equippedPrefix: non - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckPansexualPin @@ -121,7 +151,10 @@ state: pan - type: Clothing equippedPrefix: pan - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckOmnisexualPin @@ -132,7 +165,10 @@ state: omni - type: Clothing equippedPrefix: omni - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckGenderqueerPin @@ -143,7 +179,10 @@ state: gender - type: Clothing equippedPrefix: gender - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckTransPin @@ -154,7 +193,10 @@ state: trans - type: Clothing equippedPrefix: trans - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckAutismPin @@ -165,7 +207,10 @@ state: autism - type: Clothing equippedPrefix: autism - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckPinBase id: ClothingNeckGoldAutismPin @@ -176,3 +221,6 @@ state: goldautism - type: Clothing equippedPrefix: goldautism + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml b/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml index 48910159565..8a4c3d4f8d3 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/stoles.yml @@ -8,3 +8,6 @@ sprite: Clothing/Neck/Stoles/chaplain.rsi - type: Clothing sprite: Clothing/Neck/Stoles/chaplain.rsi + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml index 9e361d59192..8083fe672c7 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml @@ -13,6 +13,7 @@ - HamsterWearable - WhitelistChameleon - ClothMade + - PetWearable - type: entity parent: ClothingNeckBase @@ -24,7 +25,10 @@ sprite: Clothing/Neck/Ties/dettie.rsi - type: Clothing sprite: Clothing/Neck/Ties/dettie.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckBase id: ClothingNeckTieSci @@ -40,3 +44,4 @@ - ClothMade - HamsterWearable - WhitelistChameleon + - PetWearable diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index 0c39868950a..5060546fe36 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -32,6 +32,21 @@ prototypes: - MobCockroach +- type: entity + parent: MarkerBase + id: SpawnMobMoproach + name: Moproach Spawner + components: + - type: Sprite + layers: + - state: green + - sprite: Mobs/Animals/mothroach/moproach.rsi + state: icon + - state: ai + - type: ConditionalSpawner + prototypes: + - MobMoproach + - type: entity name: HoP Corgi Spawner id: SpawnMobCorgi diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 3a50cf58ec2..978de9807b3 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -505,6 +505,8 @@ allowedEmotes: ['Chitter', 'Squeak'] - type: FaxableObject insertingState: inserting_mothroach + - type: DashAction # Goobstation - dark souls moths + actionProto: ActionDashMoth - type: MothAccent - type: Sprite sprite: Mobs/Animals/mothroach/mothroach.rsi @@ -573,6 +575,7 @@ - Moffic understands: - Moffic + - TauCetiBasic - type: ZombieAccentOverride accent: zombieMoth - type: Vocal @@ -583,11 +586,16 @@ wilhelmProbability: 0.001 - type: MobPrice price: 150 + - type: Temperature + heatDamageThreshold: 423 + coldDamageThreshold: 0 - type: Tag tags: - Trash - CannotSuicide - VimPilot + - type: MovementAlwaysTouching + - type: PressureImmunity - type: CanEscapeInventory - type: NpcFactionMember factions: @@ -602,7 +610,7 @@ - trigger: !type:DamageTypeTrigger damageType: Blunt - damage: 60 + damage: 250 behaviors: - !type:GibBehavior { } - type: FireVisuals @@ -617,8 +625,8 @@ type: SurgeryBui - type: InventorySlots - type: Inventory - speciesId: hamster - templateId: hamster + speciesId: mothroach + templateId: mothroach displacements: head: sizeMaps: @@ -645,7 +653,11 @@ 32: sprite: Mobs/Animals/mothroach/displacement.rsi state: neck - + - type: EatToGrow # Goobstation Eat To Grow System + growth: 0.05 + maxGrowth: 2 + - type: Puller + needsHands: false # 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. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml index e13974561e1..6502bec4f65 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml @@ -11,6 +11,7 @@ tags: - Cigarette - Trash + - PetWearable - type: SpaceGarbage cleanupExempt: true # Mono - type: Clothing @@ -39,6 +40,7 @@ tags: - Cigarette - Trash + - PetWearable - type: SpaceGarbage - type: Clothing sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi @@ -77,6 +79,7 @@ - Cigarette - Trash - Burnt + - PetWearable - type: entity id: CigaretteSyndicate diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml index 64f1992f832..8e3faeb422c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -118,6 +118,7 @@ tags: - CigPack - Trash + - PetWearable - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml index a831c75879a..a9b0d306fa7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml @@ -14,6 +14,7 @@ tags: - Cigar - Trash + - PetWearable - type: Clothing sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi slots: [ mask ] @@ -48,6 +49,7 @@ - Cigar - Trash - Burnt + - PetWearable - type: entity id: CigarGold diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index d26813424b7..c63fdb05fc4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -288,7 +288,8 @@ SpacemenFigureSpawner: 28 SpawnMobCockroach: 5 MaintenanceToolSpawner: 5 - + SpawnMobMoproach: 2 + - type: entity parent: [BaseItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall name: damp rag diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index e02f6774060..0a98b675d10 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -94,7 +94,31 @@ - MobMothroach # Frontier: enforced rarity - MobMothroach # Frontier - MobMothroach # Frontier + - MobMothroachLeopard + - MobMothroachCecropia + - MobMothroachLunar + - MobMothroachMustard - MobRosyMothroach # Frontier + - MobRosyMothroach # Frontier + - MobMoproach # wizden + +- type: entity + parent: MonkeyCube + id: MothroachMustardCube + name: mustard mothroach cube + components: + - type: Rehydratable + possibleSpawns: + - MobMothroachMustard + +- type: entity + parent: MonkeyCube + id: BoomroachCube + name: boomroach cube + components: + - type: Rehydratable + possibleSpawns: + - MobBoomroach - type: entity parent: MonkeyCube diff --git a/Resources/Prototypes/GameRules/pests.yml b/Resources/Prototypes/GameRules/pests.yml index a840f9aeb65..2dd866f6615 100644 --- a/Resources/Prototypes/GameRules/pests.yml +++ b/Resources/Prototypes/GameRules/pests.yml @@ -87,9 +87,21 @@ prob: 0.005 # Mono - id: MobRosyMothroach # Frontier prob: 0.005 # Mono + - id: MobMothroachLeopard # Frontier + prob: 0.005 # Mono + - id: MobMothroachCecropia # Frontier + prob: 0.005 # Mono + - id: MobMothroachLunar # Frontier + prob: 0.005 # Mono + - id: MobMothroachMustard # Frontier + prob: 0.005 # Mono specialEntries: # Mono - id: MobCorticalBorer # Mono prob: 0.001 # Mono + - id: MobMoproach + prob: 0.001 + - id: MobBoomroach + prob: 0.0001 - type: entity id: SnailMigrationLowPop diff --git a/Resources/Prototypes/InventoryTemplates/mothroach_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/mothroach_inventory_template.yml new file mode 100644 index 00000000000..faa0fb35f03 --- /dev/null +++ b/Resources/Prototypes/InventoryTemplates/mothroach_inventory_template.yml @@ -0,0 +1,60 @@ +- type: inventoryTemplate + id: mothroach + slots: + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + whitelist: + tags: + - PetWearable + - HamsterWearable + components: # Frontier + - HamsterWearable # Frontier + - name: neck + slotTexture: neck + slotFlags: NECK + uiWindowPos: 0,1 + strippingWindowPos: 0,1 + displayName: Neck + whitelist: + tags: + - PetWearable + - HamsterWearable + - name: eyes + slotTexture: glasses + slotFlags: EYES + stripTime: 3 + uiWindowPos: 0,2 + strippingWindowPos: 0,0 + displayName: Eyes + whitelist: + tags: + - PetWearable + - HamsterWearable + components: # Frontier + - HamsterWearable # Frontier + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + stripTime: 3 + uiWindowPos: 1,0 + strippingWindowPos: 2,5 + displayName: Suit Storage + whitelist: + components: + - GasTank + - name: head + slotTexture: head + slotFlags: HEAD + uiWindowPos: 1,2 + strippingWindowPos: 1,0 + displayName: Head + whitelist: + tags: + - PetWearable + - HamsterWearable + components: # Frontier + - HamsterWearable # Frontier \ No newline at end of file diff --git a/Resources/Prototypes/NPCs/mob.yml b/Resources/Prototypes/NPCs/mob.yml index dd3378618a6..16ff03df87d 100644 --- a/Resources/Prototypes/NPCs/mob.yml +++ b/Resources/Prototypes/NPCs/mob.yml @@ -32,6 +32,19 @@ - !type:HTNCompoundTask task: IdleCompound +- type: htnCompound + id: MoproachCompound + branches: + - tasks: + - !type:HTNCompoundTask + task: FoodCompound + - tasks: + - !type:HTNCompoundTask + task: BufferNearbyPuddlesCompound + - tasks: + - !type:HTNCompoundTask + task: IdleCompound + - type: htnCompound id: GlockroachCompound branches: diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index fcb437145c8..50ab412792c 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -415,6 +415,7 @@ id: RecipeMothRoachburger name: mothroachburger recipe result: FoodBurgerMothRoach + time: 10 group: Savory solids: FoodBreadBun: 1 diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml b/Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml index 0d463662efd..b5451f282a0 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml @@ -10,6 +10,7 @@ - CowCube - GoatCube - MothroachCube + - MothroachMustardCube - MouseCube - CockroachCube @@ -19,6 +20,7 @@ - AbominationCube - SpaceCarpCube - SpaceTickCube + - BoomroachCube - type: latheRecipePack id: SpeciesCubesStatic diff --git a/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml b/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml index 6e6725c82b0..c6262accb10 100644 --- a/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml +++ b/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml @@ -45,6 +45,24 @@ materials: Biomass: 20 +- type: latheRecipe + id: BoomroachCube + result: BoomroachCube + categories: # Mono + - DangerousAnimals + completetime: 45 + materials: + Biomass: 20 + +- type: latheRecipe + id: MothroachMustardCube + result: MothroachMustardCube + categories: # Mono + - Animals + completetime: 45 + materials: + Biomass: 20 + - type: latheRecipe id: MouseCube result: MouseCube diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index 9a315d9e520..d1ebcd72deb 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -393,6 +393,26 @@ orGroup: fauna # Frontier prob: 0.2 # Frontier maxAmount: 2 # Frontier + - id: MobMothroachLeopard + orGroup: fauna + maxAmount: 2 + - id: MobMothroachCecropia + orGroup: fauna + maxAmount: 2 + - id: MobMothroachLunar + orGroup: fauna + maxAmount: 2 + - id: MobMoproach + orGroup: fauna + maxAmount: 2 + - id: MobMothroachMustard # Frontier + orGroup: fauna # Frontier + prob: 0.05 # Frontier + maxAmount: 2 # Frontier + - id: MobBoomroach # Frontier + orGroup: fauna # Frontier + prob: 0.01 # Frontier + maxAmount: 1 # Frontier # - id: MobMonkeySyndicateAgent #so lucky # Frontier # orGroup: fauna # maxAmount: 1 diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_DV/Entities/Clothing/Eyes/glasses.yml index f74790b3f43..17aa5b9d75e 100644 --- a/Resources/Prototypes/_DV/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_DV/Entities/Clothing/Eyes/glasses.yml @@ -18,3 +18,7 @@ sprite: _DV/Clothing/Eyes/Glasses/traymeson.rsi - type: Clothing sprite: _DV/Clothing/Eyes/Glasses/traymeson.rsi + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/_Goobstation/Actions/emotes.yml b/Resources/Prototypes/_Goobstation/Actions/emotes.yml index a7485248db2..38c5ee1540b 100644 --- a/Resources/Prototypes/_Goobstation/Actions/emotes.yml +++ b/Resources/Prototypes/_Goobstation/Actions/emotes.yml @@ -25,3 +25,18 @@ - bounces. - bounces! event: !type:AnimationJumpEmoteEvent + +- type: emote + id: Flip + name: chat-emote-name-flip + icon: _Goobstation/Interface/Emotes/flip.png + chatMessages: ["chat-emote-msg-flip"] + chatTriggers: + - flip + - flips + - flips. + - flips! + - does a flip + - does a flip. + - does a flip! + event: !type:AnimationFlipEmoteEvent \ No newline at end of file diff --git a/Resources/Prototypes/_Goobstation/Actions/types.yml b/Resources/Prototypes/_Goobstation/Actions/types.yml index 423013b6d17..e2f1aca9a4a 100644 --- a/Resources/Prototypes/_Goobstation/Actions/types.yml +++ b/Resources/Prototypes/_Goobstation/Actions/types.yml @@ -13,3 +13,21 @@ sprite: _Goobstation/Effects/bluespace_lifeline.rsi state: bluespace_lifeline event: !type:ActivateImplantEvent + +- type: entity + id: ActionDashMoth + name: Wing dash + description: Sharply flap your wings, dashing to the side! + categories: [ HideSpawnMenu ] + components: + - type: WorldTargetAction + useDelay: 6.5 + checkCanAccess: false + range: 0 + icon: { sprite: _Goobstation/Actions/dash.rsi, state: icon } + itemIconStyle: NoItem + sound: !type:SoundPathSpecifier + path: /Audio/_Goobstation/Effects/moth_wings.ogg + params: + volume: 6.5 + event: !type:DashActionEvent \ No newline at end of file diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/glasses.yml index 9f8f78c0c6f..eb9c1bf5799 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/glasses.yml @@ -25,7 +25,10 @@ interfaces: enum.ChameleonUiKey.Key: type: ChameleonBoundUserInterface - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesHudOmni] id: ClothingEyesGlassesCentComm @@ -45,6 +48,7 @@ - WhitelistChameleon - HudMedical - HudSecurity + - PetWearable - type: IdentityBlocker coverage: EYES - type: ShowHealthBars diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/hud.yml index 4eb44227a17..2ebcf515a3a 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/hud.yml @@ -8,10 +8,16 @@ sprite: _Goobstation/Clothing/Eyes/Hud/chrono.rsi - type: Clothing sprite: _Goobstation/Clothing/Eyes/Hud/chrono.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesHudChrono id: ClothingEyesHudChronoUnremoveable suffix: Unremoveable components: - type: Unremoveable + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hats.yml index e583f91fd44..b98bef98fff 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hats.yml @@ -12,6 +12,7 @@ tags: - ClothMade - WhitelistChameleon # We do a little bit of trolling. + - PetWearable - type: entity parent: [ClothingHeadBase] @@ -27,7 +28,8 @@ tags: - ClothMade - WhitelistChameleon - + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadSanabi @@ -40,3 +42,6 @@ sprite: _Goobstation/Clothing/Head/Hats/sanabi.rsi - type: StaticPrice # Monolith vendPrice: 220 + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Masks/masks.yml index 87066b01d37..dd48c4e0958 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Masks/masks.yml @@ -14,10 +14,14 @@ - WhitelistChameleon - HidesHair - HidesNose + - PetWearable - type: entity parent: ClothingMaskGasChrono id: ClothingMaskGasChronoUnremoveable suffix: Unremoveable components: - - type: Unremoveable \ No newline at end of file + - type: Unremoveable + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml index 27b1cb29e2b..ffcd65f0a6b 100644 --- a/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/pdv_uplink_catalog.yml @@ -1153,6 +1153,17 @@ tags: - PirateUplink +- type: listing + id: UplinkMobMothSyndy + name: uplink-pirate-MobMothSyndy-name + description: uplink-pirate-MobMothSyndy-desc + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-syndiroach } + productEntity: ReinforcementRadioPDVSyndiRoach + cost: + Doubloon: 30 + categories: + - UplinkPirateExplosives + - type: listing id: UplinkPirateEmpGrenadeBox name: uplink-pirate-empgrenade-box-name diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/Balaclava/balaclavas.yml b/Resources/Prototypes/_Mono/Entities/Clothing/Balaclava/balaclavas.yml index 5d240fe7214..0d22d6e9ad6 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/Balaclava/balaclavas.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/Balaclava/balaclavas.yml @@ -24,6 +24,9 @@ right: - state: inhand-right color: "#1F1F1F" + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingBalaclavaBase @@ -48,6 +51,9 @@ right: - state: inhand-right color: "#6A6A6A" + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingBalaclavaBase @@ -68,6 +74,9 @@ - state: inhand-left right: - state: inhand-right + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingBalaclavaBase @@ -92,6 +101,9 @@ right: - state: inhand-right color: "#ff2c2c" + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingBalaclavaBase @@ -116,6 +128,9 @@ right: - state: inhand-right color: "#4CBB17" + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingBalaclavaBase @@ -140,6 +155,9 @@ right: - state: inhand-right color: "#2832C2" + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingBalaclavaBase @@ -164,6 +182,9 @@ right: - state: inhand-right color: "#B200ED" + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingBalaclavaBase @@ -188,6 +209,9 @@ right: - state: inhand-right color: "#FFF200" + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingBalaclavaBase @@ -212,6 +236,9 @@ right: - state: inhand-right color: "#d2B48C" + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingBalaclavaBase @@ -236,6 +263,9 @@ right: - state: inhand-right color: "#4A5A49" + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingBalaclavaBase @@ -260,7 +290,10 @@ right: - state: inhand-right color: "#81613C" - + - type: Tag + tags: + - PetWearable + #ski mask + hole - type: entity @@ -286,7 +319,10 @@ right: - state: inhand-right color: "#1F1F1F" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaSkiMaskMouthGray @@ -310,7 +346,10 @@ right: - state: inhand-right color: "#6A6A6A" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaSkiMaskMouthWhite @@ -330,7 +369,10 @@ - state: inhand-left right: - state: inhand-right - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaSkiMaskMouthRed @@ -354,7 +396,10 @@ right: - state: inhand-right color: "#ff2c2c" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaSkiMaskMouthGreen @@ -378,7 +423,10 @@ right: - state: inhand-right color: "#4CBB17" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaSkiMaskMouthBlue @@ -402,7 +450,10 @@ right: - state: inhand-right color: "#2832C2" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaSkiMaskMouthPurple @@ -426,7 +477,10 @@ right: - state: inhand-right color: "#B200ED" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaSkiMaskMouthYellow @@ -450,7 +504,10 @@ right: - state: inhand-right color: "#FFF200" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaSkiMaskMouthTan @@ -474,7 +531,10 @@ right: - state: inhand-right color: "#d2B48C" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaSkiMaskMouthRangerGreen @@ -498,7 +558,10 @@ right: - state: inhand-right color: "#4A5A49" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaSkiMaskMouthCoyoteBrown @@ -522,7 +585,10 @@ right: - state: inhand-right color: "#81613C" - + - type: Tag + tags: + - PetWearable + #classic mask no hole - type: entity @@ -548,7 +614,10 @@ right: - state: inhand-right color: "#1F1F1F" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicGray @@ -572,7 +641,10 @@ right: - state: inhand-right color: "#6A6A6A" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicWhite @@ -592,7 +664,10 @@ - state: inhand-left right: - state: inhand-right - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicRed @@ -616,7 +691,10 @@ right: - state: inhand-right color: "#ff2c2c" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicGreen @@ -640,7 +718,10 @@ right: - state: inhand-right color: "#4CBB17" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicBlue @@ -664,7 +745,10 @@ right: - state: inhand-right color: "#2832C2" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicPurple @@ -688,7 +772,10 @@ right: - state: inhand-right color: "#B200ED" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicYellow @@ -712,7 +799,10 @@ right: - state: inhand-right color: "#FFF200" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicTan @@ -736,7 +826,10 @@ right: - state: inhand-right color: "#d2B48C" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicRangerGreen @@ -760,7 +853,10 @@ right: - state: inhand-right color: "#4A5A49" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicCoyoteBrown @@ -784,7 +880,10 @@ right: - state: inhand-right color: "#81613C" - + - type: Tag + tags: + - PetWearable + #classic mask + hole - type: entity @@ -810,7 +909,10 @@ right: - state: inhand-right color: "#1F1F1F" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicMouthGray @@ -834,7 +936,10 @@ right: - state: inhand-right color: "#6A6A6A" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicMouthWhite @@ -854,7 +959,10 @@ - state: inhand-left right: - state: inhand-right - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicMouthRed @@ -878,7 +986,10 @@ right: - state: inhand-right color: "#ff2c2c" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicMouthGreen @@ -902,7 +1013,10 @@ right: - state: inhand-right color: "#4CBB17" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicMouthBlue @@ -926,7 +1040,10 @@ right: - state: inhand-right color: "#2832C2" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicMouthPurple @@ -950,7 +1067,10 @@ right: - state: inhand-right color: "#B200ED" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicMouthYellow @@ -974,7 +1094,10 @@ right: - state: inhand-right color: "#FFF200" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicMouthTan @@ -998,7 +1121,10 @@ right: - state: inhand-right color: "#d2B48C" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicMouthRangerGreen @@ -1022,7 +1148,10 @@ right: - state: inhand-right color: "#4A5A49" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingBalaclavaBase id: ClothingBalaclavaClassicMouthCoyoteBrown @@ -1046,3 +1175,7 @@ right: - state: inhand-right color: "#81613C" + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Mono/Entities/Clothing/Eyes/glasses.yml index 6f7720edcf5..06d7384386a 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/Eyes/glasses.yml @@ -25,6 +25,10 @@ - Inorganic - Silicon - Biological + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesHudMedical @@ -51,7 +55,10 @@ - Inorganic - Silicon - Biological - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesHudMedical id: ClothingEyesBallisticGogglesGreen @@ -77,7 +84,10 @@ - Inorganic - Silicon - Biological - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesHudMedical id: ClothingEyesBallisticGlassesGreen @@ -103,7 +113,10 @@ - Inorganic - Silicon - Biological - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesHudMedical id: ClothingEyesBallisticGogglesOrange @@ -129,7 +142,10 @@ - Inorganic - Silicon - Biological - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesHudMedical id: ClothingEyesBallisticGlassesOrange @@ -155,7 +171,10 @@ - Inorganic - Silicon - Biological - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesBase, ShowSecurityIcons] id: ClothingEyesTSFOfficerGlasses @@ -182,3 +201,7 @@ action: ActionToggleNightVision phosphorColor: "#41D7D9" lightingColor: "#FFFFFF32" + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_Mono/Entities/Clothing/Masks/masks.yml index 010754bcec1..e00a8a3ea2e 100644 --- a/Resources/Prototypes/_Mono/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_Mono/Entities/Clothing/Masks/masks.yml @@ -11,7 +11,10 @@ sprite: _Mono/Clothing/Mask/gasdi.rsi - type: IdentityBlocker coverage: MOUTH - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ ClothingMaskDrakeIndustries ] id: ClothingMaskDrakeIndustriesWatchdog @@ -26,7 +29,10 @@ coverage: MOUTH - type: EyeProtection protectionTime: 5 - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingMaskGasExplorer id: ClothingMaskCOG @@ -39,7 +45,10 @@ sprite: _Mono/Clothing/Mask/cogmask.rsi - type: IdentityBlocker coverage: MOUTH - + - type: Tag + tags: + - PetWearable + #tactical gas masks - type: entity @@ -57,7 +66,10 @@ sprite: _Mono/Clothing/Mask/SOM40.rsi - type: IdentityBlocker coverage: MOUTH - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingMaskGasExplorer id: ClothingMaskSOM41 @@ -73,7 +85,10 @@ sprite: _Mono/Clothing/Mask/SOM41.rsi - type: IdentityBlocker coverage: MOUTH - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingMaskGasExplorer id: ClothingMaskSOM42 @@ -89,3 +104,7 @@ sprite: _Mono/Clothing/Mask/SOM42.rsi - type: IdentityBlocker coverage: MOUTH + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Entities/Mobs/NPCs/mothroaches.yml b/Resources/Prototypes/_Mono/Entities/Mobs/NPCs/mothroaches.yml new file mode 100644 index 00000000000..bd6dbd87bee --- /dev/null +++ b/Resources/Prototypes/_Mono/Entities/Mobs/NPCs/mothroaches.yml @@ -0,0 +1,542 @@ +- type: entity + name: moproach + parent: MobMothroach + id: MobMoproach + description: This little mothroach has mopshoes on its feet! How adorable! + components: + - type: GhostRole + makeSentient: true + allowSpeech: true + allowMovement: true + name: ghost-role-information-moproach-name + description: ghost-role-information-moproach-description + rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgentHarmless + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.2 + density: 120 + mask: + - SmallMobMask + layer: + - SmallMobLayer + - type: GhostTakeoverAvailable + - type: Speech + speechVerb: Moth + speechSounds: Squeak + allowedEmotes: ['Chitter', 'Squeak'] + - type: FaxableObject + insertingState: inserting_mothroach + - type: MothAccent + - type: Sprite + sprite: Mobs/Animals/mothroach/moproach.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base", "movement"] + state: mothroach + - type: SpriteMovement + movementLayers: + movement: + state: mothroach-moving + noMovementLayers: + movement: + state: mothroach + - type: Item + size: Normal + - type: Clothing + quickEquip: false + sprite: Mobs/Animals/mothroach/moproach.rsi + equippedPrefix: 0 + slots: + - HEAD + - type: Appearance + - type: DamageStateVisuals + states: + Alive: + Base: mothroach + Critical: + Base: mothroach_dead + Dead: + Base: mothroach_dead + - type: MobThresholds + thresholds: + 0: Alive + 45: Critical + 65: Dead + - type: MovementSpeedModifier + baseWalkSpeed : 3 + baseSprintSpeed : 5 # extra speed for that moppin'! + weightlessAcceleration: 1.5 + weightlessFriction: 1 + baseWeightlessModifier: 1 + - type: HTN + rootTask: + task: MoproachCompound + - type: Absorbent + pickupAmount: 7.5 # small feet + - type: UseDelay + delay: 0.5 # quick feet + - type: SolutionRegeneration + solution: absorbed + generated: + reagents: + - ReagentId: Water + Quantity: 5 + - type: SolutionPurge + solution: absorbed + preserve: + - Water + quantity: 10 + - type: SolutionContainerManager + solutions: + absorbed: + maxVol: 100 + - type: ProtectedFromStepTriggers + - type: Insulated + + +- type: entity + name: Boomroach + parent: MobMothroach + id: MobBoomroach + description: This little mothroach has a chinalake strapped to its back! Why and how? + components: + - type: GhostRole + makeSentient: true + allowSpeech: true + allowMovement: true + name: ghost-role-information-boomroach-name + description: ghost-role-information-boomroach-description + rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgentHarmless + - type: AutoImplant + implants: + - RadioImplantCivilian + - type: IntrinsicRadioTransmitter + channels: + - Common + - Traffic + - type: ActiveRadio + channels: + - Common + - Traffic + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.2 + density: 120 + mask: + - SmallMobMask + layer: + - SmallMobLayer + - type: GhostTakeoverAvailable + - type: Speech + speechVerb: Moth + speechSounds: Squeak + allowedEmotes: ['Chitter', 'Squeak'] + - type: FaxableObject + insertingState: inserting_mothroach + - type: MothAccent + - type: Sprite + sprite: Mobs/Animals/mothroach/boomroach.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base", "movement"] + state: mothroach + - type: SpriteMovement + movementLayers: + movement: + state: mothroach-moving + noMovementLayers: + movement: + state: mothroach + - type: Item + size: Normal + - type: Clothing + quickEquip: false + sprite: Mobs/Animals/mothroach/boomroach.rsi + equippedPrefix: 0 + slots: + - HEAD + - type: Appearance + - type: DamageStateVisuals + states: + Alive: + Base: mothroach + Critical: + Base: mothroach_dead + Dead: + Base: mothroach_dead + - type: LanguageKnowledge # Einstein Engines - Language + speaks: + - Moffic + understands: + - Moffic + - TauCetiBasic + - type: Gun + fireRate: 2 + useKey: false + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: Battery + maxCharge: 2000 + startingCharge: 2000 + - type: ProjectileBatteryAmmoProvider + proto: 40mmGrenadeFragmentation + fireCost: 500 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 10 + - type: ExplosionResistance + damageCoefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + - type: MobThresholds + thresholds: + 0: Alive + 80: Critical + 100: Dead + +- type: entity + name: syndiroach + parent: MobMothroach + id: MobMothSyndy + description: Repurposed and highly trained elite member of the PDV, bewarned explosive personallity + components: + - type: GhostRole + makeSentient: true + allowSpeech: true + allowMovement: true + name: ghost-role-information-syndiroach-name + description: ghost-role-information-syndiroach-description + rules: ghost-role-information-syndiroach-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist + - type: AutoImplant + implants: + - FreelanceTrackingImplant + - RadioImplantFreelance + - MicroBombImplant + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: IntrinsicRadioTransmitter + channels: + - Common + - Traffic + - Freelance + - type: ActiveRadio + channels: + - Common + - Traffic + - Freelance + - type: NpcFactionMember + factions: + - PirateNF + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.2 + density: 120 + mask: + - SmallMobMask + layer: + - SmallMobLayer + - type: GhostTakeoverAvailable + - type: Speech + speechVerb: Moth + speechSounds: Squeak + allowedEmotes: ['Chitter', 'Squeak'] + - type: FaxableObject + insertingState: inserting_mothroach + - type: MothAccent + - type: Sprite + sprite: Mobs/Animals/mothroach/syndiroach.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base", "movement"] + state: mothroach + - type: SpriteMovement + movementLayers: + movement: + state: mothroach-moving + noMovementLayers: + movement: + state: mothroach + - type: Item + size: Normal + - type: Clothing + quickEquip: false + sprite: Mobs/Animals/mothroach/syndiroach.rsi + equippedPrefix: 0 + slots: + - HEAD + - type: Appearance + - type: DamageStateVisuals + states: + Alive: + Base: mothroach + Critical: + Base: mothroach_dead + Dead: + Base: mothroach_dead + - type: LanguageKnowledge # Einstein Engines - Language + speaks: + - Moffic + - Freespeak + understands: + - Moffic + - Freespeak + +- type: entity + name: leopard mothroach + parent: MobMothroach + id: MobMothroachLeopard + description: A charming result of numerous attempts to crossbreed insects with predators. + components: + - type: GhostRole + makeSentient: true + allowSpeech: true + allowMovement: true + name: ghost-role-information-mothroachleopard-name + description: ghost-role-information-mothroachleopard-description + rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgentHarmless + - type: Sprite + sprite: Mobs/Animals/mothroach/leopard_mothroach.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base", "movement"] + state: mothroach + - type: FaxableObject + insertingState: inserting_mothroach_leopard + - type: Clothing + quickEquip: false + sprite: Mobs/Animals/mothroach/leopard_mothroach.rsi + equippedPrefix: 0 + slots: + - HEAD + +- type: entity + name: cecropia mothroach + parent: MobMothroach + id: MobMothroachCecropia + description: A charming result of numerous attempts to cross a genus of the nettle family with cockroaches. + components: + - type: GhostRole + makeSentient: true + allowSpeech: true + allowMovement: true + name: ghost-role-information-mothroachcecropia-name + description: ghost-role-information-mothroachcecropia-description + rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgentHarmless + - type: Sprite + sprite: Mobs/Animals/mothroach/cecropia_mothroach.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base", "movement"] + state: mothroach + - type: FaxableObject + insertingState: inserting_mothroach_cecropia + - type: Clothing + quickEquip: false + sprite: Mobs/Animals/mothroach/cecropia_mothroach.rsi + equippedPrefix: 0 + slots: + - HEAD + +- type: entity + name: lunar mothroach + parent: MobMothroach + id: MobMothroachLunar + description: Someone left the moth under the moonlight. + components: + - type: GhostRole + makeSentient: true + allowSpeech: true + allowMovement: true + name: ghost-role-information-mothroachlunar-name + description: ghost-role-information-mothroachlunar-description + rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgentHarmless + - type: Sprite + sprite: Mobs/Animals/mothroach/lunar_mothroach.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base", "movement"] + state: mothroach + - type: FaxableObject + insertingState: inserting_mothroach_lunar + - type: Clothing + quickEquip: false + sprite: Mobs/Animals/mothroach/lunar_mothroach.rsi + equippedPrefix: 0 + slots: + - HEAD + +- type: entity + name: mustard mothroach + parent: + - EdibleBase + - BaseMob + id: MobMothroachMustard + description: A delightful result of the world's chefs crossing meat with sauce. + components: + - type: GhostRole + makeSentient: true + allowSpeech: true + allowMovement: true + name: ghost-role-information-mothroachmustard-name + description: ghost-role-information-mothroachmustard-description + rules: ghost-role-information-freeagent-rules + mindRoles: + - MindRoleGhostRoleFreeAgentHarmless + - type: GhostTakeoverAvailable + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.2 + density: 120 + mask: + - SmallMobMask + layer: + - SmallMobLayer + - type: HTN + constantlyReplan: false + rootTask: + task: MouseCompound + - type: FlavorProfile + flavors: + - meaty + - mustard + - lostfriendship + - type: SolutionContainerManager + solutions: + food: + maxVol: 45 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 5 + - ReagentId: Protein + Quantity: 5 + - ReagentId: Mustard + Quantity: 5 + - type: Speech + speechVerb: Moth + speechSounds: Squeak + allowedEmotes: ['Chitter', 'Squeak'] + - type: FaxableObject + insertingState: inserting_mothroach + - type: DashAction # Goobstation - dark souls moths + actionProto: ActionDashMoth + - type: MothAccent + - type: Sprite + noRot: true + sprite: Mobs/Animals/mothroach/mustard_mothroach.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base", "movement"] + state: mothroach + - type: SpriteMovement + movementLayers: + movement: + state: mothroach-moving + noMovementLayers: + movement: + state: mothroach + - type: Item + size: Normal + - type: Clothing + quickEquip: false + sprite: Mobs/Animals/mothroach/mustard_mothroach.rsi + equippedPrefix: 0 + slots: + - HEAD + - type: MovementSpeedModifier + baseWalkSpeed : 2.5 + baseSprintSpeed : 4 + weightlessAcceleration: 1.5 + weightlessFriction: 1 + baseWeightlessModifier: 1 + - type: CombatMode + - type: Extractable + grindableSolutionName: food + - type: LanguageKnowledge # Einstein Engines - Language + speaks: + - Moffic + understands: + - Moffic + - TauCetiBasic + - type: Vocal + sounds: + Male: UnisexMoth + Female: UnisexMoth + Unsexed: UnisexMoth + wilhelmProbability: 0.001 + - type: MobPrice + price: 150 + - type: Tag + tags: + - Trash + - CannotSuicide + - VimPilot + - Meat + - type: MovementAlwaysTouching + - type: CanEscapeInventory + - type: NpcFactionMember + factions: + - Mouse + - type: TypingIndicator + proto: moth + - type: Strippable + - type: UserInterface + interfaces: + enum.StrippingUiKey.Key: + type: StrippableBoundUserInterface + - type: InventorySlots + - type: Inventory + speciesId: mothroach + templateId: mothroach + displacements: + head: + sizeMaps: + 32: + sprite: Mobs/Animals/mothroach/displacement.rsi + state: head + mask: + sizeMaps: + 32: + sprite: Mobs/Animals/mothroach/displacement.rsi + state: mask + suitstorage: + sizeMaps: + 32: + sprite: Mobs/Animals/mothroach/displacement.rsi + state: suitstorage + eyes: + sizeMaps: + 32: + sprite: Mobs/Animals/mothroach/displacement.rsi + state: eyes + neck: + sizeMaps: + 32: + sprite: Mobs/Animals/mothroach/displacement.rsi + state: neck + - type: Puller + needsHands: false \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/_Mono/Entities/Objects/Consumable/Food/burger.yml new file mode 100644 index 00000000000..5e097ba3f57 --- /dev/null +++ b/Resources/Prototypes/_Mono/Entities/Objects/Consumable/Food/burger.yml @@ -0,0 +1,104 @@ +- type: entity + name: mustard mothroachburger + parent: FoodBurgerMothRoach + id: FoodBurgerMustardMothRoach + description: The last lamp it saw was the one inside the microwave. + components: + - type: FlavorProfile + flavors: + - bun + - mustard + - lostfriendship + - type: Sprite + sprite: _Mono/Objects/Consumable/Food/mothroach_burger.rsi + state: mustard_mothroach + +- type: entity + name: boom roachburger + parent: FoodBurgerMothRoach + id: FoodBurgerBoomRoach + description: The last lamp it saw was the one inside the microwave. + components: + - type: FlavorProfile + flavors: + - bun + - gunpowder + - lostfriendship + - type: Sprite + sprite: _Mono/Objects/Consumable/Food/mothroach_burger.rsi + state: boom_mothroach + +- type: entity + name: syndi roachburger + parent: FoodBurgerMothRoach + id: FoodBurgerSyndiRoach + description: The last lamp it saw was the one inside the microwave. + components: + - type: FlavorProfile + flavors: + - bun + - gunpowder + - lostfriendship + - type: Sprite + sprite: _Mono/Objects/Consumable/Food/mothroach_burger.rsi + state: syndi_mothroach + +- type: entity + name: mop roachburger + parent: FoodBurgerMothRoach + id: FoodBurgerMopRoach + description: The last lamp it saw was the one inside the microwave. + components: + - type: FlavorProfile + flavors: + - bun + - clean + - lostfriendship + - type: Sprite + sprite: _Mono/Objects/Consumable/Food/mothroach_burger.rsi + state: mop_mothroach + +- type: entity + name: cecropia mothroachburger + parent: FoodBurgerMothRoach + id: FoodBurgerCecropiaMothRoach + description: The last lamp it saw was the one inside the microwave. + components: + - type: FlavorProfile + flavors: + - bun + - meaty + - lostfriendship + - type: Sprite + sprite: _Mono/Objects/Consumable/Food/mothroach_burger.rsi + state: cecropia_mothroach + +- type: entity + name: leopard mothroachburger + parent: FoodBurgerMothRoach + id: FoodBurgerLeopardMothRoach + description: The last lamp it saw was the one inside the microwave. + components: + - type: FlavorProfile + flavors: + - bun + - meaty + - lostfriendship + - type: Sprite + sprite: _Mono/Objects/Consumable/Food/mothroach_burger.rsi + state: leopard_mothroach + +- type: entity + name: lunar mothroachburger + parent: FoodBurgerMothRoach + id: FoodBurgerLunarMothRoach + description: The last lamp it saw was the one inside the microwave. + components: + - type: FlavorProfile + flavors: + - bun + - meaty + - lostfriendship + - type: Sprite + sprite: _Mono/Objects/Consumable/Food/mothroach_burger.rsi + state: lunar_mothroach \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Devices/PDV_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/_Mono/Entities/Objects/Devices/PDV_Gadgets/reinforcement_teleporter.yml new file mode 100644 index 00000000000..bd02d1abf9e --- /dev/null +++ b/Resources/Prototypes/_Mono/Entities/Objects/Devices/PDV_Gadgets/reinforcement_teleporter.yml @@ -0,0 +1,18 @@ +- type: entity + parent: ReinforcementRadio + id: ReinforcementRadioPDVSyndiRoach + name: syndiroach reinforcement radio + description: Calls in a faithfully trained syndiroach with a microbomb to assist you. + components: + - type: GhostRole + name: ghost-role-information-syndiroach-name + description: ghost-role-information-syndiroach-description + rules: ghost-role-information-syndiroach-rules + mindRoles: + - MindRoleGhostRoleTeamAntagonist + raffle: + settings: default + - type: GhostRoleMobSpawner + prototype: MobMothSyndy + - type: EmitSoundOnUse + sound: /Audio/Voice/Moth/moth_chitter.ogg \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_Mono/Recipes/Cooking/meal_recipes.yml index d33492a2794..381faed8878 100644 --- a/Resources/Prototypes/_Mono/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_Mono/Recipes/Cooking/meal_recipes.yml @@ -64,3 +64,80 @@ recipeType: - Oven # Frontier - Microwave #Mono + +- type: microwaveMealRecipe + id: RecipeMustardMothRoachburger + name: mustardmothroachburger recipe + result: FoodBurgerMustardMothRoach + group: Savory + solids: + FoodBreadBun: 1 + MobMothroachMustard: 1 + recipeType: Microwave # Mono: Deviating to match the item description and restore the humor +#Breads & Sandwiches + +- type: microwaveMealRecipe + id: RecipeBoomRoachburger + name: boomroachburger recipe + result: FoodBurgerBoomRoach + group: Savory + solids: + FoodBreadBun: 1 + MobBoomroach: 1 + recipeType: Microwave # Mono: Deviating to match the item description and restore the humor +#Breads & Sandwiches + +- type: microwaveMealRecipe + id: RecipeSyndiRoachburger + name: syndiroachburger recipe + result: FoodBurgerSyndiRoach + group: Savory + solids: + FoodBreadBun: 1 + MobMothSyndy: 1 + recipeType: Microwave # Mono: Deviating to match the item description and restore the humor +#Breads & Sandwiches + +- type: microwaveMealRecipe + id: RecipeMopRoachburger + name: moproachburger recipe + result: FoodBurgerMopRoach + group: Savory + solids: + FoodBreadBun: 1 + MobMoproach: 1 + recipeType: Microwave # Mono: Deviating to match the item description and restore the humor +#Breads & Sandwiches + +- type: microwaveMealRecipe + id: RecipeCecropiMothRoachburger + name: cecropimothroachburger recipe + result: FoodBurgerCecropiaMothRoach + group: Savory + solids: + FoodBreadBun: 1 + MobMothroachCecropia: 1 + recipeType: Microwave # Mono: Deviating to match the item description and restore the humor +#Breads & Sandwiches + +- type: microwaveMealRecipe + id: RecipeleopardMothRoachburger + name: leopardmothroachburger recipe + result: FoodBurgerLeopardMothRoach + group: Savory + solids: + FoodBreadBun: 1 + MobMothroachLeopard: 1 + recipeType: Microwave # Mono: Deviating to match the item description and restore the humor +#Breads & Sandwiches + +- type: microwaveMealRecipe + id: RecipeLunarMothRoachburger + name: lunarmothroachburger recipe + result: FoodBurgerLunarMothRoach + group: Savory + solids: + FoodBreadBun: 1 + MobMothroachLunar: 1 + recipeType: Microwave # Mono: Deviating to match the item description and restore the humor +#Breads & Sandwiches \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml index c1916bf2664..4780faca8d0 100644 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml @@ -945,6 +945,22 @@ tags: - SecurityUplink +- type: listing + id: UplinkSecurityImplanterTSF + name: uplink-security-implanter-tsf-name + description: uplink-security-implanter-tsf-desc + icon: { sprite: _NF/Objects/Devices/encryption_keys.rsi, state: nfsd_label } + productEntity: RadioImplanterTsf + cost: + FederationMilitaryCredit: 10 + categories: + - UplinkSecurityUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + - type: listing id: UplinkSecurityEnergyShield name: uplink-security-energyshield-name diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml index 00006f60b4d..2ba1611f892 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml @@ -12,6 +12,9 @@ - type: EyeProtection - type: VisionCorrection - type: IdentityBlocker + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingEyesBase @@ -25,6 +28,9 @@ sprite: _NF/Clothing/Eyes/Glasses/pilot.rsi - type: HandheldGPS - type: VisionCorrection + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingEyesGlassesSecurity @@ -36,3 +42,6 @@ sprite: _NF/Clothing/Eyes/Glasses/nfsd_glasses.rsi - type: Clothing sprite: _NF/Clothing/Eyes/Glasses/nfsd_glasses.rsi + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml index d20251478a9..1c9623e54eb 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses_punks.yml @@ -33,7 +33,10 @@ base_glasses_01: CyberpunkDark glasses_decor: decor_base_glasses_01: CyberpunkDark - + - type: Tag + tags: + - PetWearable + # HUDs - type: entity id: ClothingEyesPunkInfoShades @@ -78,3 +81,7 @@ - Inorganic - Silicon - Biological + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml index 57934ad2c51..469cabb76e8 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml @@ -8,6 +8,9 @@ sprite: _NF/Clothing/Eyes/Hud/nfsd_hud.rsi - type: Clothing sprite: _NF/Clothing/Eyes/Hud/nfsd_hud.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingEyesBase @@ -20,7 +23,10 @@ - type: Clothing sprite: _NF/Clothing/Eyes/Hud/mail.rsi - type: ShowJobIcons - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ClothingEyesHudMedical, ClothingEyesHudNfsd] id: ClothingEyesHudNfsdMed @@ -34,7 +40,10 @@ - type: Construction graph: HudMedSec node: medsecHud - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesHudSecurity id: ClothingEyesHudNfsdPatch @@ -45,7 +54,10 @@ sprite: _NF/Clothing/Eyes/Hud/nfsd_patch.rsi - type: Clothing sprite: _NF/Clothing/Eyes/Hud/nfsd_patch.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingEyesHudSecurity id: ClothingEyesHudBountyHunter @@ -55,3 +67,7 @@ - type: ShowHealthBars damageContainers: - Biological + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/goblin_headwear.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/goblin_headwear.yml index 117fb4cc059..33c72e99236 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/goblin_headwear.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/goblin_headwear.yml @@ -8,7 +8,10 @@ sprite: _NF/Clothing/Head/Hoods/goblin_robe_hood.rsi - type: Clothing sprite: _NF/Clothing/Head/Hoods/goblin_robe_hood.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetBase id: ClothingHeadEVAHelmetGoblin @@ -20,3 +23,7 @@ sprite: _NF/Clothing/Head/Helmets/goblin_eva_hood.rsi - type: Clothing sprite: _NF/Clothing/Head/Helmets/goblin_eva_hood.rsi + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml index 39a80ed5fb4..01f9d750bcd 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml @@ -28,6 +28,9 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHelmetHardsuitMercenary @@ -41,7 +44,10 @@ sprite: _NF/Clothing/Head/Hardsuits/private_security.rsi - type: PointLight color: "#ffff00" - + - type: Tag + tags: + - PetWearable + #Pilot Hardsuit - type: entity parent: NFClothingHeadHardsuitWithLightBase @@ -60,7 +66,10 @@ - type: PressureProtection highPressureMultiplier: 0.1 lowPressureMultiplier: 1000 - + - type: Tag + tags: + - PetWearable + #ERT Mail Carrier Hardsuit - type: entity parent: ClothingHeadHelmetHardsuitSyndie @@ -75,7 +84,10 @@ sprite: _NF/Clothing/Head/Hardsuits/ERThelmets/ertmailcarrier.rsi - type: PointLight color: "#cbadff" - + - type: Tag + tags: + - PetWearable + # MAXIM helmet, but with light - type: entity parent: [ ClothingHeadHelmetHardsuitMaxim, NFClothingHeadHardsuitWithLightBase ] @@ -92,7 +104,10 @@ - type: PointLight # Luxury Hardsuit Light radius: 8 # 7->8 Mono energy: 4 # 3->4 Mono - + - type: Tag + tags: + - PetWearable + #Tactical hardsuit Helmet - type: entity parent: NFClothingHeadHardsuitWithLightBase @@ -115,7 +130,10 @@ Blunt: 0.8 Slash: 0.8 Piercing: 0.8 - + - type: Tag + tags: + - PetWearable + - type: entity parent: NFClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitPirateElite @@ -139,3 +157,7 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml index 01847fe6b74..33bff8b14a9 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml @@ -9,6 +9,9 @@ - type: Clothing sprite: _NF/Clothing/Head/Hats/bounty_hunter_hat.rsi - type: HamsterWearable + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBaseButcherable @@ -20,6 +23,9 @@ sprite: _NF/Clothing/Head/Hats/pilgrim_hat.rsi - type: Clothing sprite: _NF/Clothing/Head/Hats/pilgrim_hat.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBaseButcherable @@ -31,6 +37,9 @@ sprite: _NF/Clothing/Head/Hats/widebrim_hat.rsi - type: Clothing sprite: _NF/Clothing/Head/Hats/widebrim_hat.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadBaseButcherable @@ -42,7 +51,10 @@ sprite: _NF/Clothing/Head/Hats/cardinal_hat.rsi - type: Clothing sprite: _NF/Clothing/Head/Hats/cardinal_hat.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatWitchhunter @@ -53,7 +65,10 @@ sprite: _NF/Clothing/Head/Hats/witch_hunter_hat.rsi - type: Clothing sprite: _NF/Clothing/Head/Hats/witch_hunter_hat.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatBishopMitre @@ -64,7 +79,10 @@ sprite: _NF/Clothing/Head/Hats/bishop_mitre.rsi - type: Clothing sprite: _NF/Clothing/Head/Hats/bishop_mitre.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatKippah @@ -75,7 +93,10 @@ sprite: _NF/Clothing/Head/Hats/kippah.rsi - type: Clothing sprite: _NF/Clothing/Head/Hats/kippah.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatHoodCardinalHood @@ -87,7 +108,10 @@ sprite: _NF/Clothing/Head/Hoods/cardinal_hood.rsi - type: Clothing sprite: _NF/Clothing/Head/Hoods/cardinal_hood.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatMcCrown @@ -98,7 +122,10 @@ sprite: _NF/Clothing/Head/Hoods/mccargocrown.rsi - type: Clothing sprite: _NF/Clothing/Head/Hoods/mccargocrown.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatPilot @@ -112,7 +139,10 @@ - type: HideLayerClothing slots: - Hair - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatPirates @@ -123,7 +153,10 @@ sprite: _NF/Clothing/Head/Hats/pirate_hat.rsi - type: Clothing sprite: _NF/Clothing/Head/Hats/pirate_hat.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatPirateLuffy @@ -134,7 +167,10 @@ sprite: _NF/Clothing/Head/Hats/pirate_hat_luffy.rsi - type: Clothing sprite: _NF/Clothing/Head/Hats/pirate_hat_luffy.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatNfsdBeretGreen @@ -146,7 +182,10 @@ - type: Clothing sprite: _NF/Clothing/Head/Hats/nfsd_beret_green.rsi - type: CatWearable - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatNfsdBeretBrown @@ -158,7 +197,10 @@ - type: Clothing sprite: _NF/Clothing/Head/Hats/nfsd_beret_brown.rsi - type: CatWearable - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatNfsdBeretCream @@ -170,7 +212,10 @@ - type: Clothing sprite: _NF/Clothing/Head/Hats/nfsd_beret_cream.rsi - type: CatWearable - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatNfsdCampaign @@ -199,7 +244,10 @@ storagebase: !type:Container - type: PirateBountyItem id: CampaignHat - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatNfsdCampaign id: ClothingHeadHatNfsdCampaignFilled @@ -212,7 +260,10 @@ - id: FlippoEngravedLighter - id: CigarGold amount: 3 - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBaseButcherable id: ClothingHeadHatNfsdSmallCampaign @@ -226,7 +277,10 @@ - type: CatWearable - type: PirateBountyItem id: CampaignHat - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHopcap id: ClothingHeadHatSrCap @@ -238,7 +292,10 @@ - type: Clothing sprite: _NF/Clothing/Head/Hats/sr_cap.rsi - type: HamsterWearable - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHopcap id: ClothingHeadHatSrBeret @@ -250,7 +307,10 @@ - type: Clothing sprite: _NF/Clothing/Head/Hats/sr_beret.rsi - type: CatWearable - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHopcap id: ClothingHeadHatStcCap @@ -262,13 +322,16 @@ - type: Clothing sprite: _NF/Clothing/Head/Hats/stc_cap.rsi - type: HamsterWearable - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatBeretHoS id: ClothingHeadHatBeretCommander name: commander's beret description: A black beret with a commander's rank emblem. - + - type: entity parent: ClothingHeadHatBeretHoS id: ClothingHeadHatBeretCommon @@ -279,7 +342,10 @@ sprite: _Mono/Clothing/Head/Hats/tsf_blue_beret.rsi - type: Clothing sprite: _Mono/Clothing/Head/Hats/tsf_blue_beret.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadHatHopcap id: ClothingHeadHatUtilityTsfmc @@ -294,3 +360,4 @@ tags: - HamsterWearable - WhitelistChameleon + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_blood_cult.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_blood_cult.yml index 0bc5b854d81..4568cf690eb 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_blood_cult.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_blood_cult.yml @@ -11,6 +11,9 @@ - type: HideLayerClothing slots: - Hair + - type: Tag + tags: + - PetWearable - type: entity parent: @@ -26,6 +29,9 @@ - type: HideLayerClothing slots: - Hair + - type: Tag + tags: + - PetWearable - type: entity # for looks only parent: [ ClothingHeadHatHoodBloodCulthood, ClothingHeadHelmetBasic ] @@ -34,3 +40,6 @@ name: cult hood components: - type: Unremoveable + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_punks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_punks.yml index 9bade6e0f17..75ad7684eaf 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_punks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_punks.yml @@ -17,6 +17,9 @@ - type: HideLayerClothing slots: - Hair + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatHoodAcidRaincoat @@ -27,6 +30,9 @@ sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi - type: Clothing sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatHoodAcidRaincoat @@ -37,6 +43,9 @@ sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi - type: Clothing sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatHoodAcidRaincoat @@ -47,6 +56,9 @@ sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi - type: Clothing sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHatHoodAcidRaincoat @@ -57,3 +69,6 @@ sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi - type: Clothing sprite: _NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_syndicate.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_syndicate.yml index b9b219b65cd..1189b0065f9 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_syndicate.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/headwear_syndicate.yml @@ -12,6 +12,9 @@ - type: HideLayerClothing slots: - Hair + - type: Tag + tags: + - PetWearable # Syndicate armored bio suit hood - type: entity @@ -30,6 +33,9 @@ - type: HideLayerClothing slots: - Hair + - type: Tag + tags: + - PetWearable # Syndicate NPC unremoveable headwear for looks only - type: entity @@ -39,6 +45,10 @@ categories: [ HideSpawnMenu ] components: - type: Unremoveable + - type: Tag + tags: + - PetWearable + - type: entity parent: @@ -47,6 +57,10 @@ categories: [ HideSpawnMenu ] components: - type: Unremoveable + - type: Tag + tags: + - PetWearable + - type: entity parent: @@ -55,6 +69,10 @@ categories: [ HideSpawnMenu ] components: - type: Unremoveable + - type: Tag + tags: + - PetWearable + - type: entity parent: @@ -63,4 +81,8 @@ categories: [ HideSpawnMenu ] name: syndicate coat hood components: - - type: Unremoveable \ No newline at end of file + - type: Unremoveable + - type: Tag + tags: + - PetWearable + diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml index a0888333a17..ab43f1b30bf 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/helmets.yml @@ -12,6 +12,9 @@ sprite: _NF/Clothing/Head/Helmets/ert_mailcarrier.rsi - type: Clothing sprite: _NF/Clothing/Head/Helmets/ert_mailcarrier.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingHeadHelmetBasic @@ -23,6 +26,9 @@ sprite: _NF/Clothing/Head/Helmets/nfsd.rsi - type: Clothing sprite: _NF/Clothing/Head/Helmets/nfsd.rsi + - type: Tag + tags: + - PetWearable #Mercenary Helmet - type: entity @@ -35,3 +41,6 @@ sprite: _NF/Clothing/Head/Helmets/mercenary_black.rsi - type: Clothing sprite: _NF/Clothing/Head/Helmets/mercenary_black.rsi + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml index 081fc943c96..fed39f0287b 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml @@ -9,7 +9,10 @@ sprite: _NF/Clothing/Head/Hoods/Coat/arcadia.rsi - type: Clothing sprite: _NF/Clothing/Head/Hoods/Coat/arcadia.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoodRosyCloak @@ -23,6 +26,7 @@ - type: Tag tags: - WhitelistChameleon + - PetWearable - type: HideLayerClothing slots: - Hair diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml index 520d7eabcd1..92f9d0f208a 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml @@ -64,7 +64,10 @@ mask: /Textures/Effects/LightMasks/cone.png autoRot: true netsync: false - + - type: Tag + tags: + - PetWearable + # DEPARTMENTAL - type: entity parent: ClothingHeadEVAHelmetWithLightBase @@ -91,7 +94,10 @@ color: "#6b4600" - state: equipped-head-visor color: "#adcfd5" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetMailman @@ -117,7 +123,10 @@ color: "#3e3e48" - state: equipped-head-visor color: "#adcfd5" - + - type: Tag + tags: + - PetWearable + # COLORED DEPARTMENTAL ## CONTRACTORS - type: entity @@ -145,7 +154,10 @@ color: "#3e3e48" - state: equipped-head-visor color: "#adcfd5" - + - type: Tag + tags: + - PetWearable + ## COMMAND - type: entity parent: ClothingHeadEVAHelmetWithLightBase @@ -179,7 +191,10 @@ - type: PointLight radius: 5 energy: 2 - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetCaptain @@ -212,7 +227,10 @@ - type: PointLight radius: 5 energy: 2 - + - type: Tag + tags: + - PetWearable + ## ENGINEERING - type: entity parent: ClothingHeadEVAHelmetWithLightBase @@ -239,7 +257,10 @@ color: "#ff7f00" - state: equipped-head-visor color: "#adcfd5" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetAtmosTech @@ -267,7 +288,10 @@ color: "#e1b537" - type: PointLight color: "#adffe6" - + - type: Tag + tags: + - PetWearable + ## SUPPLY - type: entity parent: ClothingHeadEVAHelmetWithLightBase @@ -294,7 +318,10 @@ color: "#3e3e48" - state: equipped-head-visor color: "#adcfd5" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetSalvage @@ -322,7 +349,10 @@ color: "#adcfd5" - type: PointLight radius: 6 - + - type: Tag + tags: + - PetWearable + ## MEDICAL - type: entity parent: ClothingHeadEVAHelmetWithLightBase @@ -351,7 +381,10 @@ color: "#adcfd5" - type: PointLight color: "#adf1ff" - + - type: Tag + tags: + - PetWearable + ## SCIENCE - type: entity parent: ClothingHeadEVAHelmetWithLightBase @@ -380,7 +413,10 @@ color: "#2accff" - type: PointLight color: "#d6adff" - + - type: Tag + tags: + - PetWearable + ## SERVICE - type: entity parent: ClothingHeadEVAHelmetWithLightBase @@ -409,7 +445,10 @@ color: "#bb5cc9" - type: PointLight color: "#d6adff" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetServiceWorker @@ -435,7 +474,10 @@ color: "#606275" - state: equipped-head-visor color: "#adcfd5" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetChaplain @@ -463,7 +505,10 @@ color: "#ffce5b" - type: PointLight color: "#ffce5b" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetBoxerRed @@ -489,7 +534,10 @@ color: "#606275" - state: equipped-head-visor color: "#adcfd5" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetBoxerGreen @@ -515,7 +563,10 @@ color: "#606275" - state: equipped-head-visor color: "#adcfd5" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetBoxerBlue @@ -541,7 +592,10 @@ color: "#606275" - state: equipped-head-visor color: "#adcfd5" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetBoxerYellow @@ -567,7 +621,10 @@ color: "#606275" - state: equipped-head-visor color: "#adcfd5" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetBoxerRandom @@ -597,7 +654,10 @@ available: - EVA_helmet_decal_boxing: equipped-head-base: Sixteen # CyberpunkNeon - + - type: Tag + tags: + - PetWearable + ## WILDCARDS - type: entity parent: ClothingHeadEVAHelmetWithLightBase @@ -624,7 +684,10 @@ color: "#784f1e" - state: equipped-head-visor color: "#adcfd5" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetMercenary @@ -650,7 +713,10 @@ color: "#27272e" - state: equipped-head-visor color: "#f5fc95" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetPrivateSec @@ -676,7 +742,10 @@ color: "#2286bd" - state: equipped-head-visor color: "#ffd600" - + - type: Tag + tags: + - PetWearable + ## NFSD - type: entity parent: ClothingHeadEVAHelmetWithLightBase @@ -703,7 +772,10 @@ color: "#384d2f" - state: equipped-head-visor color: "#52843f" - + - type: Tag + tags: + - PetWearable + ## PLAYER FACTIONS - type: entity parent: ClothingHeadEVAHelmetWithLightBase @@ -730,7 +802,10 @@ color: "#3e3e48" - state: equipped-head-visor color: "#283846" - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingHeadEVAHelmetWithLightBase id: ClothingHeadEVAHelmetArcadia @@ -756,7 +831,10 @@ color: "#3e3e48" - state: equipped-head-visor color: "#8f1717" - + - type: Tag + tags: + - PetWearable + #FSB Void suit helmet - type: entity parent: NFClothingHeadHardsuitWithLightBase @@ -782,3 +860,7 @@ #- Snout - HeadTop #- HeadSide + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml index b8b220cf85a..e8576068417 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml @@ -11,6 +11,10 @@ - type: HideLayerClothing slots: - Hair + - type: Tag + tags: + - PetWearable + - type: entity parent: PlushieXeno #Mono: Remove ClothingMaskBase @@ -29,6 +33,10 @@ - type: AddAccentClothing accent: ReplacementAccent replacement: mumble + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingMaskGas @@ -42,7 +50,10 @@ sprite: _NF/Clothing/Mask/pilot.rsi - type: IdentityBlocker coverage: MOUTH - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingMaskGasSecurity id: ClothingMaskGasNfsd @@ -54,7 +65,10 @@ - type: Clothing sprite: _NF/Clothing/Mask/nfsd.rsi - type: CatWearable - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingMaskGasSwat id: ClothingMaskGasSheriff @@ -65,7 +79,10 @@ sprite: _NF/Clothing/Mask/nfsd_sheriff.rsi - type: Clothing sprite: _NF/Clothing/Mask/nfsd_sheriff.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: [ ClothingMaskGasExplorer ] id: ClothingMaskCultJanitor @@ -79,7 +96,10 @@ - type: HideLayerClothing slots: - Hair - + - type: Tag + tags: + - PetWearable + - type: entity id: ClothingMaskPunkHalf parent: [ ClothingMaskGasExplorer, RecyclableItemClothDevice ] @@ -116,7 +136,10 @@ decor-equipped-MASK: CyberpunkNeon - type: IdentityBlocker coverage: MOUTH - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingMaskClown id: ClothingMaskClownBald @@ -127,3 +150,7 @@ sprite: _NF/Clothing/Mask/clown_bald.rsi - type: Clothing sprite: _NF/Clothing/Mask/clown_bald.rsi + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/badges.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/badges.yml index 58f35b0d090..9a40818e882 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/badges.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/badges.yml @@ -12,7 +12,10 @@ layers: [] - type: Clothing sprite: _NF/Clothing/Neck/Scarfs/nfsd_bronze_badge.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckNfsdBadge id: ClothingNeckNfsdBadgeSecurityCadet @@ -29,6 +32,9 @@ sprite: _NF/Clothing/Neck/Scarfs/nfsd_silver_badge.rsi - type: Clothing sprite: _NF/Clothing/Neck/Scarfs/nfsd_silver_badge.rsi + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingNeckNfsdBadge @@ -40,7 +46,10 @@ sprite: _NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi - type: Clothing sprite: _NF/Clothing/Neck/Scarfs/nfsd_silvercross_badge.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckNfsdBadge id: ClothingNeckNfsdBadgeDetective @@ -51,7 +60,10 @@ sprite: _NF/Clothing/Neck/Scarfs/nfsd_silver_badge.rsi - type: Clothing sprite: _NF/Clothing/Neck/Scarfs/nfsd_silver_badge.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckNfsdBadge id: ClothingNeckNfsdBadgeSeniorOfficer @@ -62,7 +74,10 @@ sprite: _NF/Clothing/Neck/Scarfs/nfsd_gold_badge.rsi - type: Clothing sprite: _NF/Clothing/Neck/Scarfs/nfsd_gold_badge.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckNfsdBadge id: ClothingNeckNfsdBadgeWarden @@ -73,7 +88,10 @@ sprite: _NF/Clothing/Neck/Scarfs/nfsd_gold_badge.rsi - type: Clothing sprite: _NF/Clothing/Neck/Scarfs/nfsd_gold_badge.rsi - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckNfsdBadge id: ClothingNeckNfsdBadgeSheriff @@ -85,7 +103,10 @@ - type: Clothing sprite: _NF/Clothing/Neck/Scarfs/nfsd_star_badge.rsi - type: EmbeddableProjectile # pointy - + - type: Tag + tags: + - PetWearable + - type: entity parent: ClothingNeckBase id: ClothingNeckPublicAffairsLiaisonBadge @@ -99,3 +120,7 @@ sprite: _NF/Clothing/Neck/Misc/palbadge.rsi - type: TypingIndicatorClothing proto: pal + - type: Tag + tags: + - PetWearable + \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/medals.yml index 8060b6bd1fa..37f7cc55add 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/medals.yml @@ -11,7 +11,7 @@ - type: Tag tags: - Medal - + - PetWearable - type: entity parent: ClothingNeckBase id: ClothingNeckMedalNfsdShieldGold @@ -25,6 +25,7 @@ - type: Tag tags: - Medal + - PetWearable - type: entity parent: ClothingNeckBase @@ -39,6 +40,7 @@ - type: Tag tags: - Medal + - PetWearable - type: entity parent: ClothingNeckBase @@ -53,6 +55,7 @@ - type: Tag tags: - Medal + - PetWearable - type: entity parent: ClothingNeckBase @@ -67,6 +70,7 @@ - type: Tag tags: - Medal + - PetWearable - type: entity parent: ClothingNeckBase @@ -81,6 +85,7 @@ - type: Tag tags: - Medal + - PetWearable - type: entity parent: ClothingNeckBase @@ -95,6 +100,7 @@ - type: Tag tags: - Medal + - PetWearable # just a little joke :) - type: entity @@ -110,6 +116,7 @@ - type: Tag tags: - Medal + - PetWearable - type: Construction graph: ClothingNeckMedalGloriousOrder node: GloriousOrder diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml index 2eb3a0c50b9..471c19f9da3 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml @@ -18,6 +18,7 @@ tags: - ObjectOfSpiritualSignificance - Crucifix + - PetWearable - type: entity parent: @@ -47,6 +48,7 @@ - type: Tag tags: - ObjectOfSpiritualSignificance + - PetWearable - type: PirateBountyItem id: ClothingNeckAmuletBloodCult @@ -73,6 +75,9 @@ - state: equipped-NECK-on color: "#a9b6bd" shader: unshaded + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingNeckIFFNeutral @@ -94,6 +99,9 @@ - state: equipped-NECK-on color: "#33cc00" shader: unshaded + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingNeckIFFNeutral @@ -115,6 +123,9 @@ - state: equipped-NECK-on color: "#990000" shader: unshaded + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingNeckIFFNeutral @@ -136,6 +147,9 @@ - state: equipped-NECK-on color: "#0055cc" shader: unshaded + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingNeckIFFNeutral @@ -157,6 +171,9 @@ - state: equipped-NECK-on color: "#47f8ff" shader: unshaded + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingNeckIFFNeutral @@ -178,6 +195,9 @@ - state: equipped-NECK-on color: "#ff8227" shader: unshaded + - type: Tag + tags: + - PetWearable - type: entity parent: ClothingNeckIFFNeutral @@ -199,3 +219,6 @@ - state: equipped-NECK-on color: "#9c0de1" shader: unshaded + - type: Tag + tags: + - PetWearable diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml index 29c406961bd..dbc8b8993b5 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml @@ -7,6 +7,7 @@ - type: Tag tags: - ObjectOfSpiritualSignificance + - PetWearable - type: Sprite sprite: _NF/Clothing/Neck/Scarfs/chaplain_stole.rsi - type: Clothing @@ -22,3 +23,6 @@ sprite: _NF/Clothing/Neck/Scarfs/pilot.rsi - type: Clothing sprite: _NF/Clothing/Neck/Scarfs/pilot.rsi + - type: Tag + tags: + - PetWearable \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml index 44b1c36e195..8656a4006ec 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml @@ -128,6 +128,7 @@ - MindShieldImplant - TrackingImplant - LightImplant + - RadioImplantTsf - type: FlashImmunity - type: IntrinsicRadioTransmitter channels: @@ -162,6 +163,11 @@ - type: SouthernAccent - type: Company companyName: TSF + - type: SurgeryTarget # Shitmed + - type: UserInterface + interfaces: + enum.SurgeryUIKey.Key: # Shitmed + type: SurgeryBui - type: entity name: El Capo diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/implanters.yml index 642fb67e731..6acbaca02f0 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/implanters.yml @@ -89,3 +89,19 @@ components: - type: Implanter implant: RadioImplantFreelance + +- type: entity + id: RadioImplanterTsf + suffix: radio Tsf + parent: BaseImplantOnlyImplanter + components: + - type: Implanter + implant: RadioImplantTsf + +- type: entity + id: RadioImplanterCivilian + suffix: radio Civilian + parent: BaseImplantOnlyImplanter + components: + - type: Implanter + implant: RadioImplantCivilian \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/monkeycube.yml index e36f6ccf785..d91c3ec08ea 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/monkeycube.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/monkeycube.yml @@ -38,6 +38,23 @@ price: 20 vendPrice: 2000 # Meat only worth 607 at a depot, but can produce more stuff from extra goats + milk +- type: entity + parent: VariantCubeBox + name: mustard mothroach cube box + id: MustardMothroachCubeBox + description: "A box of ruminant cubes: a cow, a pig and goats! Just add water!" + components: + - type: StorageFill + contents: + - id: MothroachMustardCubeWrapped + amount: 6 + - type: Sprite + sprite: _NF/Objects/Misc/monkeycube.rsi + state: box_ruminant + - type: StaticPrice + price: 20 + vendPrice: 2000 + - type: entity parent: MonkeyCubeWrapped name: chicken cube @@ -107,3 +124,17 @@ - type: Sprite sprite: _NF/Objects/Misc/monkeycube.rsi state: wrapper_cow + +- type: entity + parent: MonkeyCubeWrapped + name: mustard mothroach cube + suffix: Wrapped + id: MothroachMustardCubeWrapped + description: Unwrap this to get a cow cube. + components: + - type: SpawnItemsOnUse + items: + - id: MothroachMustardCube + - type: Sprite + sprite: _NF/Objects/Misc/monkeycube.rsi + state: wrapper_mothroachmustard \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml index bab84a5b992..8ebdf753a84 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml @@ -172,3 +172,32 @@ - type: RadioImplant radioChannels: - Freelance + - Common + - Traffic + +- type: entity + parent: BaseSubdermalImplant + id: RadioImplantTsf + name: TSF radio implant + description: This implant grants access to the TSF channel without a headset. + categories: [ HideSpawnMenu ] + components: + - type: SubdermalImplant + - type: RadioImplant + radioChannels: + - Common + - Traffic + - Nfsd + +- type: entity + parent: BaseSubdermalImplant + id: RadioImplantCivilian + name: Civilian radio implant + description: This implant grants access to the Civilian channel without a headset. + categories: [ HideSpawnMenu ] + components: + - type: SubdermalImplant + - type: RadioImplant + radioChannels: + - Common + - Traffic \ No newline at end of file diff --git a/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/0-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/0-equipped-HELMET.png new file mode 100644 index 00000000000..b3c343f882a Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/0-equipped-HELMET.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/icon.png b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/icon.png new file mode 100644 index 00000000000..76167e7e1b9 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/icon.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/inhand-left.png new file mode 100644 index 00000000000..95b378880d0 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/inhand-left.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/inhand-right.png new file mode 100644 index 00000000000..4e2540f5d8c Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/inhand-right.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/meta.json new file mode 100644 index 00000000000..6f573468cfe --- /dev/null +++ b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/meta.json @@ -0,0 +1,68 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from fulpstation at https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447. 'mothroach-moving' by MilenVolf edited by lordsej", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "mothroach", + "directions": 4 + }, + { + "name": "mothroach-moving", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "mothroach_lazy", + "directions": 4 + }, + { + "name": "mothroach_sleep", + "directions": 4 + }, + { + "name": "mothroach_dead", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "0-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach-moving.png b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach-moving.png new file mode 100644 index 00000000000..185eff72d45 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach-moving.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach.png b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach.png new file mode 100644 index 00000000000..4ca6b6c015e Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach_dead.png b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach_dead.png new file mode 100644 index 00000000000..214b8942764 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach_dead.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach_lazy.png b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach_lazy.png new file mode 100644 index 00000000000..601656c9db4 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach_lazy.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach_sleep.png b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach_sleep.png new file mode 100644 index 00000000000..18161688d5e Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/boomroach.rsi/mothroach_sleep.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/0-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/0-equipped-HELMET.png new file mode 100644 index 00000000000..baaa3bcc55d Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/0-equipped-HELMET.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/icon.png b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/icon.png new file mode 100644 index 00000000000..94864034c50 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/icon.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/inhand-left.png new file mode 100644 index 00000000000..6476b2f6936 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/inhand-left.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/inhand-right.png new file mode 100644 index 00000000000..50b35d4ed4e Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/inhand-right.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/meta.json new file mode 100644 index 00000000000..f7ada210045 --- /dev/null +++ b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/meta.json @@ -0,0 +1,68 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drown by 51fishstack, made by 4_ydo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "mothroach", + "directions": 4 + }, + { + "name": "mothroach-moving", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "mothroach_lazy", + "directions": 4 + }, + { + "name": "mothroach_sleep", + "directions": 4 + }, + { + "name": "mothroach_dead", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "0-equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach-moving.png b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach-moving.png new file mode 100644 index 00000000000..3eb4a3d2559 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach-moving.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach.png b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach.png new file mode 100644 index 00000000000..11c75d036be Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach_dead.png b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach_dead.png new file mode 100644 index 00000000000..c825edc382f Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach_dead.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach_lazy.png b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach_lazy.png new file mode 100644 index 00000000000..b853ea0b766 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach_lazy.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach_sleep.png b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach_sleep.png new file mode 100644 index 00000000000..bddff4b1647 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/cecropia_mothroach.rsi/mothroach_sleep.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/0-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/0-equipped-HELMET.png new file mode 100644 index 00000000000..353ea3e99f1 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/0-equipped-HELMET.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/icon.png b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/icon.png new file mode 100644 index 00000000000..bc7d0bcb85e Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/icon.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/inhand-left.png new file mode 100644 index 00000000000..c7cb1da1581 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/inhand-left.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/inhand-right.png new file mode 100644 index 00000000000..f248ce32408 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/inhand-right.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/meta.json new file mode 100644 index 00000000000..f7ada210045 --- /dev/null +++ b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/meta.json @@ -0,0 +1,68 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drown by 51fishstack, made by 4_ydo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "mothroach", + "directions": 4 + }, + { + "name": "mothroach-moving", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "mothroach_lazy", + "directions": 4 + }, + { + "name": "mothroach_sleep", + "directions": 4 + }, + { + "name": "mothroach_dead", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "0-equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach-moving.png b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach-moving.png new file mode 100644 index 00000000000..96ec705cbc5 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach-moving.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach.png b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach.png new file mode 100644 index 00000000000..1d1604abe3d Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach_dead.png b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach_dead.png new file mode 100644 index 00000000000..1be2d60231b Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach_dead.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach_lazy.png b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach_lazy.png new file mode 100644 index 00000000000..735695f4b52 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach_lazy.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach_sleep.png b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach_sleep.png new file mode 100644 index 00000000000..8cff29f5d89 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/leopard_mothroach.rsi/mothroach_sleep.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/0-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/0-equipped-HELMET.png new file mode 100644 index 00000000000..bb6d9311c20 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/0-equipped-HELMET.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/icon.png b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/icon.png new file mode 100644 index 00000000000..dda6b92c848 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/icon.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/inhand-left.png new file mode 100644 index 00000000000..2ea511120b7 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/inhand-left.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/inhand-right.png new file mode 100644 index 00000000000..e95f7f2aa23 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/inhand-right.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/meta.json new file mode 100644 index 00000000000..f7ada210045 --- /dev/null +++ b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/meta.json @@ -0,0 +1,68 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drown by 51fishstack, made by 4_ydo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "mothroach", + "directions": 4 + }, + { + "name": "mothroach-moving", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "mothroach_lazy", + "directions": 4 + }, + { + "name": "mothroach_sleep", + "directions": 4 + }, + { + "name": "mothroach_dead", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "0-equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach-moving.png b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach-moving.png new file mode 100644 index 00000000000..7e48928aa2e Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach-moving.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach.png b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach.png new file mode 100644 index 00000000000..d7c1033ad56 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach_dead.png b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach_dead.png new file mode 100644 index 00000000000..a00228f9813 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach_dead.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach_lazy.png b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach_lazy.png new file mode 100644 index 00000000000..d3e41287e29 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach_lazy.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach_sleep.png b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach_sleep.png new file mode 100644 index 00000000000..7f06bb3deb9 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/lunar_mothroach.rsi/mothroach_sleep.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png new file mode 100644 index 00000000000..f756efee726 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/0-equipped-HELMET.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/icon.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/icon.png new file mode 100644 index 00000000000..1923b5d5948 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/icon.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-left.png new file mode 100644 index 00000000000..7b6b9a28a3b Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-left.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-right.png new file mode 100644 index 00000000000..f184340af00 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/inhand-right.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json new file mode 100644 index 00000000000..3629b336ee4 --- /dev/null +++ b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/meta.json @@ -0,0 +1,60 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from fulpstation at https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447. 'mothroach-moving' by MilenVolf, all edited by lzk228", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "mothroach", + "directions": 4 + }, + { + "name": "mothroach-moving", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "mothroach_dead", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "0-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach-moving.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach-moving.png new file mode 100644 index 00000000000..929cf998c8e Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach-moving.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach.png new file mode 100644 index 00000000000..8bc772c31f2 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach_dead.png b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach_dead.png new file mode 100644 index 00000000000..83cbc86e4db Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/moproach.rsi/mothroach_dead.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/0-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/0-equipped-HELMET.png new file mode 100644 index 00000000000..d80b402d6c7 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/0-equipped-HELMET.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/icon.png b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/icon.png new file mode 100644 index 00000000000..0446772b7db Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/icon.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/inhand-left.png new file mode 100644 index 00000000000..02422d07e0f Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/inhand-left.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/inhand-right.png new file mode 100644 index 00000000000..201ff942eb7 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/inhand-right.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/meta.json new file mode 100644 index 00000000000..f7ada210045 --- /dev/null +++ b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/meta.json @@ -0,0 +1,68 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drown by 51fishstack, made by 4_ydo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "mothroach", + "directions": 4 + }, + { + "name": "mothroach-moving", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "mothroach_lazy", + "directions": 4 + }, + { + "name": "mothroach_sleep", + "directions": 4 + }, + { + "name": "mothroach_dead", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "0-equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach-moving.png b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach-moving.png new file mode 100644 index 00000000000..62424a6ce62 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach-moving.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach.png b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach.png new file mode 100644 index 00000000000..68186604fbe Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach_dead.png b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach_dead.png new file mode 100644 index 00000000000..682a357082c Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach_dead.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach_lazy.png b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach_lazy.png new file mode 100644 index 00000000000..90613a5e2b6 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach_lazy.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach_sleep.png b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach_sleep.png new file mode 100644 index 00000000000..44fd8070a5b Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/mustard_mothroach.rsi/mothroach_sleep.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/0-equipped-HELMET.png b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/0-equipped-HELMET.png new file mode 100644 index 00000000000..d37e257de2d Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/0-equipped-HELMET.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/icon.png b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/icon.png new file mode 100644 index 00000000000..c6895b8f6ce Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/icon.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/inhand-left.png b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/inhand-left.png new file mode 100644 index 00000000000..67f15abb214 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/inhand-left.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/inhand-right.png b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/inhand-right.png new file mode 100644 index 00000000000..9cebe2433bb Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/inhand-right.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/meta.json new file mode 100644 index 00000000000..1883765a4a6 --- /dev/null +++ b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/meta.json @@ -0,0 +1,68 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from fulpstation at https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447. 'mothroach-moving' by MilenVolf, all modified by Leguia for syndiroach.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "mothroach", + "directions": 4 + }, + { + "name": "mothroach-moving", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "mothroach_lazy", + "directions": 4 + }, + { + "name": "mothroach_sleep", + "directions": 4 + }, + { + "name": "mothroach_dead", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "0-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach-moving.png b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach-moving.png new file mode 100644 index 00000000000..34443bb7e3b Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach-moving.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach.png b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach.png new file mode 100644 index 00000000000..8b6aee318aa Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach_dead.png b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach_dead.png new file mode 100644 index 00000000000..66a5903a563 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach_dead.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach_lazy.png b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach_lazy.png new file mode 100644 index 00000000000..d44aca11b60 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach_lazy.png differ diff --git a/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach_sleep.png b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach_sleep.png new file mode 100644 index 00000000000..d44aca11b60 Binary files /dev/null and b/Resources/Textures/Mobs/Animals/mothroach/syndiroach.rsi/mothroach_sleep.png differ diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json index 784e509c1d3..53570f17806 100644 --- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other lisenced sprites in the repo", + "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other lisenced sprites in the repo, old-radio-syndiroach edited by lordsej ", "size": { "x": 32, "y": 32 @@ -83,6 +83,9 @@ { "name": "old-radio-syndicat" }, + { + "name": "old-radio-syndiroach" + }, { "name": "old-radio-urist" }, diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndiroach.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndiroach.png new file mode 100644 index 00000000000..8d1a61a28a6 Binary files /dev/null and b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-syndiroach.png differ diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach_cecropia.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach_cecropia.png new file mode 100644 index 00000000000..a6d4a3e0944 Binary files /dev/null and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach_cecropia.png differ diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach_leopard.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach_leopard.png new file mode 100644 index 00000000000..b52c27c87c2 Binary files /dev/null and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach_leopard.png differ diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach_lunar.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach_lunar.png new file mode 100644 index 00000000000..760fc0bf0f8 Binary files /dev/null and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach_lunar.png differ diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach_mustard.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach_mustard.png new file mode 100644 index 00000000000..9dc5fddff14 Binary files /dev/null and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach_mustard.png differ diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json b/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json index e612cab9f2d..76d8b21792b 100644 --- a/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json @@ -98,6 +98,82 @@ ] ] }, + { + "name": "inserting_mothroach_mustard", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "inserting_mothroach_leopard", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "inserting_mothroach_cecropia", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "inserting_mothroach_lunar", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, { "name": "inserting_mouse", "delays": [ diff --git a/Resources/Textures/_Goobstation/Actions/dash.rsi/icon.png b/Resources/Textures/_Goobstation/Actions/dash.rsi/icon.png new file mode 100644 index 00000000000..d2e8f712ae5 Binary files /dev/null and b/Resources/Textures/_Goobstation/Actions/dash.rsi/icon.png differ diff --git a/Resources/Textures/_Goobstation/Actions/dash.rsi/meta.json b/Resources/Textures/_Goobstation/Actions/dash.rsi/meta.json new file mode 100644 index 00000000000..a85e707c318 --- /dev/null +++ b/Resources/Textures/_Goobstation/Actions/dash.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by synthetic_086 (discord), edited by pheenty", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/_Goobstation/Interface/Emotes/attributions.yml b/Resources/Textures/_Goobstation/Interface/Emotes/attributions.yml index 3f8ea43fce3..e5da90f2723 100644 --- a/Resources/Textures/_Goobstation/Interface/Emotes/attributions.yml +++ b/Resources/Textures/_Goobstation/Interface/Emotes/attributions.yml @@ -1,4 +1,9 @@ - files: ["caw.png"] license: "CC-BY-SA-3.0" copyright: "Made by BombasterDS" - source: "https://github.com/BombasterDS" \ No newline at end of file + source: "https://github.com/BombasterDS" + +- files: ["flip.png", "jump.png"] + license: "CC-BY-SA-3.0" + copyright: "Made by Rouge2t7" + source: "https://github.com/Sarahon" \ No newline at end of file diff --git a/Resources/Textures/_Goobstation/Interface/Emotes/flip.png b/Resources/Textures/_Goobstation/Interface/Emotes/flip.png new file mode 100644 index 00000000000..0767d9296ee Binary files /dev/null and b/Resources/Textures/_Goobstation/Interface/Emotes/flip.png differ diff --git a/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/boom_mothroach.png b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/boom_mothroach.png new file mode 100644 index 00000000000..bdbf1ed941a Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/boom_mothroach.png differ diff --git a/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/cecropia_mothroach.png b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/cecropia_mothroach.png new file mode 100644 index 00000000000..cc58a584c53 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/cecropia_mothroach.png differ diff --git a/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/leopard_mothroach.png b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/leopard_mothroach.png new file mode 100644 index 00000000000..9f6a631f471 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/leopard_mothroach.png differ diff --git a/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/lunar_mothroach.png b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/lunar_mothroach.png new file mode 100644 index 00000000000..78aaac09a9a Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/lunar_mothroach.png differ diff --git a/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/meta.json b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/meta.json new file mode 100644 index 00000000000..05e27e56a21 --- /dev/null +++ b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Arraydeess, boom_mothroach and syndi_mothroach and mop_mothroach edited by lordsej", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cecropia_mothroach" + }, + { + "name": "leopard_mothroach" + }, + { + "name": "lunar_mothroach" + }, + { + "name": "mustard_mothroach" + }, + { + "name": "boom_mothroach" + }, + { + "name": "syndi_mothroach" + }, + { + "name": "mop_mothroach" + } + ] +} diff --git a/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/mop_mothroach.png b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/mop_mothroach.png new file mode 100644 index 00000000000..e15bb1856c8 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/mop_mothroach.png differ diff --git a/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/mustard_mothroach.png b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/mustard_mothroach.png new file mode 100644 index 00000000000..5fd18b6fab1 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/mustard_mothroach.png differ diff --git a/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/syndi_mothroach.png b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/syndi_mothroach.png new file mode 100644 index 00000000000..ff5eaef9dda Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Consumable/Food/mothroach_burger.rsi/syndi_mothroach.png differ diff --git a/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/meta.json b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/meta.json index 14b58077945..4cf74e9b5bb 100644 --- a/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "box_poultry edited by Arimah from monkeycubebox from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. wrapper_chicken and wrapper_duck made by Stagnation for Frontier Station 14.", + "copyright": "box_poultry edited by Arimah from monkeycubebox from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. wrapper_chicken and wrapper_duck made by Stagnation for Frontier Station 14, wrapper_mothroachmustard edited by lordsej", "copyright": "box_ruminant edited from box_poultry, wrapper_cow/goat/pig by whatston3", "size": { "x": 32, @@ -28,6 +28,9 @@ }, { "name": "wrapper_pig" + }, + { + "name": "wrapper_mothroachmustard" } ] } diff --git a/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_mothroachmustard.png b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_mothroachmustard.png new file mode 100644 index 00000000000..8674901d0db Binary files /dev/null and b/Resources/Textures/_NF/Objects/Misc/monkeycube.rsi/wrapper_mothroachmustard.png differ