From: ScholarNZL <s_j_taylor@live.com>
Date: Fri, 15 Aug 2025 04:21:51 +0000 (+1200)
Subject: Animal organs now prefixed with 'animal' (#39228)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=d4f50c7f0a6a403ae304637a2a8c6c435d7a0967;p=space-station-14.git

Animal organs now prefixed with 'animal' (#39228)

* Resolves #38980. Animal organs prefixed with 'animal'

* Add "animal" prefix to arachnid organ types where base-type applies.

* Removed child-level names per Maintainer guidance.

* Helps if I leave the parent name details intact...

* Hidden bonus mouse organ!
---

diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
index e59aad9da3..dbf96068fa 100644
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -33,7 +33,7 @@
 - type: entity
   id: OrganAnimalLungs
   parent: BaseAnimalOrgan
-  name: lungs
+  name: animal lungs
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
@@ -67,7 +67,7 @@
 - type: entity
   id: OrganAnimalStomach
   parent: BaseAnimalOrgan
-  name: stomach
+  name: animal stomach
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
@@ -96,7 +96,6 @@
 - type: entity
   id: OrganMouseStomach
   parent: OrganAnimalStomach
-  name: stomach
   categories: [ HideSpawnMenu ]
   components:
   - type: SolutionContainerManager
@@ -110,7 +109,7 @@
 - type: entity
   id: OrganAnimalLiver
   parent: BaseAnimalOrgan
-  name: liver
+  name: animal liver
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
@@ -129,7 +128,7 @@
 - type: entity
   id: OrganAnimalHeart
   parent: BaseAnimalOrgan
-  name: heart
+  name: animal heart
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
@@ -149,7 +148,7 @@
 - type: entity
   id: OrganAnimalKidneys
   parent: BaseAnimalOrgan
-  name: kidneys
+  name: animal kidneys
   categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml b/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml
index e360f362d8..6e9b4d5900 100644
--- a/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml
@@ -1,7 +1,6 @@
 - type: entity
   id: OrganBloodsuckerStomach
   parent: OrganAnimalStomach
-  name: stomach
   categories: [ HideSpawnMenu ]
   components:
   - type: Metabolizer
@@ -10,7 +9,6 @@
 - type: entity
   id: OrganBloodsuckerLiver
   parent: OrganAnimalLiver
-  name: liver
   categories: [ HideSpawnMenu ]
   components:
   - type: Metabolizer
@@ -19,7 +17,6 @@
 - type: entity
   id: OrganBloodsuckerHeart
   parent: OrganAnimalHeart
-  name: heart
   categories: [ HideSpawnMenu ]
   components:
   - type: Metabolizer
diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml
index 20ff344fa1..b044706ecf 100644
--- a/Resources/Prototypes/Body/Organs/arachnid.yml
+++ b/Resources/Prototypes/Body/Organs/arachnid.yml
@@ -28,7 +28,6 @@
 - type: entity
   id: OrganArachnidStomach
   parent: OrganAnimalStomach
-  name: stomach
   description: "Gross. This is hard to stomach."
   components:
   - type: Sprite