From b15b2991079943a5483fd9e4f5463c53fc993dcc Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Thu, 26 Dec 2024 00:22:34 +0000 Subject: [PATCH] 2 new Contra Poster --- .../structures/wallmounts/signs/posters.ftl | 4 ++++ .../structures/wallmounts/signs/posters.ftl | 5 +++++ .../Markers/Spawners/Random/posters.yml | 2 ++ .../Structures/Wallmounts/Signs/posters.yml | 20 ++++++++++++++++++ .../Wallmounts/posters.rsi/meta.json | 8 ++++++- .../posters.rsi/sunriseposter2_contraband.png | Bin 0 -> 1085 bytes .../posters.rsi/sunriseposter3_contraband.png | Bin 0 -> 1588 bytes 7 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter2_contraband.png create mode 100644 Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter3_contraband.png diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl index d49c6bb5c54..72df9e8ccba 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl @@ -2,3 +2,7 @@ ent-PosterContrabandAriralInSpace = Ariral in Space .desc = This is clearly a message..I think I forgot something... ent-PosterLegitAIOverseer = AI is watching .desc = Anything can be automated, Security included + ent-PosterContrabandSam300 = SAM-300 + .desc = A poster advertising the SAM-300 from Cybersun Industries. + ent-PosterContrabandSyndiMechs = Syndi Mechs + .desc = A poster advertising the Syndi Mechs from Cybersun Industries. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl index 6eae32247aa..98ad63c1e17 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/structures/wallmounts/signs/posters.ftl @@ -2,3 +2,8 @@ ent-PosterContrabandAriralInSpace = Арирал в космосе .desc = Это явно послание.. Что-то я забыл.. ent-PosterLegitAIOverseer = ИИ видит .desc = Автоматизировать можно всё, даже Службу Безопасности. +ent-PosterContrabandSam300 = SAM-300 + .desc = Плакат, рекламирующий SAM-300 от Cybersun Industries. +ent-PosterContrabandSyndiMechs = Синди Мехи + .desc = Плакат, рекламирующий Мехов от компании Cybersun Industries. + diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 5e6c9f3ab96..6cac54e8edc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -32,6 +32,8 @@ offset: 0 prototypes: - PosterContrabandAriralInSpace # Sunrise-edit + - PosterContrabandSam300 # Sunrise-edit + - PosterContrabandSyndiMechs # Sunrise-edit - PosterContrabandFreeTonto - PosterContrabandAtmosiaDeclarationIndependence - PosterContrabandFunPolice diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml index 6741234dbb4..4f8d9c8c552 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Wallmounts/Signs/posters.yml @@ -8,6 +8,26 @@ sprite: _Sunrise/Structures/Wallmounts/posters.rsi state: sunriseposter1_contraband +- type: entity + parent: PosterBase + id: PosterContrabandSam300 + name: "SAM-300" + description: "A poster advertising the SAM-300 from Cybersun Industries." + components: + - type: Sprite + sprite: _Sunrise/Structures/Wallmounts/posters.rsi + state: sunriseposter2_contraband + +- type: entity + parent: PosterBase + id: PosterContrabandSyndiMechs + name: "Syndi Mechs" + description: "A poster advertising the Mechs from Cybersun Industries." + components: + - type: Sprite + sprite: _Sunrise/Structures/Wallmounts/posters.rsi + state: sunriseposter3_contraband + - type: entity parent: PosterBase id: PosterLegitAIOverseer diff --git a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/meta.json index 31f1962388f..919767f4ea9 100644 --- a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CLA", - "copyright": "Made for SUNRISE sunriseposter1_contraband made by discord: pressf6151. sunriseposter1_legit made by discord: rinary.", + "copyright": "Made for SUNRISE sunriseposter1_contraband made by discord: pressf6151. sunriseposter1_legit made by discord: rinary. sunriseposter2/3_legit made by discord: KaiserMaus ", "size": { "x": 32, "y": 32 @@ -12,6 +12,12 @@ }, { "name": "sunriseposter1_legit" + }, + { + "name": "sunriseposter2_contraband" + }, + { + "name": "sunriseposter3_contraband" } ] } diff --git a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter2_contraband.png b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter2_contraband.png new file mode 100644 index 0000000000000000000000000000000000000000..441c2e355ac8866448b6ecc2cccf9eb98b870727 GIT binary patch literal 1085 zcmV-D1j74?P)Px&_en%SR9J=OmrYAsSs2HE_ePBYBS9UEUNM1&D~&6P=_(L0OeJURE~#(~nh=^x~r z=bY#5{GaEX8{tcbp(fdE)>HHI^Yi+qVGxN#h{a-aI?vpY9bOS{yBL(h@+oxeUI3 zP?Kmh3e@X7Mc(K58G9{Gf~Qrsx?MYz%Vn91wyMi(Zupdg4ui5H^Y@0`g|;5_rR2~A zJgyomPOx(L8e@bt8 zeU(Q&r~Ewk3y*qEeKHW5xQ~IZt}eMk%j>HW+|FeAVe1c8)_!AV`a2#!eZubkJ7Gs5 zIXJ@i@59HEyAc}P$AJDm-@bW^+c$5Cyi)oXfUT`9pkA8f;7Hq3g&~-5O9GWj1*kX6 z{Ne)3>#Ov}<2c(J%qDN}a{L?S7Z;=tRGCx~DJx0Ib(y$#M@pq+AhiCVy#r%oV_whZ zrfeLgZ3*UV*D36c$0@lkfUi+Yt}A=(Mmv+G`1)4>*0k8dfPOWC)Y+M=Br{NO7$`V6 z+Z#Sw6%(p-x@>2%ZA&0ccy@N?+tBZDvx)XdPCSs4C^iNP4o+j7Z)iH(8$MZo2XsgY zMn^}zuin0u4OIel8dZj1k{<)T1j2y+h0^PvvXU&XueJ?V$>rGJ-^a2nip3)3a+zz# z$Lu5$TsuCdlFLyn78yP~lryuv4Aq=F`X|KOfkd1bqS!0SfxkD&f-Zqe00000NkvXXu0mjf D;VThV literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter3_contraband.png b/Resources/Textures/_Sunrise/Structures/Wallmounts/posters.rsi/sunriseposter3_contraband.png new file mode 100644 index 0000000000000000000000000000000000000000..56b3a2e5be3be7c1697310e4ac5ced1dafe0822f GIT binary patch literal 1588 zcmV-42Fv-0P)Px)?ny*JR9J=OmtSZc*A>QpJ3C!@)0tttRxN2p)6-kO^ z6BH#-{2&EN5-2VhLPPsdOsSrl2iJMfLx>Q;m5AfYl!7W1;dQXG?xt8yWQ(MWv`b@K z@-j0ZZM53S!_JIm|46hhv=9B@a?ic@+&SMp=iYO6;r|^zM~FtFmLqR(Z@ zaO>7BAAsmG@%aeey<5TVnb&`gxt0S!I-v5=?|ut_ACRg}60rNHs^%?Vvue(WMt8_m zyX45w5X&Kj1TZ&qowvuwd3$`ExtZ%EfaQ?Fk)fgLZT}VoVaKfNfkL4`*U%8L&S#Jg zs66;GM|-ivD^DKtaT)R5u8gJDO z5fBCPo26Yt@v*1j=^borY`C%;f)A#z(W)H+U^TnKi+P>7nd|f{E&?zYi}7M!=Y3WH z$mjD&l7y*gG-tClBu4h|KwSbq?thNH{?klO{(;r(3O8ag0NxKN0JH)VvW#FGU(IG2 z0WJfrHi>((Oj}zUEH09&;}ye}o9cz&=E4Fq(^D0jRgz}PrcAL|L{St<+vRjI z1x#xi&W?MsjG`!IJz1{!j$wP`yglC9+NvdBSr#8mUt?}&nm2#(YgeJCyPG$Dc7a?j zha^cTih{1|ycLTP3Wazp7DLx{6h%RjByzbNS;L?jDZ4@CD{w>5(9i(DslI-0B$KRW zS7^`cEZ+WzsSiIyRaH#WMAvmxRdq8TfU2tGayeJlJS2K+sO<6#OQjO+d7ZhLXu1-!64u{coowl|%bX_ML4wC{zQRJ^39el?y=z8q}XGSk^X7mzWuU*)cKurkh z!R+Y3G)imaUN`KQ7jfwgFz0b(*WF$$Ju;J=4Nu9-gunZ^1Khq zl@)+cDD=y~+FD%#fweUx!{AXQLa9_D91c?|mH6&gUt!9!JKps9X#7?)`zbM-PNT%* ztT#6^n@)51K$wtN~PD*b) z&f#>LF9!w*1cIz)?z?+k0^aPj8zf1>G)>mm*WC~}eK;IOlFC0*?#JUaMmxFqa=9Yh zPAzaBP=G5FW1Jm42g!M$Di1(qVKDTQpRzRnCmJ&uu1t*48;^rc zu$+eNx+iHDM=x2&yH8ldp1EP${TD|sS%9Ugs#R_Oe+Hj-@WW?c@B`di{uE#v;2&Qs m)$aOFjrw-X*8Da5Z{urT!H#f=iuFMN0000