juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream

Browse Source 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
This commit is contained in:
Ed
2024-10-29 11:16:56 +03:00
parent b14c75390c 0468c0f6bb
commit ae3cbd6092
388 changed files with 34535 additions and 18822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Resources/Prototypes/Body/Organs/Animal/animal.yml
View File

@@ -60,6 +60,9 @@
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
- type: Item
size: Small
heldPrefix: lungs
- type: entity
id: OrganAnimalStomach
@@ -86,6 +89,9 @@
groups:
- id: Food
- id: Drink
- type: Item
size: Small
heldPrefix: stomach
- type: entity
id: OrganMouseStomach
@@ -97,6 +103,9 @@
solutions:
stomach:
maxVol: 30
- type: Item
size: Small
heldPrefix: stomach
- type: entity
id: OrganAnimalLiver
@@ -113,6 +122,9 @@
groups:
- id: Alcohol
rateModifier: 0.1
- type: Item
size: Small
heldPrefix: liver
- type: entity
id: OrganAnimalHeart
@@ -130,6 +142,9 @@
- id: Medicine
- id: Poison
- id: Narcotic
- type: Item
size: Small
heldPrefix: heart
- type: entity
id: OrganAnimalKidneys
@@ -146,3 +161,6 @@
maxReagents: 5
metabolizerTypes: [ Animal ]
removeEmpty: true
- type: Item
size: Small
heldPrefix: kidneys

15
Resources/Prototypes/Body/Organs/arachnid.yml
View File

@@ -34,6 +34,9 @@
- type: Sprite
sprite: Mobs/Species/Arachnid/organs.rsi
state: stomach
- type: Item
size: Small
heldPrefix: stomach
- type: Stomach
updateInterval: 1.5
- type: SolutionContainerManager
@@ -91,6 +94,9 @@
components:
- type: Sprite
state: heart-on
- type: Item
size: Small
heldPrefix: heart
- type: Metabolizer
updateInterval: 1.5
maxReagents: 2
@@ -107,6 +113,9 @@
description: "Pairing suggestion: chianti and fava beans."
categories: [ HideSpawnMenu ]
components:
- type: Item
size: Small
heldPrefix: liver
- type: Sprite
state: liver
- type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
@@ -129,6 +138,9 @@
- state: kidney-l
- state: kidney-r
# The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
- type: Item
size: Small
heldPrefix: kidneys
- type: Metabolizer
updateInterval: 1.5
maxReagents: 5
@@ -145,6 +157,9 @@
layers:
- state: eyeball-l
- state: eyeball-r
- type: Item
size: Small
heldPrefix: eyeballs
- type: entity
id: OrganArachnidTongue

20
Resources/Prototypes/Body/Organs/diona.yml
View File

@@ -29,8 +29,11 @@
id: OrganDionaBrain
parent: [BaseDionaOrgan, OrganHumanBrain]
name: brain
description: "The source of incredible, unending intelligence. Honk."
description: "The central hub of a diona's pseudo-neurological activity, its root-like tendrils search for its former body."
components:
- type: Item
size: Small
heldPrefix: brain
- type: Sprite
state: brain
- type: SolutionContainerManager
@@ -64,7 +67,7 @@
id: OrganDionaStomach
parent: BaseDionaOrgan
name: stomach
description: "Gross. This is hard to stomach."
description: "The diona's equivalent of a stomach, it reeks of asparagus and vinegar."
components:
- type: Sprite
state: stomach
@@ -90,18 +93,21 @@
- id: Narcotic
- id: Alcohol
rateModifier: 0.1
- type: Item
size: Small
heldPrefix: stomach
- type: entity
id: OrganDionaLungs
parent: BaseDionaOrgan
name: lungs
description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
description: "A spongy mess of slimy, leaf-like structures. Capable of breathing both carbon dioxide and oxygen."
components:
- type: Sprite
sprite: Mobs/Species/Human/organs.rsi
layers:
- state: lung-l
- state: lung-r
state: lungs
- type: Item
size: Small
heldPrefix: lungs
- type: Lung
- type: Metabolizer
removeEmpty: true

21
Resources/Prototypes/Body/Organs/human.yml
View File

@@ -71,6 +71,9 @@
entries:
Burger: Brain
Taco: Brain
- type: Item
size: Small
heldPrefix: brain
- type: entity
id: OrganHumanEyes
@@ -82,6 +85,9 @@
layers:
- state: eyeball-l
- state: eyeball-r
- type: Item
size: Small
heldPrefix: eyeballs
- type: entity
id: OrganHumanTongue
@@ -122,6 +128,9 @@
layers:
- state: lung-l
- state: lung-r
- type: Item
size: Small
heldPrefix: lungs
- type: Lung
- type: Metabolizer
removeEmpty: true
@@ -164,6 +173,9 @@
- id: Medicine
- id: Poison
- id: Narcotic
- type: Item
size: Small
heldPrefix: heart
- type: entity
id: OrganHumanStomach
@@ -173,6 +185,9 @@
components:
- type: Sprite
state: stomach
- type: Item
size: Small
heldPrefix: stomach
- type: SolutionContainerManager
solutions:
stomach:
@@ -202,6 +217,9 @@
components:
- type: Sprite
state: liver
- type: Item
size: Small
heldPrefix: liver
- type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
maxReagents: 1
metabolizerTypes: [Human]
@@ -219,6 +237,9 @@
layers:
- state: kidney-l
- state: kidney-r
- type: Item
size: Small
heldPrefix: kidneys
# The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
- type: Metabolizer
maxReagents: 5

6
Resources/Prototypes/Body/Organs/slime.yml
View File

@@ -33,6 +33,9 @@
reagents:
- ReagentId: Slime
Quantity: 10
- type: Item
size: Small
heldPrefix: brain
- type: entity
@@ -70,3 +73,6 @@
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
- type: Item
size: Small
heldPrefix: lungs

6
Resources/Prototypes/Body/Organs/vox.yml
View File

@@ -1,9 +1,15 @@
- type: entity
id: OrganVoxLungs
parent: OrganHumanLungs
description: "The blue, anaerobic lungs of a vox, they intake nitrogen to breathe. Any form of gaseous oxygen is lethally toxic if breathed in."
suffix: "vox"
components:
- type: Sprite
sprite: Mobs/Species/Vox/organs.rsi
- type: Metabolizer
metabolizerTypes: [ Vox ]
- type: Lung
alert: LowNitrogen
- type: Item
size: Small
heldPrefix: lungs