Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resprite for the Banana Phone #30137

Closed
wants to merge 6 commits into from
Closed

Resprite for the Banana Phone #30137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10b1764
Changed Banana Phone Sprite
Katzenminer Jul 17, 2024
e51b59f
Merge branch 'sprite-Fix' of https://github.com/Katzenminer/space-sta…
Katzenminer Jul 17, 2024
2c9b1bb
Merge branch 'space-wizards:master' into sprite-Fix
Katzenminer Jul 17, 2024
d8e6419
Merge branch 'space-wizards:master' into sprite-Fix
Katzenminer Jul 18, 2024
2b24cdc
Added Copyright
Katzenminer Jul 18, 2024
97586fe
Merge branch 'sprite-Fix' of https://github.com/Katzenminer/space-sta…
Katzenminer Jul 18, 2024
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
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- type: entity
- type: entity
parent: BaseHandheldInstrument
id: MusicalLungInstrument
name: musical lung
Expand Down
Binary file modified Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/banana_phone.png
View file
Open in desktop
Katzenminer marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331, /tg/station at commit https://github.com/tgstation/tgstation/commit/6681c3b347b8ec5c845f980c4c309c61223d9942. banana_phone is a modification of red_phone made by noudoit (github) for ss14",
"copyright":"https://github.com/vgstation-coders/vgstation13 at 8d9c91e19cb52713c7f7f1804c2b6f7203f8d331, /tg/station at commit https://github.com/tgstation/tgstation/commit/6681c3b347b8ec5c845f980c4c309c61223d9942 and modefied by Katzenminer(github)",
"states": [
{
"name": "bike_horn"
Expand Down
Loading