diff --git a/Content.Server/Body/Components/StomachComponent.cs b/Content.Server/Body/Components/StomachComponent.cs index c6ef9f6504..698e96ae0d 100644 --- a/Content.Server/Body/Components/StomachComponent.cs +++ b/Content.Server/Body/Components/StomachComponent.cs @@ -24,7 +24,7 @@ namespace Content.Server.Body.Components /// Initial internal solution storage volume /// [DataField("maxVolume")] - public FixedPoint2 InitialMaxVolume { get; private set; } = FixedPoint2.New(100); + public FixedPoint2 InitialMaxVolume { get; private set; } = FixedPoint2.New(20); /// /// Time in seconds between reagents being ingested and them being diff --git a/Content.Server/Chemistry/Components/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs index 6d18eaaec7..f175a79020 100644 --- a/Content.Server/Chemistry/Components/ChemMasterComponent.cs +++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs @@ -290,7 +290,7 @@ namespace Content.Server.Chemistry.Components return; } - var actualVolume = FixedPoint2.Min(individualVolume, FixedPoint2.New(50)); + var actualVolume = FixedPoint2.Min(individualVolume, FixedPoint2.New(20)); for (int i = 0; i < pillAmount; i++) { var pill = _entities.SpawnEntity("Pill", _entities.GetComponent(Owner).Coordinates); diff --git a/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl b/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl index e24df2466a..6bc5e0b1b1 100644 --- a/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl +++ b/Resources/Locale/en-US/chemistry/components/chem-master-component.ftl @@ -22,7 +22,7 @@ chem-master-window-packaging-text = Packaging chem-master-current-text-label = Label: chem-master-window-pills-label = Pills: chem-master-window-pill-type-label = Pill type: -chem-master-window-max-pills-volume-text = max 50u/each +chem-master-window-max-pills-volume-text = max 20u/each chem-master-window-max-bottles-volume-text = max 30u/each chem-master-window-create-pill-button = Create chem-master-window-create-bottle-button = Create diff --git a/Resources/Prototypes/Body/Mechanisms/human.yml b/Resources/Prototypes/Body/Mechanisms/human.yml index c99b7b8fac..607e512069 100644 --- a/Resources/Prototypes/Body/Mechanisms/human.yml +++ b/Resources/Prototypes/Body/Mechanisms/human.yml @@ -147,8 +147,6 @@ stomach: maxVol: 250 - type: Stomach - maxVolume: 250 - digestionDelay: 20 # The stomach metabolizes stuff like foods and drinks. # TODO: Have it work off of the ent's solution container, and move this # to intestines instead. diff --git a/Resources/Prototypes/Body/Mechanisms/rat.yml b/Resources/Prototypes/Body/Mechanisms/rat.yml index 712674aeab..9e5864537d 100644 --- a/Resources/Prototypes/Body/Mechanisms/rat.yml +++ b/Resources/Prototypes/Body/Mechanisms/rat.yml @@ -6,3 +6,10 @@ - type: Metabolizer metabolizerTypes: [ Rat ] +- type: entity + id: OrganRatStomach + parent: OrganAnimalStomach + suffix: "rat" + components: + - type: Stomach + maxVolume: 50 # they're hungry diff --git a/Resources/Prototypes/Body/Mechanisms/slime.yml b/Resources/Prototypes/Body/Mechanisms/slime.yml index a547dd357c..ed650946b3 100644 --- a/Resources/Prototypes/Body/Mechanisms/slime.yml +++ b/Resources/Prototypes/Body/Mechanisms/slime.yml @@ -13,8 +13,6 @@ compatibility: Slime - type: Brain - type: Stomach - maxVolume: 250 - digestionDelay: 20 - type: Metabolizer maxReagents: 6 metabolizerTypes: [ Slime ] diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml index a29db3dd7f..bd517c12ca 100644 --- a/Resources/Prototypes/Body/Parts/animal.yml +++ b/Resources/Prototypes/Body/Parts/animal.yml @@ -105,8 +105,7 @@ stomach: maxVol: 100 - type: Stomach - maxVolume: 100 - digestionDelay: 20 + maxVolume: 10 - type: Metabolizer maxReagents: 3 metabolizerTypes: [Animal] diff --git a/Resources/Prototypes/Body/Parts/rat.yml b/Resources/Prototypes/Body/Parts/rat.yml index 8ec9af385b..eef2f9e421 100644 --- a/Resources/Prototypes/Body/Parts/rat.yml +++ b/Resources/Prototypes/Body/Parts/rat.yml @@ -12,28 +12,9 @@ compatibility: Biological mechanisms: - OrganRatLungs - - OrganHumanStomach - - OrganHumanLiver - - OrganHumanHeart - - OrganHumanKidneys + - OrganRatStomach + - OrganAnimalLiver + - OrganAnimalHeart + - OrganAnimalKidneys - type: Damageable damageContainer: Biological - -- type: entity - id: OrganRatLungs - parent: BaseAnimalOrgan - name: lungs - noSpawn: true - components: - - type: Mechanism - size: 1 - compatibility: Biological - - type: Lung - - type: Metabolizer - removeEmpty: true - solutionOnBody: false - solution: "Lung" - metabolizerTypes: [ Rat ] - groups: - - id: Gas - rateModifier: 100.0 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index a59d4b8f9f..6ff3f715a7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -123,7 +123,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 50 + maxVol: 20 reagents: - ReagentId: Dexalin Quantity: 15 @@ -136,7 +136,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 50 + maxVol: 20 reagents: - ReagentId: Dylovene Quantity: 15 @@ -149,7 +149,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 50 + maxVol: 20 reagents: - ReagentId: Hyronalin Quantity: 15 @@ -162,7 +162,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 50 + maxVol: 20 reagents: - ReagentId: Iron Quantity: 15 @@ -175,7 +175,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 50 + maxVol: 20 reagents: - ReagentId: Kelotane Quantity: 15 @@ -188,7 +188,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 50 + maxVol: 20 reagents: - ReagentId: SpaceDrugs Quantity: 15 @@ -201,7 +201,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 50 + maxVol: 20 reagents: - ReagentId: Tricordrazine Quantity: 15 @@ -214,7 +214,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 50 + maxVol: 20 reagents: - ReagentId: Romerol Quantity: 10 diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 482f2c9e60..8680a89844 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -272,7 +272,7 @@ - type: SolutionContainerManager solutions: food: - maxVol: 50 + maxVol: 20 - type: SolutionSpiker sourceSolution: food - type: DeleteOnTrigger