Makes all species the same

ekrixi-14 · May 30, 2024 · d5e9dcc · d5e9dcc
1 parent 95a218d
commit d5e9dcc
Show file tree

Hide file tree

Showing 13 changed files with 107 additions and 326 deletions.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -482,13 +482,13 @@
     damageModifierSet: Moth
   - type: Bloodstream
     bloodReagent: InsectBlood
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 0.5
-    damageRecovery:
-      types:
-        Asphyxiation: -0.5
+#  - type: Respirator
+#    damage:
+#      types:
+#        Asphyxiation: 0.5
+#    damageRecovery:
+#      types:
+#        Asphyxiation: -0.5
   - type: CombatMode
   - type: Butcherable
     spawned:
@@ -1621,13 +1621,13 @@
     - VimPilot
     - Mouse
     - Meat
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 0.25
-    damageRecovery:
-      types:
-        Asphyxiation: -0.25
+#  - type: Respirator
+#    damage:
+#      types:
+#        Asphyxiation: 0.25
+#    damageRecovery:
+#      types:
+#        Asphyxiation: -0.25
   - type: Barotrauma
     damage:
       types:
@@ -2890,8 +2890,8 @@
     interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Animals/cat_meow.ogg
-  - type: Respirator #It just works?
-    minSaturation: 5.0
+#  - type: Respirator #It just works?
+#    minSaturation: 5.0
 
 - type: entity
   name: caracal cat
@@ -3168,13 +3168,13 @@
     - Trash
     - Hamster
     - Meat
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 0.25
-    damageRecovery:
-      types:
-        Asphyxiation: -0.25
+#  - type: Respirator
+#    damage:
+#      types:
+#        Asphyxiation: 0.25
+#    damageRecovery:
+#      types:
+#        Asphyxiation: -0.25
   - type: Barotrauma
     damage:
       types:

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -43,13 +43,13 @@
     spawned:
     - id: FoodMeatSlime
       amount: 2
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 0.2
-    damageRecovery:
-      types:
-        Asphyxiation: -1.0
+#  - type: Respirator
+#    damage:
+#      types:
+#        Asphyxiation: 0.2
+#    damageRecovery:
+#      types:
+#        Asphyxiation: -1.0
     maxSaturation: 15
   - type: Damageable
     damageContainer: Biological

diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
@@ -3,11 +3,11 @@
   name: Urist McWeb
   parent: BaseMobArachnid
   id: MobArachnid
-  components:
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 1.5 # This makes space and crit more lethal to arachnids.
-    damageRecovery:
-      types:
-        Asphyxiation: -0.5
+  components: []
+#  - type: Respirator
+#    damage:
+#      types:
+#        Asphyxiation: 1.5 # This makes space and crit more lethal to arachnids.
+#    damageRecovery:
+#      types:
+#        Asphyxiation: -0.5
diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
@@ -3,14 +3,14 @@
   name: Urist McPlants
   parent: BaseMobDiona
   id: MobDiona
-  components:
-    - type: Respirator
-      damage:
-        types:
-          Asphyxiation: 0.5
-      damageRecovery:
-        types:
-          Asphyxiation: -1.0
+  components: []
+#    - type: Respirator
+#      damage:
+#        types:
+#          Asphyxiation: 0.5
+#      damageRecovery:
+#        types:
+#          Asphyxiation: -1.0
 
 # Reformed Diona
 - type: entity
@@ -20,4 +20,4 @@
   name: Reformed Diona
   components:
     - type: IsDeadIC
-    - type: RandomHumanoidAppearance 
+    - type: RandomHumanoidAppearance
diff --git a/Resources/Prototypes/Entities/Mobs/Player/gingerbread.yml b/Resources/Prototypes/Entities/Mobs/Player/gingerbread.yml
@@ -3,11 +3,11 @@
   name: Urist McCookie
   parent: BaseMobGingerbread
   id: MobGingerbread
-  components:
-    - type: Respirator
-      damage:
-        types:
-          Asphyxiation: 0.5
-      damageRecovery:
-        types:
-          Asphyxiation: -1.0
+  components: []
+#    - type: Respirator
+#      damage:
+#        types:
+#          Asphyxiation: 0.5
+#      damageRecovery:
+#        types:
+#          Asphyxiation: -1.0
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -12,47 +12,47 @@
     species: Arachnid
   - type: Hunger
   - type: Thirst
-  - type: Sericulture
-    action: ActionSericulture
-    productionLength: 2
-    entityProduced: MaterialWebSilk1
-    hungerCost: 4 # Should total to 25 total silk on full hunger
-  - type: Tag
-    tags:
-    - CanPilot
-    - FootstepSound
-    - DoorBumpOpener
-    - SpiderCraft
+#  - type: Sericulture
+#    action: ActionSericulture
+#    productionLength: 2
+#    entityProduced: MaterialWebSilk1
+#    hungerCost: 4 # Should total to 25 total silk on full hunger
+#  - type: Tag
+#    tags:
+#    - CanPilot
+#    - FootstepSound
+#    - DoorBumpOpener
+#    - SpiderCraft
   - type: Butcherable
     butcheringType: Spike
     spawned:
       - id: FoodMeatSpider
         amount: 5
