Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Resources/Locale/en-US/reagents/meta/biological.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ reagent-desc-hemocyanin-blood = Contains copper as opposed to iron which gives i
reagent-name-ammonia-blood = anaerobic blood
reagent-desc-ammonia-blood = Nothing else in the entire galaxy smells quite so appalling.

reagent-name-sulfur-blood = sulfuric blood
reagent-desc-sulfur-blood = Feels almost acidic.

reagent-name-zombie-blood = zombie blood
reagent-desc-zombie-blood = Would not advise eating. Can be used to create an inoculation against the infection.

Expand Down
21 changes: 8 additions & 13 deletions Resources/Prototypes/Body/Species/vulpkanin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@
types:
Piercing: 2
Slash: 3
- type: Temperature
- type: Temperature # Same as moth temperatures until below is solved.
specificHeat: 44
- type: TemperatureDamage
heatDamageThreshold: 320
coldDamageThreshold: 230
heatDamageThreshold: 320 # TODO: 315 when there is a way to make the temperature alert not blink to the side of the screen and disappear when you "sweat" at 39C.
coldDamageThreshold: 230 # TODO: 220 when the above is solved.
coldDamage:
types:
Cold: 0.05 # Per second, scales with temperature & other constants
Expand All @@ -160,11 +160,6 @@
pitch: 1.33
volume: -5
variation: 0.05
- type: Bloodstream
bloodReferenceSolution:
reagents:
- ReagentId: SulfurBlood
Quantity: 300

- type: entity
parent: OrganBase
Expand All @@ -185,7 +180,7 @@
abstract: true
components:
- type: Sprite
sprite: Mobs/Species/Vulpkanin/organs.rsi
sprite: Mobs/Species/Human/organs.rsi

- type: entity
id: OrganVulpkaninVisual
Expand Down Expand Up @@ -274,11 +269,11 @@
id: OrganVulpkaninTongue

- type: entity
parent: [ OrganBaseAppendix, OrganVulpkaninInternal ]
parent: [ OrganBaseAppendix, OrganSpriteHumanInternal, OrganVulpkaninInternal ]
id: OrganVulpkaninAppendix

- type: entity
parent: [ OrganBaseEars, OrganVulpkaninInternal ]
parent: [ OrganBaseEars, OrganSpriteHumanInternal, OrganVulpkaninInternal ]
id: OrganVulpkaninEars

- type: entity
Expand All @@ -294,9 +289,9 @@
id: OrganVulpkaninStomach

- type: entity
parent: [ OrganBaseLiver, OrganVulpkaninInternal, OrganVulpkaninMetabolizer ]
parent: [ OrganBaseLiver, OrganSpriteHumanInternal, OrganVulpkaninInternal, OrganVulpkaninMetabolizer ]
id: OrganVulpkaninLiver

- type: entity
parent: [ OrganBaseKidneys, OrganVulpkaninInternal, OrganVulpkaninMetabolizer ]
parent: [ OrganBaseKidneys, OrganSpriteHumanInternal, OrganVulpkaninInternal, OrganVulpkaninMetabolizer ]
id: OrganVulpkaninKidneys
11 changes: 0 additions & 11 deletions Resources/Prototypes/Reagents/biological.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,17 +137,6 @@
recognizable: true
physicalDesc: reagent-physical-desc-pungent

- type: reagent
parent: Blood
id: SulfurBlood
name: reagent-name-sulfur-blood
group: Biological
desc: reagent-desc-sulfur-blood
flavor: bitter
color: "#ccac1f"
recognizable: true
physicalDesc: reagent-physical-desc-strong-smelling

- type: reagent
id: ZombieBlood
name: reagent-name-zombie-blood
Expand Down
16 changes: 1 addition & 15 deletions Resources/Prototypes/Recipes/Reactions/biological.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
Water: 4
Nitrogen: 1


- type: reaction
id: SapBloodBreakdown
source: true
Expand Down Expand Up @@ -81,21 +82,6 @@
Chlorine: 2.5
Protein: 6

- type: reaction
id: SulfurBloodBreakdown
source: true
requiredMixerCategories:
- Centrifuge
reactants:
SulfurBlood:
amount: 20
products:
Water: 10
Sulfur: 2
Hydrogen: 1
CarbonDioxide: 3
Protein: 4

- type: reaction
id: ZombieBloodBreakdown
source: true
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/XenoArch/triggers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@
- AmmoniaBlood
- ZombieBlood
- Sap
- SulfurBlood

- type: xenoArchTrigger
id: TriggerThrow
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
105 changes: 0 additions & 105 deletions Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/meta.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading