diff --git a/Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml b/Resources/Prototypes/Body/Mechanisms/human.yml similarity index 55% rename from Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml rename to Resources/Prototypes/Body/Mechanisms/human.yml index c5146be6c6..c902134854 100644 --- a/Resources/Prototypes/Body/Mechanisms/basic_human_organs.yml +++ b/Resources/Prototypes/Body/Mechanisms/human.yml @@ -1,30 +1,29 @@ -- type: entity - id: BaseMechanism - parent: BaseItem - name: "base mechanism" - abstract: true - components: - - type: Mechanism - - type: entity id: BaseHumanOrgan - parent: BaseMechanism - name: "base human organ" + parent: BaseItem abstract: true components: - - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi - -- type: entity - id: BrainHuman - parent: BaseHumanOrgan - name: "human brain" - description: "The source of incredible, unending intelligence. Honk." - components: + - type: Tag + tags: + - Grindable - type: Sprite netsync: false sprite: Mobs/Species/Human/organs.rsi + - type: Mechanism + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Nutriment + Quantity: 10 + +- type: entity + id: OrganHumanBrain + parent: BaseHumanOrgan + name: brain + description: "The source of incredible, unending intelligence. Honk." + components: + - type: Sprite state: brain - type: Mechanism size: 1 @@ -37,28 +36,26 @@ - type: GhostOnMove - type: entity - id: EyesHuman + id: OrganHumanEyes parent: BaseHumanOrgan - name: "human eyes" - description: "Ocular organ capable of turning light into a colorful visual." + name: eyes + description: "I see you!" components: - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi - state: eyeballs + layers: + - state: eyeball-l + - state: eyeball-r - type: Mechanism size: 1 compatibility: Biological - type: entity - id: HeartHuman + id: OrganHumanHeart parent: BaseHumanOrgan - name: "human heart" - description: "Pumps blood throughout a body. Essential for any entity with blood." + name: heart + description: "I feel bad for the heartless bastard who lost this." components: - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi state: heart-on - type: Mechanism size: 1 @@ -67,15 +64,27 @@ - !type:HeartBehavior {} - type: entity - id: LungsHuman + id: OrganHumanEars parent: BaseHumanOrgan - name: "human lungs" + name: ears + description: "There are three parts to the ear. Inner, middle and outer. Only one of these parts should normally be visible." + components: + - type: Sprite + state: ears + - type: Mechanism + size: 1 + compatibility: Biological + +- type: entity + id: OrganHumanLungs + parent: BaseHumanOrgan + name: lungs description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier." components: - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi - state: lungs + layers: + - state: lung-l + - state: lung-r - type: Mechanism size: 1 compatibility: Biological @@ -83,14 +92,12 @@ - !type:LungBehavior {} - type: entity - id: StomachHuman + id: OrganHumanStomach parent: BaseHumanOrgan - name: "human stomach" + name: stomach description: "Gross. This is hard to stomach." components: - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi state: stomach - type: Mechanism size: 1 @@ -103,14 +110,12 @@ maxVol: 250 - type: entity - id: LiverHuman + id: OrganHumanLiver parent: BaseHumanOrgan - name: "human liver" - description: "Filters impurities out of a bloodstream and provides other important functionality to a human, such as reagent metabolization." + name: liver + description: "Pairing suggestion: chianti and fava beans." components: - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi state: liver - type: Mechanism size: 1 @@ -123,15 +128,41 @@ toxinLethality: 0.01 - type: entity - id: KidneysHuman + id: OrganHumanKidneys parent: BaseHumanOrgan - name: "human kidneys" + name: kidneys description: "Filters toxins out of a bloodstream." components: - type: Sprite - netsync: false - sprite: Mobs/Species/Human/organs.rsi - state: kidneys + layers: + - state: kidney-l + - state: kidney-r + - type: Mechanism + size: 1 + compatibility: Biological + +- type: entity + id: OrganHumanTongue + parent: BaseHumanOrgan + name: tongue + description: "A fleshy muscle mostly used for lying." + components: + - type: Sprite + state: tongue + - type: Mechanism + size: 1 + compatibility: Biological + +- type: entity + id: OrganHumanAppendix + parent: BaseHumanOrgan + name: appendix + components: + - type: Sprite + layers: + - state: appendix + - state: appendix-inflamed + visible: false - type: Mechanism size: 1 compatibility: Biological diff --git a/Resources/Prototypes/Body/Mechanisms/basic_tests.yml b/Resources/Prototypes/Body/Mechanisms/tests.yml similarity index 100% rename from Resources/Prototypes/Body/Mechanisms/basic_tests.yml rename to Resources/Prototypes/Body/Mechanisms/tests.yml diff --git a/Resources/Prototypes/Body/Mechanisms/vox_organs.yml b/Resources/Prototypes/Body/Mechanisms/vox.yml similarity index 100% rename from Resources/Prototypes/Body/Mechanisms/vox_organs.yml rename to Resources/Prototypes/Body/Mechanisms/vox.yml diff --git a/Resources/Prototypes/Body/Parts/human_parts.yml b/Resources/Prototypes/Body/Parts/human.yml similarity index 97% rename from Resources/Prototypes/Body/Parts/human_parts.yml rename to Resources/Prototypes/Body/Parts/human.yml index 6d14fe543c..c680ced71d 100644 --- a/Resources/Prototypes/Body/Parts/human_parts.yml +++ b/Resources/Prototypes/Body/Parts/human.yml @@ -23,11 +23,11 @@ size: 14 compatibility: Biological mechanisms: - - HeartHuman - - LungsHuman - - StomachHuman - - LiverHuman - - KidneysHuman + - OrganHumanHeart + - OrganHumanLungs + - OrganHumanStomach + - OrganHumanLiver + - OrganHumanKidneys - type: BiologicalSurgeryData - type: Damageable # TODO BODY DettachableDamageableComponent? @@ -54,8 +54,8 @@ compatibility: Biological vital: true mechanisms: - - BrainHuman - - EyesHuman + - OrganHumanBrain + - OrganHumanEyes - type: BiologicalSurgeryData - type: Damageable damageContainer: biologicalDamageContainer diff --git a/Resources/Prototypes/Body/Parts/slime_parts.yml b/Resources/Prototypes/Body/Parts/slime.yml similarity index 97% rename from Resources/Prototypes/Body/Parts/slime_parts.yml rename to Resources/Prototypes/Body/Parts/slime.yml index bf348a9eb4..5009347247 100644 --- a/Resources/Prototypes/Body/Parts/slime_parts.yml +++ b/Resources/Prototypes/Body/Parts/slime.yml @@ -22,11 +22,11 @@ size: 14 compatibility: Biological mechanisms: - - HeartHuman - - LungsHuman - - StomachHuman - - LiverHuman - - KidneysHuman + - OrganHumanHeart + - OrganHumanLungs + - OrganHumanStomach + - OrganHumanLiver + - OrganHumanKidneys - type: BiologicalSurgeryData - type: Damageable # TODO BODY DettachableDamageableComponent? @@ -53,8 +53,8 @@ compatibility: Biological vital: true mechanisms: - - BrainHuman - - EyesHuman + - OrganHumanBrain + - OrganHumanEyes - type: BiologicalSurgeryData - type: Damageable damageContainer: biologicalDamageContainer diff --git a/Resources/Prototypes/Body/Parts/vox_parts.yml b/Resources/Prototypes/Body/Parts/vox.yml similarity index 97% rename from Resources/Prototypes/Body/Parts/vox_parts.yml rename to Resources/Prototypes/Body/Parts/vox.yml index f666121c7a..7b064ddcac 100644 --- a/Resources/Prototypes/Body/Parts/vox_parts.yml +++ b/Resources/Prototypes/Body/Parts/vox.yml @@ -23,11 +23,11 @@ size: 14 compatibility: Biological mechanisms: - - HeartHuman - - LungsHuman - - StomachHuman - - LiverHuman - - KidneysHuman + - OrganHumanHeart + - OrganHumanLungs + - OrganHumanStomach + - OrganHumanLiver + - OrganHumanKidneys - type: BiologicalSurgeryData - type: Damageable # TODO BODY DettachableDamageableComponent? @@ -54,8 +54,8 @@ compatibility: Biological vital: true mechanisms: - - BrainHuman - - EyesHuman + - OrganHumanBrain + - OrganHumanEyes - type: BiologicalSurgeryData - type: Damageable damageContainer: biologicalDamageContainer diff --git a/Resources/Prototypes/Body/Presets/basic_human.yml b/Resources/Prototypes/Body/Presets/human.yml similarity index 100% rename from Resources/Prototypes/Body/Presets/basic_human.yml rename to Resources/Prototypes/Body/Presets/human.yml diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/appendix-inflamed.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/appendix-inflamed.png new file mode 100644 index 0000000000..3e8f7a6ee9 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/appendix-inflamed.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/appendix.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/appendix.png index 4d4fa1293a..f52d5b0cdc 100644 Binary files a/Resources/Textures/Mobs/Species/Human/organs.rsi/appendix.png and b/Resources/Textures/Mobs/Species/Human/organs.rsi/appendix.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/appendixinflamed.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/appendixinflamed.png deleted file mode 100644 index f0cf0a2d97..0000000000 Binary files a/Resources/Textures/Mobs/Species/Human/organs.rsi/appendixinflamed.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-l.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-l.png new file mode 100644 index 0000000000..14e728707a Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-l.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-r.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-r.png new file mode 100644 index 0000000000..d18f4d4572 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeball-r.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs.png deleted file mode 100644 index 301158f76b..0000000000 Binary files a/Resources/Textures/Mobs/Species/Human/organs.rsi/eyeballs.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-l.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-l.png new file mode 100644 index 0000000000..9bcb14ea9d Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-l.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-r.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-r.png new file mode 100644 index 0000000000..442c81338c Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/kidney-r.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys.png deleted file mode 100644 index 4296d5d33a..0000000000 Binary files a/Resources/Textures/Mobs/Species/Human/organs.rsi/kidneys.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/lung-l.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/lung-l.png new file mode 100644 index 0000000000..32aca484b9 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/lung-l.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/lung-r.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/lung-r.png new file mode 100644 index 0000000000..7e29649ccd Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/lung-r.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/lungs.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/lungs.png deleted file mode 100644 index 7a2a48e218..0000000000 Binary files a/Resources/Textures/Mobs/Species/Human/organs.rsi/lungs.png and /dev/null differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json index 1ca0ec3cb8..84720d277e 100644 --- a/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Human/organs.rsi/meta.json @@ -1,65 +1,72 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and cev-eris at https://github.com/tgstation/tgstation/commit/c4b7f3c41b6742aca260fe60cc358a778ba9b8c8 and https://github.com/discordia-space/CEV-Eris/commit/476e374cea95ff5e8b1603c48342bf700e2cd7af", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "appendix" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/7489d8e74693f9ca811e4f8a921de10ed96c619e/icons/obj/surgery.dmi", - "states": [ - { - "name": "appendix", - - }, - { - "name": "appendixinflamed", - - }, - { - "name": "brain", - - }, - { - "name": "ears", - - }, - { - "name": "eyeballs", - - }, - { - "name": "heart-off", - - }, - { - "name": "heart-on", - "delays": [ - [ - 0.6, - 0.1, - 0.1 - ] - ] - }, - { - "name": "kidneys", - - }, - { - "name": "liver", - - }, - { - "name": "lungs", - - }, - { - "name": "stomach", - - }, - { - "name": "tonguenormal", - - } - ] -} \ No newline at end of file + { + "name": "appendix-inflamed" + }, + { + "name": "brain" + }, + { + "name": "ears" + }, + { + "name": "eyeball-l" + }, + { + "name": "eyeball-r" + }, + { + "name": "heart-off" + }, + { + "name": "heart-on", + "delays": [ + [ + 0.6, + 0.1, + 0.1 + ] + ] + }, + { + "name": "kidney-l" + }, + { + "name": "kidney-r" + }, + { + "name": "liver" + }, + { + "name": "lung-l" + }, + { + "name": "lung-r" + }, + { + "name": "stomach" + }, + { + "name": "tongue" + }, + { + "name": "muscle" + }, + { + "name": "nerve" + }, + { + "name": "vessel" + } + ] +} diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/muscle.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/muscle.png new file mode 100644 index 0000000000..38da7e7607 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/muscle.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/nerve.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/nerve.png new file mode 100644 index 0000000000..494b5b0290 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/nerve.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png index 0d7be9bfe4..ebf1d5f514 100644 Binary files a/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png and b/Resources/Textures/Mobs/Species/Human/organs.rsi/stomach.png differ diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/tonguenormal.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/tongue.png similarity index 100% rename from Resources/Textures/Mobs/Species/Human/organs.rsi/tonguenormal.png rename to Resources/Textures/Mobs/Species/Human/organs.rsi/tongue.png diff --git a/Resources/Textures/Mobs/Species/Human/organs.rsi/vessel.png b/Resources/Textures/Mobs/Species/Human/organs.rsi/vessel.png new file mode 100644 index 0000000000..cfca029838 Binary files /dev/null and b/Resources/Textures/Mobs/Species/Human/organs.rsi/vessel.png differ diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json index 4fb3997c36..ce03292c8a 100644 --- a/Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Human/parts.rsi/meta.json @@ -1,231 +1,62 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by DrSmugleaf", - "states": [ - { - "name": "full", - - }, - { - "name": "head_f", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "head_m", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_arm", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_foot", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_hand", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_leg", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_arm", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_foot", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_hand", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_leg", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "torso_f", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "torso_m", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - } - ] + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json index 4bf286bb1b..a7822a9e6c 100644 --- a/Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Slime/parts.rsi/meta.json @@ -1,231 +1,62 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by Zumorica", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi and modified by Zumorica", - "states": [ - { - "name": "full", - - }, - { - "name": "head_f", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "head_m", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_arm", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_foot", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_hand", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "l_leg", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_arm", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_foot", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_hand", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "r_leg", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "torso_f", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - }, - { - "name": "torso_m", - "directions": 4, - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ] - } - ] + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json index 1ed5e8a33c..1070da1203 100644 --- a/Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Vox/parts.rsi/meta.json @@ -1 +1,75 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb", "states": [{"name": "groin_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "groin_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "head_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "head_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "l_arm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "l_foot", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "l_hand", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "l_leg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "overlay_husk", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "r_arm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "r_foot", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "r_hand", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "r_leg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "torso_f", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "torso_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "vox_m", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 02ff588d59b3c560c685d9ca75e882d32a72d8cb", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "groin_f", + "directions": 4 + }, + { + "name": "groin_m", + "directions": 4 + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "overlay_husk", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + }, + { + "name": "vox_m", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Parts/lungs_phoronman.png b/Resources/Textures/Mobs/Species/lungs_phoronman.png similarity index 100% rename from Resources/Textures/Mobs/Parts/lungs_phoronman.png rename to Resources/Textures/Mobs/Species/lungs_phoronman.png