diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl index 1885b3cee6..d8f0f6c413 100644 --- a/Resources/Locale/en-US/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/reagents/meta/biological.ftl @@ -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. diff --git a/Resources/Prototypes/Body/Species/vulpkanin.yml b/Resources/Prototypes/Body/Species/vulpkanin.yml index b8cbf521dc..97a680dbe5 100644 --- a/Resources/Prototypes/Body/Species/vulpkanin.yml +++ b/Resources/Prototypes/Body/Species/vulpkanin.yml @@ -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 @@ -160,11 +160,6 @@ pitch: 1.33 volume: -5 variation: 0.05 - - type: Bloodstream - bloodReferenceSolution: - reagents: - - ReagentId: SulfurBlood - Quantity: 300 - type: entity parent: OrganBase @@ -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 @@ -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 @@ -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 diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml index fcabcadee5..ebcb2181be 100644 --- a/Resources/Prototypes/Reagents/biological.yml +++ b/Resources/Prototypes/Reagents/biological.yml @@ -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 diff --git a/Resources/Prototypes/Recipes/Reactions/biological.yml b/Resources/Prototypes/Recipes/Reactions/biological.yml index 25f9cfaa83..ec157144f3 100644 --- a/Resources/Prototypes/Recipes/Reactions/biological.yml +++ b/Resources/Prototypes/Recipes/Reactions/biological.yml @@ -40,6 +40,7 @@ Water: 4 Nitrogen: 1 + - type: reaction id: SapBloodBreakdown source: true @@ -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 diff --git a/Resources/Prototypes/XenoArch/triggers.yml b/Resources/Prototypes/XenoArch/triggers.yml index 641f7bc48d..e03e46280d 100644 --- a/Resources/Prototypes/XenoArch/triggers.yml +++ b/Resources/Prototypes/XenoArch/triggers.yml @@ -243,7 +243,6 @@ - AmmoniaBlood - ZombieBlood - Sap - - SulfurBlood - type: xenoArchTrigger id: TriggerThrow diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/appendix.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/appendix.png deleted file mode 100644 index 188bc38ff3..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/appendix.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/ears.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/ears.png deleted file mode 100644 index a35737c4b1..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/ears.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/eyeball-l.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/eyeball-l.png deleted file mode 100644 index e19ba238cc..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/eyeball-l.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/eyeball-r.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/eyeball-r.png deleted file mode 100644 index 50881ce732..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/eyeball-r.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/eyeballs-inhand-left.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/eyeballs-inhand-left.png deleted file mode 100644 index e3220edf85..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/eyeballs-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/eyeballs-inhand-right.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/eyeballs-inhand-right.png deleted file mode 100644 index 693c5b135f..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/eyeballs-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/heart-inhand-left.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/heart-inhand-left.png deleted file mode 100644 index e414f8cfb4..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/heart-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/heart-inhand-right.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/heart-inhand-right.png deleted file mode 100644 index 82df5079c9..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/heart-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/heart-off.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/heart-off.png deleted file mode 100644 index 123980743f..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/heart-off.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/heart-on.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/heart-on.png deleted file mode 100644 index cc34c261cb..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/heart-on.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/kidney-l.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/kidney-l.png deleted file mode 100644 index 2c243305c3..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/kidney-l.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/kidney-r.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/kidney-r.png deleted file mode 100644 index 80675d0725..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/kidney-r.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/kidneys-inhand-left.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/kidneys-inhand-left.png deleted file mode 100644 index 761797d296..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/kidneys-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/kidneys-inhand-right.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/kidneys-inhand-right.png deleted file mode 100644 index a0c32a7c28..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/kidneys-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/liver-inhand-left.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/liver-inhand-left.png deleted file mode 100644 index f122a624c7..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/liver-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/liver-inhand-right.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/liver-inhand-right.png deleted file mode 100644 index 1fe9fd82bd..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/liver-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/liver.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/liver.png deleted file mode 100644 index 9736b47847..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/liver.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/lung-l.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/lung-l.png deleted file mode 100644 index a6c258e769..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/lung-l.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/lung-r.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/lung-r.png deleted file mode 100644 index 11ee4ffc9c..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/lung-r.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/lungs-inhand-left.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/lungs-inhand-left.png deleted file mode 100644 index db02f80db5..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/lungs-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/lungs-inhand-right.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/lungs-inhand-right.png deleted file mode 100644 index 434b61cef2..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/lungs-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/meta.json deleted file mode 100644 index b4a12c8225..0000000000 --- a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/meta.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "original icons taken from /tg/station 13 at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 | appendix taken from CEV-Eris at https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af | inhands by mubururu_ (github). Modified by ScarKy0 (Github) into the vulpkanin versions.", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "appendix" - }, - { - "name": "ears" - }, - { - "name": "eyeballs-inhand-left", - "directions": 4 - }, - { - "name": "eyeballs-inhand-right", - "directions": 4 - }, - { - "name": "eyeball-l" - }, - { - "name": "eyeball-r" - }, - { - "name": "heart-inhand-left", - "directions": 4 - }, - { - "name": "heart-inhand-right", - "directions": 4 - }, - { - "name": "heart-off" - }, - { - "name": "heart-on", - "delays": [ - [ - 0.6, - 0.1, - 0.1 - ] - ] - }, - { - "name": "kidneys-inhand-left", - "directions": 4 - }, - { - "name": "kidneys-inhand-right", - "directions": 4 - }, - { - "name": "kidney-l" - }, - { - "name": "kidney-r" - }, - { - "name": "liver" - }, - { - "name": "liver-inhand-left", - "directions": 4 - }, - { - "name": "liver-inhand-right", - "directions": 4 - }, - { - "name": "lungs-inhand-left", - "directions": 4 - }, - { - "name": "lungs-inhand-right", - "directions": 4 - }, - { - "name": "lung-l" - }, - { - "name": "lung-r" - }, - { - "name": "stomach" - }, - { - "name": "stomach-inhand-left", - "directions": 4 - }, - { - "name": "stomach-inhand-right", - "directions": 4 - }, - { - "name": "tongue" - } - ] -} diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/stomach-inhand-left.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/stomach-inhand-left.png deleted file mode 100644 index f3145deec4..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/stomach-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/stomach-inhand-right.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/stomach-inhand-right.png deleted file mode 100644 index 6e721cf832..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/stomach-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/stomach.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/stomach.png deleted file mode 100644 index 0e7e809f73..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/stomach.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/tongue.png b/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/tongue.png deleted file mode 100644 index 4195c57728..0000000000 Binary files a/Resources/Textures/Mobs/Species/Vulpkanin/organs.rsi/tongue.png and /dev/null differ