This repository has been archived by the owner on Oct 25, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 53
Replace Ifrit with Tribarine Being #196
Open
leonardo-dabepis
wants to merge
9
commits into
DeltaV-Station:master
Choose a base branch
from
leonardo-dabepis:spicy-triangle
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
c4962e5
replace mysta's ifrit with tribarine being
leonardo-dabepis aab812f
Update familiars.yml
leonardo-dabepis 91acd88
fixed folder capitalization issue but at what cost
leonardo-dabepis 11209da
Merge branch 'master' into spicy-triangle
leonardo-dabepis 78089fa
Update Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta…
leonardo-dabepis 13c0b80
Update Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/met…
leonardo-dabepis b05870a
Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Cha…
leonardo-dabepis 8307b07
Merge branch 'master' into spicy-triangle
leonardo-dabepis 621be5d
Update Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/met…
leonardo-dabepis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Chapel/bibles.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
leonardo-dabepis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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 |
4 changes: 2 additions & 2 deletions
4
Resources/Prototypes/Nyanotrasen/Markers/Spawners/ghost_roles.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
{ | ||
"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 | ||
] | ||
leonardo-dabepis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
] | ||
} | ||
] | ||
} |
Binary file added
BIN
+1.42 KB
Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+4.41 KB
Resources/Textures/DeltaV/Mobs/Aliens/golems/triangle.rsi/triangle_flare.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+852 Bytes
Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+830 Bytes
...rces/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+829 Bytes
...ces/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions
22
Resources/Textures/DeltaV/Objects/Specific/Epistemics/mysta_book.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
} | ||
] | ||
} |
Binary file added
BIN
+816 Bytes
Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.27 KB
Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left-flame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+99 Bytes
Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.27 KB
Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right-flame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+99 Bytes
Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
115 changes: 115 additions & 0 deletions
115
Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,115 @@ | ||
{ | ||
"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 | ||
] | ||
leonardo-dabepis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
] | ||
}, | ||
{ | ||
"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 | ||
] | ||
leonardo-dabepis marked this conversation as resolved.
Show resolved
Hide resolved
|
||
] | ||
} | ||
] | ||
} |
Binary file added
BIN
+974 Bytes
Resources/Textures/DeltaV/Objects/Tools/triangle_spice.rsi/welder_flame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Folder is
DeltaV/Mobs/Aliens/golems/triangle.rsi
but game is looking forDeltaV/Mobs/Aliens/Golems/triangle.rsi
Casual capitalization issue
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay I think I fixed it but I couldn't figure out how to make changes without changing the actual files in the folders, so I was forced to add a new Secret Character