-  - type: Inventory
-    templateId: arachnid
-  - type: Reactive
-    reactions:
-    - reagents: [Water]
-      methods: [Touch]
-      effects:
-      - !type:WearableReaction
-        slot: head
-        prototypeID: WaterDropletHat
-    - reagents: [Water, SpaceCleaner]
-      methods: [Touch]
-      effects:
-      - !type:WashCreamPieReaction
+#  - type: Inventory
+#    templateId: arachnid
+#  - type: Reactive
+#    reactions:
+#    - reagents: [Water]
+#      methods: [Touch]
+#      effects:
+#      - !type:WearableReaction
+#        slot: head
+#        prototypeID: WaterDropletHat
+#    - reagents: [Water, SpaceCleaner]
+#      methods: [Touch]
+#      effects:
+#      - !type:WashCreamPieReaction
   # Damage (Self)
   - type: Bloodstream
     bloodReagent: CopperBlood
   # Damage (Others)
-  - type: MeleeWeapon
-    animation: WeaponArcBite
-    soundHit:
-      path: /Audio/Effects/bite.ogg
-    damage:
-      types:
-        Piercing: 5
+#  - type: MeleeWeapon
+#    animation: WeaponArcBite
+#    soundHit:
+#      path: /Audio/Effects/bite.ogg
+#    damage:
+#      types:
+#        Piercing: 5
   # Visual & Audio
   - type: DamageVisuals
     damageOverlayGroups:

diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -147,9 +147,9 @@
     prototype: Human
     requiredLegs: 2
   - type: Identity
-  - type: IdExaminable
+#  - type: IdExaminable
   - type: Hands
-  - type: Internals
+#  - type: Internals
   - type: Inventory
   - type: InventorySlots
   - type: FloatingVisuals
@@ -234,11 +234,11 @@
   abstract: true
   components:
   - type: Flashable
-  - type: Barotrauma
-    damage:
-      types:
-        Blunt: 0.50 #per second, scales with pressure and other constants.
-        Heat: 0.1
+#  - type: Barotrauma
+#    damage:
+#      types:
+#        Blunt: 0.50 #per second, scales with pressure and other constants.
+#        Heat: 0.1
   - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute.
     allowedStates:
     - Alive
@@ -293,13 +293,6 @@
     spawned:
       - id: FoodMeat
         amount: 5
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 1.0
-    damageRecovery:
-      types:
-        Asphyxiation: -1.0
   - type: FireVisuals
     alternateState: Standing
 

diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -7,19 +7,12 @@
   components:
   - type: HumanoidAppearance
     species: Diona
-  - type: Hunger
-    baseDecayRate: 0.0083
-  - type: Thirst
-    baseDecayRate: 0.0083
   - type: Icon
     sprite: Mobs/Species/Diona/parts.rsi
     state: full
   - type: Body
     prototype: Diona
     requiredLegs: 2
-  - type: Damageable
-    damageContainer: Biological
-    damageModifierSet: Diona
   - type: DamageVisuals
     damageOverlayGroups:
       Brute:
@@ -30,60 +23,6 @@
     spawned:
       - id: FoodMeatPlant
         amount: 5
-  - type: Bloodstream
-    bloodReagent: Sap
-  - type: Reactive
-    groups:
-      Flammable: [ Touch ]
-      Extinguish: [ Touch ]
-      Acidic: [Touch, Ingestion]
-    reactions:
-    - reagents: [Water, SpaceCleaner]
-      methods: [Touch]
-      effects:
-      - !type:WashCreamPieReaction
-    - reagents: [ PlantBGone ]
-      methods: [ Touch ]
-      effects:
-      - !type:HealthChange
-        scaleByQuantity: true
-        damage:
-          types:
-            Blunt: 2
-            Slash: 2
-            Piercing: 3
-      - !type:PopupMessage
-        type: Local
-        visualType: Large
-        messages: [ "diona-hurt-by-herbicide-popup" ]
-        probability: 0.66
-    - reagents: [ WeedKiller ]
-      methods: [ Touch ]
-      effects:
-      - !type:HealthChange
-        scaleByQuantity: true
-        damage:
-          types:
-            Poison: 5
-      - !type:PopupMessage
-        type: Local
-        visualType: Large
-        messages: [ "diona-hurt-by-herbicide-popup" ]
-        probability: 0.66
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.35
-        density: 300 #weighs more than humans because wood
-        restitution: 0.0
-        mask:
-          - MobMask
-        layer:
-          - MobLayer
-  - type: Inventory
-    templateId: diona
   - type: Speech
     speechVerb: Plant
   - type: Vocal
@@ -93,14 +32,6 @@
       Unsexed: UnisexDiona
   - type: BodyEmotes
     soundsId: DionaBodyEmotes
-  - type: IgnoreKudzu
-  - type: IgniteOnHeatDamage
-    fireStacks: 1
-    threshold: 12
-  - type: GibAction
-    actionPrototype: DionaGibAction
-    allowedStates:
-    - Dead
 
 - type: entity
   parent: BaseSpeciesDummy