From 6e56ef6dd100107a15025488955100824139cf81 Mon Sep 17 00:00:00 2001 From: "Ilya (Torgovec)" <148097034+TORGOVEC471@users.noreply.github.com> Date: Sun, 23 Jun 2024 11:35:46 +0600 Subject: [PATCH] new_posters --- Resources/Changelog/ChangelogADT.yml | 7 +++ .../structures/wallmounts/signs/posters.ftl | 12 +++++ .../Structures/Wallmount/Signs/posters.yml | 42 ++++++++++++++++++ .../Markers/Spawners/Random/posters.yml | 4 ++ .../Decoration/poster_syndycat.rsi/error.png | Bin 0 -> 204 bytes .../poster_syndycat.rsi/gasattack.png | Bin 0 -> 809 bytes .../Decoration/poster_syndycat.rsi/meta.json | 23 ++++++++++ .../Decoration/poster_syndycat.rsi/nobad.png | Bin 0 -> 927 bytes .../Decoration/poster_syndycat.rsi/nogood.png | Bin 0 -> 878 bytes 9 files changed, 88 insertions(+) create mode 100644 Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/error.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/gasattack.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/nobad.png create mode 100644 Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/nogood.png diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 248fd131976..75d09ec9187 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -1889,3 +1889,10 @@ Entries: - { message: "Добавлена фигурка Офицера Синего Щита.", type: Add} id: 55760 #костыль отображения в Обновлениях time: '2024-06-09T18:59:00.0000000+00:00' + +- author: Torgovec + changes: + - {message: Добавлено 4 новых плаката, type: Add} + - {message: Теперь нианы могут сьесть берет СИ, type: Fix} + id: 55761 #костыль отображения в Обновлениях + time: '2024-06-23T04:19:00.0000000+00:00' \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl index 6483eb204fe..7fb33f90dcd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl @@ -337,3 +337,15 @@ ent-ADTPosterPlasmaMan = Плазма(мены) ent-ADTPosterContrabandRoza = Роза .desc = Символ Атмосии. + +ent-ADTPosterError = Что-то здесь не так + .desc = Кажется кто-то забыл добавить сюда осмысленное изображение + +ent-ADTPosterNoBad = Где-то, но не здесь + .desc = Вы могли бы быть там, если бы не работали на НТ + +ent-ADTPosterNoGood = Где-то, но не тут + .desc = Вы могли бы быть там, если бы вы не работали на НТ + +ent-ADTPosterGasAttack = Газовая атака! + .desc = НТ предупреждает о тритиевых гранатах у синдиката, а так же о саботаже атмоса от вражеских агентов! \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml index 05fb28b87d4..196d63a15f4 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml @@ -787,3 +787,45 @@ sprite: ADT/Structures/Wallmounts/128x128posters.rsi state: roza scale: 0.25, 0.25 + +# Странные постеры + +- type: entity + parent: PosterBase + id: ADTPosterError + name: Error Poster + description: This is an error poster. + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_syndycat.rsi + state: error + +- type: entity + parent: PosterBase + id: ADTPosterNoBad + name: No Bad + description: This poster promotes good behavior. + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_syndycat.rsi + state: nobad + +- type: entity + parent: PosterBase + id: ADTPosterNoGood + name: No Good + description: This poster warns against bad behavior. + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_syndycat.rsi + state: nogood + +- type: entity + parent: PosterBase + id: ADTPosterGasAttack + name: Gas Attack + description: This poster warns about gas attacks. + components: + - type: Sprite + sprite: ADT/Objects/Decoration/poster_syndycat.rsi + state: gasattack diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 9e7caea8eab..da59e5a6c4d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -103,6 +103,8 @@ - ADTPosterLustyMoth - ADTPosterWatchOutChem - ADTPosterPanem + - ADTPosterGasAttack + - ADTPosterNoGood chance: 1 - type: entity @@ -172,4 +174,6 @@ - ADTPosterDontTalkToArty - ADTPosterWorkUnderWay - ADTPosterPlasmaMan + - ADTPosterError + - ADTPosterNoBad chance: 1 diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/error.png b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/error.png new file mode 100644 index 0000000000000000000000000000000000000000..c19ea8e9c06e267519bddfa858f8f849fd8c62b0 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D462u z;usRq`gYnz-UA9eEWStd=Ih-~Ig#Tm?(fXjG4YOqdHK`V2i3W_jT@4pM7(BMx9$9$ z9~VD0zCLKW+3p})&&0YVe)%knECLP*J2^K?=iT!7>bLvwo- pg?H`G6Ph=G_VJ}gc&7RKGH3zW96$^Lmx3pQC{I^Emvv4FO#nx6K1cun literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/gasattack.png b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/gasattack.png new file mode 100644 index 0000000000000000000000000000000000000000..495df75ae348d7bbb94c50900e15bbaedc872833 GIT binary patch literal 809 zcmV+^1J?YBP)XR(n&wqa3*nV~b|LuuQ7By^1 z%^p+etBvPsg{7m~ja#5+TYjSVUn}`${KNBw5~Tnlf|;>%yu;vhFw-{e%gginEwfSp zRVB+ZT-O1x_hJu#{z)I#bwxe5!RcV8PZiU$MiD_(aXp8Kc;TLhaXm->q(9@!h5ILc z4qhHq0$92NX2z#?pE!JV2*8K8AN;_L+o5^+==D+IOWq`v07|1^ZMQ>~WtiFARN02- zt3^S+1&aW(EUON&z$zU=5t$KdHk)(%4~N5h11vp+qfu0>gsKw9F#wx!k0eP*l7!8; z2SB^s{$qyupp^l}W1mkZN}2}T-1r4clDh{i_c^ywq`bZ|z~8Wc6Cgf}XYxPGj|R|e zt^v?!L~Lw0>UDnx_V@Ph2K9TE5Ho28gyJ zT+3l&LqtdiDWbj)0<~VP5YET03^4r_s*2log;<`V-KmR8yl4*bV1Q}yuoI%HL^~1b zmlW4_ForM=aV>WXr5 zzlM39PabwcU;q80N83JHqE>`qSY}MVPhiP|x%4%ZmK4vgZhDApn4xXIctJM+1Fb7J z7dHT;XDKMSmLvU^t_~1v1^$PJfW`_2vgLt-PJm(Px(6|gpdJt$1lWObae4vZ&&tXG z+X2*l+04Lx3v~iyT?%0gzZK%^VnY46&h^J@CTEjUfG7WB^534^egOpGBI#W}Satva n01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjfYD8ar literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/meta.json b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/meta.json new file mode 100644 index 00000000000..8bf90e1fb15 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:Schrodinger для Времени Приключений МРП сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "error" + }, + { + "name": "nobad" + }, + { + "name": "nogood" + }, + { + "name": "gasattack" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/nobad.png b/Resources/Textures/ADT/Objects/Decoration/poster_syndycat.rsi/nobad.png new file mode 100644 index 0000000000000000000000000000000000000000..94f2a5a7ee3fd8a002388fb69caac835091e9b17 GIT binary patch literal 927 zcmV;Q17Q4#P)W* z{O@`58UA%>GU59AdK^U&nxpGgIp=lbv@8h~IhGAeB1^~TY4*=iyDVNLW zx=tL&Se8YpR3Z#Rc6N4h_U5FlG>yHz_8*+)J$aQUXyFO_Vbt^!Zb>3ll; z#?^sdnj=~0GGVDy%E^BH{J_(5`k3(>wejVfCzEw|=No)F{KlD6Cx&yL=Sc}jJ)rBO zjbDBENYhD9xUmX%>kR*OWj)>Ylxl2<-lFpE!<-6A+ajHbU;Km^7V` z8@m9>spgFQx`&N$Fqe1iOa%J<5p(y*;r@Oywib>_Hz|U-IeEcN^?(TX$Qh1BGNN3B zsG~}3DFHDF#gY`~R7ORJI;tv|8UjLL!pswz1o0p<<$!6L!*OTuU(J%4h74J;vZfN4 zpP$dkIubn@s_7s@HVA^^1XOH`Kt)s)I;ka9*OKAU%4aU#-k7SVY0@{poPf$*Sv))Y zvydLh!>S~pDw!-g-7d?^%Y}4j3PBhaPj}Cm-VY#C+5)Ec0RYNCJ}+)IP6KdBX|_C- zn3RC)y5yacZsu|R_68M_N()Ke(3b{@*ab{rcWZlWwW_kD((H?)iYNTw$JRD2zybWh zuf^!9@MUXz&=1_<9;&cT=mSX@><2Hf2{^MFk#-lmUE$#PCNRqErFxg9T>%0XA3q1i zuiP_r!topkfPi)%&=NiqS_M8CQo|`MEAJI0f%I!< z(tZAKLFs|DHES$$gCL+1c~qyXlS6IfdU#@ zA_NT$MQGAcKtn?V5|p%nh!7GzqVxulSOk$Z53w_wOEI&v4j~KJ5j0%M@_HY0&OPVM zUBmzS$0a*mNRmW%6KF6P{1hvyd+5zz0Kl*%ti=tif&mI3YWEnf^s#_NFeBgLSfSPF za^>yDju^EB%KF%n03Nk_2n6thbMq7kR-jO@K)U>lR=Z0R_>iX1h{q!^YzZ4P!sp0! zHr46zDee0XU6qv*`UwikU=#y~pOUC{c14!G)|) zSbO!7J?$Mx3-&*hW6(Inmz=VWVCF z@jep3FJ^FQL&+5uvP}J7e@{p z$W^gY+he@~rKGtM{47IvHEwb}D=-L)ndL$paXy~HsD%5hw{C0&M#C3gGz!fFfISFMpMcy4YG=0{!q(t_Z304I#%d{hD5-nmub#rn>F$KaQPXseeY z6C&Kp@-6p19)1HL&-3jIjY}X`{A;zG@51f(pZ^G8A_6zozwRp7&#Hb<|AnemAW4$H z#p8edyZR1;d))*`;O>6_000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$ Eg4NE6FaQ7m literal 0 HcmV?d00001