From d5ee8868e3614615ec69b06d6ca75e731ad3158d Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Tue, 10 Oct 2023 05:42:19 +0200 Subject: [PATCH] paintings (#103) --- .../Structures/Wallmounts/paintings.yml | 19 ++++++++++++++++++ .../Markers/Spawners/Random/paintings.yml | 4 +++- .../Paintings/leonardodabepis.rsi/meta.json | 14 +++++++++++++ .../leonardodabepis.rsi/spoonpainting.png | Bin 0 -> 1395 bytes .../Paintings/ps3moira.rsi/bluntpainting.png | Bin 0 -> 1385 bytes .../Paintings/ps3moira.rsi/meta.json | 14 +++++++++++++ 6 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/paintings.yml create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/leonardodabepis.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/leonardodabepis.rsi/spoonpainting.png create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/ps3moira.rsi/bluntpainting.png create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/ps3moira.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/paintings.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/paintings.yml new file mode 100644 index 00000000000..af2e3e79ec3 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/paintings.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml index fc537d240b2..af1289065ce 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml @@ -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 diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/leonardodabepis.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/leonardodabepis.rsi/meta.json new file mode 100644 index 00000000000..2b8b9b58dd8 --- /dev/null +++ b/Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/leonardodabepis.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Made by @leonardo_dabepis.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spoonpainting" + } + ] +} diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/leonardodabepis.rsi/spoonpainting.png b/Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/leonardodabepis.rsi/spoonpainting.png new file mode 100644 index 0000000000000000000000000000000000000000..8463f36a47de69763da363070832960e296967b7 GIT binary patch literal 1395 zcmV-(1&sQMP)CCXZ;(%c~Je^EPtGP8P z_>Nu-Vg!IsX12AISl>N&wxjuKPIw1owej)pdVQUAJ}y1YUq^v*|BUPIKR+SDRYo7zpnGmp4sK zIRLJ9fzfA6=5k#M(DG{<@NoeQ`=vIv}u3Qj}8i|syWF>ozniyReOmL@YG-858KoqFZ zmQQ~((=x5|VcO|*raTIb-E`)?dH0-q?tSmw3;gFFCF6HrXo|_tHk&Ogv;u)Z-0s!B z0TDY#iBweElx@*1a*{< z$F=6wW750qz3ilHI8HzSlv!WA-XJh|18V%MM^$yWRms>ao6V3ar+r;MH^93<%DZu7=Z;3dOJ@L6Hf^N@k;(f0leD2gi2}_ zrL!MVWAwt$6X@)Es%u8QvywufmM0yV8xLM!x5EIR-vE=rh!OW9eBrRTB+phz>_^55 zm`oN>F$yJ?JoxB{2=4WTQCL)rUz0A}>3*q6LhWP{0ku4OZrtm6g=PnXqWoNVf(*P2 zg9s-bq}!cNM3$l`&NmUMkWmQCRvQX(yZ{{o9pMn>0e!)U2>AKaAQ0tXw`(8gl9P!< z&nN_JNIKJv#wa`?$@}863bdU*kJ`F=EOAj-Eg2}FW~ZfLPw#8A)r8;+599c$b1<3m5oSU- zySD-d59}mL!n7x$mW8>6048#y_-ot(-go5kN>7apVSMN-7}_r`DX{BrL$%6D1V};< zq8YG!;#D;?qSCnw?)gOwzVC-`Ub<6s;F?+1_5Q3xqcsG)lR&FguX>(wu5C}J2`MZ$r73>+4F?bi|f*K1_QX3X{t2WvyW9^;)*$3J8H Bf&%~m literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/ps3moira.rsi/bluntpainting.png b/Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/ps3moira.rsi/bluntpainting.png new file mode 100644 index 0000000000000000000000000000000000000000..e3e6132b5d621295f12daae9cadb6fcf7b8b1c3a GIT binary patch literal 1385 zcmV-v1(y1WP)Px)2}wjjR9J=0muYNNRTRg6@4Z=GJ9MGgLJMW7rOU7hCDjCoK*dr(gchx>iVzV9 zTY?6pT0>A1B)BG)s?kuxVuGNNh(-`Uhy(#Cbb}U=2805UPCKP^w$6KgxSg@nc{Y5o z$oX{NUC#aA|Nq>3-huzwq(GxM+pY)NR;$`4n|VC$V0-t8vl4)*`-Bm3(Ezyp0*k6h z-G@W^-F`h}yyqIjZ`BOIHRrA1x)1;WjgB_pzh@zE`oJN>09dVR5cR&(7xBqrfjw&s zrY>>nPW_HOD+2&s?xdln9)Lko45}?dGK)I#1HK* z2LRP|$I+Y-031C09Yqh`fdqYRJ#SVB0|9zG9uJx(`ea!{?_%vt%`s*@QUE}8LnUs_ z1whfV0t%j<13*J<12c2;0MOhr^YV%TFw0hO{uTzvFb4d1Q6xcoWBoO9rV8gJ@4du; z!BGHYPE2L}wp9SEeR3tUpPdT8jQNkU@xXEbHZA;!Eqh-SPIW7rXBLOWK!^lA>A4$b zD1js?B*zT{ps;iy#j73%pxy0cWMV1+CHq&<9^C}M+MP>COBXky)YGdxOqJQKh}JYYv@$~Du1aXed0&}Y$h9;HwJ)?_*Pbbvj70I z%M6HvjIEU!BzHaU$2#DF@V)L$39_;u!r3hDvc;rwv*Zu}&+CcA`2+)POU|=@Qa=Dr zdTJS&Df-x?bxrMT%8~}1!Rdm0& zpI72#%F90$AX6f+McDxOqI?f!NjY2txG#0Hh?OF>umk0K8I%A%J@`7pStCH#ckoVDHbn@XI3b`bFA!Dz^}T zH}XE@)QOV-d|UPdJIZze@a~rP*;OIp!)tNjrc-PbD!nm)fZe!pgHJx#3Bah>i6~wD z7Rk!>OX8K=u%eV%&&&p(^5Ri^W)UZAH!jDgi+GSU35zariW!R`fV(ci9sQ6jS}-4{ zUz{R6LS^q75s=F(w&QdO22wIoS@FuUz)Jis@!(h#m8xHB04Oaf<xzS17P)>$Cx}?Bp09JBkExh8~ct|(CladATn0P)TP-AuNP4| ze+vM!rWZj=RoGr367-~}FRbS+2!1V|GC@zWS!i^$ak{|)2ugL6LQAvw%^nat0GA>_ znuf)2;pPP~=O(;*Xej`G$;(^$6~bvdm_33HMUNzZLNX)bqG`JAW&4pzDFi@qwp~w* zi3(ONeOZ_^I@*j&Gl0Yxp}kRw)x8`uD&Kk=cXyR#z21VpI(@*p7pM1({S9^K(Hi%S ryNv(<01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjfgj{a9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/ps3moira.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/ps3moira.rsi/meta.json new file mode 100644 index 00000000000..a30f6be86bb --- /dev/null +++ b/Resources/Textures/DeltaV/Structures/Wallmounts/Paintings/ps3moira.rsi/meta.json @@ -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" + } + ] +}