diff --git a/Content.Server/_Lavaland/Procedural/Systems/LavalandSystem.Ruins.cs b/Content.Server/_Lavaland/Procedural/Systems/LavalandSystem.Ruins.cs index 96d91fda8f0b..d76e8de033b0 100644 --- a/Content.Server/_Lavaland/Procedural/Systems/LavalandSystem.Ruins.cs +++ b/Content.Server/_Lavaland/Procedural/Systems/LavalandSystem.Ruins.cs @@ -168,7 +168,7 @@ private void LoadGridRuin( return; } - usedSpace.Add(ruinBox); + usedSpace.Add(ruinBox.Translated(coord.Value)); coords.Remove(coord.Value); // Teleport it into place on preloader map @@ -232,7 +232,7 @@ private void LoadMarkerRuin( Spawn(ruin.SpawnedMarker, new EntityCoordinates(lavaland, coord.Value)); - usedSpace.Add(ruinBox); + usedSpace.Add(ruinBox.Translated(coord.Value)); coords.Remove(coord.Value); } diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs index dd6859e66522..a7aac5eac63a 100644 --- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs +++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs @@ -619,11 +619,13 @@ public virtual void LoadProfile(EntityUid uid, HumanoidCharacterProfile? profile humanoid.Age = profile.Age; - // CorvaxGoob-Clearing // begin Goobstation: port EE height/width sliders var species = _proto.Index(humanoid.Species); - SetScale(uid, new Vector2(species.DefaultWidth, species.DefaultHeight), true, humanoid); + if (profile.Height <= 0 || profile.Width <= 0) + SetScale(uid, new Vector2(species.DefaultWidth, species.DefaultHeight), true, humanoid); + else + SetScale(uid, new Vector2(profile.Width, profile.Height), true, humanoid); _heightAdjust.SetScale(uid, new Vector2(humanoid.Width, humanoid.Height)); // end Goobstation: port EE height/width sliders diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/attributions.yml b/Resources/Audio/_Erida/Voice/Shadowkin/attributions.yml new file mode 100644 index 000000000000..c654bbbe387b --- /dev/null +++ b/Resources/Audio/_Erida/Voice/Shadowkin/attributions.yml @@ -0,0 +1,29 @@ +- files: ["wurble.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from CHOMPStation" + source: "https://github.com/CHOMPStation2/CHOMPStation2" + +- files: ["fox-growl.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from DeadSpace" + source: "https://github.com/dead-space-server/space-station-14-fobos" + +- files: ["mrrp.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from Citadel Station 13" + source: "https://github.com/Citadel-Station-13/Citadel-Station-13-RP" + +- files: ["dog_growl1.ogg", "dog_growl2.ogg", "dog_growl3.ogg"] + license: "CC0-1.0" + copyright: "Original sound by GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/ - cut out three clips of dog growling, cleaned up, converted to ogg" + source: "https://freesound.org/people/Glitchedtones/sounds/372533/" + +- files: ["fox-scream3.ogg, fox-scream4.ogg, fox-scream5.ogg, fox-scream6.ogg, fox-scream7.ogg, scream1.ogg, scream2.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from LuaWorld frontier" + source: "https://github.com/Lua-Frontier/sector-frontier-14" + +- files: ["speak_mrrp.ogg, speak_mrrp_ask.ogg, mrrp2.ogg"] + license: "CC0-1.0" + copyright: "Taken from https://free-sound-effects.net" + source: "https://free-sound-effects.net" diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/fox-growl.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/fox-growl.ogg new file mode 100644 index 000000000000..80f9d4dbdb8c Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/fox-growl.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream3.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream3.ogg new file mode 100644 index 000000000000..285a0716e8ac Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream3.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream4.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream4.ogg new file mode 100644 index 000000000000..1d60942d4fd3 Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream4.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream5.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream5.ogg new file mode 100644 index 000000000000..116dd5812783 Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream5.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream6.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream6.ogg new file mode 100644 index 000000000000..777495fd42c7 Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream6.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream7.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream7.ogg new file mode 100644 index 000000000000..6c79d3ac60e1 Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/fox-scream7.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/growl1.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/growl1.ogg new file mode 100644 index 000000000000..d2c99e97e7e0 Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/growl1.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/growl2.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/growl2.ogg new file mode 100644 index 000000000000..3eb018413a56 Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/growl2.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/growl3.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/growl3.ogg new file mode 100644 index 000000000000..84b505442d24 Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/growl3.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/mrrp.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/mrrp.ogg new file mode 100644 index 000000000000..7c617d9c522b Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/mrrp.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/mrrp2.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/mrrp2.ogg new file mode 100644 index 000000000000..b3140124829f Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/mrrp2.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/speak_mrrp_ask.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/speak_mrrp_ask.ogg new file mode 100644 index 000000000000..789f45ca0b5f Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/speak_mrrp_ask.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/speak_mrrp_say.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/speak_mrrp_say.ogg new file mode 100644 index 000000000000..b6097a26d5d0 Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/speak_mrrp_say.ogg differ diff --git a/Resources/Audio/_Erida/Voice/Shadowkin/wurble.ogg b/Resources/Audio/_Erida/Voice/Shadowkin/wurble.ogg new file mode 100644 index 000000000000..f5ee488ed5aa Binary files /dev/null and b/Resources/Audio/_Erida/Voice/Shadowkin/wurble.ogg differ diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index 1c0665b9e5c6..f8dae3ca3ea0 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -18,8 +18,6 @@ requiredLegs: 2 - type: HumanoidAppearance species: Vox - undergarmentTop: UndergarmentTopTanktopVox - undergarmentBottom: UndergarmentBottomBoxersVox markingsDisplacement: # Goobstation? Hair: sizeMaps: @@ -318,8 +316,6 @@ components: - type: HumanoidAppearance species: Vox - undergarmentTop: UndergarmentTopTanktopVox - undergarmentBottom: UndergarmentBottomBoxersVox markingsDisplacement: # Goobstation? Hair: sizeMaps: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_plastic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_plastic.yml index 89ceb6995027..16180e875610 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_plastic.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_plastic.yml @@ -23,6 +23,7 @@ - type: Tag tags: - DrinkBottle # Needed to fit in the soda dispenser, needs a better name + - MolotovConstruction # Erida - type: Construction #Goob content graph: MolotovConstruction node: start diff --git a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml index 4d1e8821f826..17b26d62f667 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/felinid.yml @@ -3,7 +3,7 @@ - type: species id: Felinid name: species-name-felinid - roundStart: false # Goobstation change + roundStart: true prototype: MobFelinid sprites: MobHumanSprites markingLimits: MobFelinidMarkingLimits diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 22a9355cd09d..c307d611b6b5 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -23,8 +23,6 @@ TailOversuit: MobHumanoidAnyMarking # floof Head: MobArachnidHead Snout: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking Chest: MobArachnidChest Groin: MobArachnidGroin Hair: MobHumanoidAnyMarking # imp, arachnid hair arachnid hair! @@ -67,12 +65,6 @@ Chest: points: 100 required: false - UndergarmentBottom: - points: 10 - required: false - UndergarmentTop: - points: 10 - required: false RightLeg: points: 10 required: false diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml index bdfaae789250..8f94a2eb0408 100644 --- a/Resources/Prototypes/Species/diona.yml +++ b/Resources/Prototypes/Species/diona.yml @@ -23,8 +23,6 @@ Head: MobDionaHead HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking Chest: MobDionaChest Groin: MobDionaGroin Eyes: MobDionaEyes @@ -49,12 +47,6 @@ HeadSide: points: 10 required: false - UndergarmentTop: - points: 10 - required: false - UndergarmentBottom: - points: 10 - required: false Chest: points: 10 required: false diff --git a/Resources/Prototypes/Species/gingerbread.yml b/Resources/Prototypes/Species/gingerbread.yml index eba65e84ba4f..46d9736adc7d 100644 --- a/Resources/Prototypes/Species/gingerbread.yml +++ b/Resources/Prototypes/Species/gingerbread.yml @@ -19,8 +19,6 @@ Head: MobGingerbreadHead HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking Chest: MobGingerbreadChest Groin: MobGingerbreadGroin Eyes: MobGingerbreadEyes diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml index 3a5e4338e23e..f90e102a76b8 100644 --- a/Resources/Prototypes/Species/human.yml +++ b/Resources/Prototypes/Species/human.yml @@ -35,8 +35,6 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking Chest: MobHumanChest Groin: MobHumanGroin Eyes: MobHumanoidEyes @@ -70,12 +68,6 @@ HeadTop: points: 10 required: false - UndergarmentTop: - points: 10 - required: false - UndergarmentBottom: - points: 10 - required: false HeadSide: points: 10 required: false diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml index 5b0b67611a3d..94796908b497 100644 --- a/Resources/Prototypes/Species/moth.yml +++ b/Resources/Prototypes/Species/moth.yml @@ -33,8 +33,6 @@ Hair: MobHumanoidAnyMarking # Erida FacialHair: MobHumanoidAnyMarking # Erida Snout: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking Chest: MobMothChest Groin: MobMothGroin # Goob HeadTop: MobHumanoidAnyMarking @@ -82,12 +80,6 @@ Head: points: 10 required: false - UndergarmentTop: - points: 10 - required: false - UndergarmentBottom: - points: 10 - required: false Chest: points: 10 required: false diff --git a/Resources/Prototypes/Species/reptilian.yml b/Resources/Prototypes/Species/reptilian.yml index 21273f1c3861..470a0c1fa67e 100644 --- a/Resources/Prototypes/Species/reptilian.yml +++ b/Resources/Prototypes/Species/reptilian.yml @@ -23,8 +23,6 @@ Head: MobReptilianHead Face: MobHumanoidAnyMarking # Goob? Snout: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking Chest: MobReptilianChest Groin: MobReptilianGroin HeadTop: MobHumanoidAnyMarking @@ -63,12 +61,6 @@ HeadSide: points: 10 # WWDP-Edit required: false - UndergarmentTop: - points: 10 - required: false - UndergarmentBottom: - points: 10 - required: false Chest: points: 10 required: false diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index bd904e1fa85b..c0b4c98be13f 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -21,8 +21,6 @@ HeadSide: MobHumanoidAnyMarking Hair: MobSlimeMarkingFollowSkin FacialHair: MobSlimeMarkingFollowSkin - UndergarmentTop: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking Chest: MobSlimeChest Groin: MobSlimeGroin Eyes: MobHumanoidEyes @@ -34,6 +32,8 @@ RLeg: MobSlimeRLeg LFoot: MobSlimeLFoot RFoot: MobSlimeRFoot + HeadTop: MobHumanoidAnyMarking # Erida + Tail: MobHumanoidAnyMarking # Erida - type: markingPoints id: MobSlimeMarkingLimits @@ -56,12 +56,6 @@ Chest: points: 10 required: false - UndergarmentBottom: # Goob - points: 10 - required: false - UndergarmentTop: # Goob - points: 10 - required: false RightLeg: points: 10 required: false diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml index d8596d705584..7a297ffec477 100644 --- a/Resources/Prototypes/Species/vox.yml +++ b/Resources/Prototypes/Species/vox.yml @@ -25,8 +25,6 @@ Snout: MobHumanoidAnyMarking Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking Chest: MobVoxChest Groin: MobVoxGroin Eyes: MobVoxEyes @@ -67,12 +65,6 @@ points: 10 required: true defaultMarkings: [ VoxLLegScales, VoxRLegScales, VoxRFootScales, VoxLFootScales ] - UndergarmentTop: - points: 10 - required: false - UndergarmentBottom: - points: 10 - required: false Chest: points: 10 required: false diff --git a/Resources/Prototypes/Stacks/Specific/medical.yml b/Resources/Prototypes/Stacks/Specific/medical.yml index f7c93a7fc841..f90d7652191a 100644 --- a/Resources/Prototypes/Stacks/Specific/medical.yml +++ b/Resources/Prototypes/Stacks/Specific/medical.yml @@ -19,6 +19,7 @@ - type: stack parent: BaseSmallStack id: Gauze + maxCount: 15 # Erida name: stack-gauze icon: { sprite: "/Textures/_Erida/Objects/Specific/Medical/medical.rsi", state: gauze } spawn: Gauze diff --git a/Resources/Prototypes/_DV/Species/chitinid.yml b/Resources/Prototypes/_DV/Species/chitinid.yml index 555d28fd33aa..b74859d872b3 100644 --- a/Resources/Prototypes/_DV/Species/chitinid.yml +++ b/Resources/Prototypes/_DV/Species/chitinid.yml @@ -21,8 +21,6 @@ Groin: MobChitinidGroin HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking Tail: MobHumanoidAnyMarking Eyes: MobChitinidEyes LArm: MobChitinidLArm diff --git a/Resources/Prototypes/_DV/Species/feroxi.yml b/Resources/Prototypes/_DV/Species/feroxi.yml index ec31f118009f..09225cbfd1b0 100644 --- a/Resources/Prototypes/_DV/Species/feroxi.yml +++ b/Resources/Prototypes/_DV/Species/feroxi.yml @@ -22,8 +22,6 @@ Chest: MobFeroxiChest Groin: MobFeroxiGroin HeadTop: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking Tail: MobHumanoidAnyMarking Eyes: MobHumanoidEyes LArm: MobFeroxiLArm diff --git a/Resources/Prototypes/_DV/Species/harpy.yml b/Resources/Prototypes/_DV/Species/harpy.yml index 00529c001f1c..ee85836ead24 100644 --- a/Resources/Prototypes/_DV/Species/harpy.yml +++ b/Resources/Prototypes/_DV/Species/harpy.yml @@ -29,8 +29,6 @@ Groin: MobHarpyGroin HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking Tail: MobHumanoidAnyMarking Eyes: MobHumanoidEyes LArm: MobHarpyLArm @@ -69,12 +67,6 @@ points: 10 required: true defaultMarkings: [ HarpyChestDefault ] - UndergarmentBottom: - points: 10 - required: false - UndergarmentTop: - points: 10 - required: false RightLeg: points: 10 required: false diff --git a/Resources/Prototypes/_DV/Species/rodentia.yml b/Resources/Prototypes/_DV/Species/rodentia.yml index 7860ff071a77..f813501ee8de 100644 --- a/Resources/Prototypes/_DV/Species/rodentia.yml +++ b/Resources/Prototypes/_DV/Species/rodentia.yml @@ -31,8 +31,6 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking Chest: MobRodentiaChest Groin: MobRodentiaGroin HeadTop: MobHumanoidAnyMarking @@ -74,12 +72,6 @@ Chest: points: 100 required: false - UndergarmentBottom: - points: 10 - required: false - UndergarmentTop: - points: 10 - required: false RightLeg: points: 10 required: false diff --git a/Resources/Prototypes/_DV/Species/vulpkanin.yml b/Resources/Prototypes/_DV/Species/vulpkanin.yml index 42b83181e36c..e787cf15e06f 100644 --- a/Resources/Prototypes/_DV/Species/vulpkanin.yml +++ b/Resources/Prototypes/_DV/Species/vulpkanin.yml @@ -26,8 +26,6 @@ Groin: MobVulpkaninGroin HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking Tail: MobHumanoidAnyMarking Eyes: MobHumanoidEyes LArm: MobVulpkaninLArm diff --git a/Resources/Prototypes/_EinsteinEngines/Species/shadowkin.yml b/Resources/Prototypes/_EinsteinEngines/Species/shadowkin.yml index 6ad063715c05..4089958aab59 100644 --- a/Resources/Prototypes/_EinsteinEngines/Species/shadowkin.yml +++ b/Resources/Prototypes/_EinsteinEngines/Species/shadowkin.yml @@ -36,8 +36,6 @@ Snout: MobShadowkinAnyMarkingFollowSkin HeadTop: MobShadowkinAnyMarking HeadSide: MobShadowkinAnyMarkingFollowSkin - UndergarmentTop: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking Tail: MobShadowkinAnyMarkingFollowSkin Chest: MobShadowkinChest Groin: MobShadowkinGroin diff --git a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emote_sounds.yml index df392fd86d9a..e6047f617fb7 100644 --- a/Resources/Prototypes/_EinsteinEngines/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_EinsteinEngines/Voice/speech_emote_sounds.yml @@ -82,7 +82,7 @@ variation: 0.125 sounds: Scream: - collection: SlimeMaleScreams + collection: ShadowkinScreams # Erida Laugh: collection: MaleLaugh Sneeze: @@ -130,7 +130,7 @@ variation: 0.125 sounds: Scream: - collection: SlimeFemaleScreams + collection: ShadowkinScreams # Erida Laugh: collection: MaleLaugh Sneeze: diff --git a/Resources/Prototypes/_Erida/Loadouts/Miscellaneous/underwear.yml b/Resources/Prototypes/_Erida/Loadouts/Miscellaneous/underwear.yml index 1d01b49d06ce..f7f5cb531ac8 100644 --- a/Resources/Prototypes/_Erida/Loadouts/Miscellaneous/underwear.yml +++ b/Resources/Prototypes/_Erida/Loadouts/Miscellaneous/underwear.yml @@ -1,159 +1,159 @@ - type: loadout id: UnderwearBoxerShorts equipment: - underwear: ClothingUnderwearBoxerShorts + underpants: ClothingUnderwearBoxerShorts - type: loadout id: BoxerShortsAssBlastUSA equipment: - underwear: ClothingUnderwearBoxerShortsAssBlastUSA + underpants: ClothingUnderwearBoxerShortsAssBlastUSA - type: loadout id: BoxerShortsBee equipment: - underwear: ClothingUnderwearBoxerShortsBee + underpants: ClothingUnderwearBoxerShortsBee - type: loadout id: BoxerShortsBriefs equipment: - underwear: ClothingUnderwearBoxerShortsBriefs + underpants: ClothingUnderwearBoxerShortsBriefs - type: loadout id: BoxerShortsCommie equipment: - underwear: ClothingUnderwearBoxerShortsCommie + underpants: ClothingUnderwearBoxerShortsCommie - type: loadout id: BoxerShortsHeart equipment: - underwear: ClothingUnderwearBoxerShortsHeart + underpants: ClothingUnderwearBoxerShortsHeart - type: loadout id: BoxerShortsLong equipment: - underwear: ClothingUnderwearBoxerShortsLong + underpants: ClothingUnderwearBoxerShortsLong - type: loadout id: BoxerShortsSponge equipment: - underwear: ClothingUnderwearBoxerShortsSponge + underpants: ClothingUnderwearBoxerShortsSponge - type: loadout id: BoxerShortsStriped equipment: - underwear: ClothingUnderwearBoxerShortsStriped + underpants: ClothingUnderwearBoxerShortsStriped - type: loadout id: BoxerShortsUK equipment: - underwear: ClothingUnderwearBoxerShortsUK + underpants: ClothingUnderwearBoxerShortsUK - type: loadout id: Mankini equipment: - underwear: ClothingUnderwearMankini + underpants: ClothingUnderwearMankini - type: loadout id: Panties equipment: - underwear: ClothingUnderwearPanties + underpants: ClothingUnderwearPanties - type: loadout id: PantiesAssBlastUSA equipment: - underwear: ClothingUnderwearPantiesAssBlastUSA + underpants: ClothingUnderwearPantiesAssBlastUSA - type: loadout id: PantiesBeeKini equipment: - underwear: ClothingUnderwearPantiesBeeKini + underpants: ClothingUnderwearPantiesBeeKini - type: loadout id: PantiesBriefs equipment: - underwear: ClothingUnderwearPantiesBriefs + underpants: ClothingUnderwearPantiesBriefs - type: loadout id: PantiesCommie equipment: - underwear: ClothingUnderwearPantiesCommie + underpants: ClothingUnderwearPantiesCommie - type: loadout id: PantiesFishnet equipment: - underwear: ClothingUnderwearPantiesFishnet + underpants: ClothingUnderwearPantiesFishnet - type: loadout id: PantiesFishnetLower equipment: - underwear: ClothingUnderwearPantiesFishnetLower + underpants: ClothingUnderwearPantiesFishnetLower - type: loadout id: PantiesFishnetLowerAlt equipment: - underwear: ClothingUnderwearPantiesFishnetLowerAlt + underpants: ClothingUnderwearPantiesFishnetLowerAlt - type: loadout id: PantiesHarley equipment: - underwear: ClothingUnderwearPantiesHarley + underpants: ClothingUnderwearPantiesHarley - type: loadout id: PantiesJockstrap equipment: - underwear: ClothingUnderwearPantiesJockstrap + underpants: ClothingUnderwearPantiesJockstrap - type: loadout id: PantiesKinky equipment: - underwear: ClothingUnderwearPantiesKinky + underpants: ClothingUnderwearPantiesKinky - type: loadout id: PantiesLizared equipment: - underwear: ClothingUnderwearPantiesLizared + underpants: ClothingUnderwearPantiesLizared - type: loadout id: PantiesNeko equipment: - underwear: ClothingUnderwearPantiesNeko + underpants: ClothingUnderwearPantiesNeko - type: loadout id: PantiesSlim equipment: - underwear: ClothingUnderwearPantiesSlim + underpants: ClothingUnderwearPantiesSlim - type: loadout id: PantiesStriped equipment: - underwear: ClothingUnderwearPantiesStriped + underpants: ClothingUnderwearPantiesStriped - type: loadout id: PantiesSwimming equipment: - underwear: ClothingUnderwearPantiesSwimming + underpants: ClothingUnderwearPantiesSwimming - type: loadout id: PantiesThin equipment: - underwear: ClothingUnderwearPantiesThin + underpants: ClothingUnderwearPantiesThin - type: loadout id: PantiesUK equipment: - underwear: ClothingUnderwearPantiesUK + underpants: ClothingUnderwearPantiesUK - type: loadout id: PantiesAlt equipment: - underwear: ClothingUnderwearPantiesAlt + underpants: ClothingUnderwearPantiesAlt - type: loadout id: Thong equipment: - underwear: ClothingUnderwearThong + underpants: ClothingUnderwearThong - type: loadout id: ThongBabydoll equipment: - underwear: ClothingUnderwearThongBabydoll + underpants: ClothingUnderwearThongBabydoll diff --git a/Resources/Prototypes/_Erida/SoundCollections/shadowkin.yml b/Resources/Prototypes/_Erida/SoundCollections/shadowkin.yml new file mode 100644 index 000000000000..7d7db3edfbd6 --- /dev/null +++ b/Resources/Prototypes/_Erida/SoundCollections/shadowkin.yml @@ -0,0 +1,8 @@ +- type: soundCollection + id: ShadowkinScreams + files: + - /Audio/_Erida/Voice/Shadowkin/fox-scream3.ogg + - /Audio/_Erida/Voice/Shadowkin/fox-scream4.ogg + - /Audio/_Erida/Voice/Shadowkin/fox-scream5.ogg + - /Audio/_Erida/Voice/Shadowkin/fox-scream6.ogg + - /Audio/_Erida/Voice/Shadowkin/fox-scream7.ogg diff --git a/Resources/Prototypes/_Erida/Species/anthropomorph.yml b/Resources/Prototypes/_Erida/Species/anthropomorph.yml index 1af94fa26a25..4f60f5bc65ef 100644 --- a/Resources/Prototypes/_Erida/Species/anthropomorph.yml +++ b/Resources/Prototypes/_Erida/Species/anthropomorph.yml @@ -24,8 +24,6 @@ HeadSide: MobHumanoidAnyMarking Tail: MobHumanoidAnyMarking Eyes: MobHumanoidEyes - UndergarmentTop: MobHumanoidAnyMarking # erida edit - UndergarmentBottom: MobHumanoidAnyMarking # erida edit LArm: MobAnthropomorphLArm RArm: MobAnthropomorphRArm LHand: MobAnthropomorphLHand @@ -59,12 +57,6 @@ Snout: points: 10 required: false - UndergarmentTop: # erida edit - points: 10 - required: false - UndergarmentBottom: # erida edit - points: 10 - required: false Legs: points: 10 required: false diff --git a/Resources/Prototypes/_Floofstation/Species/resomi.yml b/Resources/Prototypes/_Floofstation/Species/resomi.yml index eb8d4173814f..1e2f0726a03c 100644 --- a/Resources/Prototypes/_Floofstation/Species/resomi.yml +++ b/Resources/Prototypes/_Floofstation/Species/resomi.yml @@ -34,8 +34,6 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking Chest: MobResomiChest Groin: MobResomiGroin Eyes: MobResomiEyes @@ -73,12 +71,6 @@ Chest: points: 100 required: false - UndergarmentBottom: - points: 10 - required: false - UndergarmentTop: - points: 10 - required: false RightLeg: points: 10 required: false diff --git a/Resources/Prototypes/_Goobstation/Species/tajaran.yml b/Resources/Prototypes/_Goobstation/Species/tajaran.yml index 7f9c2d3e6e99..2e28a789fa52 100644 --- a/Resources/Prototypes/_Goobstation/Species/tajaran.yml +++ b/Resources/Prototypes/_Goobstation/Species/tajaran.yml @@ -47,12 +47,6 @@ Chest: points: 100 required: false - UndergarmentTop: - points: 10 - required: false - UndergarmentBottom: - points: 10 - required: false RightLeg: points: 10 required: false @@ -87,8 +81,6 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking Chest: MobTajaranChest Groin: MobTajaranGroin Eyes: MobTajaranEyes diff --git a/Resources/Prototypes/_Goobstation/Species/yowie.yml b/Resources/Prototypes/_Goobstation/Species/yowie.yml index cf0329764cff..b975448f89dd 100644 --- a/Resources/Prototypes/_Goobstation/Species/yowie.yml +++ b/Resources/Prototypes/_Goobstation/Species/yowie.yml @@ -37,8 +37,6 @@ Hair: MobHumanoidAnyMarking FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking Chest: MobYowieChest Groin: MobYowieGroin Eyes: MobHumanoidEyes @@ -77,12 +75,6 @@ Chest: points: 100 required: false - UndergarmentBottom: - points: 10 - required: false - UndergarmentTop: - points: 10 - required: false RightLeg: points: 10 required: false diff --git a/Resources/Prototypes/_Obelisk/Species/hydrakin.yml b/Resources/Prototypes/_Obelisk/Species/hydrakin.yml index 74a6cd7b32d5..6ec51e87ddbb 100644 --- a/Resources/Prototypes/_Obelisk/Species/hydrakin.yml +++ b/Resources/Prototypes/_Obelisk/Species/hydrakin.yml @@ -27,8 +27,6 @@ Chest: MobHydrakinTorso HeadTop: MobHumanoidAnyMarking HeadSide: MobHumanoidAnyMarking - UndergarmentBottom: MobHumanoidAnyMarking - UndergarmentTop: MobHumanoidAnyMarking Tail: MobHumanoidAnyMarking # Eyes: MobHydrakinEyes LArm: MobHydrakinLArm