diff --git a/Content.Server/_DV/Feroxi/FeroxiDehydrateComponent.cs b/Content.Server/_DV/Feroxi/FeroxiDehydrateComponent.cs new file mode 100644 index 0000000000..894e12fd36 --- /dev/null +++ b/Content.Server/_DV/Feroxi/FeroxiDehydrateComponent.cs @@ -0,0 +1,32 @@ +using Content.Shared.Body.Prototypes; +using Robust.Shared.Prototypes; + +namespace Content.Server._DV.Feroxi; + +/// +/// Component that allows the switching between s based on thirst +/// +[RegisterComponent, Access(typeof(FeroxiDehydrateSystem))] +public sealed partial class FeroxiDehydrateComponent : Component +{ + /// + /// Defines which to use when over the + /// + [DataField(required: true)] + public ProtoId HydratedMetabolizer; + + /// + /// Defines which to use when below the + /// + [DataField(required: true)] + public ProtoId DehydratedMetabolizer; + + [DataField] + public bool Dehydrated; + + /// + /// Gives the threshold on when to flip between and + /// + [DataField(required: true)] + public float DehydrationThreshold; +} diff --git a/Content.Server/_DV/Feroxi/FeroxiDehydrateSystem.cs b/Content.Server/_DV/Feroxi/FeroxiDehydrateSystem.cs new file mode 100644 index 0000000000..f93e7e3fb2 --- /dev/null +++ b/Content.Server/_DV/Feroxi/FeroxiDehydrateSystem.cs @@ -0,0 +1,48 @@ +using Content.Server.Body.Components; +using Content.Server.Body.Systems; +using Content.Shared.Nutrition.Components; + +namespace Content.Server._DV.Feroxi; + +public sealed class FeroxiDehydrateSystem : EntitySystem +{ + [Dependency] private readonly BodySystem _body = default!; + + public override void Update(float frameTime) + { + var query = EntityQueryEnumerator(); + + while (query.MoveNext(out var uid, out var feroxiDehydrate, out var thirst)) + { + var currentThirst = thirst.CurrentThirst; + var shouldBeDehydrated = currentThirst <= feroxiDehydrate.DehydrationThreshold; + + if (feroxiDehydrate.Dehydrated != shouldBeDehydrated) + { + UpdateDehydrationStatus((uid, feroxiDehydrate), shouldBeDehydrated); + } + } + } + + /// + /// Checks and changes the lungs when meeting the threshold for a swap of metabolizer + /// + /// + /// + private void UpdateDehydrationStatus(Entity ent, bool shouldBeDehydrated) + { + ent.Comp.Dehydrated = shouldBeDehydrated; + + foreach (var entity in _body.GetBodyOrganEntityComps(ent.Owner)) + { + if (!TryComp(entity, out var metabolizer) || metabolizer.MetabolizerTypes == null) + { + continue; + } + //Changing the metabolizer to the appropriate value based + var newMetabolizer = shouldBeDehydrated ? ent.Comp.DehydratedMetabolizer : ent.Comp.HydratedMetabolizer; + metabolizer.MetabolizerTypes!.Clear(); + metabolizer.MetabolizerTypes.Add(newMetabolizer); + } + } +} diff --git a/Content.Shared/Body/Organ/OrganComponent.cs b/Content.Shared/Body/Organ/OrganComponent.cs index a675f64111..96e9af1844 100644 --- a/Content.Shared/Body/Organ/OrganComponent.cs +++ b/Content.Shared/Body/Organ/OrganComponent.cs @@ -69,5 +69,11 @@ public sealed partial class OrganComponent : Component, ISurgeryToolComponent // /// [DataField] public bool CanEnable = true; + + /// + /// DeltaV - Can this organ be removed? Used to be able to make organs unremovable by setting it to false. + /// + [DataField] + public bool Removable = true; // Shitmed Change End } diff --git a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs index de32ebb4dc..58638bd4df 100644 --- a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs +++ b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs @@ -27,6 +27,7 @@ using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Prototypes; using Robust.Shared.Timing; +using Content.Shared.Body.Organ; namespace Content.Shared._Shitmed.Medical.Surgery; @@ -266,6 +267,11 @@ public abstract partial class SharedSurgerySystem : EntitySystem || ent.Comp.Reattaching && !organs.Any(organ => HasComp(organ.Id)))) args.Cancelled = true; + // Start of DeltaV Additions - Checks if any organ has the removable component set to true, hiding it from the surgery UI + if (!organs.Any(organ => !TryComp(organ.Id, out var organComp) + || organComp.Removable)) + args.Cancelled = true; + // End of DeltaV Additions } else if (!ent.Comp.Inverse) args.Cancelled = true; diff --git a/Resources/Locale/en-US/_DV/chat/emotes.ftl b/Resources/Locale/en-US/_DV/chat/emotes.ftl index 6676ad49b8..1570152200 100644 --- a/Resources/Locale/en-US/_DV/chat/emotes.ftl +++ b/Resources/Locale/en-US/_DV/chat/emotes.ftl @@ -11,3 +11,4 @@ delta-chat-emote-name-snarl = Snarl delta-chat-emote-name-whine = Whine delta-chat-emote-name-howl = Howl delta-chat-emote-name-awoo = Awoo +delta-chat-emote-name-gnash = Gnash diff --git a/Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl b/Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl index f58ade59f6..ddc6df1e2a 100644 --- a/Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl +++ b/Resources/Locale/en-US/_DV/chat/managers/chat_manager.ftl @@ -27,3 +27,9 @@ chat-speech-verb-chitinid-1 = clicks chat-speech-verb-chitinid-2 = chitters chat-speech-verb-chitinid-3 = hisses chat-speech-verb-chitinid-4 = buzzes + +chat-speech-verb-name-feroxi = Feroxi +chat-speech-verb-feroxi-1 = blubs +chat-speech-verb-feroxi-2 = swishes +chat-speech-verb-feroxi-3 = gnashes +chat-speech-verb-feroxi-4 = growls diff --git a/Resources/Locale/en-US/_DV/markings/feroxi.ftl b/Resources/Locale/en-US/_DV/markings/feroxi.ftl new file mode 100644 index 0000000000..f38301b43e --- /dev/null +++ b/Resources/Locale/en-US/_DV/markings/feroxi.ftl @@ -0,0 +1,143 @@ +marking-FeroxiEars = Ears +marking-FeroxiEars-feroxi-ears = Base Ears +marking-FeroxiEars-feroxi-ears-inner = Inner Ear + +marking-FeroxiTailAndDorsal = Tail and Dorsal +marking-FeroxiTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTailAndDorsal-feroxi-dorsal = Base Dorsal + +marking-FeroxiSnout = Snout +marking-FeroxiSnout-feroxi-snout = Base Snout + +marking-FeroxiHeadStripesTiger = Tiger Stripes +marking-FeroxiHeadStripesTiger-feroxi-head-stripes-tiger = Stripes + +marking-FeroxiEarsTips = Tipped Ears +marking-FeroxiEarsTips-feroxi-ears = Base Ears +marking-FeroxiEarsTips-feroxi-ears-inner = Inner Ear +marking-FeroxiEarsTips-feroxi-ears-tips = Ear Tips + +marking-FeroxiSnoutStripe = Striped Snout +marking-FeroxiSnoutStripe-feroxi-snout = Base Snout +marking-FeroxiSnoutStripe-feroxi-snout-stripe = Stripe + +marking-FeroxiSnoutCountershading = Countershaded Snout +marking-FeroxiSnoutCountershading-feroxi-snout = Base Snout +marking-FeroxiSnoutCountershading-feroxi-snout-Countershading = Countershading + +marking-FeroxiSnoutCountershadingStripe = Striped and Countershaded Snout with +marking-FeroxiSnoutCountershadingStripe-feroxi-snout = Base Snout +marking-FeroxiSnoutCountershadingStripe-feroxi-snout-countershading = Countershading +marking-FeroxiSnoutCountershadingStripe-feroxi-snout-stripe = Stripe + +marking-FeroxiSnoutNurse = Nurse Snout +marking-FeroxiSnoutNurse-feroxi-snout = Base Snout +marking-FeroxiSnoutNurse-feroxi-snout-nurse = Barbels + +marking-FeroxiSnoutNurseCountershading = Countershaded Nurse Snout +marking-FeroxiSnoutNurseCountershading-feroxi-snout = Base Snout +marking-FeroxiSnoutNurseCountershading-feroxi-snout-countershading = Countershading +marking-FeroxiSnoutNurseCountershading-feroxi-snout-nurse = Barbels + +marking-FeroxiTailBlitz = Striped Tail with Fin Tips and Dorsal +marking-FeroxiTailBlitz-feroxi-tail = Base Tail +marking-FeroxiTailBlitz-feroxi-tail-stripes = Tail Stripes +marking-FeroxiTailBlitz-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTailBlitz-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTailBlitz-feroxi-tail-under = Under Tail +marking-FeroxiTailBlitz-feroxi-dorsal = Base Dorsal +marking-FeroxiTailBlitz-feroxi-dorsal-stripes = Dorsal Stripes + +marking-FeroxiTailBlitzNoDorsal = Striped Tail with Fin Tips +marking-FeroxiTailBlitzNoDorsal-feroxi-tail = Base Tail +marking-FeroxiTailBlitzNoDorsal-feroxi-tail-stripes = Tail Stripes +marking-FeroxiTailBlitzNoDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTailBlitzNoDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTailBlitzNoDorsal-feroxi-tail-under = Under Tail + +marking-FeroxiStripedTail = Striped Tail +marking-FeroxiStripedTail-feroxi-tail = Base Tail +marking-FeroxiStripedTail-feroxi-tail-stripes = Tail Stripes + +marking-FeroxiStripedTailAndDorsal = Striped Tail with Dorsal +marking-FeroxiStripedTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiStripedTailAndDorsal-feroxi-tail-stripes = Tail Stripes +marking-FeroxiStripedTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiStripedTailAndDorsal-feroxi-dorsal-stripes = Dorsal Stripes + +marking-FeroxiTail = Tail +marking-FeroxiTail-feroxi-tail = Base Tail + +marking-FeroxiTipTail = Tail with Tips +marking-FeroxiTipTail-feroxi-tail = Base Tail +marking-FeroxiTipTail-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTail-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTail-feroxi-second-dorsal-tip = Secondary Dorsal Fin Tip +marking-FeroxiTipTail-feroxi-dorsal = Base Dorsal + +marking-FeroxiTipTailAndDorsal = Tail with Tips and Dorsal +marking-FeroxiTipTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTipTailAndDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTailAndDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTailAndDorsal-feroxi-second-dorsal-tip = Secondary Dorsal Fin Tip +marking-FeroxiTipTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiTipTailAndDorsal-feroxi-dorsal-tip = Dorsal Tip + +marking-FeroxiTwoToneTail = Two Tone Tail +marking-FeroxiTwoToneTail-feroxi-tail = Base Tail +marking-FeroxiTwoToneTail-feroxi-tail-under = Under Tail + +marking-FeroxiTwoToneTailAndDorsal = Two Tone Tail and Dorsal +marking-FeroxiTwoToneTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTwoToneTailAndDorsal-feroxi-tail-under = Under Tail +marking-FeroxiTwoToneTailAndDorsal-feroxi-dorsal = Base Dorsal + +marking-FeroxiStripeTwoToneTail = Two Tone Tail with Stripes +marking-FeroxiStripeTwoToneTail-feroxi-tail = Base Tail +marking-FeroxiStripeTwoToneTail-feroxi-tail-stripes = Tail Stripes +marking-FeroxiStripeTwoToneTail-feroxi-tail-under = Under Tail + +marking-FeroxiStripeTwoToneTailAndDorsal = Two Tone Tail with Stripes and Dorsal +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-tail-stripes = Tail Stripes +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-tail-under = Under Tail +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-dorsal-stripes = Dorsal Stripes + +marking-FeroxiTipTwoToneTail = Two Tone Tail with Tips +marking-FeroxiTipTwoToneTail-feroxi-tail = Base Tail +marking-FeroxiTipTwoToneTail-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTwoToneTail-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTwoToneTail-feroxi-tail-under = Under Tail + +marking-FeroxiTipTwoToneTailAndDorsal = Two Tone Tail with Tips and Dorsal +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail-under = Under Tail +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-dorsal-tip = Dorsal Tip + +marking-FeroxiTorsoStripesBlitz = Small Under Arm Stripes +marking-FeroxiTorsoStripesBlitz-feroxi-torso-stripes-blitz = Stripes + +marking-FeroxiTorsoStripesTiger = Full Stripes +marking-FeroxiTorsoStripesTiger-feroxi-torso-stripes-tiger = Stripes + +marking-FeroxiTorsoCountershadingF = Countershading (Feminine) +marking-FeroxiTorsoCountershadingF-feroxi-torso-countershading-f = Countershading + +marking-FeroxiTorsoCountershadingM = Countershading (Masculine) +marking-FeroxiTorsoCountershadingM-feroxi-torso-countershading-m = Countershading + +marking-FeroxiLegStripesBlitz = Calf Stripes +marking-FeroxiLegStripesBlitz-feroxi-leg-stripes-blitz = Stripes + +marking-FeroxiLegStripesTiger = Full Stripes +marking-FeroxiLegStripesTiger-feroxi-leg-stripes-tiger = Stripes + +marking-FeroxiArmStripesBlitz = Shoulder Stripes +marking-FeroxiArmStripesBlitz-feroxi-arm-stripes-blitz = Stripes + +marking-FeroxiArmStripesTiger = Full Stripes +marking-FeroxiArmStripesTiger-feroxi-arm-stripes-tiger = Stripes diff --git a/Resources/Locale/en-US/_DV/phrases/species.ftl b/Resources/Locale/en-US/_DV/phrases/species.ftl index fef94615ea..5378c4bed7 100644 --- a/Resources/Locale/en-US/_DV/phrases/species.ftl +++ b/Resources/Locale/en-US/_DV/phrases/species.ftl @@ -40,3 +40,4 @@ phrase-species-pest = pest phrase-species-insect = insect phrase-species-pet = pet phrase-species-chicken = chicken +phrase-species-fish = fish diff --git a/Resources/Locale/en-US/_DV/species/species.ftl b/Resources/Locale/en-US/_DV/species/species.ftl index b8cebd93d5..ce488d4fa0 100644 --- a/Resources/Locale/en-US/_DV/species/species.ftl +++ b/Resources/Locale/en-US/_DV/species/species.ftl @@ -4,3 +4,4 @@ species-name-vulpkanin = Vulpkanin species-name-harpy = Harpy species-name-rodentia = Rodentia species-name-chitinid = Chitinid +species-name-feroxi = Feroxi diff --git a/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl b/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl new file mode 100644 index 0000000000..67dffabda9 --- /dev/null +++ b/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl @@ -0,0 +1,2 @@ +metabolizer-type-feroxi = Feroxi +metabolizer-type-feroxi-dehydrated = Dehydrated Feroxi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 5ada80142a..3415732295 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -205,6 +205,10 @@ children: - id: NitrogenTankFilled - id: DoubleEmergencyNitrogenTankFilled + - !type:GroupSelector # DeltaV - Random water vapor tanks spawn too + children: + - id: WaterVaporTankFilled + - id: DoubleEmergencyWaterVaporTankFilled - id: EmergencyFunnyOxygenTankFilled weight: 0.5 - !type:GroupSelector diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 2f8fba5d7a..a545bba94c 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -58,7 +58,7 @@ id: GauzeBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Harpy, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Harpy, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -114,7 +114,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -128,7 +128,7 @@ id: GauzeLeftArm bodyPart: LArm, LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -142,7 +142,7 @@ id: GauzeLowerLegLeft bodyPart: LFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -156,7 +156,7 @@ id: GauzeUpperLegLeft bodyPart: LLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -170,7 +170,7 @@ id: GauzeUpperLegRight bodyPart: RLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -184,7 +184,7 @@ id: GauzeLowerLegRight bodyPart: RFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -198,7 +198,7 @@ id: GauzeBoxerWrapRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -212,7 +212,7 @@ id: GauzeBoxerWrapLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Thaven, Feroxi coloring: default: type: @@ -226,7 +226,7 @@ id: GauzeHead bodyPart: Head markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Moth, Chitinid, Thaven] # Delta V - Chitinid, Thaven + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Moth, Chitinid, Thaven, Feroxi] # Delta V - Chitinid, Thaven, Feroxi coloring: default: type: @@ -312,7 +312,7 @@ id: GauzeMothBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -326,7 +326,7 @@ id: GauzeMothShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -340,7 +340,7 @@ id: GauzeMothStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -354,7 +354,7 @@ id: GauzeMothLeftEyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -368,7 +368,7 @@ id: GauzeMothLeftEyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -382,7 +382,7 @@ id: GauzeMothRightEyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -396,7 +396,7 @@ id: GauzeMothRightEyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -410,7 +410,7 @@ id: GauzeMothUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -424,7 +424,7 @@ id: GauzeMothUpperArmLeft bodyPart: LArm markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -438,7 +438,7 @@ id: GauzeMothUpperLegRight bodyPart: RLeg markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -452,7 +452,7 @@ id: GauzeMothUpperLegLeft bodyPart: LLeg markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -466,7 +466,7 @@ id: GauzeMothLowerLegRight bodyPart: RFoot markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: @@ -480,7 +480,7 @@ id: GauzeMothLowerLegLeft bodyPart: LFoot markingCategory: Overlay - speciesRestriction: [Moth, Chitinid] # Delta V - Chitinid + speciesRestriction: [Moth, Chitinid] # DeltaV - Chitinid coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 822be2893c..68b47030eb 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -2,7 +2,7 @@ id: ScarEyeRight bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia] # Delta V - Felinid, Oni, Harpy, Rodentia + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia, Feroxi] # Delta V - Felinid, Oni, Harpy, Rodentia, Feroxi followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -12,7 +12,7 @@ id: ScarEyeLeft bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia] # Delta V - Felinid, Oni, Harpy, Rodentia + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Rodentia, Feroxi] # Delta V - Felinid, Oni, Harpy, Rodentia, Feroxi followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -22,7 +22,7 @@ id: ScarTopSurgeryShort bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi] #Einstein Engines - Felinid, Oni - DeltaV - Feroxi sexRestriction: [Male] followSkinColor: true sprites: @@ -33,7 +33,7 @@ id: ScarTopSurgeryLong bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi] #Einstein Engines - Felinid, Oni - DeltaV - Feroxi sexRestriction: [Male] followSkinColor: true sprites: @@ -44,7 +44,7 @@ id: ScarChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi] #Einstein Engines - Felinid, Oni - DeltaV - Feroxi sexRestriction: [Male] # DeltaV: Splitting the scars and tattoos followSkinColor: true sprites: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index 6310f1b34f..3266acb7fe 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -116,7 +116,7 @@ id: TattooEyeRight bodyPart: Eyes markingCategory: Head - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia coloring: default: type: @@ -130,7 +130,7 @@ id: TattooEyeLeft bodyPart: Eyes markingCategory: Head - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia coloring: default: type: diff --git a/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml b/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml index 2d7fa79d48..18b91943a9 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/blueprint.yml @@ -49,3 +49,4 @@ providedRecipes: - DoubleEmergencyOxygenTank - DoubleEmergencyNitrogenTank + - DoubleEmergencyWaterVaporTank # DeltaV - New tank new recipe diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml index a5d08ef640..1d83b2c6f9 100644 --- a/Resources/Prototypes/Guidebook/species.yml +++ b/Resources/Prototypes/Guidebook/species.yml @@ -19,6 +19,7 @@ - Rodentia - Chitinid - IPC + - Feroxi # ImpStation additions - Thaven diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index b642dd3dc6..118cd0885b 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -88,6 +88,7 @@ - EmergencyOxygen - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVapor # DeltaV - type: loadoutGroup id: GroupEVATank @@ -96,6 +97,7 @@ loadouts: - LoadoutSpeciesEVANitrogen - LoadoutSpeciesEVAOxygen + - LoadoutSpeciesEVAWaterVapor # DeltaV - type: loadoutGroup id: GroupPocketTankDouble @@ -104,6 +106,7 @@ loadouts: - LoadoutSpeciesPocketDoubleNitrogen - LoadoutSpeciesPocketDoubleOxygen + - LoadoutSpeciesPocketDoubleWaterVapor # DeltaV # Command - type: loadoutGroup @@ -540,6 +543,7 @@ - EmergencyOxygenClown - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVaporClown # DeltaV - type: loadoutGroup id: MimeHead @@ -599,6 +603,7 @@ - EmergencyOxygenMime - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVaporMime # DeltaV - type: loadoutGroup id: MusicianJumpsuit @@ -905,6 +910,7 @@ - EmergencyOxygenExtended - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVaporExtended # DeltaV # Science - type: loadoutGroup @@ -1237,6 +1243,7 @@ - EmergencyOxygenSecurity - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVaporSecurity # DeltaV - type: loadoutGroup id: SecurityStar @@ -1436,6 +1443,7 @@ - EmergencyOxygenMedical - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVaporMedical # DeltaV # Wildcards - type: loadoutGroup @@ -1481,6 +1489,7 @@ - EmergencyOxygenSyndicate - LoadoutSpeciesVoxNitrogen - EmergencyIPCBox # DeltaV + - EmergencyWaterVaporSyndicate # DeltaV - type: loadoutGroup id: GroupSpeciesBreathTool diff --git a/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml b/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml index a4d96c109e..b23b5c6431 100644 --- a/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml +++ b/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml @@ -12,3 +12,4 @@ SlimePerson: 0.5 Vulpkanin: 0.5 Rodentia: 0.5 + Feroxi: 0.5 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index ad680a5fbc..f94f6157e0 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -447,6 +447,41 @@ effects: - !type:SatiateThirst factor: 4 + Gas: # DeltaV - Feroxi get to breathe with this too! + effects: + - !type:Oxygenate + conditions: + - !type:OrganType + type: Feroxi + - !type:SatiateThirst + conditions: + - !type:OrganType + type: Feroxi + factor: 2 + - !type:Oxygenate + conditions: + - !type:OrganType + type: FeroxiDehydrated + - !type:SatiateThirst + conditions: + - !type:OrganType + type: FeroxiDehydrated + factor: 2 + # DeltaV Converts H2O into CO2 for Feroxi + - !type:ModifyLungGas + conditions: + - !type:OrganType + type: Feroxi + ratios: # DeltaV no duplicating O2 >:3 + CarbonDioxide: 0.5 + WaterVapor: -1.0 + - !type:ModifyLungGas + conditions: + - !type:OrganType + type: FeroxiDehydrated + ratios: # DeltaV no duplicating O2 >:3 + CarbonDioxide: 0.5 + WaterVapor: -1.0 - type: reagent id: Ice diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 634b2c473e..171226b63b 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -26,6 +26,10 @@ conditions: - !type:OrganType type: Plant + - !type:Oxygenate # DeltaV - Feroxi Still need to breathe + conditions: + - !type:OrganType + type: Feroxi # Convert Oxygen into CO2. - !type:ModifyLungGas conditions: diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index fc866c9b77..0b58294649 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -666,7 +666,16 @@ Drink: effects: - !type:SatiateThirst + conditions: # DeltaV nerf of saline for Feroxi + - !type:OrganType + type: Feroxi + shouldHave: false factor: 6 + - !type:SatiateThirst # DeltaV nerf of saline for Feroxi + conditions: + - !type:OrganType + type: Feroxi + factor: 2 - !type:ModifyBloodLevel amount: 6 diff --git a/Resources/Prototypes/Species/species_weights.yml b/Resources/Prototypes/Species/species_weights.yml index 1a5a0323e4..9c01342573 100644 --- a/Resources/Prototypes/Species/species_weights.yml +++ b/Resources/Prototypes/Species/species_weights.yml @@ -9,5 +9,6 @@ Felinid: 4 # Nyanotrasen - Felinid, see Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml Vulpkanin: 3 # DeltaV - Vulpkanin, see Prototypes/_DV/Entities/Mobs/Species/vulpkanin.yml Rodentia: 3 # DeltaV - Rodentia, see Prototypes/_DV/Entities/Mobs/Species/rodentia.yml + Feroxi: 3 # DeltaV - Feroxi, see Prototypes/_DV/Entities/Mobs/Species/feroxi.yml Diona: 2 Chitinid: 3 # DeltaV - Chitinid, see Prototypes/_DV/Entities/Mobs/Species/chitinid.yml diff --git a/Resources/Prototypes/_DV/Body/Organs/feroxi.yml b/Resources/Prototypes/_DV/Body/Organs/feroxi.yml new file mode 100644 index 0000000000..75d8e3eba9 --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Organs/feroxi.yml @@ -0,0 +1,64 @@ +- type: entity + parent: OrganAnimalStomach + id: OrganFeroxiStomach + name: feroxian stomach + categories: [ HideSpawnMenu ] + components: + - type: Stomach + specialDigestible: + tags: + - ReptilianFood + - Meat + - Pill + - Crayon + - Paper + - type: Metabolizer + maxReagents: 2 + metabolizerTypes: [ Feroxi, Animal ] + - type: SolutionContainerManager + solutions: + stomach: + maxVol: 50 + food: + maxVol: 5 + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 5 + +- type: entity + parent: BaseHumanOrgan + id: OrganFeroxiLungs + name: feroxian lungs and gills + description: "A pair of amphibious lungs along with gills, filtering oxygen out of the air continuously." + components: + - type: Sprite + sprite: Mobs/Species/Human/organs.rsi + layers: + - state: lung-l + - state: lung-r + - type: Organ + removable: false + - type: Lung + - type: Metabolizer + removeEmpty: true + solutionOnBody: false + solution: "Lung" + metabolizerTypes: [ Feroxi ] + groups: + - id: Gas + rateModifier: 100.0 + - type: SolutionContainerManager + solutions: + organ: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 10 + Lung: + maxVol: 100 + canReact: False + food: + maxVol: 5 + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 5 diff --git a/Resources/Prototypes/_DV/Body/Parts/feroxi.yml b/Resources/Prototypes/_DV/Body/Parts/feroxi.yml new file mode 100644 index 0000000000..f3f958b183 --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Parts/feroxi.yml @@ -0,0 +1,58 @@ +- type: entity + parent: [ BasePart ] + abstract: true + id: PartFeroxiBase + name: feroxi body part + components: + - type: Sprite + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + +- type: entity + parent: [ PartFeroxiBase, BaseTorso ] + id: TorsoFeroxi + name: feroxi torso + +- type: entity + parent: [ PartFeroxiBase, BaseHead ] + id: HeadFeroxi + name: feroxi head + +- type: entity + parent: [ PartFeroxiBase, BaseLeftArm ] + id: LeftArmFeroxi + name: left feroxi arm + +- type: entity + parent: [ PartFeroxiBase, BaseRightArm ] + id: RightArmFeroxi + name: right feroxi arm + +- type: entity + parent: [ PartFeroxiBase, BaseLeftHand ] + id: LeftHandFeroxi + name: left feroxi hand + +- type: entity + parent: [ PartFeroxiBase, BaseRightHand ] + id: RightHandFeroxi + name: right feroxi hand + +- type: entity + parent: [ PartFeroxiBase, BaseLeftLeg ] + id: LeftLegFeroxi + name: left feroxi leg + +- type: entity + parent: [ PartFeroxiBase, BaseRightLeg ] + id: RightLegFeroxi + name: right feroxi leg + +- type: entity + parent: [ PartFeroxiBase, BaseLeftFoot ] + id: LeftFootFeroxi + name: left feroxi foot + +- type: entity + parent: [ PartFeroxiBase, BaseRightFoot ] + id: RightFootFeroxi + name: right feroxi foot diff --git a/Resources/Prototypes/_DV/Body/Prototypes/feroxi.yml b/Resources/Prototypes/_DV/Body/Prototypes/feroxi.yml new file mode 100644 index 0000000000..3984c2bbd3 --- /dev/null +++ b/Resources/Prototypes/_DV/Body/Prototypes/feroxi.yml @@ -0,0 +1,49 @@ +- type: body + name: species-name-feroxi + id: Feroxi + root: torso + slots: + head: + part: HeadFeroxi + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoFeroxi + organs: + heart: OrganAnimalHeart + lungs: OrganFeroxiLungs + stomach: OrganFeroxiStomach + liver: OrganAnimalLiver + kidneys: OrganHumanKidneys + connections: + - right arm + - left arm + - right leg + - left leg + right arm: + part: RightArmFeroxi + connections: + - right hand + left arm: + part: LeftArmFeroxi + connections: + - left hand + right hand: + part: RightHandFeroxi + left hand: + part: LeftHandFeroxi + right leg: + part: RightLegFeroxi + connections: + - right foot + left leg: + part: LeftLegFeroxi + connections: + - left foot + right foot: + part: RightFootFeroxi + left foot: + part: LeftFootFeroxi diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml index f7b8d7db2e..3b45a4edf2 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml @@ -42,3 +42,138 @@ - id: Oilpack1 - id: CableApcStack10 - id: WelderMini + +- type: entity + parent: BoxSurvivalBrigmedic + id: BoxSurvivalBrigmedicWaterVapor + suffix: MedSec H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreathMedicalSecurity + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + # Intentionally wrong picture on the box. NT did not care enough to change it. + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvival + id: BoxSurvivalWaterVapor + suffix: Standard H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalEngineering + id: BoxSurvivalEngineeringWaterVapor + suffix: Extended H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: ExtendedEmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalSecurity + id: BoxSurvivalSecurityWaterVapor + suffix: Security H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskGasSecurity + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalMedical + id: BoxSurvivalMedicalWaterVapor + suffix: Medical H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreathMedical + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxHug + id: BoxHugWaterVapor + suffix: Emergency H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalWaterVapor + id: BoxMimeWaterVapor + suffix: Mime, Emergency H2O + components: + - type: StorageFill + contents: + - id: SpaceMedipen + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodBreadBaguette + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalSyndicate + id: BoxSurvivalSyndicateWaterVapor + suffix: Syndicate H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskGasSyndicate + - id: ExtendedEmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen + - id: FoodPSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/_DV/Catalog/Fills/Items/gas_tanks.yml new file mode 100644 index 0000000000..216193e9e1 --- /dev/null +++ b/Resources/Prototypes/_DV/Catalog/Fills/Items/gas_tanks.yml @@ -0,0 +1,75 @@ +- type: entity + id: WaterVaporTankFilled + parent: WaterVaporTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 31 minutes + volume: 5 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # plasma + - 0 # tritium + - 2.051379050 # water vapor + temperature: 293.15 + +- type: entity + id: EmergencyWaterVaporTankFilled + parent: EmergencyWaterVaporTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 4 minutes + volume: 0.66 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # plasma + - 0 # tritium + - 0.270782035 # water vapor + temperature: 293.15 + +- type: entity + id: ExtendedEmergencyWaterVaporTankFilled + parent: ExtendedEmergencyWaterVaporTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 9 minutes + volume: 1.5 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # plasma + - 0 # tritium + - 0.615413715 # water vapor + temperature: 293.15 + +- type: entity + id: DoubleEmergencyWaterVaporTankFilled + parent: DoubleEmergencyWaterVaporTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 15 minutes + volume: 2.5 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # plasma + - 0 # tritium + - 1.025689525 # water vapor + temperature: 293.15 diff --git a/Resources/Prototypes/_DV/Chemistry/metabolizer_types.yml b/Resources/Prototypes/_DV/Chemistry/metabolizer_types.yml new file mode 100644 index 0000000000..c29cf4b42e --- /dev/null +++ b/Resources/Prototypes/_DV/Chemistry/metabolizer_types.yml @@ -0,0 +1,10 @@ +# If your species wants to metabolize stuff differently, +# you'll likely have to tag its metabolizers with something other than Human. + +- type: metabolizerType + id: Feroxi + name: metabolizer-type-feroxi + +- type: metabolizerType + id: FeroxiDehydrated + name: metabolizer-type-feroxi-dehydrated diff --git a/Resources/Prototypes/_DV/Damage/modifier_sets.yml b/Resources/Prototypes/_DV/Damage/modifier_sets.yml index f88f0adc9a..2aac478438 100644 --- a/Resources/Prototypes/_DV/Damage/modifier_sets.yml +++ b/Resources/Prototypes/_DV/Damage/modifier_sets.yml @@ -17,6 +17,13 @@ Slash: 1.15 Piercing: 1.15 +- type: damageModifierSet + id: Feroxi + coefficients: + Cold: 0.9 + Blunt: 0.9 + Slash: 1.1 + - type: damageModifierSet id: StorageTank coefficients: diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml new file mode 100644 index 0000000000..994af53cb1 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml @@ -0,0 +1,389 @@ +# Default +- type: marking + id: FeroxiEars + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-ears + - sprite: _DV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-ears-inner + +- type: marking + id: FeroxiTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + +- type: marking + id: FeroxiSnout + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + +# Ears Markings +- type: marking + id: FeroxiEarsTips + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-ears + - sprite: _DV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-ears-inner + - sprite: _DV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-ears-tips + +# Snout Markings +- type: marking + id: FeroxiSnoutStripe + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-stripe + +- type: marking + id: FeroxiSnoutCountershading + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-countershading + +- type: marking + id: FeroxiSnoutCountershadingStripe + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-countershading + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-stripe + +- type: marking + id: FeroxiSnoutNurse + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-nurse + +- type: marking + id: FeroxiSnoutNurseCountershading + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-countershading + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-nurse + +# Tail Markings +- type: marking + id: FeroxiTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + +- type: marking + id: FeroxiStripedTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + +- type: marking + id: FeroxiStripedTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-stripes + +- type: marking + id: FeroxiTipTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip + +- type: marking + id: FeroxiTipTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-tip + +- type: marking + id: FeroxiTailBlitz + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-stripes + +- type: marking + id: FeroxiTailBlitzNoDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + +- type: marking + id: FeroxiTwoToneTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + +- type: marking + id: FeroxiTwoToneTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + +- type: marking + id: FeroxiStripeTwoToneTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + +- type: marking + id: FeroxiStripeTwoToneTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-stripes + +- type: marking + id: FeroxiTipTwoToneTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + +- type: marking + id: FeroxiTipTwoToneTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-tip + +# Body Markings +- type: marking + id: FeroxiHeadStripesTiger + bodyPart: Head + markingCategory: Head + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-head-stripes-tiger + +- type: marking + id: FeroxiTorsoStripesBlitz + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-torso-stripes-blitz + +- type: marking + id: FeroxiTorsoCountershadingF + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-torso-countershading-f + +- type: marking + id: FeroxiTorsoCountershadingM + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-torso-countershading-m + +- type: marking + id: FeroxiTorsoStripesTiger + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-torso-stripes-tiger + +# Leg Markings +- type: marking + id: FeroxiLegStripesBlitz + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-leg-stripes-blitz + +- type: marking + id: FeroxiLegStripesTiger + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-leg-stripes-tiger + +# Arm Markings +- type: marking + id: FeroxiArmStripesBlitz + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-arm-stripes-blitz + +- type: marking + id: FeroxiArmStripesTiger + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-arm-stripes-tiger diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml index f5f83ca422..e9374a9d43 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/makeup.yml @@ -16,7 +16,7 @@ id: MakeupBlush bodyPart: Head markingCategory: Head - speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Harpy, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -30,7 +30,7 @@ id: MakeupNailPolishRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -44,7 +44,7 @@ id: MakeupNailPolishLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/scars.yml index c074ef72b9..6b6d64cfc4 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/scars.yml @@ -2,7 +2,7 @@ id: ScarChestFemale # DeltaV: Splitting the scars and tattoos bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] #Einstein Engines - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Feroxi] #Einstein Engines - Felinid, Oni sexRestriction: [Female] # DeltaV: Splitting the scars and tattoos followSkinColor: true sprites: diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/feroxi.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/feroxi.yml new file mode 100644 index 0000000000..8184ca5b5f --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/feroxi.yml @@ -0,0 +1,5 @@ +- type: entity + save: false + name: Urist McFin + parent: BaseMobFeroxi + id: MobFeroxi diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml new file mode 100644 index 0000000000..ca45e896ae --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml @@ -0,0 +1,105 @@ +- type: entity + parent: BaseMobSpeciesOrganic + id: BaseMobFeroxi + name: Urist McFin + save: false + abstract: true + components: + - type: HumanoidAppearance + species: Feroxi + - type: Hunger + - type: Carriable + - type: Inventory + speciesId: feroxi + - type: Thirst + baseDecayRate: 0.2 + - type: Icon + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: full + - type: Body + prototype: Feroxi + - type: Speech + speechSounds: Tenor + speechVerb: Feroxi + allowedEmotes: [ "Gnash" ] + - type: Sprite + netsync: false + noRot: true + drawdepth: Mobs + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: [ "enum.HumanoidVisualLayers.RArm" ] + - map: [ "enum.HumanoidVisualLayers.LArm" ] + - map: [ "enum.HumanoidVisualLayers.RLeg" ] + - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - shader: StencilClear + sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 + # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. + # sprite refactor when + state: l_leg + - map: [ "enum.HumanoidVisualLayers.Underwear" ] + - map: [ "enum.HumanoidVisualLayers.Undershirt" ] + - map: [ "jumpsuit" ] + - map: [ "enum.HumanoidVisualLayers.LHand" ] + - map: [ "enum.HumanoidVisualLayers.RHand" ] + - map: [ "enum.HumanoidVisualLayers.LFoot" ] + - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "id" ] + - map: [ "gloves" ] + - map: [ "shoes" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "neck" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: [ "clownedon" ] # Dynamically generated + sprite: "_DV/Effects/creampie.rsi" + state: "creampie_feroxi" + visible: false + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 30 + animation: WeaponArcBite + damage: + types: + Piercing: 7 # oooh scary extra damage~ + - type: Perishable + - type: Damageable + damageModifierSet: Feroxi + - type: TypingIndicator + proto: feroxi + - type: FeroxiDehydrate + hydratedMetabolizer: Feroxi + dehydratedMetabolizer: FeroxiDehydrated + dehydrationThreshold: 150 + +- type: entity + parent: MobHumanDummy + id: MobFeroxiDummy + name: Feroxi Dummy + save: false + categories: [ HideSpawnMenu ] + description: A dummy feroxi meant to be used in character setup. + components: + - type: HumanoidAppearance + species: Feroxi diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml index 2395e99179..63a9605270 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/harpy.yml @@ -113,7 +113,7 @@ - type: Speech speechSounds: Harpy speechVerb: Harpy - allowedEmotes: ['Meow', 'Hiss', 'Mew', 'Purr', 'Growl', 'Bark', 'Snarl', 'Whine', 'Howl', 'Awoo', 'HarpyHonk', 'HarpyRing', 'HarpyPew', 'HarpyBang', 'HarpyBeep', 'HarpyRev', 'HarpyCaw', 'Squish', 'Chitter', 'Squeak', 'Click', ] + allowedEmotes: ['Meow', 'Hiss', 'Mew', 'Purr', 'Growl', 'Bark', 'Snarl', 'Whine', 'Howl', 'Awoo', 'HarpyHonk', 'HarpyRing', 'HarpyPew', 'HarpyBang', 'HarpyBeep', 'HarpyRev', 'HarpyCaw', 'Squish', 'Chitter', 'Squeak', 'Click', 'Gnash',] - type: Vocal sounds: Male: SoundsHarpy diff --git a/Resources/Prototypes/_DV/Entities/Objects/Tools/gas_tank.yml b/Resources/Prototypes/_DV/Entities/Objects/Tools/gas_tank.yml new file mode 100644 index 0000000000..722b40d895 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Tools/gas_tank.yml @@ -0,0 +1,52 @@ +- type: entity + parent: OxygenTank + id: WaterVaporTank + name: water vapor tank + description: A standard cylindrical gas tank for water vapor. It can hold 5 L of gas. + components: + - type: Sprite + sprite: _DV/Objects/Tanks/water_vapor.rsi + - type: Item + sprite: _DV/Objects/Tanks/water_vapor.rsi + - type: Clothing + sprite: _DV/Objects/Tanks/water_vapor.rsi + +- type: entity + parent: EmergencyOxygenTank + id: EmergencyWaterVaporTank + name: emergency water vapor tank + description: An easily portable tank for emergencies. Contains very little water vapor, rated for survival use only. It can hold 0.66 L of gas. + components: + - type: Sprite + sprite: _DV/Objects/Tanks/emergency_water_vapor.rsi + - type: Item + sprite: _DV/Objects/Tanks/emergency_water_vapor.rsi + - type: Clothing + sprite: _DV/Objects/Tanks/emergency_water_vapor.rsi + +- type: entity + parent: ExtendedEmergencyOxygenTank + id: ExtendedEmergencyWaterVaporTank + name: extended-capacity emergency water vapor tank + description: An emergency tank with extended capacity. Technically rated for prolonged use. It can hold 1.5 L of gas. + components: + - type: Sprite + sprite: _DV/Objects/Tanks/emergency_extended_water_vapor.rsi + - type: Item + sprite: _DV/Objects/Tanks/emergency_extended_water_vapor.rsi + - type: Clothing + sprite: _DV/Objects/Tanks/emergency_extended_water_vapor.rsi + +- type: entity + parent: DoubleEmergencyOxygenTank + id: DoubleEmergencyWaterVaporTank + name: double emergency water vapor tank + description: A high-grade dual-tank emergency life support container. It holds a decent amount of water vapor for its small size. It can hold 2.5 L of gas. + components: + - type: Sprite + sprite: _DV/Objects/Tanks/emergency_double_water_vapor.rsi + - type: Item + sprite: _DV/Objects/Tanks/emergency_double_water_vapor.rsi + - type: Clothing + sprite: _DV/Objects/Tanks/emergency_double_water_vapor.rsi + diff --git a/Resources/Prototypes/_DV/Guidebook/species.yml b/Resources/Prototypes/_DV/Guidebook/species.yml index a5c6c1df24..feb8cd2a37 100644 --- a/Resources/Prototypes/_DV/Guidebook/species.yml +++ b/Resources/Prototypes/_DV/Guidebook/species.yml @@ -27,3 +27,8 @@ id: Chitinid name: species-name-chitinid text: "/ServerInfo/Guidebook/Mobs/_DV/Chitinid.xml" + +- type: guideEntry + id: Feroxi + name: species-name-feroxi + text: "/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml" diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml index de467628dc..5c88074132 100644 --- a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml @@ -1,3 +1,99 @@ +# Species +- type: loadoutEffectGroup + id: WaterBreather + effects: + - !type:SpeciesLoadoutEffect + species: + - Feroxi + +# Basic +- type: loadout + id: EmergencyWaterVapor + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalWaterVapor + +# Clown +- type: loadout + id: EmergencyWaterVaporClown + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxHugWaterVapor + +# Mime +- type: loadout + id: EmergencyWaterVaporMime + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxMimeWaterVapor + +# Engineering / Extended +- type: loadout + id: EmergencyWaterVaporExtended + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalEngineeringWaterVapor + +# Medical +- type: loadout + id: EmergencyWaterVaporMedical + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalMedicalWaterVapor + +# Security +- type: loadout + id: EmergencyWaterVaporSecurity + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalSecurityWaterVapor + +# Syndicate +- type: loadout + id: EmergencyWaterVaporSyndicate + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalWaterVapor + +# Full EVA Tank, Any Species +- type: loadout + id: LoadoutSpeciesEVAWaterVapor + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + equipment: + suitstorage: WaterVaporTankFilled + +# Species-appropriate Double Emergency Tank in Pocket 1 +- type: loadout + id: LoadoutSpeciesPocketDoubleWaterVapor + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + equipment: + pocket1: DoubleEmergencyWaterVaporTankFilled + # Corpsman - type: loadout id: EmergencyOxygenCorpsman @@ -17,6 +113,14 @@ back: - BoxSurvivalBrigmedicNitrogen +- type: loadout + id: EmergencyWaterVaporCorpsman + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + equipment: + mask: BoxSurvivalBrigmedicWaterVapor + - type: loadout id: LoadoutSpeciesBreathToolCorpsman effects: diff --git a/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml b/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml index a93c664b83..a99603cdb2 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Species/crew.yml @@ -63,8 +63,13 @@ id: SpeciesVoxPhrase parent: BaseCrewSpeciesPhrase text: species-name-vox - + - type: quickPhrase id: SpeciesRodentiaPhrase parent: BaseCrewSpeciesPhrase - text: species-name-rodentia + text: species-name-rodentia + +- type: quickPhrase + id: SpeciesFeroxiPhrase + parent: BaseCrewSpeciesPhrase + text: species-name-feroxi diff --git a/Resources/Prototypes/_DV/QuickPhrases/Species/generic_species.yml b/Resources/Prototypes/_DV/QuickPhrases/Species/generic_species.yml index 6a12736cc6..1d51e1e438 100644 --- a/Resources/Prototypes/_DV/QuickPhrases/Species/generic_species.yml +++ b/Resources/Prototypes/_DV/QuickPhrases/Species/generic_species.yml @@ -53,3 +53,8 @@ id: SpeciesPetPhrase parent: BaseGenericSpeciesPhrase text: phrase-species-pet + +- type: quickPhrase + id: SpeciesFishPhrase + parent: BaseGenericSpeciesPhrase + text: phrase-species-fish diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/misc.yml b/Resources/Prototypes/_DV/Recipes/Lathes/misc.yml index 574b240bce..53ae0cfc79 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/misc.yml @@ -47,3 +47,10 @@ materials: Silver: 500 Diamond: 100 + +- type: latheRecipe + id: DoubleEmergencyWaterVaporTank + result: DoubleEmergencyWaterVaporTank + completetime: 4 + materials: + Steel: 250 diff --git a/Resources/Prototypes/_DV/SoundCollections/feroxi.yml b/Resources/Prototypes/_DV/SoundCollections/feroxi.yml new file mode 100644 index 0000000000..67e8c474b8 --- /dev/null +++ b/Resources/Prototypes/_DV/SoundCollections/feroxi.yml @@ -0,0 +1,4 @@ +- type: soundCollection + id: FeroxiGnashes + files: + - /Audio/Effects/bite.ogg diff --git a/Resources/Prototypes/_DV/Species/feroxi.yml b/Resources/Prototypes/_DV/Species/feroxi.yml new file mode 100644 index 0000000000..3c85d0e437 --- /dev/null +++ b/Resources/Prototypes/_DV/Species/feroxi.yml @@ -0,0 +1,152 @@ +- type: species + id: Feroxi + name: species-name-feroxi + roundStart: true + prototype: MobFeroxi + sprites: MobFeroxiSprites + defaultSkinTone: "#8DB9D6" + markingLimits: MobFeroxiMarkingLimits + dollPrototype: MobFeroxiDummy + skinColoration: Hues + maleFirstNames: names_first_male + femaleFirstNames: names_first_female + lastNames: names_last + +- type: speciesBaseSprites + id: MobFeroxiSprites + sprites: + Head: MobFeroxiHead + Hair: MobHumanoidAnyMarking + FacialHair: MobHumanoidAnyMarking + Snout: MobHumanoidAnyMarking + Chest: MobFeroxiTorso + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking + Tail: MobHumanoidAnyMarking + Eyes: MobHumanoidEyes + LArm: MobFeroxiLArm + RArm: MobFeroxiRArm + LHand: MobFeroxiLHand + RHand: MobFeroxiRHand + LLeg: MobFeroxiLLeg + RLeg: MobFeroxiRLeg + LFoot: MobFeroxiLFoot + RFoot: MobFeroxiRFoot + +- type: markingPoints + id: MobFeroxiMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + required: false + Head: + points: 3 + required: false + HeadTop: + points: 1 + required: true + defaultMarkings: [ FeroxiEars ] + Snout: + points: 1 + required: true + defaultMarkings: [ FeroxiSnout ] + Chest: + points: 3 + required: false + Arms: + points: 1 + required: false + Legs: + points: 1 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [ FeroxiTailAndDorsal ] + +- type: humanoidBaseSprite + id: MobFeroxiHead + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobFeroxiHeadMale + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobFeroxiHeadFemale + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobFeroxiTorso + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobFeroxiTorsoMale + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobFeroxiTorsoFemale + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobFeroxiLLeg + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobFeroxiLHand + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobFeroxiLArm + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobFeroxiLFoot + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobFeroxiRLeg + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobFeroxiRHand + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobFeroxiRArm + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobFeroxiRFoot + baseSprite: + sprite: _DV/Mobs/Species/Feroxi/parts.rsi + state: r_foot diff --git a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml index 1a250450e8..9aa8c54ca6 100644 --- a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml @@ -276,3 +276,75 @@ collection: MaleGasp DefaultDeathgasp: collection: MothDeathGasp + +- type: emoteSounds + id: MaleFeroxi + params: + variation: 0.125 + sounds: + Scream: + collection: MaleScreams + Laugh: + collection: MaleLaugh + Snore: + collection: Snores + Honk: + collection: BikeHorn + Sigh: + collection: MaleSigh + Crying: + collection: MaleCry + Whistle: + collection: Whistles + Weh: + collection: Weh + Hew: + collection: Hew + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + Yawn: + collection: MaleYawn + Gnash: + collection: FeroxiGnashes + Gasp: + collection: MaleGasp + DefaultDeathgasp: + collection: MaleDeathGasp + +- type: emoteSounds + id: FemaleFeroxi + params: + variation: 0.125 + sounds: + Scream: + collection: FemaleScreams + Laugh: + collection: FemaleLaugh + Sneeze: + collection: FemaleSneezes + Cough: + collection: FemaleCoughs + Yawn: + collection: FemaleYawn + Snore: + collection: Snores + Honk: + collection: CluwneHorn + Sigh: + collection: FemaleSigh + Crying: + collection: FemaleCry + Whistle: + collection: Whistles + Weh: + collection: Weh + Hew: + collection: Hew + Gnash: + collection: FeroxiGnashes + Gasp: + collection: FemaleGasp + DefaultDeathgasp: + collection: FemaleDeathGasp diff --git a/Resources/Prototypes/_DV/Voice/speech_emotes.yml b/Resources/Prototypes/_DV/Voice/speech_emotes.yml index be396f03cd..8485bc47ec 100644 --- a/Resources/Prototypes/_DV/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_DV/Voice/speech_emotes.yml @@ -215,3 +215,38 @@ - awoos - awooing - awooed + +# Feroxi +- type: emote + id: Gnash + name: delta-chat-emote-name-gnash + category: Vocal + available: false + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: [gnashes.] + chatTriggers: + - gnash + - gnashes + - gnashing + - gnashed + - gnash teeth + - gnashes teeth + - gnashing teeth + - gnashed teeth + - gnashes their teeth + - gnashes her teeth + - gnashes his teeth + - gnashes its teeth + - gnashing their teeth + - gnashing her teeth + - gnashing his teeth + - gnashing its teeth + - gnashed their teeth + - gnashed her teeth + - gnashed his teeth + - gnashed its teeth diff --git a/Resources/Prototypes/_DV/Voice/speech_verbs.yml b/Resources/Prototypes/_DV/Voice/speech_verbs.yml index e5c4b72724..ecb6fb7404 100644 --- a/Resources/Prototypes/_DV/Voice/speech_verbs.yml +++ b/Resources/Prototypes/_DV/Voice/speech_verbs.yml @@ -42,3 +42,12 @@ - chat-speech-verb-chitinid-2 - chat-speech-verb-chitinid-3 - chat-speech-verb-chitinid-4 + +- type: speechVerb + id: Feroxi + name: chat-speech-verb-name-feroxi + speechVerbStrings: + - chat-speech-verb-feroxi-1 + - chat-speech-verb-feroxi-2 + - chat-speech-verb-feroxi-3 + - chat-speech-verb-feroxi-4 diff --git a/Resources/Prototypes/_DV/typing_indicator.yml b/Resources/Prototypes/_DV/typing_indicator.yml index 6958106dde..ae5e758193 100644 --- a/Resources/Prototypes/_DV/typing_indicator.yml +++ b/Resources/Prototypes/_DV/typing_indicator.yml @@ -21,3 +21,8 @@ spritePath: /Textures/_DV/Effects/speech.rsi typingState: thaven0 offset: -0.2, 0.1 # 0625 + +- type: typingIndicator + id: feroxi + spritePath: /Textures/_DV/Effects/speech.rsi + typingState: feroxi0 diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml index de00242f59..cced8c038f 100644 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp1.yml @@ -2,7 +2,7 @@ id: CyberLimbsMarkingComp1LArm bodyPart: LArm markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_arm-primary @@ -15,7 +15,7 @@ id: CyberLimbsMarkingComp1LHand bodyPart: LHand markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_hand @@ -24,7 +24,7 @@ id: CyberLimbsMarkingComp1LLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_leg-primary @@ -36,7 +36,7 @@ id: CyberLimbsMarkingComp1LFoot bodyPart: LFoot markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: l_foot @@ -47,7 +47,7 @@ id: CyberLimbsMarkingComp1RArm bodyPart: RArm markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_arm-primary @@ -61,7 +61,7 @@ id: CyberLimbsMarkingComp1RHand bodyPart: RHand markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_hand @@ -70,7 +70,7 @@ id: CyberLimbsMarkingComp1RLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_leg-primary @@ -82,7 +82,7 @@ id: CyberLimbsMarkingComp1RFoot bodyPart: RFoot markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp1/comp1_main.rsi state: r_foot diff --git a/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml b/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml index fd9b42cfd7..9057f654fb 100644 --- a/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml +++ b/Resources/Prototypes/_EE/Entities/Mobs/Customization/cyberlimbs/comp2.yml @@ -2,7 +2,7 @@ id: CyberLimbsMarkingComp2LArm bodyPart: LArm markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_arm-1 @@ -13,7 +13,7 @@ id: CyberLimbsMarkingComp2LHand bodyPart: LHand markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_hand-1 @@ -24,7 +24,7 @@ id: CyberLimbsMarkingComp2LLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_leg-1 @@ -36,7 +36,7 @@ id: CyberLimbsMarkingComp2LFoot bodyPart: LFoot markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: l_foot-1 @@ -49,7 +49,7 @@ id: CyberLimbsMarkingComp2RArm bodyPart: RArm markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_arm-1 @@ -61,7 +61,7 @@ id: CyberLimbsMarkingComp2RHand bodyPart: RHand markingCategory: Arms - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_hand-1 @@ -73,7 +73,7 @@ id: CyberLimbsMarkingComp2RLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_leg-1 @@ -85,7 +85,7 @@ id: CyberLimbsMarkingComp2RFoot bodyPart: RFoot markingCategory: Legs - speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia] + speciesRestriction: [Moth, Human, Arachnid, Felinid, Oni, Vulpkanin, Reptilian, Rodentia, Feroxi] # DeltaV - Feroxi sprites: - sprite: _EE/Mobs/Customization/cyberlimbs/comp2/comp2_main.rsi state: r_foot-1 diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml index 5161d4cb9b..0bf010543b 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/undershirt.yml @@ -2,7 +2,7 @@ id: UndershirtDefault bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -16,7 +16,7 @@ id: UndershirtRolled bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -30,7 +30,7 @@ id: UndershirtSleeveless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -44,7 +44,7 @@ id: UndershirtRolledSleeveless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -58,7 +58,7 @@ id: UndershirtGrossSleeveless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -72,7 +72,7 @@ id: UndershirtNanotrasen bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -86,7 +86,7 @@ id: UndershirtBinder bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -100,7 +100,7 @@ id: UndershirtBraClassic bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -114,7 +114,7 @@ id: UndershirtBraSports bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -128,7 +128,7 @@ id: UndershirtBraStrapless bodyPart: Undershirt markingCategory: Undershirt - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml index f3bf745377..b8199e4b43 100644 --- a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/underwear.yml @@ -2,7 +2,7 @@ id: UnderwearDefault bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -16,7 +16,7 @@ id: UnderwearBriefs bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -30,7 +30,7 @@ id: UnderwearLowriders bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -44,7 +44,7 @@ id: UnderwearSatin bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: @@ -58,7 +58,7 @@ id: UnderwearTanga bodyPart: Underwear markingCategory: Underwear - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid] # Delta V - Chitinid, + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Diona, Moth, Vulpkanin, Rodentia, Harpy, Felinid, Vox, Oni, Chitinid, Feroxi] # Delta V - Chitinid, Feroxi coloring: default: type: diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index 212eac983c..06a6cde246 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -26,6 +26,7 @@ + diff --git a/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml b/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml new file mode 100644 index 0000000000..161b636cd3 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml @@ -0,0 +1,30 @@ + + # Feroxi + + + + + + The Feroxi (fer-ox-i) are a race of humanoid shark-like beings. Carnivourous in nature with a strong bite force. + + ## Diet + + - Can ONLY eat meat. + - Will get poisoned by Theobromine (Chocolate, Tea, Coffee) and Allicin (Onion, Garlic). + + ## Benefits + + - Uses their jaws to do piercing damage, and harder than other species, rivaling Oni. + - Their cartilaginous skeleton allows them to resist blunt force trauma more easily. + - Their adaptation to native environments allows them to resist the cold more easily. + - Their biology allow them to breathe water vapour. + + ## Drawbacks + + - They take 10% more Slash damage. + - Gets thirsty 100% faster. That's faster than a Diona! + - When thirst falls to "Parched" they begin to suffocate. Have water handy! + - Saline is too salty! It hydrates you much less! + - Your lungs are unremovable as theyre intergrated with your gills. + + diff --git a/Resources/Textures/_DV/Effects/creampie.rsi/creampie_feroxi.png b/Resources/Textures/_DV/Effects/creampie.rsi/creampie_feroxi.png new file mode 100644 index 0000000000..c3c34b6e50 Binary files /dev/null and b/Resources/Textures/_DV/Effects/creampie.rsi/creampie_feroxi.png differ diff --git a/Resources/Textures/_DV/Effects/creampie.rsi/meta.json b/Resources/Textures/_DV/Effects/creampie.rsi/meta.json index dc74e11cc0..c0cb775a3f 100644 --- a/Resources/Textures/_DV/Effects/creampie.rsi/meta.json +++ b/Resources/Textures/_DV/Effects/creampie.rsi/meta.json @@ -1,19 +1,23 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Edited by Floofers and portfiend", - "states": [ - { - "name": "creampie_vulpkanin", - "directions": 4 - }, - { - "name": "creampie_rodentia", - "directions": 4 - } - ] + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by Floofers, portfiend and BlitzTheSquishy", + "states": [ + { + "name": "creampie_vulpkanin", + "directions": 4 + }, + { + "name": "creampie_rodentia", + "directions": 4 + }, + { + "name": "creampie_feroxi", + "directions": 4 + } + ] } diff --git a/Resources/Textures/_DV/Effects/speech.rsi/feroxi0.png b/Resources/Textures/_DV/Effects/speech.rsi/feroxi0.png new file mode 100644 index 0000000000..a171bdb2da Binary files /dev/null and b/Resources/Textures/_DV/Effects/speech.rsi/feroxi0.png differ diff --git a/Resources/Textures/_DV/Effects/speech.rsi/feroxi1.png b/Resources/Textures/_DV/Effects/speech.rsi/feroxi1.png new file mode 100644 index 0000000000..2d47c2766d Binary files /dev/null and b/Resources/Textures/_DV/Effects/speech.rsi/feroxi1.png differ diff --git a/Resources/Textures/_DV/Effects/speech.rsi/feroxi2.png b/Resources/Textures/_DV/Effects/speech.rsi/feroxi2.png new file mode 100644 index 0000000000..7ff1e6f5ea Binary files /dev/null and b/Resources/Textures/_DV/Effects/speech.rsi/feroxi2.png differ diff --git a/Resources/Textures/_DV/Effects/speech.rsi/meta.json b/Resources/Textures/_DV/Effects/speech.rsi/meta.json index eb055d9d57..9193b20805 100644 --- a/Resources/Textures/_DV/Effects/speech.rsi/meta.json +++ b/Resources/Textures/_DV/Effects/speech.rsi/meta.json @@ -1,11 +1,11 @@ -{ +{ "version": 1, "size": { "x": 32, "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Felinid sprites made by Adrian16199 (Github), Rodentia sprites made by portfiend", + "copyright": "Felinid sprites made by Adrian16199 (Github), Rodentia sprites made by portfiend, Feroxi sprites made by BlitzTheSquishy", "states": [ { "name": "felinid0", @@ -74,6 +74,23 @@ 0.3 ] ] + }, + { + "name": "feroxi0", + "delays": [ + [ + 0.2, + 0.3, + 0.3, + 0.5 + ] + ] + }, + { + "name": "feroxi1" + }, + { + "name": "feroxi2" } ] } diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-blitz.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-blitz.png new file mode 100644 index 0000000000..eb2b8391b7 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-blitz.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-tiger.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-tiger.png new file mode 100644 index 0000000000..195377a94a Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-tiger.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-head-stripes-tiger.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-head-stripes-tiger.png new file mode 100644 index 0000000000..2083785e86 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-head-stripes-tiger.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-blitz.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-blitz.png new file mode 100644 index 0000000000..5ae825cc12 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-blitz.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-tiger.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-tiger.png new file mode 100644 index 0000000000..f23df762ac Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-tiger.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-f.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-f.png new file mode 100644 index 0000000000..dfd82e0f2a Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-f.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-m.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-m.png new file mode 100644 index 0000000000..329a6e88a4 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-m.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-blitz.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-blitz.png new file mode 100644 index 0000000000..ee93064e4a Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-blitz.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-tiger.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-tiger.png new file mode 100644 index 0000000000..71474ed301 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-tiger.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json new file mode 100644 index 0000000000..145c0f0c2b --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Stripes made by BlitzTheSquishy, Countershading made by Emily9031", + "size":{ + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "feroxi-torso-stripes-blitz", + "directions": 4 + }, + { + "name": "feroxi-arm-stripes-blitz", + "directions": 4 + }, + { + "name": "feroxi-leg-stripes-blitz", + "directions": 4 + }, + { + "name": "feroxi-torso-countershading-m", + "directions": 4 + }, + { + "name": "feroxi-torso-countershading-f", + "directions": 4 + }, + { + "name": "feroxi-torso-stripes-tiger", + "directions": 4 + }, + { + "name": "feroxi-arm-stripes-tiger", + "directions": 4 + }, + { + "name": "feroxi-leg-stripes-tiger", + "directions": 4 + }, + { + "name": "feroxi-head-stripes-tiger", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-inner.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-inner.png new file mode 100644 index 0000000000..e05811cd9a Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-inner.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-tips.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-tips.png new file mode 100644 index 0000000000..c38913dd67 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-tips.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears.png new file mode 100644 index 0000000000..8a4ca1aa0e Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json new file mode 100644 index 0000000000..4f0707b4c9 --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by BlitzTheSquishy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "feroxi-ears", + "directions": 4 + }, + { + "name": "feroxi-ears-inner", + "directions": 4 + }, + { + "name": "feroxi-ears-tips", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-countershading.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-countershading.png new file mode 100644 index 0000000000..ac58aa3e01 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-countershading.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-nurse.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-nurse.png new file mode 100644 index 0000000000..d01ad85758 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-nurse.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-stripe.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-stripe.png new file mode 100644 index 0000000000..23af628a68 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-stripe.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png new file mode 100644 index 0000000000..a46c41813d Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json new file mode 100644 index 0000000000..4fb1776744 --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by BlitzTheSquishy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "feroxi-snout", + "directions": 4 + }, + { + "name": "feroxi-snout-stripe", + "directions": 4 + }, + { + "name": "feroxi-snout-countershading", + "directions": 4 + }, + { + "name": "feroxi-snout-nurse", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-stripes.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-stripes.png new file mode 100644 index 0000000000..9914b9d80e Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-stripes.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-tip.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-tip.png new file mode 100644 index 0000000000..6f4cea1fdc Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-tip.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal.png new file mode 100644 index 0000000000..6f44074629 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-bottom-tip.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-bottom-tip.png new file mode 100644 index 0000000000..624f4b4d35 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-bottom-tip.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-second-dorsal-tip.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-second-dorsal-tip.png new file mode 100644 index 0000000000..0ef74a2293 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-second-dorsal-tip.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-stripes.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-stripes.png new file mode 100644 index 0000000000..acb9ab8e3e Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-stripes.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-top-tip.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-top-tip.png new file mode 100644 index 0000000000..7a263bc0dc Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-top-tip.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-under.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-under.png new file mode 100644 index 0000000000..471867639c Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-under.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail.png new file mode 100644 index 0000000000..00570d0e22 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json new file mode 100644 index 0000000000..e122a88398 --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json @@ -0,0 +1,48 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by BlitzTheSquishy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "feroxi-tail", + "directions": 4 + }, + { + "name": "feroxi-tail-top-tip", + "directions": 4 + }, + { + "name": "feroxi-tail-bottom-tip", + "directions": 4 + }, + { + "name": "feroxi-tail-second-dorsal-tip", + "directions": 4 + }, + + { + "name": "feroxi-tail-under", + "directions": 4 + }, + { + "name": "feroxi-tail-stripes", + "directions": 4 + }, + { + "name": "feroxi-dorsal", + "directions": 4 + }, + { + "name": "feroxi-dorsal-tip", + "directions": 4 + }, + { + "name": "feroxi-dorsal-stripes", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/full.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/full.png new file mode 100644 index 0000000000..9ccc38350d Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/full.png differ diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/head_f.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/head_f.png new file mode 100644 index 0000000000..04ffbcbe87 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/head_f.png differ diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/head_m.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/head_m.png new file mode 100644 index 0000000000..dc9f32e9b1 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/head_m.png differ diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_arm.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_arm.png new file mode 100644 index 0000000000..90352d9f23 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_arm.png differ diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_foot.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_foot.png new file mode 100644 index 0000000000..7a40a74ec1 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_foot.png differ diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_hand.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_hand.png new file mode 100644 index 0000000000..ab5c98c5e4 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_hand.png differ diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_leg.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_leg.png new file mode 100644 index 0000000000..a3bc415fc0 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/l_leg.png differ diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/meta.json b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/meta.json new file mode 100644 index 0000000000..cdf0d802fe --- /dev/null +++ b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi, modified by BlitzTheSquishy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_arm.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_arm.png new file mode 100644 index 0000000000..59e0ec71e3 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_arm.png differ diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_foot.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_foot.png new file mode 100644 index 0000000000..d5e1985ef5 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_foot.png differ diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_hand.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_hand.png new file mode 100644 index 0000000000..0d5957e191 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_hand.png differ diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_leg.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_leg.png new file mode 100644 index 0000000000..a17d429906 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/r_leg.png differ diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/torso_f.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/torso_f.png new file mode 100644 index 0000000000..8bfe93d386 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/torso_f.png differ diff --git a/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/torso_m.png b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/torso_m.png new file mode 100644 index 0000000000..396a20064e Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Species/Feroxi/parts.rsi/torso_m.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-BELT.png new file mode 100644 index 0000000000..26672b7c9d Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000..1a477780f7 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-cat.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000..9fc2615cc0 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-dog.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000..08bc852f33 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-fox.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png new file mode 100644 index 0000000000..6ba8ab62ba Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png new file mode 100644 index 0000000000..0b5ffd4856 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-pig.png new file mode 100644 index 0000000000..91dabfcb3d Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-pig.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000..5048181bff Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-possum.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000..6b5deece8c Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000..dfb17c0a0a Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..26672b7c9d Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/icon.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/icon.png new file mode 100644 index 0000000000..38b79ca0e7 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-left.png new file mode 100644 index 0000000000..b2b69543ed Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-right.png new file mode 100644 index 0000000000..90b5b348d1 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/meta.json new file mode 100644 index 0000000000..8b865f4e29 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by BlitzTHeSquishy, Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-hamster", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-kangaroo", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [[1], [1], [1], [1]] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-BELT.png new file mode 100644 index 0000000000..0da6de00a0 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000..7bbe6010c8 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-cat.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000..530cf7f1a5 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-dog.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000..b4c88309b1 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-fox.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png new file mode 100644 index 0000000000..7cca5779c1 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png new file mode 100644 index 0000000000..232f2c9b3e Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-pig.png new file mode 100644 index 0000000000..23a6da6f44 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-pig.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000..b0e61db129 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-possum.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000..184417f953 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000..07e69b2272 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..0da6de00a0 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/icon.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/icon.png new file mode 100644 index 0000000000..ea10d61fde Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/inhand-left.png new file mode 100644 index 0000000000..901127b514 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/inhand-right.png new file mode 100644 index 0000000000..e62fc61942 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/meta.json new file mode 100644 index 0000000000..12f077963a --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by BlitzTheSquishy, Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-kangaroo", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-hamster", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-BELT.png new file mode 100644 index 0000000000..0da6de00a0 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000..7bbe6010c8 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-cat.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000..530cf7f1a5 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-dog.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000..b4c88309b1 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-fox.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png new file mode 100644 index 0000000000..7cca5779c1 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png new file mode 100644 index 0000000000..232f2c9b3e Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-pig.png new file mode 100644 index 0000000000..23a6da6f44 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-pig.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000..b0e61db129 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-possum.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000..184417f953 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000..07e69b2272 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..0da6de00a0 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/icon.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/icon.png new file mode 100644 index 0000000000..d83da2df0e Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-left.png new file mode 100644 index 0000000000..901127b514 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-right.png new file mode 100644 index 0000000000..e62fc61942 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/meta.json new file mode 100644 index 0000000000..ac29190538 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by BlitzTheSquishy, Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-kangaroo", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-hamster", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-BACKPACK.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..a77c794670 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000..78c6d23a13 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-cat.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000..4574831244 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-dog.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000..c466744d3a Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-fox.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-hamster.png new file mode 100644 index 0000000000..bdc52b7f90 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-hamster.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png new file mode 100644 index 0000000000..12ba6b7192 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-pig.png new file mode 100644 index 0000000000..0c1e5d6c94 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-pig.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000..8f5fe6a29d Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-possum.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000..b826d038fe Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-puppy.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-secdog.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-secdog.png new file mode 100644 index 0000000000..6868304980 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-secdog.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000..a74bf202f0 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-sloth.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..a77c794670 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/icon.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/icon.png new file mode 100644 index 0000000000..ec36474956 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/icon.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/inhand-left.png new file mode 100644 index 0000000000..c0eb8e38a8 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/inhand-right.png new file mode 100644 index 0000000000..3b2527a6f8 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/meta.json new file mode 100644 index 0000000000..f34881842b --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/meta.json @@ -0,0 +1,80 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by BlitzTheSquishy, Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Suit and back storages drawn by Ubaser. equipped-SUITSTORAGE-secdog taken from generic.rsi.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-secdog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-hamster", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-kangaroo", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}