diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml index 781771efd4..886faf917c 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml @@ -17,4 +17,18 @@ - PaintingTheGreatWave - PaintingCafeTerraceAtNight - PaintingNightHawks + - PaintingSkeletonCigarette + - PaintingPrayerHands + - PaintingOldGuitarist + - PaintingOlympia + - PaintingSaturn + - PaintingSleepingGypsy + - PaintingRedBlueYellow + - PaintingHelloWorld chance: 1 + rarePrototypes: + - PaintingSkeletonBoof + - PaintingEmpty + - PaintingMoony + - PaintingAmogusTriptych + rareChance: 0.01 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml index 9d92c35049..4791d549e6 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml @@ -88,4 +88,94 @@ description: This painting depicts a lonely-looking diner. The patrons are sitting glumly at the counter. components: - type: Sprite - state: painting8 \ No newline at end of file + state: painting8 + +- type: entity + parent: PaintingBase + id: PaintingSkeletonCigarette + name: Skull of a Skeleton with Burning Cigarette + description: This painting depicts an impressionist portrait of a skeleton. A lit cigarette is wedged between its teeth. + components: + - type: Sprite + state: painting9 + +- type: entity + parent: PaintingBase + id: PaintingSkeletonBoof + name: Skull of MLG Skeleton with Fat Boof + description: Painting goes hard. Feel free to screenshot. + components: + - type: Sprite + state: painting10 + +- type: entity + parent: PaintingBase + id: PaintingPrayerHands + name: Study of the Hands of an Apostle + description: This painting depicts a pair of hands clasped in prayer. + components: + - type: Sprite + state: painting11 + +- type: entity + parent: PaintingBase + id: PaintingOldGuitarist + name: The Old Guitarist + description: This painting depicts an old, thin man clutching a guitar. His face looks shallow and sickly. + components: + - type: Sprite + state: painting12 + +- type: entity + parent: PaintingBase + id: PaintingOlympia + name: Olympia + description: This painting depicts a nude woman lying on a bed. A servant is tending to her. + components: + - type: Sprite + state: painting13 + +- type: entity + parent: PaintingBase + id: PaintingSaturn + name: Saturn Devouring His Son + description: This painting depicts giant devouring a human corpse. He has a frightening look in his eyes. + components: + - type: Sprite + state: painting14 + +- type: entity + parent: PaintingBase + id: PaintingSleepingGypsy + name: The Sleeping Gypsy + description: This painting depicts a gypsy sleeping among their belongings in the desert. A lion stands behind them. + components: + - type: Sprite + state: painting15 + +- type: entity + parent: PaintingBase + id: PaintingRedBlueYellow + name: Composition with Red Blue and Yellow + description: This painting is made up of several boxes. They are filled with flat shades of color. + components: + - type: Sprite + state: painting16 + +- type: entity + parent: PaintingBase + id: PaintingAmogusTriptych + name: Amogus Triptych (Untitled.) + description: This painting is made up of 3 individual sections. Each depicts a religious figure. + components: + - type: Sprite + state: painting17 + +- type: entity + parent: PaintingBase + id: PaintingHelloWorld + name: Hello World + description: This painting is made up of lots of multicolored squares arranged in a peculiar pattern. Perhaps it means something? + components: + - type: Sprite + state: painting18 \ No newline at end of file diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/paintings.rsi/meta.json index 82fbb7ed6d..c705e9e249 100644 --- a/Resources/Textures/Structures/Wallmounts/paintings.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/paintings.rsi/meta.json @@ -15,6 +15,16 @@ { "name": "painting5" }, { "name": "painting6" }, { "name": "painting7" }, - { "name": "painting8" } + { "name": "painting8" }, + { "name": "painting9" }, + { "name": "painting10" }, + { "name": "painting11" }, + { "name": "painting12" }, + { "name": "painting13" }, + { "name": "painting14" }, + { "name": "painting15" }, + { "name": "painting16" }, + { "name": "painting17" }, + { "name": "painting18" } ] } diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting10.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting10.png new file mode 100644 index 0000000000..9fd501dc03 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting10.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting11.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting11.png new file mode 100644 index 0000000000..4f08b2ce97 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting11.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting12.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting12.png new file mode 100644 index 0000000000..e2e276f6f2 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting12.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting13.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting13.png new file mode 100644 index 0000000000..625de714ad Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting13.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting14.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting14.png new file mode 100644 index 0000000000..931941e7f9 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting14.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting15.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting15.png new file mode 100644 index 0000000000..043fb15cd1 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting15.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting16.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting16.png new file mode 100644 index 0000000000..cec24088e9 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting16.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting17.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting17.png new file mode 100644 index 0000000000..359937935d Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting17.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting18.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting18.png new file mode 100644 index 0000000000..0ba3971f0a Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting18.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting2.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting2.png index 4eae30762b..0cfa5f0a0f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting2.png and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting4.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting4.png index 5cb54370f6..a939e7ec30 100644 Binary files a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting4.png and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting4.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting5.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting5.png index 5c5838e51f..dbfe85aeff 100644 Binary files a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting5.png and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting5.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting7.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting7.png index a1b5b2a148..928721f9af 100644 Binary files a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting7.png and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting7.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting8.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting8.png index a2d4df4d58..022dd96524 100644 Binary files a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting8.png and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting8.png differ diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting9.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting9.png new file mode 100644 index 0000000000..6c6d89df1c Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting9.png differ