[Fix] Bug fixes

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);
     }
 

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

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"

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:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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: