diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml index 327214a102..70bd112b95 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/familiars.yml @@ -1,23 +1,26 @@ - type: entity parent: SimpleSpaceMobBase id: MobIfritFamiliar - name: Ifrit - description: The mystagogue's servant. + name: Tribarine Being + description: The mystagogue's servant, summoned from a different spacial dimension. It is difficult to look at and has the tendency to light things on fire. components: - type: Sprite drawdepth: Mobs - sprite: Mobs/Aliens/Guardians/guardians.rsi + sprite: DeltaV/Mobs/Aliens/Golems/triangle.rsi layers: - - state: magic_base + - state: triangle_base map: [ "enum.DamageStateVisualLayers.Base" ] - - state: magic_flare + - state: triangle_flare map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] color: "#40a7d7" shader: unshaded - type: RandomSprite available: - enum.DamageStateVisualLayers.BaseUnshaded: - magic_flare: Sixteen + triangle_flare: Emagged + - type: PointLight + radius: 2 + color: "#2F0A28" - type: Fixtures fixtures: fix1: @@ -93,13 +96,13 @@ - type: entity parent: WelderExperimental id: WelderIfrit - name: ifrit hand - description: The welding hand of an ifrit. + name: Tribarine Flame Array + description: Orbs of fire that the Tribar can use to weld things. components: - type: Sprite - sprite: Nyanotrasen/Objects/Tools/ifrit_hand.rsi + sprite: DeltaV/Objects/Tools/triangle_spice.rsi - type: Item - sprite: Nyanotrasen/Objects/Tools/ifrit_hand.rsi + sprite: DeltaV/Objects/Tools/triangle_spice.rsi - type: SolutionContainerManager solutions: Welder: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml index c3a1dfa436..3698970d13 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml @@ -1,14 +1,14 @@ - type: entity parent: Bible id: BibleMystagogue - name: book of mysteries - description: The mystagogue's holy book. + name: Field Guide to Advanced Anomalous Sciences + description: A book issued to all mystagogues, meant to prepare them for some of the more advanced concepts in epistemics. Now including a tutorial on summoning Tribarine Beings! components: - type: Summonable specialItem: SpawnPointGhostIfrit - type: Sprite - sprite: Nyanotrasen/Objects/Specific/Chapel/holylight.rsi + sprite: DeltaV/Objects/Specific/Epistemics/mysta_book.rsi state: icon - type: Item size: 15 - sprite: Nyanotrasen/Objects/Specific/Chapel/holylight.rsi + sprite: DeltaV/Objects/Specific/Epistemics/mysta_book.rsi diff --git a/Resources/Prototypes/Nyanotrasen/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Nyanotrasen/Markers/Spawners/ghost_roles.yml index c4520d8572..e38d2e3038 100644 --- a/Resources/Prototypes/Nyanotrasen/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Nyanotrasen/Markers/Spawners/ghost_roles.yml @@ -1,14 +1,14 @@ - type: entity id: SpawnPointGhostIfrit name: ghost role spawn point - suffix: Ifrit + suffix: Tribar parent: MarkerBase noSpawn: true components: - type: GhostRoleMobSpawner prototype: MobIfritFamiliar - type: GhostRole - name: Mystagogue's Ifrit + name: Mystagogue's Tribarine Being description: Obey the mystagogue. Defend the oracle. rules: You are a servant of the mystagogue. Obey them directly. - type: Sprite diff --git a/Resources/Textures/DeltaV/Mobs/Aliens/Mysterious/glizzybeth.PNG b/Resources/Textures/DeltaV/Mobs/Aliens/Mysterious/glizzybeth.PNG new file mode 100644 index 0000000000..7643f14254 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Aliens/Mysterious/glizzybeth.PNG differ diff --git a/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json new file mode 100644 index 0000000000..4bc3b5fc67 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "triangle_base", + "directions": 4 + }, + { + "name": "triangle_flare", + "directions": 4, + "delays": [ + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_base.png b/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_base.png new file mode 100644 index 0000000000..5441b4b524 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_base.png differ diff --git a/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_flare.png b/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_flare.png new file mode 100644 index 0000000000..df471f8921 Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_flare.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/icon.png new file mode 100644 index 0000000000..1f3ac8e567 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-left.png new file mode 100644 index 0000000000..4ca4f5d056 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-right.png new file mode 100644 index 0000000000..1490222c74 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/meta.json new file mode 100644 index 0000000000..7e47493c46 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/icon.png new file mode 100644 index 0000000000..6764c94718 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left-flame.png b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left-flame.png new file mode 100644 index 0000000000..83fd010d15 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left-flame.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left.png new file mode 100644 index 0000000000..bb5db873e8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right-flame.png b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right-flame.png new file mode 100644 index 0000000000..83fd010d15 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right-flame.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right.png new file mode 100644 index 0000000000..bb5db873e8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json new file mode 100644 index 0000000000..03875665bf --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "welder_flame" + }, + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + }, + { + "name": "inhand-left-flame", + "directions": 4, + "delays": [ + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ], + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ], + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ], + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ] + ] + }, + { + "name": "inhand-right-flame", + "directions": 4, + "delays": [ + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ], + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ], + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ], + [ 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13, 0.13 ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/welder_flame.png b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/welder_flame.png new file mode 100644 index 0000000000..7a31bbcf9c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/welder_flame.png differ