From 06747e0f7e7d04cf87e63a359a3a86b1a35442cc Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Fri, 7 Jul 2023 00:23:02 -0600 Subject: [PATCH] some silly paintings and posters (#17872) * webedit * Update meta.json * god is real hes here with us * so true * so truers rise * worst meta.json ive seen in my life * so true --- .../Structures/Wallmounts/Signs/paintings.yml | 11 ++++++- .../Structures/Wallmounts/Signs/posters.yml | 29 +++++++++++++++++- .../Wallmounts/paintings.rsi/meta.json | 5 +-- .../Wallmounts/paintings.rsi/painting19.png | Bin 0 -> 590 bytes .../Wallmounts/posters.rsi/meta.json | 2 +- .../Wallmounts/posters.rsi/poster40_legit.png | Bin 0 -> 900 bytes .../Wallmounts/posters.rsi/poster41_legit.png | Bin 0 -> 398 bytes .../Wallmounts/posters.rsi/poster42_legit.png | Bin 0 -> 775 bytes 8 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Structures/Wallmounts/paintings.rsi/painting19.png create mode 100644 Resources/Textures/Structures/Wallmounts/posters.rsi/poster40_legit.png create mode 100644 Resources/Textures/Structures/Wallmounts/posters.rsi/poster41_legit.png create mode 100644 Resources/Textures/Structures/Wallmounts/posters.rsi/poster42_legit.png diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml index 4791d549e6..0b2d95c856 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml @@ -178,4 +178,13 @@ 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 + state: painting18 + +- type: entity + parent: PaintingBase + id: PaintingSadClown + name: Sad Clown + description: This painting is a sad clown! It sparks joy. + components: + - type: Sprite + state: painting19 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index 5f3184eab1..61c6c308c9 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -885,11 +885,38 @@ parent: PosterBase id: PosterLegitSecWatch name: "Sec is Watching You" - description: A poster reminding you that security is watching your every move. + description: "A poster reminding you that security is watching your every move." components: - type: Sprite state: poster39_legit +- type: entity + parent: PosterBase + id: PosterLegitAnatomyPoster + name: "Anatomy of a spessman" + description: "A poster showing the bits and bobs that makes you... you!" + components: + - type: Sprite + state: poster40_legit + +- type: entity + parent: PosterBase + id: PosterLegitMime + name: "Mime Postmodern" + description: "A postmodern depiction of a mime, superb!" + components: + - type: Sprite + state: poster41_legit + +- type: entity + parent: PosterBase + id: PosterLegitCarpMount + name: "Wall-mounted Carp" + description: "Carpe diem!" + components: + - type: Sprite + state: poster42_legit + #maps - type: entity diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/paintings.rsi/meta.json index 2aa4e851ef..9adfaab21a 100644 --- a/Resources/Textures/Structures/Wallmounts/paintings.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/paintings.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by EmoGarbage, Painting 17 and the Among Us IP is used in respect with the policy at https://www.innersloth.com/fan-creation-policy/", + "copyright": "Created by EmoGarbage, Painting 17 and the Among Us IP is used in respect with the policy at https://www.innersloth.com/fan-creation-policy/, painting 19 was taken from vg station at commit https://github.com/vgstation-coders/vgstation13/commit/af32149e4e9e4ccb1edcbc36d9a1f72b05a6c66c", "size": { "x": 32, "y": 32 @@ -25,6 +25,7 @@ { "name": "painting15" }, { "name": "painting16" }, { "name": "painting17" }, - { "name": "painting18" } + { "name": "painting18" }, + { "name": "painting19" } ] } diff --git a/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting19.png b/Resources/Textures/Structures/Wallmounts/paintings.rsi/painting19.png new file mode 100644 index 0000000000000000000000000000000000000000..7dc8dd530a650d72ee318af686170a09859f9689 GIT binary patch literal 590 zcmV-U0@%z61AV51-xpd?ke6^6q)QcYfc!=iKMrpcQLv z;Qt!9xk^rr_YPuZhwTRDfuQGyi9R0Rjp?obKKFfT12Ujl#ZIpEaY@@V&1-7F2$TU? z(Od(78-dG$lnlr~1N-~bXf}B~91f{aC{VZ4p=PT^)9KgZIUEjJBuh=0N~I{9%`#XB zF-%;R%lf@^I{jlVDFa@wm%81q9tQ&fz77Ths#Gcr7bcF9Ngl&UqtUR(K(E*1*$4oV zyWMW8)oK)v$Jt0Y9Of8hfk8Zn_iQl$l}aV@`~5ry5DJAt3_H!`$mMcTzuza1$HTv& z7i6T=1DQ;Q%K>4wq7+cQUgv8x8kL&4B?FL1ewNScv&0x>saC7B?Q|;Tv$PA)cv$w) zXvA?a7}U4n(`3S{B)bZh44}IK+x7W4ZnxXtVl=C4DJ&U4V&0mcP@!2kq-h%WjO_;S z1vJ7SlmIdMKt)Oh1YCUej4%-wi^bpRfx|?CB9REgX9XY{Q3Y(tz@nN8@S^|zr46V6 z%uYbk25^j;2a`>FetVyqjUQiME|d(IfsBdGWCoNnAWpA4n_I_L6U%C057-S;Ht-i( c8(6u455J@Rn{hRi{r~^~07*qoM6N<$g2+V!{{R30 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index 51e414ac4d..cde1eaf618 100644 --- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460", "size": {"x": 32, "y": 32}, "states": [{"name": "rolled_contraband"}, {"name": "rolled_legit"}, {"name": "poster_being_set", "delays": [[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]]}, {"name": "pinningposter"}, {"name": "poster_broken"}, {"name": "poster1_contraband"}, {"name": "poster2_contraband"}, {"name": "poster3_contraband"}, {"name": "poster4_contraband"}, {"name": "poster5_contraband"}, {"name": "poster6_contraband"}, {"name": "poster7_contraband"}, {"name": "poster8_contraband"}, {"name": "poster9_contraband"}, {"name": "poster10_contraband"}, {"name": "poster11_contraband"}, {"name": "poster12_contraband"}, {"name": "poster13_contraband"}, {"name": "poster14_contraband"}, {"name": "poster15_contraband"}, {"name": "poster16_contraband"}, {"name": "poster17_contraband"}, {"name": "poster18_contraband"}, {"name": "poster19_contraband"}, {"name": "poster20_contraband"}, {"name": "poster21_contraband"}, {"name": "poster22_contraband"}, {"name": "poster23_contraband"}, {"name": "poster24_contraband"}, {"name": "poster25_contraband"}, {"name": "poster26_contraband"}, {"name": "poster27_contraband"}, {"name": "poster28_contraband"}, {"name": "poster29_contraband"}, {"name": "poster30_contraband"}, {"name": "poster31_contraband"}, {"name": "poster32_contraband"}, {"name": "poster33_contraband"}, {"name": "poster35_contraband"}, {"name": "poster36_contraband"}, {"name": "poster37_contraband"}, {"name": "poster38_contraband"}, {"name": "poster39_contraband"}, {"name": "poster40_contraband"}, {"name": "poster41_contraband"}, {"name": "poster42_contraband"}, {"name": "poster43_contraband"}, {"name": "poster44_contraband"}, {"name": "poster45_contraband"}, {"name": "poster46_contraband"}, {"name": "poster47_contraband"}, {"name": "poster48_contraband"}, {"name": "poster50_contraband"}, {"name": "poster55_contraband"}, {"name": "poster56_contraband"}, {"name": "poster51_contraband"}, {"name": "poster1_legit"}, {"name": "poster2_legit"}, {"name": "poster3_legit"}, {"name": "poster4_legit"}, {"name": "poster5_legit"}, {"name": "poster6_legit"}, {"name": "poster7_legit"}, {"name": "poster8_legit"}, {"name": "poster9_legit"}, {"name": "poster10_legit"}, {"name": "poster11_legit"}, {"name": "poster12_legit"}, {"name": "poster13_legit"}, {"name": "poster14_legit"}, {"name": "poster15_legit"}, {"name": "poster16_legit"}, {"name": "poster17_legit"}, {"name": "poster18_legit"}, {"name": "poster19_legit"}, {"name": "poster20_legit"}, {"name": "poster21_legit"}, {"name": "poster22_legit"}, {"name": "poster23_legit"}, {"name": "poster24_legit"}, {"name": "poster25_legit"}, {"name": "poster26_legit"}, {"name": "poster27_legit"}, {"name": "poster28_legit"}, {"name": "poster29_legit"}, {"name": "poster30_legit"}, {"name": "poster31_legit"}, {"name": "poster32_legit"}, {"name": "poster33_legit"}, {"name": "poster34_legit"}, {"name": "poster35_legit"}, {"name": "poster36_legit"}, {"name": "poster37_legit"}, {"name": "poster38_legit"}, {"name": "poster39_legit"}, {"name": "random_legit"}, {"name": "random_contraband"}, {"name": "random_anything"}, {"name": "poster52_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster53_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster54_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "bagelmap", "directions": 1, "delays": [[1.0]]}, {"name": "deltamap", "directions": 1, "delays": [[1.0]]}, {"name": "marathonmap", "directions": 1, "delays": [[1.0]]}, {"name": "originmap", "delays": [[1.0]]}, {"name": "moosemap", "directions": 1, "delays": [[1.0]]}, {"name": "packedmap", "directions": 1, "delays": [[1.0]]}, {"name": "pillarmap", "directions": 1, "delays": [[1.0]]}, {"name": "salternmap", "directions": 1, "delays": [[1.0]]}, {"name": "splitmap", "directions": 1, "delays": [[1.0]]}, {"name": "lighthousemap", "directions": 1, "delays": [[1.0]]}, {"name": "waystationmap", "directions": 1, "delays": [[1.0]]}]} +{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460", "size": {"x": 32, "y": 32}, "states": [{"name": "rolled_contraband"}, {"name": "rolled_legit"}, {"name": "poster_being_set", "delays": [[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]]}, {"name": "pinningposter"}, {"name": "poster_broken"}, {"name": "poster1_contraband"}, {"name": "poster2_contraband"}, {"name": "poster3_contraband"}, {"name": "poster4_contraband"}, {"name": "poster5_contraband"}, {"name": "poster6_contraband"}, {"name": "poster7_contraband"}, {"name": "poster8_contraband"}, {"name": "poster9_contraband"}, {"name": "poster10_contraband"}, {"name": "poster11_contraband"}, {"name": "poster12_contraband"}, {"name": "poster13_contraband"}, {"name": "poster14_contraband"}, {"name": "poster15_contraband"}, {"name": "poster16_contraband"}, {"name": "poster17_contraband"}, {"name": "poster18_contraband"}, {"name": "poster19_contraband"}, {"name": "poster20_contraband"}, {"name": "poster21_contraband"}, {"name": "poster22_contraband"}, {"name": "poster23_contraband"}, {"name": "poster24_contraband"}, {"name": "poster25_contraband"}, {"name": "poster26_contraband"}, {"name": "poster27_contraband"}, {"name": "poster28_contraband"}, {"name": "poster29_contraband"}, {"name": "poster30_contraband"}, {"name": "poster31_contraband"}, {"name": "poster32_contraband"}, {"name": "poster33_contraband"}, {"name": "poster35_contraband"}, {"name": "poster36_contraband"}, {"name": "poster37_contraband"}, {"name": "poster38_contraband"}, {"name": "poster39_contraband"}, {"name": "poster40_contraband"}, {"name": "poster41_contraband"}, {"name": "poster42_contraband"}, {"name": "poster43_contraband"}, {"name": "poster44_contraband"}, {"name": "poster45_contraband"}, {"name": "poster46_contraband"}, {"name": "poster47_contraband"}, {"name": "poster48_contraband"}, {"name": "poster50_contraband"}, {"name": "poster55_contraband"}, {"name": "poster56_contraband"}, {"name": "poster51_contraband"}, {"name": "poster1_legit"}, {"name": "poster2_legit"}, {"name": "poster3_legit"}, {"name": "poster4_legit"}, {"name": "poster5_legit"}, {"name": "poster6_legit"}, {"name": "poster7_legit"}, {"name": "poster8_legit"}, {"name": "poster9_legit"}, {"name": "poster10_legit"}, {"name": "poster11_legit"}, {"name": "poster12_legit"}, {"name": "poster13_legit"}, {"name": "poster14_legit"}, {"name": "poster15_legit"}, {"name": "poster16_legit"}, {"name": "poster17_legit"}, {"name": "poster18_legit"}, {"name": "poster19_legit"}, {"name": "poster20_legit"}, {"name": "poster21_legit"}, {"name": "poster22_legit"}, {"name": "poster23_legit"}, {"name": "poster24_legit"}, {"name": "poster25_legit"}, {"name": "poster26_legit"}, {"name": "poster27_legit"}, {"name": "poster28_legit"}, {"name": "poster29_legit"}, {"name": "poster30_legit"}, {"name": "poster31_legit"}, {"name": "poster32_legit"}, {"name": "poster33_legit"}, {"name": "poster34_legit"}, {"name": "poster35_legit"}, {"name": "poster36_legit"}, {"name": "poster37_legit"}, {"name": "poster38_legit"}, {"name": "poster39_legit"}, {"name": "poster40_legit"}, {"name": "poster41_legit"}, {"name": "poster42_legit"}, {"name": "random_legit"}, {"name": "random_contraband"}, {"name": "random_anything"}, {"name": "poster52_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster53_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster54_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "bagelmap", "directions": 1, "delays": [[1.0]]}, {"name": "deltamap", "directions": 1, "delays": [[1.0]]}, {"name": "marathonmap", "directions": 1, "delays": [[1.0]]}, {"name": "originmap", "delays": [[1.0]]}, {"name": "moosemap", "directions": 1, "delays": [[1.0]]}, {"name": "packedmap", "directions": 1, "delays": [[1.0]]}, {"name": "pillarmap", "directions": 1, "delays": [[1.0]]}, {"name": "salternmap", "directions": 1, "delays": [[1.0]]}, {"name": "splitmap", "directions": 1, "delays": [[1.0]]}, {"name": "lighthousemap", "directions": 1, "delays": [[1.0]]}, {"name": "waystationmap", "directions": 1, "delays": [[1.0]]}]} diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster40_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster40_legit.png new file mode 100644 index 0000000000000000000000000000000000000000..27136cd7297d24dff4d7c97a374c703e5d51c4f9 GIT binary patch literal 900 zcmV-~1AF|5P)cgB+J0j z-7bQHScU{yF^IgVAS7E}1Q9EWFvwh3;Z2L$O@c;Uc+-#N)Cq#phJRqx_kQy`opapI zzO#+$fpN}v&ij4u^ZxHx@Q;y}KzwrYm(^}p)`_X9jE9jt$?5mm9FAqC3D6<+d)x@U z3M=b$P%Bl-srQ>Ez+Xnc;b=uUzu$eJ4zFMI@cSp9hLE_u9l>i+zV>~M@hi!yt96dSQ7|`5$<$Ur|V;+LJW_^=7?Q zTi>68&tgS`XB=G}tx|hT69_cgK zBtQ!FR#;E;@h}uPD{<&y5A54&@wEB4l8A!1EKD~dQcn088^D7zA(S0Hh>`B+2y`cN zKzL2YdP4%K8qZkA4y@YgQP!igw=nvs3suJ&u+aAgElvk64t|06(q*Z}Wk^8Zc*yeg z`j`A_@ZL3M zjx^~3m2yJ7=P~A3{P$nIiB4uUbwdh4UJ0m`Qteau2`C;AYs)kX$27YuR$6n;1cckE z`>B-^sQ$?Vlmn!c@_^<7c|*1mq(UG_h$|%^C8V#@kAR0JVhKV+Gs#9IX?aEhOBzXI zFMl>R@dGYaigZP9J8MSs-0h>Y7XIGbKPcUV3<(fY{R=8BSfeqy z^8m@`bsWopW&tH)StP>O`f;4e8-@h*e=t))B;pA305u=s0Rnk}=0es4^vY+Roise` z-Z~reKwR@ICl6>267wL%9C$Zhu-Jf#G*uvzjMCGPAGkOR^cWvYAe82eoIIfUE?^m- z3S@1%T*>*nKx|ekNN16Fu9nNB+>k(RO$}nvVdM&@Yh`u>-bNy6zvs;0^LJw-{@<_T azlGo96pwKevo1FP00000A5XkeKe(t*_5DSvVS?T|=L|?sr0-Pvw99 zCV=qAJfnwZ0{l4uY&RSW=g>Zi*Z8cQmB7ETZhv_J>10@$#?=^$FS0DLQ@5iTPL z0{a%|guC!lKo!nEYTLS=ZxizGKlyQtnqX8z%!3%C@Zs5->(*e?@eISj=0X{Q07h{< s1s@|hz?~!9s0F^l!B((RU{5ZAH+);30s33bu>b%707*qoM6N<$f-oMYBme*a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster42_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster42_legit.png new file mode 100644 index 0000000000000000000000000000000000000000..11103c9e82145de8cb9e10b76cbd44164298c556 GIT binary patch literal 775 zcmV+i1Ni)jP)z7H|cN3BM9(|&xR6J39DgcN> znC)`H4M4;Zj|CvT4jUj~wrETRuvN_ka(gFzK;6cX{$EZVSr^(FrnL9A_hAnjeQQ)A z0C@TB$38v0erU#693th^&|Kx1z8@~>D12zND79KL@9%Z`dR;(l(5`_)ssaFbX#K?( z`ccnN_sOpaEsIJB9y9Z5oZMyVHCwb&Wr&=H+8`R8r)BdzU^IZ-PWAe^h;Y7|#FnBr z>7Nl8wqPVY2#&;1!LTsbOWXaduNvUl_E)->cJx4H9PS(6Tm_S%ii!kMpdbxII2AG_ zwn#vng;^ZoHxYO|$kU^2$3S?I$OJq@^-G9wN@NsxtgQbzYTVx?a+{hO$Y!&1gTY`V zAu6HKj?ULRN5Jwfu{mjBVhI?$if`UL3!cU6IbpwqEoocIE(w$Hmx+06iTL{_mtCBmu zj6oCxi8MTKQKTJ5S}`CtSN&eTe$hV%VDj|icH3^+qXx^XkfRoC;#L4yt?3^eHJUf$ zd=vws=gQ}bbgWJ0i+>#7y6Z*b%F0cu(qiD$yIni@d3E;5S9OfU;V{lCuB+002ovPDHLk FV1ikkW{Cg* literal 0 HcmV?d00001