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

Two new paintings #103

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Two new paintings #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3173867
paintings
FluffiestFloof Oct 5, 2023
b587fc7
Merge branch 'DeltaV-Station:master' into painting2
FluffiestFloof Oct 9, 2023
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
19 changes: 19 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/paintings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: entity
parent: PaintingBase
id: PaintingBlunt
name: Blunt Painting
description: A blunt smoking weird-cat thing with a smug look.
components:
- type: Sprite
sprite: DeltaV/Structures/Wallmounts/Paintings/ps3moira.rsi
state: bluntpainting

- type: entity
parent: PaintingBase
id: PaintingSpoon
name: Spoon Painting
description: The type of painting that really ties together a room.
components:
- type: Sprite
sprite: DeltaV/Structures/Wallmounts/Paintings/leonardodabepis.rsi
state: spoonpainting
4 changes: 3 additions & 1 deletion Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@
- PaintingSleepingGypsy
- PaintingRedBlueYellow
- PaintingHelloWorld
- PaintingSpoon # DeltaV Painting, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/painting.yml
chance: 1
rarePrototypes:
- PaintingSkeletonBoof
- PaintingEmpty
- PaintingMoony
- PaintingAmogusTriptych
- PaintingMothBigCatch # Nyanotrasen Painting, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/painting.yml
- PaintingMothBigCatch # Nyanotrasen Painting, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/painting.yml
- PaintingBlunt # DeltaV Painting, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/painting.yml
rareChance: 0.01
14 changes: 14 additions & 0 deletions Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/leonardodabepis.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Made by @leonardo_dabepis.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "spoonpainting"
}
]
}
Binary file added ...es/DeltaV/Structures/Wallmounts/Paintings/leonardodabepis.rsi/spoonpainting.png
View file
Open in desktop
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 .../Textures/DeltaV/Structures/Wallmounts/Paintings/ps3moira.rsi/bluntpainting.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/ps3moira.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Taken from Delta-V discord, modified by ps3moira#9488",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "bluntpainting"
}
]
}
Loading