diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index a79d96065a..b957fba140 100644 --- 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 index d2ca780438..000a84f288 100644 --- 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 index d9dea3c18d..bc504bd9d3 100644 --- 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 index 4153250bbf..7d4510ca11 100644 --- 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 \ No newline at end of file + - type: RandomHumanoidAppearance diff --git a/Resources/Prototypes/Entities/Mobs/Player/gingerbread.yml b/Resources/Prototypes/Entities/Mobs/Player/gingerbread.yml index 18ff8381d4..9769b1c333 100644 --- 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 index 8b3c66d5dd..472eea8bea 100644 --- 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 index 01b938ffa8..3dc40780f6 100644 --- 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 index 1cac380cd0..db71a8538c 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index 5a54b56c48..413340cfe4 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml @@ -10,13 +10,6 @@ - type: Icon sprite: Mobs/Species/Slime/parts.rsi # It was like this beforehand, no idea why. state: full - - type: Respirator - damage: - types: - Asphyxiation: 2 - damageRecovery: - types: - Asphyxiation: -1.0 - type: Sprite noRot: true drawdepth: Mobs @@ -29,19 +22,6 @@ spawned: - id: FoodMeatHuman amount: 5 - - type: Fixtures - fixtures: # TODO: This needs a second fixture just for mob collisions. - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - # they r smaller - density: 120 - restitution: 0.0 - mask: - - MobMask - layer: - - MobLayer - type: Vocal sounds: Male: UnisexDwarf diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index f2a0194b7a..1914be612d 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -15,11 +15,6 @@ - type: Body prototype: Moth requiredLegs: 2 - - type: Damageable - damageContainer: Biological - damageModifierSet: Moth - - type: ZombieAccentOverride - accent: zombieMoth - type: Speech speechVerb: Moth allowedEmotes: ['Chitter', 'Squeak'] @@ -43,25 +38,6 @@ Male: UnisexMoth Female: UnisexMoth Unsexed: UnisexMoth - - type: MovementSpeedModifier - weightlessAcceleration: 1.5 # Move around more easily in space. - weightlessFriction: 1 - weightlessModifier: 1 - - type: Flammable - damage: - types: - Heat: 4.5 # moths burn more easily - - type: Temperature # Moths hate the heat and thrive in the cold. - heatDamageThreshold: 320 - coldDamageThreshold: 230 - currentTemperature: 310.15 - specificHeat: 46 - coldDamage: - types: - Cold : 0.05 #per second, scales with temperature & other constants - heatDamage: - types: - Heat : 3 #per second, scales with temperature & other constants - type: Sprite # sprite again because we want different layer ordering noRot: true drawdepth: Mobs diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index f099ffdc6a..7876064883 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -8,8 +8,6 @@ - type: HumanoidAppearance species: Reptilian - type: Hunger - - type: Puller - needsHands: false - type: Thirst - type: Icon sprite: Mobs/Species/Reptilian/parts.rsi @@ -22,8 +20,6 @@ spawned: - id: FoodMeatLizard amount: 5 - - type: Inventory - speciesId: reptilian - type: LizardAccent - type: Speech speechSounds: Lizard @@ -35,28 +31,6 @@ Male: MaleReptilian Female: FemaleReptilian Unsexed: MaleReptilian - - type: Damageable - damageContainer: Biological - damageModifierSet: Scale - - type: MeleeWeapon - soundHit: - collection: AlienClaw - angle: 30 - animation: WeaponArcClaw - damage: - types: - Slash: 5 - - type: Temperature - heatDamageThreshold: 400 - coldDamageThreshold: 285 - currentTemperature: 310.15 - specificHeat: 42 - coldDamage: - types: - Cold : 0.1 #per second, scales with temperature & other constants - heatDamage: - types: - Heat : 1.5 #per second, scales with temperature & other constants - type: Wagging - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 2ab26ffcd6..c0e078dcac 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -12,29 +12,6 @@ - type: Body prototype: Slime requiredLegs: 2 - # they like eat it idk lol - - type: Storage - clickInsert: false - grid: - - 0,0,1,2 - maxItemSize: Large - storageInsertSound: - path: /Audio/Voice/Slime/slime_squish.ogg - - type: ContainerContainer - containers: - storagebase: !type:Container - ents: [] - - type: UserInterface - interfaces: - enum.StorageUiKey.Key: - type: StorageBoundUserInterface - enum.VoiceMaskUIKey.Key: - type: VoiceMaskBoundUserInterface - enum.HumanoidMarkingModifierKey.Key: - type: HumanoidMarkingModifierBoundUserInterface - enum.StrippingUiKey.Key: - type: StrippableBoundUserInterface - # to prevent bag open/honk spam - type: UseDelay delay: 0.5 - type: HumanoidAppearance @@ -50,66 +27,16 @@ Male: MaleSlime Female: FemaleSlime Unsexed: MaleSlime - - type: Damageable - damageContainer: Biological - damageModifierSet: Slime - - type: Geras - - type: PassiveDamage # Around 8 damage a minute healed - allowedStates: - - Alive - damageCap: 65 - damage: - types: - Heat: -0.14 - groups: - Brute: -0.14 - type: DamageVisuals damageOverlayGroups: Brute: sprite: Mobs/Effects/brute_damage.rsi color: "#2cf274" - - type: Bloodstream - bloodReagent: Slime # TODO Color slime blood based on their slime color or smth - - type: Barotrauma - damage: - types: - Blunt: 0.50 #per second, scales with pressure and other constants. - Heat: 0.2 # 0.1 more than humans, i feel like low pressure would make slime boil more than blunt stretch them so i decided on this instead. - - type: Reactive - groups: - Flammable: [ Touch ] - Extinguish: [ Touch ] - reactions: - - reagents: [ Water, SpaceCleaner ] - methods: [ Touch ] - effects: - - !type:WashCreamPieReaction - - reagents: [ Water ] - methods: [ Touch ] - effects: - - !type:HealthChange - scaleByQuantity: true - damage: - types: - Heat: 2 - - !type:PopupMessage - type: Local - visualType: Large - messages: [ "slime-hurt-by-water-popup" ] - probability: 0.25 - type: Butcherable butcheringType: Spike spawned: - id: FoodMeatSlime amount: 5 - - type: Respirator - damage: - types: - Asphyxiation: 0.2 - damageRecovery: - types: - Asphyxiation: -1.0 - maxSaturation: 15 - type: entity parent: MobHumanDummy diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml index 74fac39ea1..a2fdc65aff 100644 --- a/Resources/Prototypes/Entities/Mobs/base.yml +++ b/Resources/Prototypes/Entities/Mobs/base.yml @@ -183,10 +183,10 @@ heatDamage: types: Heat: 1.5 #per second, scales with temperature & other constants - - type: Barotrauma - damage: - types: - Blunt: 0.15 #per second, scales with pressure and other constants. +# - type: Barotrauma +# damage: +# types: +# Blunt: 0.15 #per second, scales with pressure and other constants. # Used for mobs that can be set on fire - type: entity @@ -209,15 +209,15 @@ save: false id: MobRespirator abstract: true - components: - - type: Internals - - type: Respirator - damage: - types: - Asphyxiation: 2 - damageRecovery: - types: - Asphyxiation: -1.0 + components: [] +# - type: Internals +# - type: Respirator +# damage: +# types: +# Asphyxiation: 2 +# damageRecovery: +# types: +# Asphyxiation: -1.0 # Used for mobs that have a bloodstream - type: entity